* lib/rss: backoported from HEAD.

* lib/rss: refactored.
  - gave a name to 'x'.
  - undef_method -> remove_method for avoiding a warning in ruby 1.6.


* lib/rss/parser.rb: @@setter -> @@setters.

* lib/rss/parser.rb
  (RSS::BaseListener.register_uri)
  (RSS::BaseListener.uri_registered?)
  (RSS::BaseListener.install_get_text_element):
  swapped the first argument and the second argument.

* lib/rss/taxonomy.rb: swapped the first argument and the second
  argument for RSS::BaseListener.install_get_text_element.
* lib/rss/image.rb: ditto.
* lib/rss/syndication.rb: ditto.
* lib/rss/dublincore.rb: ditto.
* lib/rss/parser.rb: ditto.
* lib/rss/1.0.rb: ditto.
* lib/rss/2.0.rb: ditto.
* lib/rss/0.9.rb: ditto.
* lib/rss/content.rb: ditto.

* lib/rss/parser.rb
  (RSS::BaseListener.install_setter)
  (RSS::BaseListener.register_uri): changed fallback way.

* lib/rss/parser.rb: added class name registry for complex model
  elements. (ex. have childlen elements, have some attributes and
  a child element and so on.)


* lib/rss/dublincore.rb: supported multiple Dublin Core items.
* lib/rss/maker/dublincore.rb: ditto.
* lib/rss/maker/image.rb: supproted new Dublin Core API.
* lib/rss/maker/base.rb: added default current_element implementation.
* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
  moved to RSS::Utils.

* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
  moved from RSS::TrackBackUtils.

* lib/rss/maker/image.rb: fixed invalid argument of
  add_need_initialize_variable bug.
* lib/rss/maker/trackback.rb: ditto.

* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
  for date value.


* test/test_dublincore.rb: added tests for plural accessor and
  multiple Dublin Core items.

* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
  values.

* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
  an assertion for testing multiple Dublin Core items.

* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
  for making multiple Dublin Core items.

* test/rss/test_maker_dc.rb (test_date): added a test for #date=
  and #dc_date=.


* sample/rss/tdiary_plugin/rss-recent.rb:
  new option: @options['rss-recent.use-image-link']:
  use image as link instread of text if available.

* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
  0.0.5 -> 0.0.6.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 17 deletions

diff --git a/lib/rss/trackback.rb b/lib/rss/trackback.rb
index 439bdf3843..973a1035d1 100644
--- a/lib/rss/trackback.rb
+++ b/lib/rss/trackback.rb
@@ -11,18 +11,10 @@ module RSS
 
   module TrackBackUtils
     private
-    def new_with_value_if_need(klass, value)
-      if value.is_a?(klass)
-        value
-      else
-        klass.new(value)
-      end
-    end
-          
     def trackback_validate(tags)
       counter = {}
-      %w(ping about).each do |x|
-        counter["#{TRACKBACK_PREFIX}_#{x}"] = 0
+      %w(ping about).each do |name|
+        counter["#{TRACKBACK_PREFIX}_#{name}"] = 0
       end
 
       tags.each do |tag|
@@ -48,9 +40,9 @@ module RSS
       unless klass.class == Module
         klass.__send__(:include, TrackBackUtils)
 
-        %w(ping).each do |x|
-          var_name = "#{TRACKBACK_PREFIX}_#{x}"
-          klass_name = x.capitalize
+        %w(ping).each do |name|
+          var_name = "#{TRACKBACK_PREFIX}_#{name}"
+          klass_name = name.capitalize
           klass.install_have_child_element(var_name)
           klass.module_eval(<<-EOC, __FILE__, __LINE__)
             remove_method :#{var_name}
@@ -60,7 +52,7 @@ module RSS
 
             remove_method :#{var_name}=
             def #{var_name}=(value)
-              @#{var_name} = new_with_value_if_need(#{klass_name}, value)
+              @#{var_name} = Utils.new_with_value_if_need(#{klass_name}, value)
             end
           EOC
         end
@@ -88,16 +80,16 @@ module RSS
             remove_method :set_#{var_name}
             def #{var_name}=(*args)
               if args.size == 1
-                item = new_with_value_if_need(#{klass_name}, args[0])
+                item = Utils.new_with_value_if_need(#{klass_name}, args[0])
                 @#{var_name}.push(item)
               else
                 new_val = args.last
                 if new_val.is_a?(Array)
                   new_val = new_value.collect do |val|
-                    new_with_value_if_need(#{klass_name}, val)
+                    Utils.new_with_value_if_need(#{klass_name}, val)
                   end
                 else
-                  new_val = new_with_value_if_need(#{klass_name}, new_val)
+                  new_val = Utils.new_with_value_if_need(#{klass_name}, new_val)
                 end
                 @#{var_name}.send("[]=", *(args[0..-2] + [new_val]))
               end