* 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, 25 insertions, 25 deletions

diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index 86c19afc70..0e0f8d9fd2 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -44,8 +44,8 @@ module RSS
       install_model(tag, occurs)
     end
 
-    %w(channel image textinput).each do |x|
-      install_have_child_element(x)
+    %w(channel image textinput).each do |name|
+      install_have_child_element(name)
     end
 
     install_have_children_element("item")
@@ -87,8 +87,8 @@ module RSS
       rv = [
         [::RSS::URI, "channel"],
         [::RSS::URI, "image"],
-      ].delete_if {|x| send(x[1]).nil?}
-      @item.each do |x|
+      ].delete_if {|uri, name| send(name).nil?}
+      @item.each do |item|
         rv << [::RSS::URI, "item"]
       end
       rv << [::RSS::URI, "textinput"] if @textinput
@@ -142,7 +142,7 @@ module RSS
 
       def _tags
         rv = []
-        @li.each do |x|
+        @li.each do |li|
           rv << [URI, "li"]
         end
         rv
@@ -210,12 +210,12 @@ module RSS
         install_get_attribute(name, uri, required)
       end
 
-      %w(title link description).each do |x|
-        install_text_element(x)
+      %w(title link description).each do |name|
+        install_text_element(name)
       end
 
-      %w(image items textinput).each do |x|
-        install_have_child_element(x)
+      %w(image items textinput).each do |name|
+        install_have_child_element(name)
       end
       
       [
@@ -263,8 +263,8 @@ module RSS
           [::RSS::URI, 'image'],
           [::RSS::URI, 'items'],
           [::RSS::URI, 'textinput'],
-        ].delete_if do |x|
-          send(x[1]).nil?
+        ].delete_if do |uri, name|
+          send(name).nil?
         end
       end
 
@@ -431,8 +431,8 @@ module RSS
         install_get_attribute(name, uri, required)
       end
 
-      %w(title url link).each do |x|
-        install_text_element(x)
+      %w(title url link).each do |name|
+        install_text_element(name)
       end
     
       [
@@ -467,8 +467,8 @@ module RSS
           [::RSS::URI, 'title'],
           [::RSS::URI, 'url'],
           [::RSS::URI, 'link'],
-        ].delete_if do |x|
-          send(x[1]).nil?
+        ].delete_if do |uri, name|
+          send(name).nil?
         end
       end
 
@@ -501,8 +501,8 @@ module RSS
         install_get_attribute(name, uri, required)
       end
 
-      %w(title link description).each do |x|
-        install_text_element(x)
+      %w(title link description).each do |name|
+        install_text_element(name)
       end
 
       [
@@ -537,8 +537,8 @@ module RSS
           [::RSS::URI, 'title'],
           [::RSS::URI, 'link'],
           [::RSS::URI, 'description'],
-        ].delete_if do |x|
-          send(x[1]).nil?
+        ].delete_if do |uri, name|
+          send(name).nil?
         end
       end
 
@@ -571,8 +571,8 @@ module RSS
         install_get_attribute(name, uri, required)
       end
 
-      %w(title description name link).each do |x|
-        install_text_element(x)
+      %w(title description name link).each do |name|
+        install_text_element(name)
       end
     
       [
@@ -610,8 +610,8 @@ module RSS
           [::RSS::URI, 'description'],
           [::RSS::URI, 'name'],
           [::RSS::URI, 'link'],
-        ].delete_if do |x|
-          send(x[1]).nil?
+        ].delete_if do |uri, name|
+          send(name).nil?
         end
       end
       
@@ -628,8 +628,8 @@ module RSS
 
   end
 
-  RSS10::ELEMENTS.each do |x|
-    BaseListener.install_get_text_element(x, URI, "#{x}=")
+  RSS10::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element(URI, name, "#{name}=")
   end
 
   module ListenerMixin