serialized-hashie 1.0.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6cb66d2cf6a88d0c9e5cfb7604f377a771c841acf684220d613e5437fdd91d
-  data.tar.gz: 431e698faa570e3b7d01aaedff1da2e10deacb7b8eb48650f4bf616b91bbd256
+  metadata.gz: 300103bd38c44cb166420b1acc239e8ef20bc0f1c7d9f4bf12e929834a44666c
+  data.tar.gz: daaf36066c71f252d3d33f38f3ac6bcab310a1491b18badad7f985d9fbad1a3c
 SHA512:
-  metadata.gz: 5520e6b7e143d19c05c7b80098df83efd68885ac481fd89ba188046e77ff9373ddb55fe87c93a87b15c295887e11c9850f1d4d66245b28e3b4388a06b2e20dc9
-  data.tar.gz: 70a503e80d67008b47681ae3889afe73dd2f60459532052d761e652c5681a3038056a7d42143fc8314d6c22832eb4b57505e78218a9f8d280c3f7b38d48965d1
+  metadata.gz: 4eb43c83b54941b0b81628aa37441741a931205b73ce8c0f52e5d0ffc260b0fc1e845795748c0745a8faf108a2ad13413ed696f88cb52ab1cea9b5da32ed7f80
+  data.tar.gz: bfc8aa01bfdbe685901ab35952ad5ba437570b4bdc6d50b1fabe3780b2d133166398d8024888aed392787096271f7f41f6a2f64afa2f9a9d9620b80eb634babc

data/.github/workflows/ci.yml

@@ -16,6 +16,6 @@ jobs:
           ruby-version: ${{ matrix.ruby_version }}
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: bundle install
+        run: bundle install && bundle exec appraisal install
       - name: Run tests
-        run: bundle exec rspec
+        run: bundle exec appraisal rspec

data/.github/workflows/package.yml

@@ -15,7 +15,10 @@ jobs:
       - name: Set up Ruby 2.6
         uses: actions/setup-ruby@v1
         with:
-          version: 2.6.x
+          ruby-version: 2.6.x
+
+      - name: Export version from tag name
+        run: echo "${GITHUB_REF/refs\/tags\//}" > VERSION
 
       - name: Build Gem
         run: gem build *.gemspec

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -7,5 +8,10 @@
 /spec/reports/
 /tmp/
 
+# Appraisals generated Gemfiles
+/gemfiles/
+
 # rspec failure tracking
 .rspec_status
+.rubocop-http*
+VERSION

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+appraise 'json-1.8' do
+  gem 'json', '~> 1.8.0'
+end
+
+appraise 'json-2' do
+  gem 'json', '~> 2.0'
+end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2020 Krystal Hosting Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/serialized_hashie.rb

@@ -19,6 +19,10 @@ module SerializedHashie
       @dump_extensions ||= Extensions.new
     end
 
+    def load_hash_extensions
+      @load_hash_extensions ||= Extensions.new
+    end
+
   end
 
 end

data/lib/serialized_hashie/hash.rb

@@ -10,22 +10,13 @@ module SerializedHashie
     class << self
 
       def dump(obj)
-        obj = obj.reject { |_, v| blank?(v) }
-        obj.each do |key, value|
-          if value.is_a?(Array)
-            obj[key] = value.reject { |v| blank?(v) }
-          end
-
-          obj[key] = SerializedHashie.dump_extensions.run(obj[key])
-        end
-        obj.to_h.to_json
+        hash = dump_hash(obj)
+        hash.to_json
       end
 
       def load(raw_hash)
         hash = JSON.parse(presence(raw_hash) || '{}')
-        hash.each do |key, value|
-          hash[key] = SerializedHashie.load_extensions.run(value)
-        end
+        hash = load_hash(hash)
         new(hash)
       end
 
@@ -42,6 +33,52 @@ module SerializedHashie
         blank?(value) ? nil : value
       end
 
+      def dump_hash(hash)
+        hash = hash.transform_values do |value|
+          dump_value(value)
+        end
+        hash.reject { |_, v| blank?(v) }
+      end
+
+      def dump_value(value)
+        if blank?(value)
+          return nil
+        end
+
+        if value.is_a?(::Hash)
+          return dump_hash(value)
+        end
+
+        if value.is_a?(::Array)
+          return value.map { |v| dump_value(v) }.compact
+        end
+
+        SerializedHashie.dump_extensions.run(value)
+      end
+
+      def load_hash(hash)
+        hash.transform_values do |value|
+          load_value(value)
+        end
+      end
+
+      def load_value(value)
+        if value.is_a?(::Hash)
+          hash = SerializedHashie.load_hash_extensions.run(value)
+
+          # If the result is still a hash, we'll return that here
+          return load_hash(hash) if hash.is_a?(::Hash)
+
+          # If the result is not a hash, we'll just return whatever
+          # was returned as a normal value.
+          return load_value(hash)
+        end
+
+        return value.map { |v| load_value(v) } if value.is_a?(Array)
+
+        SerializedHashie.load_extensions.run(value)
+      end
+
     end
 
   end

data/lib/serialized_hashie/version.rb

@@ -2,6 +2,11 @@
 
 module SerializedHashie
 
-  VERSION = '1.0.1'
+  VERSION_FILE_ROOT = File.expand_path('../../VERSION', __dir__)
+  if File.file?(VERSION_FILE_ROOT)
+    VERSION = File.read(VERSION_FILE_ROOT).strip.delete_prefix('v')
+  else
+    VERSION = '0.0.0.dev'
+  end
 
 end

data/serialized-hashie.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |spec|
   spec.version       = SerializedHashie::VERSION
   spec.authors       = ['Adam Cooke']
   spec.email         = ['adam@krystal.uk']
-
   spec.summary       = 'Helpers to serialize data into ActiveRecord models as JSON and returning a Hashie::Mash'
   spec.description   = spec.summary
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.licenses = ['MIT']
+  spec.homepage = 'https://github.com/krystal/serialized-hashie'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(/^(test|spec|features)\//) }
@@ -19,6 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(/^exe\//) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'appraisal', '~> 2.3'
+
   spec.add_runtime_dependency 'hashie', '>= 4.0', '< 5.0'
-  spec.add_runtime_dependency 'json', '>= 2.0', '< 3.0'
+  spec.add_runtime_dependency 'json', '>= 1.8', '< 3.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serialized-hashie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +50,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -46,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -62,8 +76,9 @@ files:
 - ".github/workflows/package.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- Appraisals
 - Gemfile
-- Gemfile.lock
+- MIT-LICENSE
 - README.md
 - bin/console
 - bin/setup
@@ -72,8 +87,9 @@ files:
 - lib/serialized_hashie/hash.rb
 - lib/serialized_hashie/version.rb
 - serialized-hashie.gemspec
-homepage: 
-licenses: []
+homepage: https://github.com/krystal/serialized-hashie
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    serialized-hashie (1.0.1)
-      hashie (>= 4.0, < 5.0)
-      json (>= 2.0, < 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    diff-lcs (1.3)
-    hashie (4.1.0)
-    json (2.1.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.83.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake (~> 12.0)
-  rspec (~> 3.0)
-  rubocop
-  serialized-hashie!
-
-BUNDLED WITH
-   2.1.4