hana 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5593991a2078ce9a518e6815df0eae13a5a6b016
-  data.tar.gz: b03db1e4ec9245bde4757190b51ec19b5084a932
+  metadata.gz: b259b5422ec5303610246f9c0359dddab090f41d
+  data.tar.gz: 0e05b0271035942c551969550f2d6fc549d6d9c1
 SHA512:
-  metadata.gz: 9a71e96247335c047ba05d71beb6eab4f65813e667c021b9e6a36769b0564d93a099326a1a06ac474dbf7a645978255ca4d193ada800e32837bcd7bf601edb0c
-  data.tar.gz: 86379cd00f01187cd5e504ba301c1041170b36f05b6d1ef53c8025cea539577375edc3b4d6f69d94a6fefa60df1d61417ceccfa4792a882b4fcd6ad5f62718f8
+  metadata.gz: 4236a94452c5aa0672009813ab7082248fcd7a0be36bb23c372321da44134ff193f5beb6864a48383739e28eb430c8dd46d6533cbdbb89a0b10d8d5e65f78690
+  data.tar.gz: 330794b059b22dc3d2a088ff95eba30445f36fa8c08f13f2f959b92c4b74fab7c037385160b0b67b9b2c7f4413f83e3b487596525f03e09e8739be0ba211e77c

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+Wed May 22 19:28:10 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* All IETF compliant
+
 Fri Sep  7 18:54:17 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* Bumping the version.

data/lib/hana.rb

@@ -1,5 +1,5 @@
 module Hana
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 
   class Pointer
     include Enumerable
@@ -18,7 +18,13 @@ module Hana
     ESC = {'^/' => '/', '^^' => '^', '~0' => '~', '~1' => '/'} # :nodoc:
 
     def self.eval list, object
-      list.inject(object) { |o, part| o[(Array === o ? part.to_i : part)] }
+      list.inject(object) { |o, part|
+        if Array === o
+          raise Patch::IndexException unless part =~ /\A\d+\Z/
+          part = part.to_i
+        end
+        o[part]
+      }
     end
 
     def self.parse path
@@ -50,6 +56,9 @@ module Hana
     class ObjectOperationOnArrayException < Exception
     end
 
+    class IndexException < Exception
+    end
+
     def initialize is
       @is = is
     end
@@ -72,7 +81,11 @@ module Hana
       dest = Pointer.eval list, doc
       obj  = ins['value']
 
-      add_op dest, key, obj
+      if key
+        add_op dest, key, obj
+      else
+        dest.replace obj
+      end
     end
 
     def move ins, doc
@@ -105,7 +118,11 @@ module Hana
     end
 
     def test ins, doc
-      expected = Pointer.new(ins['path']).eval doc
+      begin
+        expected = Pointer.new(ins['path']).eval doc
+      rescue Patch::IndexException
+        raise FailedTestException.new(ins['value'], ins['path'])
+      end
 
       unless expected == ins['value']
         raise FailedTestException.new(ins['value'], ins['path'])
@@ -132,6 +149,8 @@ module Hana
     end
 
     def check_index obj, key
+      return -1 if key == '-'
+
       raise ObjectOperationOnArrayException unless key =~ /\A-?\d+\Z/
       idx = key.to_i
       raise OutOfBoundsException if idx > obj.length || idx < 0

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

@@ -1,4 +1,12 @@
 [
+  {
+    "comment": "4.1. add with missing object",
+    "doc": { "q": { "bar": 2 } },
+    "patch": [ {"op": "add", "path": "/a/b", "value": 1} ],
+    "error":
+       "path /a does not exist -- missing objects are not created recursively"
+  },
+
   {
     "comment": "A.1.  Adding an Object Member",
     "doc": {
@@ -14,7 +22,7 @@
   },
 
   {
-    "comment": "A.2.  Adding an Array Element", 
+    "comment": "A.2.  Adding an Array Element",
     "doc": {
   "foo": [ "bar", "baz" ]
 },
@@ -58,7 +66,7 @@
     "doc": {
   "baz": "qux",
   "foo": "bar"
-}, 
+},
     "patch": [
   { "op": "replace", "path": "/baz", "value": "boo" }
 ],
@@ -78,10 +86,10 @@
   "qux": {
     "corge": "grault"
   }
-}, 
+},
     "patch": [
   { "op": "move", "from": "/foo/waldo", "path": "/qux/thud" }
-], 
+],
     "expected": {
   "foo": {
     "bar": "baz"
@@ -97,10 +105,10 @@
     "comment": "A.7.  Moving an Array Element",
     "doc": {
   "foo": [ "all", "grass", "cows", "eat" ]
-}, 
+},
     "patch": [
   { "op": "move", "from": "/foo/1", "path": "/foo/3" }
-], 
+],
     "expected": {
   "foo": [ "all", "cows", "eat", "grass" ]
 }
@@ -131,7 +139,7 @@
     "patch": [
   { "op": "test", "path": "/baz", "value": "bar" }
 ],
-    "error": "string not equivalent" 
+    "error": "string not equivalent"
   },
 
   {
@@ -150,21 +158,21 @@
   }
 }
   },
-  
+
   {
     "comment": "A.11.  Ignoring Unrecognized Elements",
     "doc": {
   "foo":"bar"
-}, 
+},
     "patch": [
   { "op": "add", "path": "/baz", "value": "qux", "xyz": 123 }
 ],
     "expected": {
-  "foo":"bar", 
+  "foo":"bar",
   "baz":"qux"
 }
   },
-  
+
  {
     "comment": "A.12.  Adding to a Non-existant Target",
     "doc": {
@@ -175,9 +183,9 @@
 ],
     "error": "add to a non-existant target"
   },
-  
+
  {
-    "comment": "Invalid JSON Patch Document",
+    "comment": "A.13 Invalid JSON Patch Document",
     "doc": {
      "foo": "bar"
     },
@@ -186,18 +194,39 @@
 ],
     "error": "operation has two 'op' members"
   },
-  
-  { 
-    "comment": "~ Escape Ordering",
+
+  {
+    "comment": "A.14. ~ Escape Ordering",
     "doc": {
        "/": 9,
-       "~1": 10 
+       "~1": 10
     },
-    "patch": [{"op": "test", "path": "/~01", "value":"10"}],
+    "patch": [{"op": "test", "path": "/~01", "value": 10}],
     "expected": {
        "/": 9,
-       "~1": 10 
+       "~1": 10
+    }
+  },
+
+  {
+    "comment": "A.15. Comparing Strings and Numbers",
+    "doc": {
+       "/": 9,
+       "~1": 10
+    },
+    "patch": [{"op": "test", "path": "/~01", "value": "10"}],
+    "error": "number is not equal to string"
+  },
+
+  {
+    "comment": "A.16. Adding an Array Value",
+    "doc": {
+       "foo": ["bar"]
+    },
+    "patch": [{ "op": "add", "path": "/foo/-", "value": ["abc", "def"] }],
+    "expected": {
+      "foo": ["bar", ["abc", "def"]]
     }
   }
-    
-]
+
+]

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

@@ -108,9 +108,19 @@
       "expected": ["bar", "foo", "sil"] },
 
     { "doc": ["foo", "sil"],
-      "patch": [{"op":" add", "path": "/2", "value": "bar"}],
+      "patch": [{"op":"add", "path": "/2", "value": "bar"}],
       "expected": ["foo", "sil", "bar"] },
 
+    { "comment": "test against implementation-specific numeric parsing",
+      "doc": {"1e0": "foo"},
+      "patch": [{"op": "test", "path": "/1e0", "value": "foo"}],
+      "expected": {"1e0": "foo"} },
+
+    { "comment": "test with bad number should fail",
+      "doc": ["foo", "bar"],
+      "patch": [{"op": "test", "path": "/1e0", "value": "bar"}],
+      "error": "test op shouldn't get array element 1" },
+
     { "doc": ["foo", "sil"],
       "patch": [{"op": "add", "path": "/bar", "value": 42}],
       "error": "Object operation on array target" },
@@ -238,5 +248,20 @@
       "patch": [{"op": "copy", "from": "/baz/0", "path": "/boo"}],
       "expected": {"baz":[{"qux":"hello"}],"bar":1,"boo":{"qux":"hello"}} },
 
+    { "comment": "replacing the root of the document is possible with add",
+      "doc": {"foo": "bar"},
+      "patch": [{"op": "add", "path": "", "value": {"baz": "qux"}}],
+      "expected": {"baz":"qux"}},
+
+    { "comment": "Adding to \"/-\" adds to the end of the array",
+      "doc": [ 1, 2 ],
+      "patch": [ { "op": "add", "path": "/-", "value": { "foo": [ "bar", "baz" ] } } ],
+      "expected": [ 1, 2, { "foo": [ "bar", "baz" ] } ]},
+
+    { "comment": "Adding to \"/-\" adds to the end of the array, even n levels down",
+      "doc": [ 1, 2, [ 3, [ 4, 5 ] ] ],
+      "patch": [ { "op": "add", "path": "/2/1/-", "value": { "foo": [ "bar", "baz" ] } } ],
+      "expected": [ 1, 2, [ 3, [ 4, 5, { "foo": [ "bar", "baz" ] } ] ] ]},
+
     { "comment": "tests complete" }
 ]

metadata

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