xmlhasher 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0141c719c75bbae939e900964c22fc208f9dd1edcd5043d7dfa3ea1191a41d50
-  data.tar.gz: 4c598efe5871498e9fea2a12d9ecd4acd2a930c7a783a13e5b5715f03e8dc881
+  metadata.gz: cf67f59279e556373a5f608b70b21e435eb64173316bf82ec7461bc444a193c4
+  data.tar.gz: 446fd644b407a93c467dd8c24df75afe9308f04d15000b313ceec1898893ea2b
 SHA512:
-  metadata.gz: 81f2afb7c5cb3fa22b51f3567ef84e1c1538a92103f3b1d131ba1d1550f55e7b8e7c7fb18ad506d047cd847d5cff9b13a3bf73b60cbcaeb9d06b0a7eeb182388
-  data.tar.gz: 51242da088ffc005df4db1769582fc1a1ac7adbb7756ff9ecefa0212d54eee3ea45b30804758b230a72f824a9334034adeaa397e7d05978a0a38ac320f56f150
+  metadata.gz: d4c32e4578bb6bae7c5e63b485e5dd84a304374fa35aa22f134a15b05faa663f29adaf5cb615afa63ec43f1a9d8a8a84bdaf9e8359610d9a86ae4ea625da43fc
+  data.tar.gz: 22523c1d1089d9cf6add10df187b43175551138cb767be51c78ae1befe6dcba17a4bd6ce0a3b9f4b79ecadce1568309dab811d19c6bd5674e0ee43346acbf1d6

data/.rubocop.yml

@@ -0,0 +1,27 @@
+AllCops:
+  TargetRubyVersion: 2.5
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 200
+
+Metrics/AbcSize:
+  Max: 42
+
+Metrics/ClassLength:
+  Max: 300
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/MethodLength:
+  Max: 60
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/xmlhasher.rb'

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.2.3
   - 2.3.0
   - 2.5.1
+  - 2.6.3
 script:
   - gem build xmlhasher.gemspec
   - gem install xmlhasher-*

data/CHANGELOG.md

@@ -0,0 +1,71 @@
+# Changelog
+
+All changes to the XmlHasher gem are documented here. Releases follow semantic versioning.
+
+## [1.0.5] - 2019-06-16
+
+- Updated ox version.
+- Fixed warning for global variable `$INPUT_RECORD_SEPARATOR`.
+- CHANGELOG.md added.
+- Use new ruby style guide and `rubocop` gem.
+- Added transform cache for keys.
+
+## [1.0.4] - 2018-09-20
+
+- Added `rake benchmark` command.
+- Enabled CDATA parsing.
+- Cleanup travis config.
+- Updated ox version.
+
+## [1.0.3] - 2018-09-20
+
+- Updated ruby version requirement.
+- Fix deprecation warning on SimpleCov::Formatter::MultiFormatter use.
+- Update dependencies.
+
+## [1.0.2] - 2016-02-20
+
+- Cleaned up support environments.
+- Updated ruby version requirement.
+
+## [1.0.1] - 2016-02-20
+
+- Bumped OX and escape_utils gem dependency versions.
+
+
+## [1.0.0] - 2016-02-20
+
+- Small changes in README.md.
+- Removed roby-head from Travis - too unstable.
+- Fixed ruby 2.2+ issue with single node parsing.
+
+## [0.0.6] - 2013-09-09
+
+- Added script for benchmarks.
+- Added 'string_keys' option to keep keys at Strings vs Symbols.
+
+## [0.0.5] - 2013-04-24
+
+- Test release (CI).
+
+## [0.0.4] - 2013-04-24
+
+- Fixed mixed children array detection.
+- Enable Coveralls.
+- Add more examples and license into README.md
+
+## [0.0.3] - 2013-04-24
+
+- Added escape method for attributes and dependency from `escape_utils` gem.
+- Some fixes for node children parsing.
+- Added more tests.
+
+## [0.0.2] - 2013-04-24
+
+- Some fixes for node children parsing.
+- Add more tests.
+- Updated gem description.
+
+## [0.0.1] - 2013-04-24
+
+- The first implementation of the XML parser.

data/Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
 group :test do
