rubysl-rss 1.0.0 → 2.0.0

data/lib/rss/content/1.0.rb

@@ -1,5 +1,4 @@
 require 'rss/1.0'
-require 'rss/content'
 
 module RSS
   RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)

data/lib/rss/content/2.0.rb

@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/content"
 
 module RSS
   Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)

data/lib/rss/converter.rb

@@ -3,10 +3,14 @@ require "rss/utils"
 module RSS
 
   class Converter
-    
+
     include Utils
 
     def initialize(to_enc, from_enc=nil)
+      if "".respond_to?(:encode)
+        @to_encoding = to_enc
+        return
+      end
       normalized_to_enc = to_enc.downcase.gsub(/-/, '_')
       from_enc ||= 'utf-8'
       normalized_from_enc = from_enc.downcase.gsub(/-/, '_')
@@ -23,7 +27,11 @@ module RSS
     end
 
     def convert(value)
-      value
+      if value.is_a?(String) and value.respond_to?(:encode)
+        value.encode(@to_encoding)
+      else
+        value
+      end
     end
 
     def def_convert(depth=0)
@@ -55,11 +63,11 @@ module RSS
         raise UnknownConversionMethodError.new(to_enc, from_enc)
       end
     end
-    
+
     def def_else_enc(to_enc, from_enc)
       def_iconv_convert(to_enc, from_enc, 0)
     end
-    
+
     def def_same_enc()
       def_convert do |value|
         value
@@ -93,40 +101,40 @@ module RSS
     def def_to_euc_jp_from_utf_8
       def_uconv_convert_if_can('u8toeuc', 'EUC-JP', 'UTF-8', '-We')
     end
-    
+
     def def_to_utf_8_from_euc_jp
       def_uconv_convert_if_can('euctou8', 'UTF-8', 'EUC-JP', '-Ew')
     end
-    
+
     def def_to_shift_jis_from_utf_8
       def_uconv_convert_if_can('u8tosjis', 'Shift_JIS', 'UTF-8', '-Ws')
     end
-    
+
     def def_to_utf_8_from_shift_jis
       def_uconv_convert_if_can('sjistou8', 'UTF-8', 'Shift_JIS', '-Sw')
     end
-    
+
     def def_to_euc_jp_from_shift_jis
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Se', #{value})"
       end
     end
-    
+
     def def_to_shift_jis_from_euc_jp
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Es', #{value})"
       end
     end
-    
+
     def def_to_euc_jp_from_iso_2022_jp
       require "nkf"
       def_convert do |value|
         "NKF.nkf('-Je', #{value})"
       end
     end
-    
+
     def def_to_iso_2022_jp_from_euc_jp
       require "nkf"
       def_convert do |value|
@@ -139,7 +147,7 @@ module RSS
         "#{value}.unpack('C*').pack('U*')"
       end
     end
-    
+
     def def_to_iso_8859_1_from_utf_8
       def_convert do |value|
         <<-EOC
@@ -156,7 +164,7 @@ module RSS
         EOC
       end
     end
-    
+
   end
-  
+
 end

data/lib/rss/dublincore.rb

@@ -25,7 +25,7 @@ module RSS
           def #{full_name}
             @#{full_name}.first and @#{full_name}.first.value
           end
-          
+
           def #{full_name}=(new_value)
             @#{full_name}[0] = Utils.new_with_value_if_need(#{klass_name}, new_value)
           end
@@ -50,7 +50,7 @@ module RSS
       EOC
     end
   end
-  
+
   module DublinCoreModel
 
     extend BaseModel
@@ -76,26 +76,26 @@ module RSS
     DATE_ELEMENTS = {
       "date" => "w3cdtf",
     }
-    
+
     ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a
     DublinCoreModel::DATE_ELEMENTS.each do |name, |
       ELEMENT_NAME_INFOS << [name, nil]
     end
-    
+
     ELEMENTS = TEXT_ELEMENTS.keys + DATE_ELEMENTS.keys
 
     ELEMENTS.each do |name, plural_name|
       module_eval(<<-EOC, *get_file_and_line_from_caller(0))
         class DublinCore#{Utils.to_class_name(name)} < Element
           include RSS10
-          
+
           content_setup
 
           class << self
             def required_prefix
               DC_PREFIX
             end
