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

diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb
index 4bd46512f4..af6ced9f7c 100644
--- a/lib/rss/2.0.rb
+++ b/lib/rss/2.0.rb
@@ -6,9 +6,9 @@ module RSS
 
     class Channel
 
-      %w(generator ttl).each do |x|
-        install_text_element(x)
-        install_model(x, '?')
+      %w(generator ttl).each do |name|
+        install_text_element(name)
+        install_model(name, '?')
       end
 
       remove_method :ttl=
@@ -26,8 +26,8 @@ module RSS
       [
         ["image", "?"],
         ["language", "?"],
-      ].each do |x, occurs|
-        install_model(x, occurs)
+      ].each do |name, occurs|
+        install_model(name, occurs)
       end
 
       def other_element(need_convert, indent)
@@ -47,8 +47,8 @@ EOT
 
       alias _tags09 _tags
       def _tags
-        rv = %w(generator ttl).delete_if do |x|
-          send(x).nil?
+        rv = %w(generator ttl).delete_if do |name|
+          send(name).nil?
         end.collect do |elem|
           [nil, elem]
         end + _tags09
@@ -67,25 +67,25 @@ EOT
         [
           ["comments", "?"],
           ["author", "?"],
-        ].each do |x, occurs|
-          install_text_element(x)
-          install_model(x, occurs)
+        ].each do |name, occurs|
+          install_text_element(name)
+          install_model(name, occurs)
         end
 
         [
           ["pubDate", '?'],
-        ].each do |x, occurs|
-          install_date_element(x, 'rfc822')
-          install_model(x, occurs)
+        ].each do |name, occurs|
+          install_date_element(name, 'rfc822')
+          install_model(name, occurs)
         end
         alias date pubDate
         alias date= pubDate=
 
         [
           ["guid", '?'],
-        ].each do |x, occurs|
-          install_have_child_element(x)
-          install_model(x, occurs)
+        ].each do |name, occurs|
+          install_have_child_element(name)
+          install_model(name, occurs)
         end
       
         def other_element(need_convert, indent)
@@ -108,8 +108,8 @@ EOT
 
         alias _tags09 _tags
         def _tags
-          %w(comments author pubDate guid).delete_if do |x|
-            send(x).nil?
+          %w(comments author pubDate guid).delete_if do |name|
+            send(name).nil?
           end.collect do |elem|
             [nil, elem]
           end + _tags09
@@ -162,8 +162,8 @@ EOT
 
   end
 
-  RSS09::ELEMENTS.each do |x|
-    BaseListener.install_get_text_element(x, nil, "#{x}=")
+  RSS09::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element(nil, name, "#{name}=")
   end
 
 end