+  gem 'coveralls', require: false
   gem 'minitest'
+  gem 'simplecov', require: false
   gem 'test-unit'
-  gem 'simplecov', :require => false
-  gem 'coveralls', :require => false
-end
+end

data/README.md

@@ -19,6 +19,10 @@ or add it to your Gemfile like this:
 gem 'xmlhasher'
 ```
 
+## Release Notes
+
+See [CHANGELOG.md](CHANGELOG.md)
+
 ## Usage
 
 ```ruby

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
@@ -7,9 +9,9 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc "Run the benchmarks"
+desc 'Run the benchmarks'
 task :benchmark do
-  system("ruby", File.join(File.dirname(__FILE__), "benchmark", "benchmark.rb"))
+  system('ruby', File.join(File.dirname(__FILE__), 'benchmark', 'benchmark.rb'))
 end
 
-task :default => :test
+task default: :test

data/benchmark/benchmark.rb

@@ -1,4 +1,6 @@
-$:.push File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('../lib', __dir__)
 
 require 'benchmark'
 require 'xmlhasher'
@@ -28,7 +30,6 @@ rescue LoadError
   puts "libxml gem in not installed, run 'gem install libxml-ruby'"
 end
 
-
 def benchmark(runs, xml)
   label_width = 25 # needs to be >= any label's size
 
@@ -53,7 +54,7 @@ def benchmark(runs, xml)
     end
 
     x.report 'nori' do
-      runs.times { Nori.new(:advanced_typecasting => false).parse(xml) }
+      runs.times { Nori.new(advanced_typecasting: false).parse(xml) }
     end
 
     x.report 'xmlhasher' do
@@ -63,7 +64,7 @@ def benchmark(runs, xml)
 end
 
 puts 'Converting small xml from text to Hash:'
-benchmark(100, File.read(File.expand_path('../../test/fixtures/institution.xml', __FILE__)))
+benchmark(100, File.read(File.expand_path('../test/fixtures/institution.xml', __dir__)))
 puts 'Converting large xml from file to Hash:'
-benchmark(5, File.read(File.expand_path('../../test/fixtures/institutions.xml', __FILE__)))
+benchmark(5, File.read(File.expand_path('../test/fixtures/institutions.xml', __dir__)))
 puts

data/bin/rake

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -7,11 +8,10 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("rake", "rake")
+load Gem.bin_path('rake', 'rake')

data/lib/xmlhasher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xmlhasher/configurable'
 require 'xmlhasher/handler'
 require 'xmlhasher/parser'
@@ -17,9 +19,8 @@ module XmlHasher
 
     def method_missing(method_name, *args, &block)
       return super unless parser.respond_to?(method_name)
+
       parser.send(method_name, *args, &block)
     end
-
   end
-
 end

data/lib/xmlhasher/configurable.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 module XmlHasher
   module Configurable
-
     attr_writer :snakecase, :ignore_namespaces, :string_keys
 
-    KEYS = [:snakecase, :ignore_namespaces, :string_keys]
+    KEYS = %i[snakecase ignore_namespaces string_keys].freeze
 
     def configure
       yield self
@@ -13,8 +14,7 @@ module XmlHasher
     private
 
     def options
-      XmlHasher::Configurable::KEYS.inject({}) { |hash, key| hash[key] = instance_variable_get(:"@#{key}"); hash }
+      XmlHasher::Configurable::KEYS.each_with_object({}) { |key, hash| hash[key] = instance_variable_get(:"@#{key}"); }
     end
-
   end
 end

data/lib/xmlhasher/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ox'
 require 'escape_utils'
 
@@ -6,6 +8,7 @@ module XmlHasher
     def initialize(options = {})
       @options = options
       @stack = []
+      @transform_cache = {}
     end
 
     def to_hash
@@ -17,9 +20,9 @@ module XmlHasher
     end
 
     def attr(name, value)
-      unless ignore_attribute?(name)
-        @stack.last.attributes[transform(name)] = escape(value) unless @stack.empty?
-      end
+      return if ignore_attribute?(name) || @stack.empty?
+
+      @stack.last.attributes[transform(name)] = escape(value)
     end
 
     def text(value)
