* lib/rss/dublincore.rb: supported multiple DublinCore items.

* 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/maker/base.rb: added default current_element implementation.

* lib/rss/maker/dublincore.rb: supported multiple DublinCore items.

* lib/rss/maker/image.rb: supproted new DublinCore API.

* 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 DublinCore items.

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


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

1 files changed, 17 insertions, 5 deletions

diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 05af111ad4..7e93c62f61 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -125,6 +125,7 @@ module RSS
 
       @@setters = {}
       @@registered_uris = {}
+      @@class_names = {}
 
       def install_setter(uri, tag_name, setter)
         @@setters[uri] ||= {}
@@ -146,16 +147,29 @@ module RSS
           []
         end
       end
-          
+      
       def register_uri(uri, name)
         @@registered_uris[name] ||= {}
         @@registered_uris[name][uri] = nil
       end
-
+      
       def uri_registered?(uri, name)
         @@registered_uris[name].has_key?(uri)
       end
 
+      def install_class_name(uri, tag_name, class_name)
+        @@class_names[uri] ||= {}
+        @@class_names[uri][tag_name] = class_name
+      end
+
+      def class_name(uri, tag_name)
+        begin
+          @@class_names[uri][tag_name]
+        rescue NameError
+          tag_name[0,1].upcase + tag_name[1..-1]
+        end
+      end
+
       def install_get_text_element(uri, name, setter)
         install_setter(uri, name, setter)
         def_get_text_element(uri, name, *get_file_and_line_from_caller(1))
@@ -275,13 +289,11 @@ module RSS
     end
 
     def start_else_element(local, prefix, attrs, ns)
-      class_name = local[0,1].upcase << local[1..-1]
+      class_name = self.class.class_name(ns[prefix], local)
       current_class = @last_element.class
-#			begin
       if current_class.constants.include?(class_name)
         next_class = current_class.const_get(class_name)
         start_have_something_element(local, prefix, attrs, ns, next_class)
-#			rescue NameError
       else
         if @ignore_unknown_element
           @proc_stack.push(nil)