-        
+
             def required_uri
               DC_URI
             end
@@ -105,7 +105,7 @@ module RSS
 
           alias_method(:value, :content)
           alias_method(:value=, :content=)
-          
+
           def initialize(*args)
             if Utils.element_initialize_arguments?(args)
               super
@@ -114,7 +114,7 @@ module RSS
               self.content = args[0]
             end
           end
-      
+
           def full_name
             tag_name_with_prefix(DC_PREFIX)
           end

data/lib/rss/dublincore/1.0.rb

@@ -1,5 +1,4 @@
 require "rss/1.0"
-require "rss/dublincore"
 
 module RSS
   RDF.install_ns(DC_PREFIX, DC_URI)

data/lib/rss/dublincore/2.0.rb

@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/dublincore"
 
 module RSS
   Rss.install_ns(DC_PREFIX, DC_URI)

data/lib/rss/dublincore/atom.rb

@@ -1,5 +1,4 @@
 require "rss/atom"
-require "rss/dublincore"
 
 module RSS
   module Atom

data/lib/rss/image.rb

@@ -15,7 +15,7 @@ module RSS
     BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}")
     IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}"
   end
-  
+
   module ImageModelUtils
     def validate_one_tag_name(ignore_unknown_element, name, tags)
       if !ignore_unknown_element
@@ -25,7 +25,7 @@ module RSS
       raise TooMuchTagError.new(name, tag_name) if tags.size > 1
     end
   end
-  
+
   module ImageItemModel
     include ImageModelUtils
     extend BaseModel
@@ -43,12 +43,12 @@ module RSS
       include DublinCoreModel
 
       @tag_name = "item"
-      
+
       class << self
         def required_prefix
           IMAGE_PREFIX
         end
-        
+
         def required_uri
           IMAGE_URI
         end
@@ -102,11 +102,11 @@ module RSS
       end
     end
   end
-  
+
   module ImageFaviconModel
     include ImageModelUtils
     extend BaseModel
-    
+
     def self.append_features(klass)
       super
 
@@ -122,12 +122,12 @@ module RSS
       include DublinCoreModel
 
       @tag_name = "favicon"
-      
+
       class << self
         def required_prefix
           IMAGE_PREFIX
         end
-        
+
         def required_uri
           IMAGE_URI
         end
@@ -154,7 +154,7 @@ module RSS
         end
         set_size(new_value)
       end
-      
+
       alias image_size= size=
       alias image_size size
 

data/lib/rss/maker.rb

@@ -1,30 +1,64 @@
 require "rss/rss"
 
 module RSS
+  ##
+  #
+  # Provides a set of builders for various RSS objects
+  #
+  # * Feeds
+  #   * RSS 0.91
+  #   * RSS 1.0
+  #   * RSS 2.0
+  #   * Atom 1.0
+  #
+  # * Elements
+  #   * Atom::Entry
+
   module Maker
+
+    # Collection of supported makers
     MAKERS = {}
 
     class << self
+      # Builder for an RSS object
+      # Creates an object of the type passed in +args+
+      #
+      # Executes the +block+ to populate elements of the created RSS object
       def make(version, &block)
-        m = maker(version)
-        raise UnsupportedMakerVersionError.new(version) if m.nil?
-        m[:maker].make(m[:version], &block)
+        self[version].make(&block)
       end
 
-      def maker(version)
-        MAKERS[version]
+      # Returns the maker for the +version+
+      def [](version)
+        maker_info = maker(version)
+        raise UnsupportedMakerVersionError.new(version) if maker_info.nil?
+        maker_info[:maker]
       end
 
+      # Adds a maker to the set of supported makers
       def add_maker(version, normalized_version, maker)
         MAKERS[version] = {:maker => maker, :version => normalized_version}
       end
 
+      # Returns collection of supported maker versions
       def versions
         MAKERS.keys.uniq.sort
       end
 
+      # Returns collection of supported makers
       def makers
-        MAKERS.values.collect {|info| info[:maker]}.uniq
+        MAKERS.values.collect { |info| info[:maker] }.uniq
+      end
+
+      # Returns true if the version is supported
+      def supported?(version)
+        versions.include?(version)
+      end
+
+      private
+      # Can I remove this method?
+      def maker(version)
+        MAKERS[version]
       end
     end
   end

data/lib/rss/maker/0.9.rb

@@ -4,14 +4,14 @@ require "rss/maker/base"
 
 module RSS
   module Maker
-    
+
     class RSS09 < RSSBase
-      
-      def initialize(feed_version="0.92")
+
+      def initialize(feed_version)
         super
         @feed_type = "rss"
       end
-      
+
       private
       def make_feed
         Rss.new(@feed_version, @version, @encoding, @standalone)
@@ -24,7 +24,7 @@ module RSS
       class Channel < ChannelBase
         def to_feed(rss)
           channel = Rss::Channel.new
-          set = setup_values(channel)
+          setup_values(channel)
           _not_set_required_variables = not_set_required_variables
           if _not_set_required_variables.empty?
             rss.channel = channel
@@ -38,20 +38,20 @@ module RSS
             raise NotSetError.new("maker.channel", _not_set_required_variables)
           end
         end
-        
+
         private
         def setup_items(rss)
           @maker.items.to_feed(rss)
         end
-        
+
         def setup_image(rss)
           @maker.image.to_feed(rss)
         end
-        
+
         def setup_textinput(rss)
           @maker.textinput.to_feed(rss)
         end
-        
+
         def variables
           super + ["pubDate"]
         end
@@ -78,7 +78,7 @@ module RSS
               end
             end
           end
-          
+
           class Day < DayBase
             def to_feed(rss, days)
               day = Rss::Channel::SkipDays::Day.new
@@ -96,7 +96,7 @@ module RSS
             end
           end
         end
-        
+
         class SkipHours < SkipHoursBase
           def to_feed(rss, channel)
             unless @hours.empty?
@@ -108,7 +108,7 @@ module RSS
               end
             end
           end
-          
+
           class Hour < HourBase
             def to_feed(rss, hours)
               hour = Rss::Channel::SkipHours::Hour.new
@@ -126,7 +126,7 @@ module RSS
             end
           end
         end
-        
+
         class Cloud < CloudBase
           def to_feed(*args)
           end
@@ -243,7 +243,7 @@ module RSS
           true
         end
       end
-      
+
       class Items < ItemsBase
         def to_feed(rss)
           if rss.channel
@@ -253,11 +253,11 @@ module RSS
             setup_other_elements(rss, rss.items)
           end
         end
-        
+
         class Item < ItemBase
           def to_feed(rss)
             item = Rss::Channel::Item.new
-            set = setup_values(item)
+            setup_values(item)
             _not_set_required_variables = not_set_required_variables
             if _not_set_required_variables.empty?
               rss.items << item
@@ -439,7 +439,7 @@ module RSS
           end
         end
       end
-      
+
       class Textinput < TextinputBase
         def to_feed(rss)
           textInput = Rss::Channel::TextInput.new
@@ -457,11 +457,52 @@ module RSS
         end
       end
     end
-    
-    add_maker("0.9", "0.92", RSS09)
-    add_maker("0.91", "0.91", RSS09)
-    add_maker("0.92", "0.92", RSS09)
-    add_maker("rss0.91", "0.91", RSS09)
-    add_maker("rss0.92", "0.92", RSS09)
+
+    class RSS091 < RSS09
+      def initialize(feed_version="0.91")
+        super
+      end
+
+      class Channel < RSS09::Channel
+      end
+
+      class Items < RSS09::Items
+        class Item < RSS09::Items::Item
+        end
+      end
+
+      class Image < RSS09::Image
+      end
+
+      class Textinput < RSS09::Textinput
+      end
+    end
+
+    class RSS092 < RSS09
+      def initialize(feed_version="0.92")
+        super
+      end
+
+      class Channel < RSS09::Channel
+      end
+
+      class Items < RSS09::Items
+        class Item < RSS09::Items::Item
+        end
+      end
+
+      class Image < RSS09::Image
+      end
+
+      class Textinput < RSS09::Textinput
+      end
+    end
+
+    add_maker("0.9", "0.92", RSS092)
+    add_maker("0.91", "0.91", RSS091)
+    add_maker("0.92", "0.92", RSS092)
+    add_maker("rss0.9", "0.92", RSS092)
+    add_maker("rss0.91", "0.91", RSS091)
+    add_maker("rss0.92", "0.92", RSS092)
   end
 end