hana 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c03b78248bd570dcbfafd16008862ef61e649362caba2718e14379cdb91a0fb
-  data.tar.gz: b06a607921faf55826ab2f975707eb7d109cbcf9199358bda1d995b4f284bf40
+  metadata.gz: 8f7c301531d8d60e3267883dc0cd34f1366151fd5b876a2439fb296a971248ee
+  data.tar.gz: 8aaa875ad968a75b54bfc5526137430c69cbbd1090dc47eb3997ec2557c645aa
 SHA512:
-  metadata.gz: 9af7c351c9328b51235961633b65e06ddba40c90d758774b26cf2430295a4260f61ca9b36094759d8e0a77c25a498cf0b92ba5e5323472104331b6c08a8d8729
-  data.tar.gz: 30785df502dd77244272c26d3709772d8c6ab8fc57d3e693bbe576befae60db6b3c82285d51d5e002453a176fb7c7a18a92fa1829887c484bf9007a29fc34151
+  metadata.gz: 934c2ddf91379c64cd7b748f940df6fb120fdf79b8667522c7a20e305ed92a92a1ecc01148029c3ddd50b759671aa890a2ecac40bfe1c02b8980dbda7e9086f4
+  data.tar.gz: 8d15b436be7dc1c61e6ff6364dfbdc1a5fe09c0962e15efd858bab4143f8725212a6166480be170950eb4908bb38d26075ae64b49e638600c06649cb8ff9f5ca

data/README.md

@@ -35,7 +35,7 @@ patch.apply('foo' => 'bar') # => {'baz' => 'qux', 'foo' => 'bar'}
 
 (The MIT License)
 
-Copyright (c) 2012-2016 Aaron Patterson
+Copyright (c) 2012-2020 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,12 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+begin
+  require 'hoe'
+rescue LoadError
+  Gem.install 'hoe'
+  retry
+end
 
 Hoe.plugins.delete :rubyforge
 Hoe.plugin :minitest

data/lib/hana.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Hana
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 
   class Pointer
     include Enumerable
@@ -73,6 +73,9 @@ module Hana
     class ObjectOperationOnArrayException < Exception
     end
 
+    class InvalidObjectOperationException < Exception
+    end
+
     class IndexError < Exception
     end
 
