badgerfish 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3812b8f2e3afef7416d2dfb2139f610e951997cf
-  data.tar.gz: bc77518461d51d4a44937ed619744e1665bdd074
+  metadata.gz: 701b8ae82afa8d6022fb905415e5131a93854b41
+  data.tar.gz: eded2895524d80adb427681cfab22af0ad8c6787
 SHA512:
-  metadata.gz: da1b3af22ee374f714ea8c1bf30ec0628ed4de935f2d56e3cc755dc3cc63e7b00d4bd955af068b8e121e32bf04f524fc2b8f4b285c8092b9bd1ec791b1998a75
-  data.tar.gz: 1bc4511789ec4cbdddc7c9d50de60c8e6fea250fc2554557079bfffffc4768a0a2970beaf392e24ceeabe7ee72f02741931dfcdc3538841b87a92151f68f3307
+  metadata.gz: b43a9a7e27358f03e477eb3ceeb7c4456b65f7934d6fc0081c9ae0efa07315a8aacf131b805f8d58ac0b488cc49b2faf0e5b21096e33c0163473692a4df0290c
+  data.tar.gz: 8cbeb6ac68a3d8cab9007bbfbabe0f9e2c443b95cec5c47599b0acfc28256800c54789c18622f78a73155f30e7da14c8f57a8acd967295c238256d9c26c6acbb

data/lib/badgerfish/ox_sax_parser.rb

@@ -14,6 +14,7 @@ module Badgerfish
       end
 
       @html_entities_coder = HTMLEntities.new
+      @remove_namespaces = !!options[:remove_namespaces]
       @result = @root = {}
       @parents = []
       Ox.sax_parse(self, StringIO.new(xml))
@@ -27,36 +28,43 @@ module Badgerfish
       new_element = {}
       name = name.to_s # force string representation of symbols
 
+      if @remove_namespaces
+        if colon_index = name.index(":")
+          name.slice!(0..colon_index)
+        end
+      end
+
       if @root[name].nil?
         @root[name] = new_element
       else
         @root[name] = [@root[name]] unless @root[name].is_a?(Array)
-        @root[name].push new_element
+        @root[name] << new_element
       end
 
-      @parents.push @root
+      @parents << @root
       @root = new_element
     end
 
     def end_element(name)
-      (@root = @parents.pop).inject(@root) do |memo, (key, value)|
-        memo.tap do |hash|
-          hash[key] = nil if value.empty?
-        end
+      (@root = @parents.pop).inject(@root) do |hash, (key, value)|
+        hash[key] = nil if value.nil? || value.empty?
+        hash
       end
     end
 
     def attr(name, value)
-      unless name.to_s.start_with? 'xmlns'
-        @root["@#{name}"] = value
-      else
-        @root['@xmlns'] ||= {}
+      if name.to_s.start_with?('xmlns')
+        unless @remove_namespaces
+          @root['@xmlns'] ||= {}
 
-        if name.to_s.start_with? 'xmlns:'
-          @root['@xmlns'][name[6, name.length]] = value
-        else
-          @root['@xmlns']['$'] = value
+          if name.to_s.start_with? 'xmlns:'
+            @root['@xmlns'][name[6, name.length]] = value
+          else
+            @root['@xmlns']['$'] = value
+          end
         end
+      else
+        @root["@#{name}"] = value
       end
     end
 

data/lib/badgerfish/version.rb

@@ -1,3 +1,3 @@
 module Badgerfish
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: badgerfish
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Sievers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox