From 02cce7ed8273bab55081357c57f24a8265a6f32a Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jun 2006 01:28:46 +0000
Subject: * lib/rss/rss.rb (Kernel#funcall): removed. * lib/rss/parser.rb
 (Kernel.URI): removed.

* lib/rss/maker/: supported
    xxx.new_yyy do |yyy|
      yyy.zzz = zzz
      ...
    end
  style and this style became the style of the recommendation.

  Old style
    yyy = xxx.new_yyy
    yyy.zzz = zzz
    ...
  is supported too but this style isn't recommended.
  [ruby-talk:197284]

* test/rss/test_*maker*.rb: used new recommended style.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rss/test_setup_maker_1.0.rb | 106 +++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 50 deletions(-)

(limited to 'test/rss/test_setup_maker_1.0.rb')

diff --git a/test/rss/test_setup_maker_1.0.rb b/test/rss/test_setup_maker_1.0.rb
index 95d8b310ba..51a4d146c7 100644
--- a/test/rss/test_setup_maker_1.0.rb
+++ b/test/rss/test_setup_maker_1.0.rb
@@ -195,23 +195,25 @@ module RSS
         setup_dummy_channel(maker)
         
         item_size.times do |i|
-          item = maker.items.new_item
-          item.title = "#{title}#{i}"
-          item.link = "#{link}#{i}"
-          item.description = "#{description}#{i}"
-
-          @dc_elems.each do |var, value|
-            item.__send__("dc_#{var}=", value)
-          end
-          
-          @content_elems.each do |var, value|
-            item.__send__("content_#{var}=", value)
-          end
-
-          item.trackback_ping = @trackback_elems[:ping]
-          @trackback_elems[:about].each do |value|
-            new_about = item.trackback_abouts.new_about
-            new_about.value = value
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+
+            @dc_elems.each do |var, value|
+              item.__send__("dc_#{var}=", value)
+            end
+
+            @content_elems.each do |var, value|
+              item.__send__("content_#{var}=", value)
+            end
+
+            item.trackback_ping = @trackback_elems[:ping]
+            @trackback_elems[:about].each do |value|
+              item.trackback_abouts.new_about do |new_about|
+                new_about.value = value
+              end
+            end
           end
         end
       end
@@ -321,14 +323,15 @@ module RSS
         maker.encoding = encoding
         maker.standalone = standalone
 
-        xss = maker.xml_stylesheets.new_xml_stylesheet
-        xss.href = href
-        xss.type = type
-        xss.title = title
-        xss.media = media
-        xss.charset = charset
-        xss.alternate = alternate
-        
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
         setup_dummy_channel(maker)
       end
       
@@ -384,14 +387,15 @@ module RSS
         maker.encoding = encoding
         maker.standalone = standalone
 
-        xss = maker.xml_stylesheets.new_xml_stylesheet
-        xss.href = href
-        xss.type = type
-        xss.title = title
-        xss.media = media
-        xss.charset = charset
-        xss.alternate = alternate
-        
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
         maker.channel.about = channel_about
         maker.channel.title = channel_title
         maker.channel.link = channel_link
@@ -418,23 +422,25 @@ module RSS
         end
         
         item_size.times do |i|
-          item = maker.items.new_item
-          item.title = "#{item_title}#{i}"
-          item.link = "#{item_link}#{i}"
-          item.description = "#{item_description}#{i}"
-
-          @dc_elems.each do |var, value|
-            item.__send__("dc_#{var}=", value)
-          end
-          
-          @content_elems.each do |var, value|
-            item.__send__("content_#{var}=", value)
-          end
-
-          item.trackback_ping = @trackback_elems[:ping]
-          @trackback_elems[:about].each do |value|
-            new_about = item.trackback_abouts.new_about
-            new_about.value = value
+          maker.items.new_item do |item|
+            item.title = "#{item_title}#{i}"
+            item.link = "#{item_link}#{i}"
+            item.description = "#{item_description}#{i}"
+
+            @dc_elems.each do |var, value|
+              item.__send__("dc_#{var}=", value)
+            end
+
+            @content_elems.each do |var, value|
+              item.__send__("content_#{var}=", value)
+            end
+
+            item.trackback_ping = @trackback_elems[:ping]
+            @trackback_elems[:about].each do |value|
+              item.trackback_abouts.new_about do |new_about|
+                new_about.value = value
+              end
+            end
           end
         end
 
-- 
cgit v1.2.3