diff options
Diffstat (limited to 'lib/rss')
| -rw-r--r-- | lib/rss/0.9.rb | 4 | ||||
| -rw-r--r-- | lib/rss/dublincore.rb | 1 | ||||
| -rw-r--r-- | lib/rss/maker.rb | 1 | ||||
| -rw-r--r-- | lib/rss/maker/base.rb | 6 | ||||
| -rw-r--r-- | lib/rss/maker/dublincore.rb | 2 | ||||
| -rw-r--r-- | lib/rss/rss.rb | 16 | ||||
| -rw-r--r-- | lib/rss/utils.rb | 7 |
7 files changed, 29 insertions, 8 deletions
diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb index 24560324ed..2bb59763d9 100644 --- a/lib/rss/0.9.rb +++ b/lib/rss/0.9.rb @@ -223,6 +223,10 @@ module RSS end end + def not_need_to_call_setup_maker_variables + %w(image textInput) + end + class SkipDays < Element include RSS09 diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb index 7ea9cf31dd..afdd4d392d 100644 --- a/lib/rss/dublincore.rb +++ b/lib/rss/dublincore.rb @@ -56,7 +56,6 @@ module RSS end prefix_size = DC_PREFIX.size + 1 - DublinCoreModel::ELEMENTS.uniq! DublinCoreModel::ELEMENTS.each do |x| BaseListener.install_get_text_element(x[prefix_size..-1], DC_URI, "#{x}=") end diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb index 66c3bc2928..d248711aa2 100644 --- a/lib/rss/maker.rb +++ b/lib/rss/maker.rb @@ -33,3 +33,4 @@ require "rss/maker/content" require "rss/maker/dublincore" require "rss/maker/syndication" require "rss/maker/trackback" +require "rss/maker/image" diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb index 7faafe8d4e..0b157b1ee2 100644 --- a/lib/rss/maker/base.rb +++ b/lib/rss/maker/base.rb @@ -144,7 +144,7 @@ module RSS end def make_#{element} - self.class::#{element[0,1].upcase}#{element[1..-1]}.new(self) + self.class::#{Utils.to_class_name(element)}.new(self) end EOC end @@ -255,7 +255,7 @@ EOC end def make_#{element} - self.class::#{element[0,1].upcase}#{element[1..-1]}.new(@maker) + self.class::#{Utils.to_class_name(element)}.new(@maker) end EOC end @@ -443,7 +443,7 @@ EOC end def make_#{element} - self.class::#{element[0,1].upcase}#{element[1..-1]}.new(@maker) + self.class::#{Utils.to_class_name(element)}.new(@maker) end EOC end diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb index a9b8d58715..3eeb269df1 100644 --- a/lib/rss/maker/dublincore.rb +++ b/lib/rss/maker/dublincore.rb @@ -7,7 +7,7 @@ module RSS def self.append_features(klass) super - ::RSS::DublinCoreModel::ELEMENTS.each do |element| + ::RSS::DublinCoreModel::ELEMENTS.uniq.each do |element| klass.add_need_initialize_variable(element) klass.add_other_element(element) klass.__send__(:attr_accessor, element) diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index 7ffb475007..848fbd7b79 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -627,12 +627,22 @@ EOC def setup_maker_element(target) self.class.need_initialize_variables.each do |var| - setter = "#{var}=" - if target.respond_to?(setter) - target.__send__(setter, __send__(var)) + value = __send__(var) + if value.respond_to?("setup_maker") and + !not_need_to_call_setup_maker_variables.include?(var) + value.setup_maker(target) + else + setter = "#{var}=" + if target.respond_to?(setter) + target.__send__(setter, value) + end end end end + + def not_need_to_call_setup_maker_variables + [] + end def setup_maker_elements(parent) self.class.have_children_elements.each do |name, plural_name| diff --git a/lib/rss/utils.rb b/lib/rss/utils.rb index 1c30ae74bc..19f27183eb 100644 --- a/lib/rss/utils.rb +++ b/lib/rss/utils.rb @@ -2,6 +2,13 @@ module RSS module Utils + module_function + def to_class_name(name) + name.split(/_/).collect do |part| + "#{part[0, 1].upcase}#{part[1..-1]}" + end.join("") + end + def get_file_and_line_from_caller(i=0) file, line, = caller[i].split(':') [file, line.to_i] |