hana 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556063c84c12bf3c25887a6021dbe2231ab3f4a63ef142ad9497031c7fdb6f14
-  data.tar.gz: 41a7f89c78c4cec3c97c5e8a1f9e409e3a7f6b7edc84ac8f21c7b794fce665f5
+  metadata.gz: 8967fc878a6eb09d469a2020f6dcef6d78dbced59b3432a7627a1d82064d1cab
+  data.tar.gz: fe88760ea18ff82c272b737e6e7c366dbecda53a1248b6307fc461d056433070
 SHA512:
-  metadata.gz: 6922f6fccc85b67181b4d262df950bbb76df8ace31be13acd1ad943aae40b3ab2f936a41af2e18cf546345409d51236c8a74a8a7be6bc05ec6a14c5456e9442b
-  data.tar.gz: 15c8575ff781dfe4dbb01bc77f80383d4a216a69d8e0282c64175837da52e29d5b92d88bb8ad0a891159ce33c2b9185d895337410400a8038650e623f0931c49
+  metadata.gz: 196a984b465565c19efd2e0fe6e08aa718b3dd846d36059242bfc36455deb9f0871aa66c32d892fe7b7b0bae80ed75c471a35dab6f9bc35af4c57a9253fb48e5
+  data.tar.gz: b483189d57bd549d4c6072a9bd0adc84a480367fd20720e26c51dd40a48c96dedaf5aced42b64e478dd6ecf4c8554a147efaab9710bd7ee23e20d49871c32507

data/lib/hana.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 module Hana
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 
   class Pointer
     include Enumerable
 
+    class Exception < StandardError
+    end
+
+    class FormatError < Exception
+    end
+
     def initialize path
       @path = Pointer.parse path
     end
@@ -32,6 +38,11 @@ module Hana
 
     def self.parse path
       return [''] if path == '/'
+      return []   if path == ''
+
+      unless path.start_with? '/'
+        raise FormatError, "JSON Pointer should start with a slash"
+      end
 
       parts = path.sub(/^\//, '').split(/(?<!\^)\//).each { |part|
         part.gsub!(/\^[\/^]|~[01]/) { |m| ESC[m] }
@@ -68,6 +79,9 @@ module Hana
     class MissingTargetException < Exception
     end
 
+    class InvalidPath < Exception
+    end
+
     def initialize is
       @is = is
     end
@@ -90,12 +104,22 @@ module Hana
     OP    = 'op' # :nodoc:
 
     def add ins, doc
-      list = Pointer.parse ins[PATH]
+      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
+
+      list = Pointer.parse path
       key  = list.pop
       dest = Pointer.eval list, doc
       obj  = ins.fetch VALUE
 
-      raise(MissingTargetException, ins[PATH]) unless dest
+      raise(MissingTargetException, ins['path']) unless dest
 
       if key
         add_op dest, key, obj
@@ -117,6 +141,12 @@ module Hana
       src      = Pointer.eval from, doc
       dest     = Pointer.eval to, doc
 
+      unless Array === src
+        unless src.key? from_key
+          raise Hana::Patch::MissingTargetException
+        end
+      end
+
       obj = rm_op src, from_key
       add_op dest, key, obj
       doc
@@ -134,7 +164,11 @@ module Hana
         raise Patch::IndexError unless from_key =~ /\A\d+\Z/
         obj = src.fetch from_key.to_i
       else
-        obj = src.fetch from_key
+        begin
+          obj = src.fetch from_key
+        rescue KeyError => e
+          raise Hana::Patch::MissingTargetException, e.message
+        end
       end
 
       add_op dest, key, obj

data/test/helper.rb

@@ -67,8 +67,12 @@ module Hana
         [KeyError]
       when /Unrecognized op 'spam'/ then
         [Hana::Patch::Exception]
+      when /missing 'path'|null is not valid value for 'path'/ then
+        [Hana::Patch::InvalidPath]
       when /missing|non-existent/ then
         [Hana::Patch::MissingTargetException]
+      when /JSON Pointer should start with a slash/ then
+        [Hana::Pointer::FormatError]
       else
         [Hana::Patch::FailedTestException]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hana
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -28,30 +28,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.17'
 description: Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.
 email:
 - aaron@tenderlovemaking.com
@@ -96,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.