@@ -90,7 +93,7 @@ module Hana
 
     def apply doc
       @is.inject(doc) { |d, ins|
-        send VALID.fetch(ins[OP].strip) { |k|
+        send VALID.fetch(ins['op'].strip) { |k|
           raise Exception, "bad method `#{k}`"
         }, ins, d
       }
@@ -98,28 +101,17 @@ module Hana
 
     private
 
-    PATH  = 'path' # :nodoc:
     FROM  = 'from' # :nodoc:
     VALUE = 'value' # :nodoc:
-    OP    = 'op' # :nodoc:
 
     def add ins, doc
-      unless ins.key?('path')
-        raise Hana::Patch::InvalidPath, "missing 'path' parameter"
-      end
-
-      path = ins['path']
-
-      unless path
-        raise Hana::Patch::InvalidPath, "null is not valid value for 'path'"
-      end
-
+      path = get_path ins
       list = Pointer.parse path
       key  = list.pop
       dest = Pointer.eval list, doc
       obj  = ins.fetch VALUE
 
-      raise(MissingTargetException, ins['path']) unless dest
+      raise(MissingTargetException, "target location '#{ins['path']}' does not exist") unless dest
 
       if key
         add_op dest, key, obj
@@ -134,18 +126,15 @@ module Hana
     end
 
     def move ins, doc
+      path = get_path ins
       from     = Pointer.parse ins.fetch FROM
-      to       = Pointer.parse ins[PATH]
+      to       = Pointer.parse path
       from_key = from.pop
       key      = to.pop
       src      = Pointer.eval from, doc
       dest     = Pointer.eval to, doc
 
-      unless Array === src
-        unless src.key? from_key
-          raise Hana::Patch::MissingTargetException
-        end
-      end
+      raise(MissingTargetException, "target location '#{ins['path']}' does not exist") unless dest
 
       obj = rm_op src, from_key
       add_op dest, key, obj
@@ -153,68 +142,81 @@ module Hana
     end
 
     def copy ins, doc
+      path = get_path ins
       from     = Pointer.parse ins.fetch FROM
-      to       = Pointer.parse ins[PATH]
+      to       = Pointer.parse path
       from_key = from.pop
       key      = to.pop
       src      = Pointer.eval from, doc
       dest     = Pointer.eval to, doc
 
       if Array === src
-        raise Patch::IndexError unless from_key =~ /\A\d+\Z/
+        raise Patch::ObjectOperationOnArrayException, "cannot apply non-numeric key '#{key}' to array" unless from_key =~ /\A\d+\Z/
         obj = src.fetch from_key.to_i
       else
         begin
           obj = src.fetch from_key
-        rescue KeyError => e
-          raise Hana::Patch::MissingTargetException, e.message
+        rescue KeyError, NoMethodError
+          raise Hana::Patch::MissingTargetException, "'from' location '#{ins.fetch FROM}' does not exist"
         end
       end
 
+      raise(MissingTargetException, "target location '#{ins['path']}' does not exist") unless dest
+
       add_op dest, key, obj
       doc
     end
 
     def test ins, doc
-      expected = Pointer.new(ins[PATH]).eval doc
+      path = get_path ins
+      expected = Pointer.new(path).eval doc
 
       unless expected == ins.fetch(VALUE)
-        raise FailedTestException.new(ins[VALUE], ins[PATH])
+        raise FailedTestException.new(ins['path'], ins[VALUE])
       end
       doc
     end
 
     def replace ins, doc
-      list = Pointer.parse ins[PATH]
+      path = get_path ins
+      list = Pointer.parse path
       key  = list.pop
       obj  = Pointer.eval list, doc
 
       return ins.fetch VALUE unless key
 
-      if Array === obj
-        raise Patch::IndexError unless key =~ /\A\d+\Z/
-        obj[key.to_i] = ins.fetch VALUE
-      else
-        raise Patch::MissingTargetException unless obj
-        obj[key] = ins.fetch VALUE
-      end
+      rm_op obj, key
+      add_op obj, key, ins.fetch(VALUE)
       doc
     end
 
     def remove ins, doc
-      list = Pointer.parse ins[PATH]
+      path = get_path ins
+      list = Pointer.parse path
       key  = list.pop
       obj  = Pointer.eval list, doc
       rm_op obj, key
       doc
     end
 
+    def get_path ins
+      unless ins.key?('path')
+        raise Hana::Patch::InvalidPath, "missing 'path' parameter"
+      end
+
+      unless ins['path']
+        raise Hana::Patch::InvalidPath, "null is not valid value for 'path'"
+      end
+
+      ins['path']
+    end
+
     def check_index obj, key
       return -1 if key == '-'
 
-      raise ObjectOperationOnArrayException unless key =~ /\A-?\d+\Z/
+      raise ObjectOperationOnArrayException, "cannot apply non-numeric key '#{key}' to array" unless key =~ /\A-?\d+\Z/
       idx = key.to_i
-      raise OutOfBoundsException if idx > obj.length || idx < 0
+      raise OutOfBoundsException, "key '#{key}' is out of bounds for array" if idx > obj.length || idx < 0
       idx
     end
 
@@ -222,19 +224,24 @@ module Hana
       if Array === dest
         dest.insert check_index(dest, key), obj
       else
+        raise Patch::InvalidObjectOperationException, "cannot add key '#{key}' to non-object" unless Hash === dest
         dest[key] = obj
       end
     end
 
     def rm_op obj, key
       if Array === obj
-        raise Patch::IndexError unless key =~ /\A\d+\Z/
+        raise Patch::ObjectOperationOnArrayException, "cannot apply non-numeric key '#{key}' to array" unless key =~ /\A\d+\Z/
         key = key.to_i
-        raise Patch::OutOfBoundsException if key >= obj.length
+        raise Patch::OutOfBoundsException, "key '#{key}' is out of bounds for array" if key >= obj.length
         obj.delete_at key
       else
-        raise Patch::IndexError unless obj&.key? key
-        obj.delete key
+        begin
+          raise Patch::MissingTargetException, "key '#{key}' not found" unless obj&.key? key
+          obj.delete key
+        rescue ::NoMethodError
+          raise Patch::InvalidObjectOperationException, "cannot remove key '#{key}' from non-object"
+        end
       end
     end
   end

data/test/helper.rb

@@ -60,7 +60,7 @@ module Hana
       when /bad number$/ then
         [Hana::Patch::IndexError, Hana::Patch::ObjectOperationOnArrayException]
       when /removing a nonexistent (field|index)/ then
-        [Hana::Patch::IndexError, Hana::Patch::OutOfBoundsException]
+        [Hana::Patch::MissingTargetException, Hana::Patch::OutOfBoundsException]
       when /test op should reject the array value, it has leading zeros/ then
         [Hana::Patch::IndexError]
       when /missing '(from|value)' parameter/ then

data/test/test_hana.rb

@@ -74,7 +74,7 @@ class TestHana < Hana::TestCase
     patch = Hana::Patch.new [
       { 'op' => 'remove', 'path' => '/missing_key' }
     ]
-    assert_raises(Hana::Patch::IndexError) do
+    assert_raises(Hana::Patch::MissingTargetException) do
       patch.apply('foo' => 'bar')
     end
   end
@@ -83,7 +83,7 @@ class TestHana < Hana::TestCase
     patch = Hana::Patch.new [
       { 'op' => 'remove', 'path' => '/missing_key1/missing_key2' }
     ]
-    assert_raises(Hana::Patch::IndexError) do
+    assert_raises(Hana::Patch::MissingTargetException) do
       patch.apply('foo' => 'bar')
     end
   end
@@ -101,7 +101,7 @@ class TestHana < Hana::TestCase
     patch = Hana::Patch.new [
       { 'op' => 'remove', 'path' => '/1/baz' }
     ]
-    assert_raises(Hana::Patch::IndexError) do
+    assert_raises(Hana::Patch::MissingTargetException) do
       patch.apply([
         { 'foo' => 'bar' },
         { 'foo' => 'bar' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hana
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Aaron Patterson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,7 +86,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: http://github.com/tenderlove/hana
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -103,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.2.0.rc.2
+signing_key:
 specification_version: 4
 summary: Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.
 test_files: []