julien51-sax-machine 0.0.17 → 0.0.18

data/lib/sax-machine.rb

@@ -7,5 +7,5 @@ require "sax-machine/sax_handler"
 require "sax-machine/sax_config"
 
 module SAXMachine
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/sax-machine/sax_config.rb

@@ -6,16 +6,18 @@ module SAXMachine
     attr_reader :top_level_elements, :collection_elements
 
     def initialize
-      @top_level_elements  = []
-      @collection_elements = []
+      @top_level_elements  = {}
+      @collection_elements = {}
     end
 
     def add_top_level_element(name, options)
-      @top_level_elements << ElementConfig.new(name, options)
+      @top_level_elements[name.to_s] ||= []
+      @top_level_elements[name.to_s] << ElementConfig.new(name, options)
     end
 
     def add_collection_element(name, options)
-      @collection_elements << CollectionConfig.new(name, options)
+      @collection_elements[name.to_s] ||= []
+      @collection_elements[name.to_s] << CollectionConfig.new(name, options)
     end
 
     def collection_config(name, nsstack)
@@ -23,7 +25,7 @@ module SAXMachine
       prefix, name = nil, prefix unless name  # No prefix
       namespace = nsstack[prefix]
 
-      @collection_elements.detect { |ce|
+      (@collection_elements[name.to_s] || []).detect { |ce|
         ce.name.to_s == name.to_s &&
         ce.xmlns_match?(namespace)
       }
@@ -31,8 +33,7 @@ module SAXMachine
 
     def element_configs_for_attribute(name, attrs)
       name = name.split(':', 2).last
-      @top_level_elements.select do |element_config|
-        element_config.name == name &&
+      (@top_level_elements[name.to_s] || []).select do |element_config|
         element_config.has_value_and_attrs_match?(attrs)
       end
     end
@@ -42,8 +43,7 @@ module SAXMachine
       prefix, name = nil, prefix unless name  # No prefix
       namespace = nsstack[prefix]
 
-      @top_level_elements.detect do |element_config|
-        element_config.name == name &&
+      (@top_level_elements[name.to_s] || []).detect do |element_config|
         element_config.xmlns_match?(namespace) &&
         element_config.attrs_match?(attrs)
       end

data/lib/sax-machine/sax_document.rb

@@ -43,11 +43,15 @@ module SAXMachine
     end
 
     def columns
-      sax_config.top_level_elements
+      r = []
+      sax_config.top_level_elements.each do |name, ecs|
+        r += ecs
+      end
+      r
     end
 
     def column(sym)
-      columns.select{|c| c.column == sym}[0]
+      sax_config.top_level_elements[sym.to_s][0]
     end
 
     def data_class(sym)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Paul Dix