multi_xml 0.5.4 → 0.5.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.5.5
+-----
+* [Fix symbolize_keys function](https://github.com/sferik/multi_xml/commit/a4cae3aeb690999287cd30206399abaa5ce1ae81)
+* [Fix Nokogiri parser for the same attr and inner element name](https://github.com/sferik/multi_xml/commit/a28ed86e2d7826b2edeed98552736b4c7ca52726)
+
 0.5.4
 -----
 * [Add option to not cast parsed values](https://github.com/sferik/multi_xml/commit/44fc05fbcfd60cc8b555b75212471fab29fa8cd0)

data/lib/multi_xml.rb

@@ -70,9 +70,9 @@ module MultiXml
   class << self
     # Get the current parser class.
     def parser
-      return @@parser if defined?(@@parser)
+      return @parser if defined?(@parser)
       self.parser = self.default_parser
-      @@parser
+      @parser
     end
 
     # The default parser based on what you currently
@@ -84,7 +84,7 @@ module MultiXml
       return :libxml if defined?(::LibXML)
       return :nokogiri if defined?(::Nokogiri)
 
-      REQUIREMENT_MAP.each do |(library, parser)|
+      REQUIREMENT_MAP.each do |library, parser|
         begin
           require library
           return parser
@@ -105,9 +105,9 @@ module MultiXml
       case new_parser
       when String, Symbol
         require "multi_xml/parsers/#{new_parser.to_s.downcase}"
-        @@parser = MultiXml::Parsers.const_get("#{new_parser.to_s.split('_').map{|s| s.capitalize}.join('')}")
+        @parser = MultiXml::Parsers.const_get("#{new_parser.to_s.split('_').map{|s| s.capitalize}.join('')}")
       when Class, Module
-        @@parser = new_parser
+        @parser = new_parser
       else
         raise "Did not recognize your parser specification. Please specify either a symbol or a class."
       end
@@ -180,22 +180,16 @@ module MultiXml
       f
     end
 
-    def symbolize_keys(hash)
-      hash.inject({}) do |result, (key, value)|
-        new_key = case key
-        when String
-          key.to_sym
-        else
-          key
-        end
-        new_value = case value
-        when Hash
-          symbolize_keys(value)
-        else
-          value
+    def symbolize_keys(params)
+      case params
+      when Hash
+        params.inject({}) do |result, (key, value)|
+          result.merge(key.to_sym => symbolize_keys(value))
         end
-        result[new_key] = new_value
-        result
+      when Array
+        params.map{|value| symbolize_keys(value)}
+      else
+        params
       end
     end
 

data/lib/multi_xml/parsers/libxml2_parser.rb

@@ -35,7 +35,15 @@ module MultiXml
         end
 
         # Handle attributes
-        each_attr(node) {|a| node_hash[node_name(a)] = a.value }
+        each_attr(node) do |a|
+          key = node_name(a)
+
+          node_hash[key] = if v = node_hash[key]
+                             [a.value, v]
+                           else
+                             a.value
+                           end
+        end
 
         hash
       end

data/lib/multi_xml/parsers/ox.rb

@@ -10,7 +10,7 @@ require 'ox' unless defined?(Ox)
 #   pairs. Children are added as described by this rule.
 #
 # - Text and CDATE is stored in the parent element Hash with a key of
-#   '__content__' and a value of the text itself.
+#   MultiXml::CONTENT_ROOT and a value of the text itself.
 #
 # - If a key already exists in the Hash then the value associated with the key
 #   is converted to an Array with the old and new value in it.
@@ -52,11 +52,11 @@ module MultiXml
         end
 
         def text(value)
-          append('__content__', value)
+          append(MultiXml::CONTENT_ROOT, value)
         end
 
         def cdata(value)
-          append('__content__', value)
+          append(MultiXml::CONTENT_ROOT, value)
         end
 
         def start_element(name)

data/lib/multi_xml/version.rb

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.5.4" unless defined?(MultiXML::VERSION)
+  VERSION = "0.5.5" unless defined?(MultiXML::VERSION)
 end

data/spec/multi_xml_spec.rb

@@ -11,17 +11,14 @@ describe "MultiXml" do
     end
 
     it "defaults to the best available gem" do
-      pending
-      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Rexml')
-      require 'nokogiri'
-      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Nokogiri')
-      require 'libxml'
-      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Libxml')
+      # Clear cache variable already set by previous tests
+      MultiXml.send(:remove_instance_variable, :@parser)
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Ox')
     end
 
     it "is settable via a symbol" do
-      MultiXml.parser = :nokogiri
-      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Nokogiri')
+      MultiXml.parser = :rexml
+      expect(MultiXml.parser.name).to eq('MultiXml::Parsers::Rexml')
     end
 
     it "is settable via a class" do

data/spec/parser_shared_example.rb

@@ -58,6 +58,16 @@ shared_examples_for "a parser" do |parser|
         end
       end
 
+      context "element with the same inner element and attribute name" do
+        before do
+          @xml = "<user name='John'><name>Smith</name></user>"
+        end
+
+        it "returns nams as Array" do
+          expect(MultiXml.parse(@xml)['user']['name']).to eq ['John', 'Smith']
+        end
+      end
+
       context "with content" do
         before do
           @xml = '<user>Erik Michaels-Ober</user>'
@@ -122,63 +132,11 @@ shared_examples_for "a parser" do |parser|
 
       context "with :symbolize_keys => true" do
         before do
-          @xml = '<user><name>Erik Michaels-Ober</name></user>'
+          @xml = '<users><user name="Erik Michaels-Ober"/><user><name>Wynn Netherland</name></user></users>'
         end
 
         it "symbolizes keys" do
-          expect(MultiXml.parse(@xml, :symbolize_keys => true)).to eq({:user => {:name => "Erik Michaels-Ober"}})
-        end
-      end
-
-      context "when value is true" do
-        before do
-          pending
-          @xml = '<tag>true</tag>'
-        end
-
-        it "returns true" do
-          expect(MultiXml.parse(@xml)['tag']).to be_true
-        end
-      end
-
-      context "when value is false" do
-        before do
-          pending
-          @xml = '<tag>false</tag>'
-        end
-
-        it "returns false" do
-          expect(MultiXml.parse(@xml)['tag']).to be_false
-        end
-      end
-
-      context "when key is id" do
-        before do
-          pending
-          @xml = '<id>1</id>'
-        end
-
-        it "returns a Fixnum" do
-          expect(MultiXml.parse(@xml)['id']).to be_a(Fixnum)
-        end
-
-        it "returns the correct number" do
-          expect(MultiXml.parse(@xml)['id']).to eq(1)
-        end
-      end
-
-      context "when key contains _id" do
-        before do
-          pending
-          @xml = '<tag_id>1</tag_id>'
-        end
-
-        it "returns a Fixnum" do
-          expect(MultiXml.parse(@xml)['tag_id']).to be_a(Fixnum)
-        end
-
-        it "returns the correct number" do
-          expect(MultiXml.parse(@xml)['tag_id']).to eq(1)
+          expect(MultiXml.parse(@xml, :symbolize_keys => true)).to eq({:users => {:user => [{:name => "Erik Michaels-Ober"}, {:name => "Wynn Netherland"}]}})
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_xml
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler