rubysl-rss 1.0.0 → 2.0.0

data/lib/rss/maker/dublincore.rb

@@ -11,10 +11,7 @@ module RSS
           plural_name ||= "#{name}s"
           full_name = "#{RSS::DC_PREFIX}_#{name}"
           full_plural_name = "#{RSS::DC_PREFIX}_#{plural_name}"
-          klass_name = Utils.to_class_name(name)
           plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
-          full_plural_klass_name = "self.class::#{plural_klass_name}"
-          full_klass_name = "#{full_plural_klass_name}::#{klass_name}"
           klass.def_classed_elements(full_name, "value", plural_klass_name,
                                      full_plural_name, name)
           klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
@@ -90,7 +87,7 @@ EOC
     class ChannelBase
       include DublinCoreModel
     end
-    
+
     class ImageBase; include DublinCoreModel; end
     class ItemsBase
       class ItemBase

data/lib/rss/maker/entry.rb

@@ -99,7 +99,7 @@ module RSS
               end
             end
 
-            def _set_default_values(&block)
+            def _set_default_values
               keep = {
                 :authors => authors.to_a.dup,
                 :contributors => contributors.to_a.dup,
@@ -126,7 +126,7 @@ module RSS
                 @maker.channel.title {|t| @title = t}
               end
               self.updated ||= @maker.channel.updated
-              super(&block)
+              super
             ensure
               authors.replace(keep[:authors])
               contributors.replace(keep[:contributors])
@@ -135,7 +135,7 @@ module RSS
               self.id = keep[:id]
               @rights = keep[:rights]
               @title = keep[:title]
-              self.updated = keep[:prev_updated]
+              self.updated = keep[:updated]
             end
 
             Guid = Feed::Items::Item::Guid

data/lib/rss/maker/feed.rb

@@ -22,6 +22,8 @@ module RSS
         end
 
         class Channel < ChannelBase
+          include SetupDefaultLanguage
+
           def to_feed(feed)
             set_default_values do
               setup_values(feed)
@@ -71,14 +73,11 @@ module RSS
           def _set_default_values(&block)
             keep = {
               :id => id,
-              :updated => updated,
             }
             self.id ||= about
-            self.updated ||= dc_date
             super(&block)
           ensure
             self.id = keep[:id]
-            self.updated = keep[:updated]
           end
 
           class SkipDays < SkipDaysBase
@@ -182,6 +181,7 @@ module RSS
               set_default_values do
                 entry = feed.class::Entry.new
                 set = setup_values(entry)
+                entry.dc_dates.clear
                 setup_other_elements(feed, entry)
                 if set
                   feed.entries << entry
@@ -216,14 +216,11 @@ module RSS
             def _set_default_values(&block)
               keep = {
                 :id => id,
-                :updated => updated,
               }
               self.id ||= link
-              self.updated ||= dc_date
               super(&block)
             ensure
               self.id = keep[:id]
-              self.updated = keep[:updated]
             end
 
             class Guid < GuidBase

data/lib/rss/maker/image.rb

@@ -13,7 +13,7 @@ module RSS
       end
 
       def self.install_image_item(klass)
-	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           class ImageItem < ImageItemBase
             DublinCoreModel.install_dublin_core(self)
           end
@@ -57,7 +57,7 @@ EOC
       end
 
       def self.install_image_favicon(klass)
-	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           class ImageFavicon < ImageFaviconBase
             DublinCoreModel.install_dublin_core(self)
           end
@@ -89,7 +89,7 @@ EOC
     end
 
     class ChannelBase; include Maker::ImageFaviconModel; end
-    
+
     class ItemsBase
       class ItemBase; include Maker::ImageItemModel; end
     end

data/lib/rss/maker/itunes.rb

@@ -176,7 +176,7 @@ module RSS
 
         %w(hour minute second).each do |name|
           attr_reader(name)
-          add_need_initialize_variable(name, '0')
+          add_need_initialize_variable(name, 0)
         end
 
         def content=(content)

data/lib/rss/maker/taxonomy.rb

@@ -72,12 +72,12 @@ EOC
         class TaxonomyTopicBase < Base
           include DublinCoreModel
           include TaxonomyTopicsModel
-          
+
           attr_accessor :value
           add_need_initialize_variable("value")
           alias_method(:taxo_link, :value)
           alias_method(:taxo_link=, :value=)
-          
+
           def have_required_values?
             @value
           end
@@ -88,11 +88,11 @@ EOC
     class RSSBase
       include TaxonomyTopicModel
     end
-    
+
     class ChannelBase
       include TaxonomyTopicsModel
     end
-    
+
     class ItemsBase
       class ItemBase
         include TaxonomyTopicsModel

data/lib/rss/maker/trackback.rb

@@ -19,7 +19,7 @@ module RSS
         class TrackBackAboutBase < Base
           attr_accessor :value
           add_need_initialize_variable("value")
-          
+
           alias_method(:resource, :value)
           alias_method(:resource=, :value=)
           alias_method(:content, :value)

data/lib/rss/parser.rb

@@ -34,8 +34,8 @@ module RSS
   class NotValidXMLParser < Error
     def initialize(parser)
       super("#{parser} is not an available XML parser. " <<
-            "Available XML parser"<<
-            (AVAILABLE_PARSERS.size > 1 ? "s are ": " is ") <<
+            "Available XML parser" <<
+            (AVAILABLE_PARSERS.size > 1 ? "s are " : " is ") <<
             "#{AVAILABLE_PARSERS.inspect}.")
     end
   end
@@ -98,7 +98,7 @@ module RSS
       return rss if maybe_xml?(rss)
 
       uri = to_uri(rss)
-      
+
       if uri.respond_to?(:read)
         uri.read
       elsif !rss.tainted? and File.readable?(rss)
@@ -113,7 +113,7 @@ module RSS
       source.is_a?(String) and /</ =~ source
     end
 
-    # Attempt to convert rss to a URI, but just return it if 
+    # Attempt to convert rss to a URI, but just return it if
     # there's a ::URI::Error
     def to_uri(rss)
       return rss if rss.is_a?(::URI::Generic)
@@ -133,7 +133,7 @@ module RSS
         listener.raise_for_undefined_entity?
       end
     end
-    
+
     def initialize(rss)
       @listener = self.class.listener.new
       @rss = rss
@@ -196,13 +196,13 @@ module RSS
       def available_tags(uri)
         (@@accessor_bases[uri] || {}).keys
       end
-      
+
       # register uri against this name.
       def register_uri(uri, name)
         @@registered_uris[name] ||= {}
         @@registered_uris[name][uri] = nil
       end
-      
+
       # test if this uri is registered against this name
       def uri_registered?(uri, name)
         @@registered_uris[name].has_key?(uri)
@@ -220,9 +220,7 @@ module RSS
         name = (@@class_names[uri] || {})[tag_name]
         return name if name
 
-        tag_name = tag_name.gsub(/[_\-]([a-z]?)/) do
-          $1.upcase
-        end
+        tag_name = tag_name.gsub(/[_\-]([a-z]?)/) {$1.upcase}
         tag_name[0, 1].upcase + tag_name[1..-1]
       end
 
@@ -230,11 +228,11 @@ module RSS
         install_accessor_base(uri, name, accessor_base)
         def_get_text_element(uri, name, *get_file_and_line_from_caller(1))
       end
-      
+
       def raise_for_undefined_entity?
         true
       end
-    
+
       private
       # set the accessor for the uri, tag_name pair
       def install_accessor_base(uri, tag_name, accessor_base)
@@ -281,7 +279,7 @@ module RSS
       @xml_element = nil
       @last_xml_element = nil
     end
-    
+
     # set instance vars for version, encoding, standalone
     def xmldecl(version, encoding, standalone)
       @version, @encoding, @standalone = version, encoding, standalone
@@ -303,7 +301,7 @@ module RSS
       attrs = {}
       attributes.each do |n, v|
         if /\Axmlns(?:\z|:)/ =~ n
-          ns[$'] = v
+          ns[$POSTMATCH] = v
         else
           attrs[n] = v
         end
@@ -389,14 +387,12 @@ 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 class_name and
-          (current_class.const_defined?(class_name) or
-           current_class.constants.include?(class_name))
+      if known_class?(current_class, class_name)
         next_class = current_class.const_get(class_name)
         start_have_something_element(local, prefix, attrs, ns, next_class)
       else
         if !@do_validate or @ignore_unknown_element
-          @proc_stack.push(nil)
+          @proc_stack.push(setup_next_element_in_unknown_element)
         else
           parent = "ROOT ELEMENT???"
           if current_class.tag_name
@@ -407,19 +403,42 @@ module RSS
       end
     end
 
-    NAMESPLIT = /^(?:([\w:][-\w\d.]*):)?([\w:][-\w\d.]*)/
+    if Module.method(:const_defined?).arity == -1
+      def known_class?(target_class, class_name)
+        class_name and
+          (target_class.const_defined?(class_name, false) or
+           target_class.constants.include?(class_name.to_sym))
+      end
+    else
+      def known_class?(target_class, class_name)
+        class_name and
+          (target_class.const_defined?(class_name) or
+           target_class.constants.include?(class_name))
+      end
+    end
+
+    NAMESPLIT = /^(?:([\w:][-\w.]*):)?([\w:][-\w.]*)/
     def split_name(name)
       name =~ NAMESPLIT
       [$1 || '', $2]
     end
 
-    def check_ns(tag_name, prefix, ns, require_uri)
-      unless _ns(ns, prefix) == require_uri
-        if @do_validate
+    def check_ns(tag_name, prefix, ns, require_uri, ignore_unknown_element=nil)
+      if _ns(ns, prefix) == require_uri
+        true
+      else
+        if ignore_unknown_element.nil?
+          ignore_unknown_element = @ignore_unknown_element
+        end
+
+        if ignore_unknown_element
+          false
+        elsif @do_validate
           raise NSError.new(tag_name, prefix, require_uri)
         else
           # Force bind required URI with prefix
           @ns_stack.last[prefix] = require_uri
+          true
         end
       end
     end
@@ -427,7 +446,7 @@ module RSS
     def start_get_text_element(tag_name, prefix, ns, required_uri)
       pr = Proc.new do |text, tags|
         setter = self.class.setter(required_uri, tag_name)
-        if @last_element.respond_to?(setter)
+        if setter and @last_element.respond_to?(setter)
           if @do_validate
             getter = self.class.getter(required_uri, tag_name)
             if @last_element.__send__(getter)
@@ -446,9 +465,12 @@ module RSS
     end
 
     def start_have_something_element(tag_name, prefix, attrs, ns, klass)
-      check_ns(tag_name, prefix, ns, klass.required_uri)
-      attributes = collect_attributes(tag_name, prefix, attrs, ns, klass)
-      @proc_stack.push(setup_next_element(tag_name, klass, attributes))
+      if check_ns(tag_name, prefix, ns, klass.required_uri)
+        attributes = collect_attributes(tag_name, prefix, attrs, ns, klass)
+        @proc_stack.push(setup_next_element(tag_name, klass, attributes))
+      else
+        @proc_stack.push(setup_next_element_in_unknown_element)
+      end
     end
 
     def collect_attributes(tag_name, prefix, attrs, ns, klass)
@@ -504,7 +526,7 @@ module RSS
         else
           if klass.have_content?
             if @last_element.need_base64_encode?
-              text = Base64.decode64(text.lstrip)
+              text = text.lstrip.unpack("m").first
             end
             @last_element.content = text
           end
@@ -515,6 +537,11 @@ module RSS
         @last_element = previous
       end
     end
+
+    def setup_next_element_in_unknown_element
+      current_element, @last_element = @last_element, nil
+      Proc.new {@last_element = current_element}
+    end
   end
 
   unless const_defined? :AVAILABLE_PARSER_LIBRARIES

data/lib/rss/rexmlparser.rb

@@ -7,7 +7,7 @@ if ([$1.to_i, $2.to_i] <=> [2, 5]) < 0
 end
 
 module RSS
-  
+
   class REXMLParser < BaseParser
 
     class << self
@@ -15,7 +15,7 @@ module RSS
         REXMLListener
       end
     end
-    
+
     private
     def _parse
       begin
@@ -28,9 +28,9 @@ module RSS
         raise NotWellFormedError.new(line){e.message}
       end
     end
-    
+
   end
-  
+
   class REXMLListener < BaseListener
 
     include REXML::StreamListener
@@ -41,7 +41,7 @@ module RSS
         false
       end
     end
-    
+
     def xmldecl(version, encoding, standalone)
       super(version, encoding, standalone == "yes")
       # Encoding is converted to UTF-8 when REXML parse XML.

data/lib/rss/rss.rb

@@ -45,6 +45,7 @@ class Time
   end
 end
 
+
 require "English"
 require "rss/utils"
 require "rss/converter"
@@ -52,7 +53,7 @@ require "rss/xml-stylesheet"
 
 module RSS
 
-  VERSION = "0.2.4"
+  VERSION = "0.2.7"
 
   URI = "http://purl.org/rss/1.0/"
 
@@ -69,6 +70,9 @@ module RSS
 
   class InvalidRSSError < Error; end
 
+  ##
+  # Raised if no matching tag is found.
+
   class MissingTagError < InvalidRSSError
     attr_reader :tag, :parent
     def initialize(tag, parent)
@@ -77,6 +81,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised if there are more occurrences of the tag than expected.
+
   class TooMuchTagError < InvalidRSSError
     attr_reader :tag, :parent
     def initialize(tag, parent)
@@ -85,6 +92,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised if a required attribute is missing.
+
   class MissingAttributeError < InvalidRSSError
     attr_reader :tag, :attribute
     def initialize(tag, attribute)
@@ -93,6 +103,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised when an unknown tag is found.
+
   class UnknownTagError < InvalidRSSError
     attr_reader :tag, :uri
     def initialize(tag, uri)
@@ -101,6 +114,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised when an unexpected tag is encountered.
+
   class NotExpectedTagError < InvalidRSSError
     attr_reader :tag, :uri, :parent
     def initialize(tag, uri, parent)
@@ -111,6 +127,9 @@ module RSS
   # For backward compatibility :X
   NotExceptedTagError = NotExpectedTagError
 
+  ##
+  # Raised when an incorrect value is used.
+
   class NotAvailableValueError < InvalidRSSError
     attr_reader :tag, :value, :attribute
     def initialize(tag, value, attribute=nil)
@@ -122,6 +141,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised when an unknown conversion error occurs.
+
   class UnknownConversionMethodError < Error
     attr_reader :to, :from
     def initialize(to, from)
@@ -133,6 +155,9 @@ module RSS
   # for backward compatibility
   UnknownConvertMethod = UnknownConversionMethodError
 
+  ##
+  # Raised when a conversion failure occurs.
+
   class ConversionError < Error
     attr_reader :string, :to, :from
     def initialize(string, to, from)
@@ -143,6 +168,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised when a required variable is not set.
+
   class NotSetError < Error
     attr_reader :name, :variables
     def initialize(name, variables)
@@ -152,6 +180,9 @@ module RSS
     end
   end
 
+  ##
+  # Raised when a RSS::Maker attempts to use an unknown maker.
+
   class UnsupportedMakerVersionError < Error
     attr_reader :version
     def initialize(version)
@@ -228,7 +259,7 @@ EOC
           else
             rv << value
           end
-    	    rv << "</#{elem_name}>"
+            rv << "</#{elem_name}>"
           rv
         else
           ''
@@ -248,7 +279,7 @@ EOC
       # accessor
       convert_attr_reader name
       date_writer(name, type, disp_name)
-      
+
       install_element(name) do |n, elem_name|
         <<-EOC
         if @#{n}
@@ -259,7 +290,7 @@ EOC
           else
             rv << value
           end
-    	    rv << "</#{elem_name}>"
+            rv << "</#{elem_name}>"
           rv
         else
           ''
@@ -633,7 +664,7 @@ EOC
     include SetupMaker
 
     INDENT = "  "
-    
+
     MUST_CALL_VALIDATORS = {}
     MODELS = []
     GET_ATTRIBUTES = []
@@ -670,18 +701,18 @@ EOC
       end
 
       def inherited(klass)
-        klass.const_set("MUST_CALL_VALIDATORS", {})
-        klass.const_set("MODELS", [])
-        klass.const_set("GET_ATTRIBUTES", [])
-        klass.const_set("HAVE_CHILDREN_ELEMENTS", [])
-        klass.const_set("TO_ELEMENT_METHODS", [])
-        klass.const_set("NEED_INITIALIZE_VARIABLES", [])
-        klass.const_set("PLURAL_FORMS", {})
+        klass.const_set(:MUST_CALL_VALIDATORS, {})
+        klass.const_set(:MODELS, [])
+        klass.const_set(:GET_ATTRIBUTES, [])
+        klass.const_set(:HAVE_CHILDREN_ELEMENTS, [])
+        klass.const_set(:TO_ELEMENT_METHODS, [])
+        klass.const_set(:NEED_INITIALIZE_VARIABLES, [])
+        klass.const_set(:PLURAL_FORMS, {})
 
         tag_name = klass.name.split(/::/).last
         tag_name[0, 1] = tag_name[0, 1].downcase
-        klass.instance_variable_set("@tag_name", tag_name)
-        klass.instance_variable_set("@have_content", false)
+        klass.instance_variable_set(:@tag_name, tag_name)
+        klass.instance_variable_set(:@have_content, false)
       end
 
       def install_must_call_validator(prefix, uri)
@@ -706,7 +737,7 @@ EOC
         def_corresponded_attr_writer name, writer_type, disp_name
         def_corresponded_attr_reader name, reader_type
         if type == :boolean and /^is/ =~ name
-          alias_method "#{$'}?", name
+          alias_method "#{$POSTMATCH}?", name
         end
         self::GET_ATTRIBUTES << [name, uri, required, element_name]
         add_need_initialize_variable(disp_name)
@@ -829,7 +860,7 @@ EOC
     def full_name
       tag_name
     end
-    
+
     def converter=(converter)
       @converter = converter
       targets = children.dup
@@ -864,7 +895,7 @@ EOC
     ensure
       @do_validate = do_validate
     end
-    
+
     def validate_for_stream(tags, ignore_unknown_element=true)
       validate_attribute
       __validate(ignore_unknown_element, tags, false)
@@ -984,7 +1015,7 @@ EOC
           end_tag = "\n#{indent}</#{full_name}>"
         end
       end
-      
+
       start_tag + content.join("\n") + end_tag
     end
 
@@ -1009,7 +1040,7 @@ EOC
       end
       attrs
     end
-    
+
     def tag_name_with_prefix(prefix)
       "#{prefix}:#{tag_name}"
     end
@@ -1092,9 +1123,8 @@ EOC
         tags = tags.sort_by {|x| element_names.index(x) || tags_size}
       end
 
-      _tags = tags.dup if tags
       models.each_with_index do |model, i|
-        name, model_uri, occurs, getter = model
+        name, _, occurs, = model
 
         if DEBUG
           p "before"
@@ -1200,7 +1230,7 @@ EOC
         __send__(self.class.xml_getter).to_s
       else
         _content = content
-        _content = Base64.encode64(_content) if need_base64_encode?
+        _content = [_content].pack("m").delete("\n") if need_base64_encode?
         h(_content)
       end
     end
@@ -1209,7 +1239,7 @@ EOC
   module RootElementMixin
 
     include XMLStyleSheetMixin
-    
+
     attr_reader :output_encoding
     attr_reader :feed_type, :feed_subtype, :feed_version
     attr_accessor :version, :encoding, :standalone
@@ -1295,7 +1325,7 @@ EOC
       rv << "?>\n"
       rv
     end
-    
+
     def ns_declarations
       decls = {}
       self.class::NSPOOL.collect do |prefix, uri|