* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.

* lib/rss/maker/itunes.rb: fixed new_itunes_category.
* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
  of consistency.

* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
  needless UTF-8 characters.


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

9 files changed, 28 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 925426f9ae..0674328c7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-Wed Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+Sun Dec  2 15:49:20 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
+
+	* lib/rss/maker/itunes.rb: fixed new_itunes_category.
+	* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
+	of consistency.
+
+	* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
+	needless UTF-8 characters.
+
+Sun Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	Merged 14070 from trunk.
-	
+
 	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
 	  pressing control-c in the controlling terminal or sending SIGTERM stops
 	  the XML-RPC server.
diff --git a/NEWS b/NEWS
index 4250633dae..fce3a600c8 100644
--- a/NEWS
+++ b/NEWS
@@ -82,7 +82,7 @@ with all sufficient information, see the ChangeLog file.
 
 * rss
 
-  * 0.1.6 -> 0.2.1
+  * 0.1.6 -> 0.2.2
 
   * Fix image module URI
 
diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb
index f02db28824..7c5049129d 100644
--- a/lib/rss/maker/itunes.rb
+++ b/lib/rss/maker/itunes.rb
@@ -27,7 +27,7 @@ module RSS
           full_plural_name = "#{RSS::ITUNES_PREFIX}_#{plural_name}"
           klass_name = "ITunes#{Utils.to_class_name(name)}"
           plural_klass_name = "ITunes#{Utils.to_class_name(plural_name)}"
-          def_elements_class_accessor(klass, full_name, full_plural_name,
+          def_elements_class_accessor(klass, name, full_name, full_plural_name,
                                       klass_name, plural_klass_name,
                                       recommended_attribute_name)
         end
@@ -55,7 +55,7 @@ module RSS
         klass.def_csv_element(full_name)
       end
 
-      def def_elements_class_accessor(klass, full_name, full_plural_name,
+      def def_elements_class_accessor(klass, name, full_name, full_plural_name,
                                       klass_name, plural_klass_name,
                                       recommended_attribute_name=nil)
         if recommended_attribute_name
@@ -66,7 +66,7 @@ module RSS
         end
         klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           def new_#{full_name}(text=nil)
-            #{full_name} = @#{full_plural_name}.new_#{full_name}
+            #{full_name} = @#{full_plural_name}.new_#{name}
             #{full_name}.text = text
             if block_given?
               yield #{full_name}
diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
index 798b239df9..211603840f 100644
--- a/lib/rss/maker/taxonomy.rb
+++ b/lib/rss/maker/taxonomy.rb
@@ -66,7 +66,8 @@ EOC
       end
 
       class TaxonomyTopicsBase < Base
-        def_array_element("taxo_topic", nil, "TaxonomyTopic")
+        def_array_element("topic", nil, "TaxonomyTopic")
+        alias_method(:new_taxo_topic, :new_topic) # For backward compatibility
 
         class TaxonomyTopicBase < Base
           include DublinCoreModel
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 5edcf21e17..0c76d8fdff 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -391,8 +391,9 @@ module RSS
     def start_else_element(local, prefix, attrs, ns)
       class_name = self.class.class_name(_ns(ns, prefix), local)
       current_class = @last_element.class
-      if current_class.const_defined?(class_name) or
-          current_class.constants.include?(class_name)
+      if class_name and
+          (current_class.const_defined?(class_name) or
+           current_class.constants.include?(class_name))
         next_class = current_class.const_get(class_name)
         start_have_something_element(local, prefix, attrs, ns, next_class)
       else
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index c42b86e72a..2fe7ca9fb7 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -52,7 +52,7 @@ require "rss/xml-stylesheet"
 
 module RSS
 
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   URI = "http://purl.org/rss/1.0/"
 
diff --git a/test/rss/test_itunes.rb b/test/rss/test_itunes.rb
index 3663e2c77a..283459d910 100644
--- a/test/rss/test_itunes.rb
+++ b/test/rss/test_itunes.rb
@@ -338,7 +338,7 @@ module RSS
                                "of your answers here.",
                                readers, &rss20_maker)
         _assert_itunes_summary("This week we talk about surviving in a " +
-                               "Red state if you’re a Blue person. Or " +
+                               "Red state if you're a Blue person. Or " +
                                "vice versa.",
                                readers, &rss20_maker)
       end
diff --git a/test/rss/test_version.rb b/test/rss/test_version.rb
index 5605638434..a602caf103 100644
--- a/test/rss/test_version.rb
+++ b/test/rss/test_version.rb
@@ -3,7 +3,7 @@ require "rss-testcase"
 module RSS
   class TestVersion < TestCase
     def test_version
-      assert_equal("0.2.1", ::RSS::VERSION)
+      assert_equal("0.2.2", ::RSS::VERSION)
     end
   end
 end
diff --git a/version.h b/version.h
index c54748c428..14448b03ab 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-01"
+#define RUBY_RELEASE_DATE "2007-12-02"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071201
+#define RUBY_RELEASE_CODE 20071202
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];