xmlhasher 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf67f59279e556373a5f608b70b21e435eb64173316bf82ec7461bc444a193c4
-  data.tar.gz: 446fd644b407a93c467dd8c24df75afe9308f04d15000b313ceec1898893ea2b
+  metadata.gz: bde73682245b3ba9ec69944e0dedb7488786205bf38ccfe6f64ac800fbad0f7b
+  data.tar.gz: cbf2f1830e2a7f649376e30408f78d3ef2f26c0e6cf5b1ec6f76da9ecc0e4764
 SHA512:
-  metadata.gz: d4c32e4578bb6bae7c5e63b485e5dd84a304374fa35aa22f134a15b05faa663f29adaf5cb615afa63ec43f1a9d8a8a84bdaf9e8359610d9a86ae4ea625da43fc
-  data.tar.gz: 22523c1d1089d9cf6add10df187b43175551138cb767be51c78ae1befe6dcba17a4bd6ce0a3b9f4b79ecadce1568309dab811d19c6bd5674e0ee43346acbf1d6
+  metadata.gz: '08450792f4de79c0cbd56e20e023739c5c2c095ba355048501912b1736c0efe3f455aa8ff5b880ad177fff7f92863a3bb9358335ed1012ce4f891d0bf51e3979'
+  data.tar.gz: 5373d3fb4e4f0b9644ed80d6d2957576dbfe0e97645f5a54f94e625721bd8142a5b583d0997677869bfd0ac3a1ee8a90ec7bf357532d538141909df09d5f7206

data/.rubocop.yml

@@ -1,6 +1,3 @@
-AllCops:
-  TargetRubyVersion: 2.5
-
 Style/Documentation:
   Enabled: false
 
@@ -25,3 +22,9 @@ Metrics/PerceivedComplexity:
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/xmlhasher.rb'
+
+Naming/VariableNumber:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: <%= ENV['CI'] != 'true' %>

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.2.3
-  - 2.3.0
   - 2.5.1
   - 2.6.3
+env:
+  - CI=true
 script:
+  - ./scripts/ci
   - gem build xmlhasher.gemspec
   - gem install xmlhasher-*

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All changes to the XmlHasher gem are documented here. Releases follow semantic versioning.
 
+## [1.0.6] - 2021-03-10
+
+- Resolve gem build warnings .
+- Run tests on CI
+- Little refactoring for Node hash builder.
+- Use new ruby style guide and `rubocop` gem.
+
 ## [1.0.5] - 2019-06-16
 
 - Updated ox version.

data/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rubocop', require: false if ENV['CI']
+
 group :test do
   gem 'coveralls', require: false
   gem 'minitest'

data/README.md

@@ -44,7 +44,7 @@ end
 # alternatively, specify configuration options when instantiating a Parser
 parser = XmlHasher::Parser.new(
   :snakecase => true,
-  :ignore_namespaces => true
+  :ignore_namespaces => true,
   :string_keys => false
 )
 
@@ -86,7 +86,7 @@ Note: benchmarks were generated on a 2015 Macbook Pro using Ruby 2.5.1
 
 ## Requirements
 
-* Ruby 1.9.3 or higher
+* Ruby 2.0.0 or higher
 
 ## Copyright
 Copyright (c) 2013 Gene Drabkin.

data/lib/xmlhasher.rb

@@ -22,5 +22,9 @@ module XmlHasher
 
       parser.send(method_name, *args, &block)
     end
+
+    def respond_to_missing?(method_name, include_private = false)
+      super
+    end
   end
 end

data/lib/xmlhasher/configurable.rb

@@ -14,7 +14,9 @@ module XmlHasher
     private
 
     def options
-      XmlHasher::Configurable::KEYS.each_with_object({}) { |key, hash| hash[key] = instance_variable_get(:"@#{key}"); }
+      XmlHasher::Configurable::KEYS.each_with_object({}) do |key, hash|
+        hash[key] = instance_variable_get(:"@#{key}")
+      end
     end
   end
 end

data/lib/xmlhasher/handler.rb

@@ -9,6 +9,8 @@ module XmlHasher
       @options = options
       @stack = []
       @transform_cache = {}
+
+      super()
     end
 
     def to_hash
@@ -51,7 +53,7 @@ module XmlHasher
 
       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]
+      name = @options[:string_keys] ? name.to_s : name.to_sym
       @transform_cache[orig_name] = name
       name
     end

data/lib/xmlhasher/node.rb

@@ -11,19 +11,36 @@ module XmlHasher
     end
 
     def to_hash
-      h = {}
-      if text && !text.empty?
-        h[name] = text
-      else
-        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(&: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] }; })
+      node_content = content
+      { name => node_content.empty? ? nil : node_content }
+    end
+
+    private
+
+    def content
+      return text if text && !text.empty?
+
+      attributes_to_hash.merge(children_to_hash)
+    end
+
+    def attributes_to_hash
+      attributes.each_with_object({}) do |(key, value), data|
+        next if value.nil? || value.to_s.empty?
+
+        data[key] = value
+      end
+    end
+
+    def children_to_hash
+      return children.first.to_hash if children.size == 1
+
+      children.group_by(&:name).each_with_object({}) do |(key, nodes), data|
+        next data.merge!(nodes.first.to_hash) if nodes.length == 1
+
+        data[key] = nodes.map do |node|
+          node.to_hash[node.name]
         end
       end
-      h[name] = nil if h[name].empty?
-      h
     end
   end
 end

data/lib/xmlhasher/version.rb

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

data/scripts/ci

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+init_ruby_version() {
+  echo "Using $(ruby -v)"
+  echo "$(cut -d'@' -f1 <<<"$(rvm current)")" > .ruby-version
+}
+
+run_code_quality_checks() {
+  if [[ "$(rvm current)" != *"2.0.0"* ]]; then
+    bundle exec rubocop .
+  fi
+}
+
+run_tests() {
+  bundle exec rake test
+}
+
+main() {
+  init_ruby_version &&
+    run_code_quality_checks &&
+    run_tests
+}
+
+main

data/xmlhasher.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.add_dependency 'escape_utils', '~> 1.2'
-  spec.add_dependency 'ox', '~> 2.11.0'
+  spec.add_dependency 'ox', '~> 2.11'
 
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler', '>= 1.6', '< 3'
   spec.add_development_dependency 'coveralls', '~> 0.8.21'
   spec.add_development_dependency 'minitest', '~> 5.10'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 12'
   spec.add_development_dependency 'simplecov', '~> 0.14.1'
   spec.add_development_dependency 'test-unit', '~> 3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlhasher
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Gene Drabkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +90,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +154,7 @@ files:
 - lib/xmlhasher/parser.rb
 - lib/xmlhasher/util.rb
 - lib/xmlhasher/version.rb
+- scripts/ci
 - xmlhasher.gemspec
 homepage: https://github.com/cloocher/xmlhasher
 licenses:
@@ -168,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: XmlHasher converts XML to Ruby Hash