xmlhasher 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3240088f05621e61ec077b6353d4efa8c11e38c58e6a9f5cb32fb926493a0c86
-  data.tar.gz: d7cda5ca749826197b782c8d260f13445ab573e86587a43645508a0ea0565f51
+  metadata.gz: 0141c719c75bbae939e900964c22fc208f9dd1edcd5043d7dfa3ea1191a41d50
+  data.tar.gz: 4c598efe5871498e9fea2a12d9ecd4acd2a930c7a783a13e5b5715f03e8dc881
 SHA512:
-  metadata.gz: f421d05d16de43a6e78b4f19d8704f602a36b785299b392cce444eef1a7341c57dee5ac3bc723feae03b5b68b056f65af3cd98dcac3b4e947150e68740847fcb
-  data.tar.gz: 6d7e68640d6ada4d53a77a268c20696c51df152dbd0846248e8babb65c0bfd4dd60e0e35d4c752903b3b341c82110469a6ddca695e5ba13327f4b2549daea0db
+  metadata.gz: 81f2afb7c5cb3fa22b51f3567ef84e1c1538a92103f3b1d131ba1d1550f55e7b8e7c7fb18ad506d047cd847d5cff9b13a3bf73b60cbcaeb9d06b0a7eeb182388
+  data.tar.gz: 51242da088ffc005df4db1769582fc1a1ac7adbb7756ff9ecefa0212d54eee3ea45b30804758b230a72f824a9334034adeaa397e7d05978a0a38ac320f56f150

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+2.5.1

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
-bundler_args: "--without development"
-before_install:
-  - gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.2.3
   - 2.3.0
+  - 2.5.1
 script:
   - gem build xmlhasher.gemspec
   - gem install xmlhasher-*

data/Gemfile

@@ -2,11 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake'
-
 group :test do
   gem 'minitest'
   gem 'test-unit'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false
-end
+end

data/README.md

@@ -56,30 +56,29 @@ XmlHasher.parse("<tag1><tag2>content</tag2></tag1>")
 ```
 ## Benchmarks
 
-How fast is it?  Try it for yourself - [benchmark.rb](https://github.com/cloocher/xmlhasher/blob/master/benchmark/benchmark.rb)
+How fast is it?  Try it for yourself `rake benchmark`
 
-```
+```sh
 Converting small xml from text to Hash:
-
-                            user     system      total        real
-activesupport(rexml)     0.380000   0.000000   0.380000 (  0.385326)
-activesupport(libxml)    0.060000   0.000000   0.060000 (  0.062008)
-activesupport(nokogiri)  0.090000   0.000000   0.090000 (  0.089466)
-xmlsimple                0.480000   0.010000   0.490000 (  0.490938)
-nori                     0.120000   0.000000   0.120000 (  0.123612)
-xmlhasher                0.010000   0.000000   0.010000 (  0.017366)
+                 user     system      total        real
+activesupport(rexml)     0.196861   0.000692   0.197553 (  0.197756)
+activesupport(libxml)    0.028840   0.000176   0.029016 (  0.029037)
+activesupport(nokogiri)  0.044063   0.000516   0.044579 (  0.044618)
+xmlsimple                0.225291   0.014291   0.239582 (  0.239756)
+nori                     0.048385   0.000379   0.048764 (  0.048806)
+xmlhasher                0.011791   0.000098   0.011889 (  0.011895)
 
 Converting large xml from file to Hash:
+                 user     system      total        real
+activesupport(rexml)    25.891326   0.144542  26.035868 ( 26.052577)
+activesupport(libxml)    3.911317   0.072332   3.983649 (  3.985904)
+activesupport(nokogiri)  6.126251   0.061193   6.187444 (  6.191296)
+xmlsimple               26.128386   0.120480  26.248866 ( 26.265013)
+nori                     6.347459   0.028522   6.375981 (  6.380416)
+xmlhasher                1.738668   0.027549   1.766217 (  1.767256)
 
-                            user     system      total        real
-activesupport(rexml)    57.230000   0.240000  57.470000 ( 57.460510)
-activesupport(libxml)   # Segmentation fault
-activesupport(nokogiri) 12.650000   0.250000  12.900000 ( 12.908073)
-xmlsimple               49.980000   0.160000  50.140000 ( 50.140775)
-nori                    15.590000   0.110000  15.700000 ( 15.697411)
-xmlhasher                4.290000   0.030000   4.320000 (  4.316379)
 ```
-Note: benchmarks were generated on a Macbook Pro using Ruby 1.9.3p392
+Note: benchmarks were generated on a 2015 Macbook Pro using Ruby 2.5.1
 
 ## Requirements
 

data/Rakefile

@@ -7,4 +7,9 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc "Run the benchmarks"
+task :benchmark do
+  system("ruby", File.join(File.dirname(__FILE__), "benchmark", "benchmark.rb"))
+end
+
 task :default => :test

data/benchmark/benchmark.rb

@@ -4,92 +4,66 @@ require 'benchmark'
 require 'xmlhasher'
 begin
   require 'nori'
-rescue
+rescue LoadError
   puts "nori gem in not installed, run 'gem install nori'"
 end
 begin
   require 'active_support/core_ext/hash/conversions'
-rescue
+rescue LoadError
   puts "active_support gem in not installed, run 'gem install activesupport'"
 end
 begin
   require 'xmlsimple'
-rescue
+rescue LoadError
   puts "xmlsimple gem in not installed, run 'gem install xml-simple'"
 end
 begin
   require 'nokogiri'
-rescue
+rescue LoadError
   puts "nokogiri gem in not installed, run 'gem install nokogiri'"
 end
 begin
   require 'libxml'
-rescue
+rescue LoadError
   puts "libxml gem in not installed, run 'gem install libxml-ruby'"
 end
 
 
-runs = 100
-xml = File.read(File.expand_path('../../test/fixtures/institution.xml', __FILE__))
-puts 'Converting small xml from text to Hash:'
-Benchmark.bm 10 do |x|
-  ActiveSupport::XmlMini.backend = ActiveSupport::XmlMini_REXML
-  x.report 'activesupport(rexml)   ' do
-    runs.times { Hash.from_xml(xml) }
-  end
+def benchmark(runs, xml)
+  label_width = 25 # needs to be >= any label's size
 
-  ActiveSupport::XmlMini.backend = 'LibXML'
-  x.report 'activesupport(libxml)  ' do
-    runs.times { Hash.from_xml(xml) }
-  end
+  Benchmark.bm(label_width) do |x|
+    ActiveSupport::XmlMini.backend = ActiveSupport::XmlMini_REXML
+    x.report 'activesupport(rexml)' do
+      runs.times { Hash.from_xml(xml) }
+    end
 
-  ActiveSupport::XmlMini.backend = 'Nokogiri'
-  x.report 'activesupport(nokogiri)' do
-    runs.times { Hash.from_xml(xml) }
-  end
+    ActiveSupport::XmlMini.backend = 'LibXML'
+    x.report 'activesupport(libxml)' do
+      runs.times { Hash.from_xml(xml) }
+    end
 
-  x.report 'xmlsimple              ' do
-    runs.times { XmlSimple.xml_in(xml) }
-  end
+    ActiveSupport::XmlMini.backend = 'Nokogiri'
+    x.report 'activesupport(nokogiri)' do
+      runs.times { Hash.from_xml(xml) }
+    end
 
-  x.report 'nori                   ' do
-    runs.times { Nori.new(:advanced_typecasting => false).parse(xml) }
-  end
+    x.report 'xmlsimple' do
+      runs.times { XmlSimple.xml_in(xml) }
+    end
 
-  x.report 'xmlhasher              ' do
-    runs.times { XmlHasher.parse(xml) }
+    x.report 'nori' do
+      runs.times { Nori.new(:advanced_typecasting => false).parse(xml) }
+    end
+
+    x.report 'xmlhasher' do
+      runs.times { XmlHasher.parse(xml) }
+    end
   end
 end
 
-puts
-runs = 5
-path = File.expand_path('../../test/fixtures/institutions.xml', __FILE__)
+puts 'Converting small xml from text to Hash:'
+benchmark(100, File.read(File.expand_path('../../test/fixtures/institution.xml', __FILE__)))
 puts 'Converting large xml from file to Hash:'
-Benchmark.bm 5 do |x|
-  ActiveSupport::XmlMini.backend = ActiveSupport::XmlMini_REXML
-  x.report 'activesupport(rexml)   ' do
-    runs.times { Hash.from_xml(File.new(path)) }
-  end
-
-  ActiveSupport::XmlMini.backend = 'LibXML'
-  x.report 'activesupport(libxml)  ' do
-    #runs.times { Hash.from_xml(File.new(path)) } # Segmentation fault
-  end
-
-  ActiveSupport::XmlMini.backend = 'Nokogiri'
-  x.report 'activesupport(nokogiri)' do
-    runs.times { Hash.from_xml(File.new(path)) }
-  end
-
-  x.report 'xmlsimple              ' do
-    runs.times { XmlSimple.xml_in(path) }
-  end
-
-  x.report 'nori                   ' do
-    runs.times { Nori.new(:advanced_typecasting => false).parse(File.new(path).read) } # Nori doesn't support reading from a stream, load the file in memory
-  end
-
-  x.report 'xmlhasher              ' do
-    runs.times { XmlHasher.parse(File.new(path)) }
-  end
-end
+benchmark(5, File.read(File.expand_path('../../test/fixtures/institutions.xml', __FILE__)))
+puts

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/lib/xmlhasher/handler.rb

@@ -26,6 +26,10 @@ module XmlHasher
       @stack.last.text = escape(value)
     end
 
+    def cdata(str)
+      @stack.last.text = escape(str)
+    end
+
     def end_element(name)
       if @stack.size == 1
         @hash = @stack.pop.to_hash

data/lib/xmlhasher/node.rb

@@ -17,7 +17,7 @@ module XmlHasher
         if children.size == 1
           h[name].merge!(children.first.to_hash)
         else
-          h[name].merge!(children.group_by { |child| child.name }.inject({}) { |r, (k, v)| v.length == 1 ? r.merge!(v.first.to_hash) : r[k] = v.map { |c| c.to_hash[c.name] }; r })
+          h[name].merge!(children.group_by { |c| c.name }.inject({}) { |r, (k, v)| v.length == 1 ? r.merge!(v.first.to_hash) : r[k] = v.map { |c| c.to_hash[c.name] }; r })
         end
       end
       h[name] = nil if h[name].empty?

data/lib/xmlhasher/version.rb

@@ -1,3 +1,3 @@
 module XmlHasher
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/xmlhasher/parser_test.rb

@@ -241,4 +241,10 @@ class XmlhasherTest < Test::Unit::TestCase
     expected = {:tag => nil}
     assert_equal expected, XmlHasher::Parser.new.parse(xml)
   end
+
+  def test_cdata_value
+    xml = %[<title><![CDATA[Midhir uploaded a photo.]]></title>]
+    expected = {:title => "Midhir uploaded a photo."}
+    assert_equal expected, XmlHasher::Parser.new.parse(xml)
+  end
 end

data/xmlhasher.gemspec

@@ -14,16 +14,19 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version     = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.6'
 
-  spec.add_dependency 'ox', '2.10.0'
-  spec.add_dependency 'escape_utils', '~> 1.2', '>= 1.2.0'
+  spec.add_dependency 'ox', '~> 2.10.0'
+  spec.add_dependency 'escape_utils', '~> 1.2'
 
-  spec.add_development_dependency 'rake', '~> 0'
-  spec.add_development_dependency 'bundler', '~> 0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'minitest',  '~> 5.10'
+  spec.add_development_dependency 'test-unit', '~> 3.2'
+  spec.add_development_dependency 'simplecov', '~> 0.14.1'
+  spec.add_development_dependency 'coveralls', '~> 0.8.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlhasher
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Gene Drabkin
@@ -14,14 +14,14 @@ dependencies:
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
@@ -31,9 +31,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,37 +38,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.21
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.21
 description: Fast XML to Ruby Hash converter
 email:
 - gene.drabkin@gmail.com
@@ -88,6 +138,7 @@ files:
 - README.md
 - Rakefile
 - benchmark/benchmark.rb
+- bin/rake
 - lib/xmlhasher.rb
 - lib/xmlhasher/configurable.rb
 - lib/xmlhasher/handler.rb