@@ -30,7 +33,7 @@ module XmlHasher
       @stack.last.text = escape(str)
     end
 
-    def end_element(name)
+    def end_element(_name)
       if @stack.size == 1
         @hash = @stack.pop.to_hash
       else
@@ -42,9 +45,14 @@ module XmlHasher
     private
 
     def transform(name)
+      return @transform_cache[name] if @transform_cache[name]
+
+      orig_name = name
+
       name = name.to_s.split(':').last if @options[:ignore_namespaces]
       name = Util.snakecase(name) if @options[:snakecase]
       name = name.to_sym unless @options[:string_keys]
+      @transform_cache[orig_name] = name
       name
     end
 

data/lib/xmlhasher/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module XmlHasher
   class Node
     attr_accessor :name, :attributes, :children, :text
@@ -13,11 +15,11 @@ module XmlHasher
       if text && !text.empty?
         h[name] = text
       else
-        h[name] = attributes.inject({}) { |r, (key, value)| r[key] = value if !value.nil? && !value.to_s.empty?; r }
+        h[name] = attributes.each_with_object({}) { |(key, value), r| r[key] = value if !value.nil? && !value.to_s.empty?; }
         if children.size == 1
           h[name].merge!(children.first.to_hash)
         else
-          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 })
+          h[name].merge!(children.group_by(&:name).each_with_object({}) { |(k, v), r| v.length == 1 ? r.merge!(v.first.to_hash) : r[k] = v.map { |c| c.to_hash[c.name] }; })
         end
       end
       h[name] = nil if h[name].empty?
@@ -25,4 +27,3 @@ module XmlHasher
     end
   end
 end
-

data/lib/xmlhasher/parser.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'stringio'
 
 module XmlHasher
   class Parser
-
     def initialize(options = {})
       @options = options
     end

data/lib/xmlhasher/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module XmlHasher
   module Util
     def self.snakecase(str)

data/lib/xmlhasher/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module XmlHasher
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/xmlhasher.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xmlhasher/version'
 
@@ -8,25 +9,26 @@ Gem::Specification.new do |spec|
   spec.version       = XmlHasher::VERSION
   spec.authors       = ['Gene Drabkin']
   spec.email         = ['gene.drabkin@gmail.com']
-  spec.description   = %q{Fast XML to Ruby Hash converter}
-  spec.summary       = %q{XmlHasher converts XML to Ruby Hash}
+  spec.description   = 'Fast XML to Ruby Hash converter'
+  spec.summary       = 'XmlHasher converts XML to Ruby Hash'
   spec.homepage      = 'https://github.com/cloocher/xmlhasher'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version     = '>= 1.9.3'
+  spec.required_ruby_version     = Gem::Requirement.new('>= 1.9.3')
   spec.required_rubygems_version = '>= 1.3.6'
 
-  spec.add_dependency 'ox', '~> 2.10.0'
   spec.add_dependency 'escape_utils', '~> 1.2'
+  spec.add_dependency 'ox', '~> 2.11.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'
+  spec.add_development_dependency 'minitest', '~> 5.10'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'simplecov', '~> 0.14.1'
+  spec.add_development_dependency 'test-unit', '~> 3.2'
 end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: xmlhasher
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Gene Drabkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.21
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '3.2'
 description: Fast XML to Ruby Hash converter
 email:
 - gene.drabkin@gmail.com
@@ -130,9 +130,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,11 +148,6 @@ files:
 - lib/xmlhasher/parser.rb
 - lib/xmlhasher/util.rb
 - lib/xmlhasher/version.rb
-- test/fixtures/institution.xml
-- test/fixtures/institutions.xml
-- test/test_helper.rb
-- test/xmlhasher/parser_test.rb
-- test/xmlhasher/xmlhasher_test.rb
 - xmlhasher.gemspec
 homepage: https://github.com/cloocher/xmlhasher
 licenses:
@@ -176,9 +173,4 @@ rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: XmlHasher converts XML to Ruby Hash
-test_files:
-- test/fixtures/institution.xml
-- test/fixtures/institutions.xml
-- test/test_helper.rb
-- test/xmlhasher/parser_test.rb
-- test/xmlhasher/xmlhasher_test.rb
+test_files: []