rubysl-rss 1.0.0 → 2.0.0

data/lib/rss/maker/1.0.rb

@@ -25,13 +25,14 @@ module RSS
       end
 
       class Channel < ChannelBase
+        include SetupDefaultLanguage
 
         def to_feed(rss)
           set_default_values do
             _not_set_required_variables = not_set_required_variables
             if _not_set_required_variables.empty?
               channel = RDF::Channel.new(@about)
-              set = setup_values(channel)
+              setup_values(channel)
               channel.dc_dates.clear
               rss.channel = channel
               set_parent(channel, rss)
@@ -60,7 +61,7 @@ module RSS
           rss.channel.items = items
           set_parent(rss.channel, items)
         end
-        
+
         def setup_image(rss)
           if @maker.image.have_required_values?
             image = RDF::Channel::Image.new(@maker.image.url)
@@ -91,11 +92,11 @@ module RSS
         class SkipDays < SkipDaysBase
           def to_feed(*args)
           end
-          
+
           class Day < DayBase
           end
         end
-        
+
         class SkipHours < SkipHoursBase
           def to_feed(*args)
           end
@@ -103,7 +104,7 @@ module RSS
           class Hour < HourBase
           end
         end
-        
+
         class Cloud < CloudBase
           def to_feed(*args)
           end
@@ -403,7 +404,7 @@ module RSS
           end
         end
       end
-      
+
       class Textinput < TextinputBase
         def to_feed(rss)
           if @link

data/lib/rss/maker/2.0.rb

@@ -4,9 +4,9 @@ require "rss/maker/0.9"
 
 module RSS
   module Maker
-    
+
     class RSS20 < RSS09
-      
+
       def initialize(feed_version="2.0")
         super
       end
@@ -17,17 +17,17 @@ module RSS
         def required_variable_names
           %w(link)
         end
-        
+
         class SkipDays < RSS09::Channel::SkipDays
           class Day < RSS09::Channel::SkipDays::Day
           end
         end
-        
+
         class SkipHours < RSS09::Channel::SkipHours
           class Hour < RSS09::Channel::SkipHours::Hour
           end
         end
-        
+
         class Cloud < RSS09::Channel::Cloud
           def to_feed(rss, channel)
             cloud = Rss::Channel::Cloud.new
@@ -51,7 +51,7 @@ module RSS
               category.to_feed(rss, channel)
             end
           end
-          
+
           class Category < RSS09::Channel::Categories::Category
             def to_feed(rss, channel)
               category = Rss::Channel::Category.new
@@ -81,14 +81,14 @@ module RSS
           end
         end
       end
-      
+
       class Image < RSS09::Image
         private
         def required_element?
           false
         end
       end
-      
+
       class Items < RSS09::Items
         class Item < RSS09::Items::Item
           private
@@ -179,7 +179,7 @@ module RSS
                 category.to_feed(rss, item)
               end
             end
-          
+
             class Category < RSS09::Items::Item::Categories::Category
               def to_feed(rss, item)
                 category = Rss::Channel::Item::Category.new
@@ -212,11 +212,11 @@ module RSS
           end
         end
       end
-      
+
       class Textinput < RSS09::Textinput
       end
     end
-    
+
     add_maker("2.0", "2.0", RSS20)
     add_maker("rss2.0", "2.0", RSS20)
   end

data/lib/rss/maker/base.rb

@@ -23,15 +23,17 @@ module RSS
         end
 
         def inherited(subclass)
-          subclass.const_set("OTHER_ELEMENTS", [])
-          subclass.const_set("NEED_INITIALIZE_VARIABLES", [])
+          subclass.const_set(:OTHER_ELEMENTS, [])
+          subclass.const_set(:NEED_INITIALIZE_VARIABLES, [])
         end
 
         def add_other_element(variable_name)
           self::OTHER_ELEMENTS << variable_name
         end
 
-        def add_need_initialize_variable(variable_name, init_value="nil")
+        def add_need_initialize_variable(variable_name, init_value=nil,
+                                         &init_block)
+          init_value ||= init_block
           self::NEED_INITIALIZE_VARIABLES << [variable_name, init_value]
         end
 
@@ -45,7 +47,7 @@ module RSS
           def_delegators("@#{plural}", :push, :pop, :shift, :unshift)
           def_delegators("@#{plural}", :each, :size, :empty?, :clear)
 
-          add_need_initialize_variable(plural, "[]")
+          add_need_initialize_variable(plural) {[]}
 
           module_eval(<<-EOC, __FILE__, __LINE__ + 1)
             def new_#{name}
@@ -74,7 +76,9 @@ module RSS
         def def_classed_element_without_accessor(name, class_name=nil)
           class_name ||= Utils.to_class_name(name)
           add_other_element(name)
-          add_need_initialize_variable(name, "make_#{name}")
+          add_need_initialize_variable(name) do |object|
+            object.send("make_#{name}")
+          end
           module_eval(<<-EOC, __FILE__, __LINE__ + 1)
             private
             def setup_#{name}(feed, current)
@@ -185,7 +189,19 @@ module RSS
       private
       def initialize_variables
         self.class.need_initialize_variables.each do |variable_name, init_value|
-          instance_eval("@#{variable_name} = #{init_value}", __FILE__, __LINE__)
+          if init_value.nil?
+            value = nil
+          else
+            if init_value.respond_to?(:call)
+              value = init_value.call(self)
+            elsif init_value.is_a?(String)
+              # just for backward compatibility
+              value = instance_eval(init_value, __FILE__, __LINE__)
+            else
+              value = init_value
+            end
+          end
+          instance_variable_set("@#{variable_name}", value)
         end
       end
 
@@ -222,7 +238,7 @@ module RSS
             setter = "#{var}="
             if target.respond_to?(setter)
               value = __send__(var)
-              if value
+              unless value.nil?
                 target.__send__(setter, value)
                 set = true
               end
@@ -238,7 +254,8 @@ module RSS
 
       def variables
         self.class.need_initialize_variables.find_all do |name, init|
-          "nil" == init
+          # init == "nil" is just for backward compatibility
+          init.nil? or init == "nil"
         end.collect do |name, init|
           name
         end
@@ -336,36 +353,62 @@ module RSS
 
     module SetupDefaultDate
       private
-      def _set_default_values(&block)
+      def _set_default_values
         keep = {
           :date => date,
           :dc_dates => dc_dates.to_a.dup,
         }
-        _date = date
+        _date = _parse_date_if_needed(date)
         if _date and !dc_dates.any? {|dc_date| dc_date.value == _date}
           dc_date = self.class::DublinCoreDates::DublinCoreDate.new(self)
           dc_date.value = _date.dup
           dc_dates.unshift(dc_date)
         end
         self.date ||= self.dc_date
-        super(&block)
+        super
       ensure
         date = keep[:date]
         dc_dates.replace(keep[:dc_dates])
       end
+
+      def _parse_date_if_needed(date_value)
+        date_value = Time.parse(date_value) if date_value.is_a?(String)
+        date_value
+      end
+    end
+
+    module SetupDefaultLanguage
+      private
+      def _set_default_values
+        keep = {
+          :dc_languages => dc_languages.to_a.dup,
+        }
+        _language = language
+        if _language and
+            !dc_languages.any? {|dc_language| dc_language.value == _language}
+          dc_language = self.class::DublinCoreLanguages::DublinCoreLanguage.new(self)
+          dc_language.value = _language.dup
+          dc_languages.unshift(dc_language)
+        end
+        super
+      ensure
+        dc_languages.replace(keep[:dc_languages])
+      end
     end
 
     class RSSBase < Base
       class << self
-        def make(version, &block)
-          new(version).make(&block)
+        def make(*args, &block)
+          new(*args).make(&block)
         end
       end
 
       %w(xml_stylesheets channel image items textinput).each do |element|
         attr_reader element
-        add_need_initialize_variable(element, "make_#{element}")
-        module_eval(<<-EOC, __FILE__, __LINE__)
+        add_need_initialize_variable(element) do |object|
+          object.send("make_#{element}")
+        end
+        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           private
           def setup_#{element}(feed)
             @#{element}.to_feed(feed)
@@ -376,7 +419,7 @@ module RSS
           end
         EOC
       end
-      
+
       attr_reader :feed_version
       alias_method(:rss_version, :feed_version)
       attr_accessor :version, :encoding, :standalone
@@ -390,14 +433,10 @@ module RSS
         @encoding = "UTF-8"
         @standalone = nil
       end
-      
+
       def make
