superfeedr-sax-machine 0.0.22.2 → 0.0.23

data/lib/sax-machine.rb

@@ -10,3 +10,6 @@ require "sax-machine/sax_event_recorder"
 module SAXMachine
   VERSION = "0.0.21"
 end
+
+EMPTY_STRING = ''
+COLON = ':'

data/lib/sax-machine/ns_stack.rb

@@ -1,16 +1,19 @@
 module SAXMachine
   class NSStack < Hash
-    def initialize(parent=nil, attrs=[])
+    XMLNS = 'xmlns'
+
+    def initialize(parent=nil, attrs=nil)
       # Initialize
       super()
       @parent = parent
 
+      return self unless attrs
       # Parse attributes
       attrs.each do |attr|
         if attr.kind_of?(Array)
           k, v = attr
           case k
-          when 'xmlns' then self[''] = v
+          when XMLNS then self[EMPTY_STRING] = v
           when /^xmlns:(.+)/ then self[$1] = v
           end
         end
@@ -27,7 +30,7 @@ module SAXMachine
         @parent[name]
       else
         # Undefined, empty namespace
-        ''
+        EMPTY_STRING
       end
     end
 

data/lib/sax-machine/sax_collection_config.rb

@@ -15,16 +15,16 @@ module SAXMachine
                   else nil
                   end
         @default_xmlns = options[:default_xmlns]
-        if @default_xmlns && @xmlns && !@xmlns.include?('')
-          @xmlns << ''
+        if @default_xmlns && @xmlns && !@xmlns.include?(EMPTY_STRING)
+          @xmlns << EMPTY_STRING
         end
         @record_events = options[:events]
       end
       
       def handler(nsstack)
-        if @default_xmlns && (nsstack.nil? || nsstack[''] == '')
+        if @default_xmlns && (nsstack.nil? || nsstack[EMPTY_STRING] == EMPTY_STRING)
           nsstack = NSStack.new(nsstack, nsstack)
-          nsstack[''] = @default_xmlns
+          nsstack[EMPTY_STRING] = @default_xmlns
         end
         unless @record_events
           SAXHandler.new(@class.new, nsstack)

data/lib/sax-machine/sax_config.rb

@@ -21,29 +21,33 @@ module SAXMachine
     end
 
     def collection_config(name, nsstack)
-      prefix, name = name.split(':', 2)
+      prefix, name = name.split(COLON, 2)
       prefix, name = nil, prefix unless name  # No prefix
       namespace = nsstack[prefix]
 
-      (@collection_elements[name.to_s] || []).detect { |ce|
+      return nil unless (a = @collection_elements[name.to_s])
+      a.detect { |ce|
         ce.name.to_s == name.to_s &&
         ce.xmlns_match?(namespace)
       }
     end
 
     def element_configs_for_attribute(name, attrs)
-      name = name.split(':', 2).last
-      (@top_level_elements[name.to_s] || []).select do |element_config|
+      name = name.split(COLON, 2).last
+
+      return [] unless (a = @top_level_elements[name.to_s])
+      a.select do |element_config|
         element_config.has_value_and_attrs_match?(attrs)
       end
     end
 
     def element_config_for_tag(name, attrs, nsstack)
-      prefix, name = name.split(':', 2)
+      prefix, name = name.split(COLON, 2)
       prefix, name = nil, prefix unless name  # No prefix
       namespace = nsstack[prefix]
 
-      (@top_level_elements[name.to_s] || []).detect do |element_config|
+      return nil unless (a = @top_level_elements[name.to_s])
+      a.detect do |element_config|
         element_config.xmlns_match?(namespace) &&
         element_config.attrs_match?(attrs)
       end

data/lib/sax-machine/sax_element_config.rb

@@ -52,7 +52,15 @@ module SAXMachine
       
       def attrs_match?(attrs)
         if @with
-          @with == (@with & attrs)
+          if attrs.nil?
+            if @with.empty?
+              true
+            else
+              false
+            end
+          else
+            @with == (@with & attrs)
+          end
         else
           true
         end

data/lib/sax-machine/sax_event_recorder.rb

@@ -10,15 +10,15 @@ module SAXMachine
       @events[1..-2]
     end
 
-    def start_element(name, attrs = [])
+    def start_element(name, attrs = nil)
       @nsstack = NSStack.new(@nsstack, attrs)
-      prefix, name = name.split(':', 2)
+      prefix, name = name.split(COLON, 2)
       prefix, name = nil, prefix unless name
       @events << [:start_element, @nsstack[prefix], name, attrs]
     end
 
     def end_element(name)
-      prefix, name = name.split(':', 2)
+      prefix, name = name.split(COLON, 2)
       prefix, name = nil, prefix unless name
       @events << [:end_element, @nsstack[prefix], name]
       @nsstack = @nsstack.pop

data/lib/sax-machine/sax_handler.rb

@@ -14,7 +14,11 @@ module SAXMachine
       if parsing_collection?
         @collection_handler.characters(string)
       elsif @element_config
-        @value << string
+        if !@value || @value == EMPTY_STRING
+          @value = string
+        else
+          @value << string
+        end
       end
     end
 
@@ -22,10 +26,10 @@ module SAXMachine
       characters(string)
     end
 
-    def start_element(name, attrs = [])
+    def start_element(name, attrs = nil)
 
       @name   = name
-      @attrs  = attrs.map { |a| SAXHandler.decode_xml(a) }
+      @attrs  = attrs ? attrs.map { |a| SAXHandler.decode_xml(a) } : nil
       @nsstack  = NSStack.new(@nsstack, @attrs)
 
       if parsing_collection?
@@ -46,7 +50,7 @@ module SAXMachine
     end
 
     def end_element(name)
-      if parsing_collection? && @collection_config.name == name.split(':').last
+      if parsing_collection? && @collection_config.name == name.split(COLON).last
         @collection_handler.end_element(name)
         @object.send(@collection_config.accessor) << @collection_handler.object
         reset_current_collection
@@ -85,7 +89,7 @@ module SAXMachine
     end
 
     def set_element_config_for_element_value
-      @value = ""
+      @value = EMPTY_STRING
       @element_config = sax_config.element_config_for_tag(@name, @attrs, @nsstack)
     end
 

metadata

@@ -1,32 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: superfeedr-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.22.2
+  version: 0.0.23
 platform: ruby
 authors: 
 - Paul Dix
-- Stephan Maka
+- astro
 - julien51
 - superfeedr
+- yakischloba
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: superfeedr-nokogiri
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: 1.4.0.20091116183308
+        version: 0.0.0
     version: 
 description: 
-email: paul@pauldix.net stephan@spaceboyz.net
+email: 
 executables: []
 
 extensions: []
@@ -48,7 +49,7 @@ files:
 - spec/spec_helper.rb
 - spec/sax-machine/sax_document_spec.rb
 has_rdoc: true
-homepage: http://github.com/pauldix/sax-machine
+homepage: http://github.com/julien51/sax-machine
 licenses: []
 
 post_install_message: