diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-25 00:15:08 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-25 00:15:08 +0000 |
| commit | 2d579c00745e342db294a4a4afb547c85ceac05c (patch) | |
| tree | 21a21fe9c9b7b053f6b91acef5e109f096cbee1a /lib/rdoc | |
| parent | f1ef3d600d5b0a8253dc5d6585f0607f2f23f515 (diff) | |
* lib/rdoc/generator/darkfish.rb: Fixed debug message. RDoc bug #174
by Thomas Leitner.
* lib/rdoc/store.rb: Fixed deletion of ri attribute data when a class
was loaded then saved. RDoc bug #171 by Thomas Leitner.
* test/rdoc/test_rdoc_store.rb: Test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/generator/darkfish.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/store.rb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index 103a244a25..ba62646e77 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -453,7 +453,7 @@ class RDoc::Generator::Darkfish template_file = @template_dir + 'servlet_not_found.rhtml' return unless template_file.exist? - debug_msg "Rendering the servlet root page..." + debug_msg "Rendering the servlet 404 Not Found page..." rel_prefix = rel_prefix = '' search_index_rel_prefix = rel_prefix diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb index 4975c6af51..6cbbfb5b69 100644 --- a/lib/rdoc/store.rb +++ b/lib/rdoc/store.rb @@ -819,13 +819,13 @@ class RDoc::Store @cache[:ancestors][full_name] ||= [] @cache[:ancestors][full_name].concat ancestors - attributes = klass.attributes.map do |attribute| + attribute_definitions = klass.attributes.map do |attribute| "#{attribute.definition} #{attribute.name}" end - unless attributes.empty? then + unless attribute_definitions.empty? then @cache[:attributes][full_name] ||= [] - @cache[:attributes][full_name].concat attributes + @cache[:attributes][full_name].concat attribute_definitions end to_delete = [] @@ -839,13 +839,15 @@ class RDoc::Store class_methods = class_methods. map { |method| method.name } instance_methods = instance_methods.map { |method| method.name } + attribute_names = klass.attributes.map { |attr| attr.name } old = @cache[:class_methods][full_name] - class_methods to_delete.concat old.map { |method| method_file full_name, "#{full_name}::#{method}" } - old = @cache[:instance_methods][full_name] - instance_methods + old = @cache[:instance_methods][full_name] - + instance_methods - attribute_names to_delete.concat old.map { |method| method_file full_name, "#{full_name}##{method}" } |