-        if block_given?
-          yield(self)
-          to_feed
-        else
-          nil
-        end
+        yield(self)
+        to_feed
       end
 
       def to_feed
@@ -405,13 +444,10 @@ module RSS
         setup_xml_stylesheets(feed)
         setup_elements(feed)
         setup_other_elements(feed)
-        if feed.valid?
-          feed
-        else
-          nil
-        end
+        feed.validate
+        feed
       end
-      
+
       private
       remove_method :make_xml_stylesheets
       def make_xml_stylesheets
@@ -428,7 +464,7 @@ module RSS
           attr_accessor attribute
           add_need_initialize_variable(attribute)
         end
-        
+
         def to_feed(feed)
           xss = ::RSS::XMLStyleSheet.new
           guess_type_if_need(xss)
@@ -451,7 +487,7 @@ module RSS
         end
       end
     end
-    
+
     class ChannelBase < Base
       include SetupDefaultDate
 
@@ -472,12 +508,24 @@ module RSS
       end
 
       %w(id about language
-         managingEditor webMaster rating docs date
-         lastBuildDate ttl).each do |element|
+         managingEditor webMaster rating docs ttl).each do |element|
         attr_accessor element
         add_need_initialize_variable(element)
       end
 
+      %w(date lastBuildDate).each do |date_element|
+        attr_reader date_element
+        add_need_initialize_variable(date_element)
+      end
+
+      def date=(_date)
+        @date = _parse_date_if_needed(_date)
+      end
+
+      def lastBuildDate=(_date)
+        @lastBuildDate = _parse_date_if_needed(_date)
+      end
+
       def pubDate
         date
       end
@@ -526,7 +574,7 @@ module RSS
           end
         end
       end
-      
+
       class SkipHoursBase < Base
         def_array_element("hour")
 
@@ -537,7 +585,7 @@ module RSS
           end
         end
       end
-      
+
       class CloudBase < Base
         %w(domain port path registerProcedure protocol).each do |element|
           attr_accessor element
@@ -607,7 +655,7 @@ module RSS
         include AtomTextConstructBase
       end
     end
-    
+
     class ImageBase < Base
       %w(title url width height description).each do |element|
         attr_accessor element
@@ -618,18 +666,18 @@ module RSS
         @maker.channel.link
       end
     end
-    
+
     class ItemsBase < Base
       def_array_element("item")
 
       attr_accessor :do_sort, :max_size
-      
+
       def initialize(maker)
         super
         @do_sort = false
         @max_size = -1
       end
-      
+
       def normalize
         if @max_size >= 0
           sort_if_need[0...@max_size]
@@ -670,13 +718,22 @@ module RSS
          ["contributor", "name"],
         ].each do |name, attribute|
           def_classed_elements(name, attribute)
-	end
+        end
 
-        %w(date comments id published).each do |element|
+        %w(comments id published).each do |element|
           attr_accessor element
           add_need_initialize_variable(element)
         end
 
+        %w(date).each do |date_element|
+          attr_reader date_element
+          add_need_initialize_variable(date_element)
+        end
+
+        def date=(_date)
+          @date = _parse_date_if_needed(_date)
+        end
+
         def pubDate
           date
         end
@@ -715,6 +772,14 @@ module RSS
             attr_accessor element
             add_need_initialize_variable(element)
           end
+
+          def permanent_link?
+            isPermaLink
+          end
+
+          def permanent_link=(bool)
+            self.isPermaLink = bool
+          end
         end
 
         class EnclosureBase < Base
@@ -725,6 +790,8 @@ module RSS
         end
 
         class SourceBase < Base
+          include SetupDefaultDate
+
           %w(authors categories contributors generator icon
              logo rights subtitle title).each do |name|
             def_classed_element(name)
@@ -736,7 +803,7 @@ module RSS
             def_classed_elements(name, attribute)
           end
 
-          %w(id content date).each do |element|
+          %w(id content).each do |element|
             attr_accessor element
             add_need_initialize_variable(element)
           end
@@ -744,6 +811,15 @@ module RSS
           alias_method(:url, :link)
           alias_method(:url=, :link=)
 
+          %w(date).each do |date_element|
+            attr_reader date_element
+            add_need_initialize_variable(date_element)
+          end
+
+          def date=(_date)
+            @date = _parse_date_if_needed(_date)
+          end
+
           def updated
             date
           end