hana 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47901af6a51be41cedcdbea157ab51919387f620
-  data.tar.gz: 533536f30bece16ab323ef9af184dbf7aca22e6f
+  metadata.gz: ccb71fa0fbe43f9887bd8a7f3a1b5ad9273acbcb
+  data.tar.gz: 807c25b1c8b8dcc67ce9f109799224f91bff37ad
 SHA512:
-  metadata.gz: 0720be506f273f9404ba4ac0f62b46599eec0935906e07542b6fbb95da6e5054193b87f96de888c7680cced1c543b551a193a02499f2b39cf3bfb597dc611e41
-  data.tar.gz: 840399954c106f206257c46f4d217a2ed06d23f84b92c0d30e59b65b77839c21d335ca806188da86621de5403195b4a941eefd421846576d3763af8a5dac8c4e
+  metadata.gz: 44ebd19bc18f9aac58a3e22d97ef0af22249bd2d559d5b25e876d0054fd12c5d4ed4bc8def868da96c71d1655809006578d6ca3bfe0931c3abf42b00549154b0
+  data.tar.gz: f8882b84a664e16bb252138a101af07640c3dbcd33c037ed777d33838815a1b7c458c710b3877ca1abd39c484cea61981b4e63ace77c6d495a1ca02a808c4f61

data/lib/hana.rb

@@ -1,5 +1,5 @@
 module Hana
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 
   class Pointer
     include Enumerable
@@ -88,7 +88,7 @@ module Hana
       list = Pointer.parse ins[PATH]
       key  = list.pop
       dest = Pointer.eval list, doc
-      obj  = ins[VALUE]
+      obj  = ins.fetch VALUE
 
       raise(MissingTargetException, ins[PATH]) unless dest
 
@@ -101,7 +101,7 @@ module Hana
     end
 
     def move ins, doc
-      from     = Pointer.parse ins[FROM]
+      from     = Pointer.parse ins.fetch FROM
       to       = Pointer.parse ins[PATH]
       from_key = from.pop
       key      = to.pop
@@ -114,7 +114,7 @@ module Hana
     end
 
     def copy ins, doc
-      from     = Pointer.parse ins[FROM]
+      from     = Pointer.parse ins.fetch FROM
       to       = Pointer.parse ins[PATH]
       from_key = from.pop
       key      = to.pop
@@ -135,7 +135,7 @@ module Hana
     def test ins, doc
       expected = Pointer.new(ins[PATH]).eval doc
 
-      unless expected == ins[VALUE]
+      unless expected == ins.fetch(VALUE)
         raise FailedTestException.new(ins[VALUE], ins[PATH])
       end
       doc
@@ -146,11 +146,13 @@ module Hana
       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[VALUE]
+        obj[key.to_i] = ins.fetch VALUE
       else
-        obj[key] = ins[VALUE]
+        obj[key] = ins.fetch VALUE
       end
       doc
     end

data/test/helper.rb

@@ -49,7 +49,11 @@ module Hana
         [Hana::Patch::IndexError, Hana::Patch::ObjectOperationOnArrayException]
       when /bad number$/ then
         [Hana::Patch::IndexError, Hana::Patch::ObjectOperationOnArrayException]
-      when /missing|non-existant/ then
+      when /missing '(from|value)' parameter/ then
+        [KeyError]
+      when /Unrecognized op 'spam'/ then
+        [Hana::Patch::Exception]
+      when /missing|non-existent/ then
         [Hana::Patch::MissingTargetException]
       else
         [Hana::Patch::FailedTestException]

data/test/json-patch-tests/README.md

@@ -1,8 +1,9 @@
 JSON Patch Tests
 ================
 
-These are test cases for implementations of the [IETF JSON Patch
-draft](http://tools.ietf.org/html/draft-ietf-appsawg-json-patch).
+These are test cases for implementations of [IETF JSON Patch (RFC6902)](http://tools.ietf.org/html/rfc6902).
+
+Some implementations can be found at [jsonpatch.com](http://jsonpatch.com).
 
 
 Test Format
@@ -21,7 +22,30 @@ test record is an object with the following members:
 All fields except 'doc' and 'patch' are optional. Test records consisting only
 of a comment are also OK.
 
-These tests are not complete, or even correct - help welcome!
+
+Files
+-----
+
+- tests.json: the main test file
+- spec_tests.json: tests from the RFC6902 spec
+
+
+Writing Tests
+-------------
+
+All tests should have a descriptive comment.  Tests should be as
+simple as possible - just what's required to test a specific piece of
+behavior.  If you want to test interacting behaviors, create tests for
+each behavior as well as the interaction.
+
+If an 'error' member is specified, the error text should describe the
+error the implementation should raise - *not* what's being tested.
+Implementation error strings will vary, but the suggested error should
+be easily matched to the implementation error string.  Try to avoid
+creating error tests that might pass because an incorrect error was
+reported.
+
+Please feel free to contribute!
 
 
 Credits
@@ -35,7 +59,7 @@ extended by [Mike McCabe](https://github.com/mikemccabe).
 License
 -------
 
-   Copyright 2012 The Authors
+   Copyright 2014 The Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -47,4 +71,5 @@ License
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
+

data/test/json-patch-tests/spec_tests.json

@@ -174,14 +174,14 @@
   },
 
  {
-    "comment": "A.12.  Adding to a Non-existant Target",
+    "comment": "A.12.  Adding to a Non-existent Target",
     "doc": {
   "foo": "bar"
 },
     "patch": [
   { "op": "add", "path": "/baz/bat", "value": "qux" }
 ],
-    "error": "add to a non-existant target"
+    "error": "add to a non-existent target"
   },
 
  {
@@ -192,7 +192,8 @@
     "patch": [
   { "op": "add", "path": "/baz", "value": "qux", "op": "remove" }
 ],
-    "error": "operation has two 'op' members"
+    "error": "operation has two 'op' members",
+    "disabled": true
   },
 
   {

data/test/json-patch-tests/tests.json

@@ -171,6 +171,11 @@
       "expected": ["foo", ["bar", "baz"]],
       "comment": "value in array replace not flattened" },
 
+    { "comment": "replace whole document",
+      "doc": {"foo": "bar"},
+      "patch": [{"op": "replace", "path": "", "value": {"baz": "qux"}}],
+      "expected": {"baz": "qux"} },
+
     { "comment": "spurious patch properties",
       "doc": {"foo": 1},
       "patch": [{"op": "test", "path": "/foo", "value": 1, "spurious": 1}],
@@ -196,8 +201,6 @@
       "patch": [{"op": "test", "path": "/foo", "value": [1, 2]}],
       "error": "test op should fail" },
 
-    { "comment": "json-pointer tests" },
-
     { "comment": "Whole document",
       "doc": { "foo": 1 },
       "patch": [{"op": "test", "path": "", "value": {"foo": 1}}],
@@ -263,5 +266,86 @@
       "patch": [ { "op": "add", "path": "/2/1/-", "value": { "foo": [ "bar", "baz" ] } } ],
       "expected": [ 1, 2, [ 3, [ 4, 5, { "foo": [ "bar", "baz" ] } ] ] ]},
 
-    { "comment": "tests complete" }
+    { "comment": "test remove with bad number should fail",
+      "doc": {"foo": 1, "baz": [{"qux": "hello"}]},
+      "patch": [{"op": "remove", "path": "/baz/1e0/qux"}],
+      "error": "remove op shouldn't remove from array with bad number" },
+
+    { "comment": "test remove on array",
+      "doc": [1, 2, 3, 4],
+      "patch": [{"op": "remove", "path": "/0"}],
+      "expected": [2, 3, 4] },
+
+    { "comment": "test repeated removes",
+      "doc": [1, 2, 3, 4],
+      "patch": [{ "op": "remove", "path": "/1" },
+                { "op": "remove", "path": "/2" }],
+      "expected": [1, 3] },
+
+    { "comment": "test remove with bad index should fail",
+      "doc": [1, 2, 3, 4],
+      "patch": [{"op": "remove", "path": "/1e0"}],
+      "error": "remove op shouldn't remove from array with bad number" },
+
+    { "comment": "test replace with bad number should fail",
+      "doc": [""],
+      "patch": [{"op": "replace", "path": "/1e0", "value": false}],
+      "error": "replace op shouldn't replace in array with bad number" },
+
+    { "comment": "test copy with bad number should fail",
+      "doc": {"baz": [1,2,3], "bar": 1},
+      "patch": [{"op": "copy", "from": "/baz/1e0", "path": "/boo"}],
+      "error": "copy op shouldn't work with bad number" },
+
+    { "comment": "test move with bad number should fail",
+      "doc": {"foo": 1, "baz": [1,2,3,4]},
+      "patch": [{"op": "move", "from": "/baz/1e0", "path": "/foo"}],
+      "error": "move op shouldn't work with bad number" },
+
+    { "comment": "test add with bad number should fail",
+      "doc": ["foo", "sil"],
+      "patch": [{"op": "add", "path": "/1e0", "value": "bar"}],
+      "error": "add op shouldn't add to array with bad number" },
+
+    { "comment": "missing 'value' parameter to add",
+      "doc": [ 1 ],
+      "patch": [ { "op": "add", "path": "/-" } ],
+      "error": "missing 'value' parameter" },
+
+    { "comment": "missing 'value' parameter to replace",
+      "doc": [ 1 ],
+      "patch": [ { "op": "replace", "path": "/0" } ],
+      "error": "missing 'value' parameter" },
+
+    { "comment": "missing 'value' parameter to test",
+      "doc": [ null ],
+      "patch": [ { "op": "test", "path": "/0" } ],
+      "error": "missing 'value' parameter" },
+
+    { "comment": "missing value parameter to test - where undef is falsy",
+      "doc": [ false ],
+      "patch": [ { "op": "test", "path": "/0" } ],
+      "error": "missing 'value' parameter" },
+
+    { "comment": "missing from parameter to copy",
+      "doc": [ 1 ],
+      "patch": [ { "op": "copy", "path": "/-" } ],
+      "error": "missing 'from' parameter" },
+
+    { "comment": "missing from parameter to move",
+      "doc": { "foo": 1 },
+      "patch": [ { "op": "move", "path": "" } ],
+      "error": "missing 'from' parameter" },
+
+    { "comment": "duplicate ops",
+      "doc": { "foo": "bar" },
+      "patch": [ { "op": "add", "path": "/baz", "value": "qux",
+                   "op": "move", "from":"/foo" } ],
+      "error": "patch has two 'op' members",
+      "disabled": true },
+
+    { "comment": "unrecognized op should fail",
+      "doc": {"foo": 1},
+      "patch": [{"op": "spam", "path": "/foo", "value": 1}],
+      "error": "Unrecognized op 'spam'" }
 ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hana
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Aaron Patterson