hana 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b259b5422ec5303610246f9c0359dddab090f41d
-  data.tar.gz: 0e05b0271035942c551969550f2d6fc549d6d9c1
+  metadata.gz: 1cbfce7020c1e6b550e0c4b08659f36ec2dcee8e
+  data.tar.gz: c3283388b7d72f50c74d66c693a154bfd3a223a4
 SHA512:
-  metadata.gz: 4236a94452c5aa0672009813ab7082248fcd7a0be36bb23c372321da44134ff193f5beb6864a48383739e28eb430c8dd46d6533cbdbb89a0b10d8d5e65f78690
-  data.tar.gz: 330794b059b22dc3d2a088ff95eba30445f36fa8c08f13f2f959b92c4b74fab7c037385160b0b67b9b2c7f4413f83e3b487596525f03e09e8739be0ba211e77c
+  metadata.gz: 944e3a00cbd11622b76d000cd28ba368338b4483e5827da783ea2a6d8cda46d7e378fb9c2eb654b328774b2f97d4d3504232cb879a97f297f633a58c688ce526
+  data.tar.gz: c890fff53ef18b8ff1b4df345749e2097106e3a636e6cc307a9bed7bd757e591447115561dbeb861030f254159a1d088777d58ab35f9668d990314f2e623b10a

data/Manifest.txt

@@ -8,5 +8,6 @@ test/helper.rb
 test/json-patch-tests/README.md
 test/json-patch-tests/spec_tests.json
 test/json-patch-tests/tests.json
+test/mine.json
 test/test_hana.rb
 test/test_ietf.rb

data/Rakefile

@@ -13,6 +13,7 @@ Hoe.spec 'hana' do
   self.readme_file   = 'README.md'
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc']
+  extra_dev_deps << ["minitest", "~> 5.0"]
 end
 
 # vim: syntax=ruby

data/lib/hana.rb

@@ -1,5 +1,5 @@
 module Hana
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   class Pointer
     include Enumerable
@@ -20,7 +20,7 @@ module Hana
     def self.eval list, object
       list.inject(object) { |o, part|
         if Array === o
-          raise Patch::IndexException unless part =~ /\A\d+\Z/
+          raise Patch::IndexError unless part =~ /\A\d+\Z/
           part = part.to_i
         end
         o[part]
@@ -56,7 +56,10 @@ module Hana
     class ObjectOperationOnArrayException < Exception
     end
 
-    class IndexException < Exception
+    class IndexError < Exception
+    end
+
+    class MissingTargetException < Exception
     end
 
     def initialize is
@@ -81,6 +84,8 @@ module Hana
       dest = Pointer.eval list, doc
       obj  = ins['value']
 
+      raise(MissingTargetException, ins['path']) unless dest
+
       if key
         add_op dest, key, obj
       else
@@ -109,6 +114,7 @@ module Hana
       dest     = Pointer.eval to, doc
 
       if Array === src
+        raise Patch::IndexError unless from_key =~ /\A\d+\Z/
         obj = src.fetch from_key.to_i
       else
         obj = src.fetch from_key
@@ -118,11 +124,7 @@ module Hana
     end
 
     def test ins, doc
-      begin
-        expected = Pointer.new(ins['path']).eval doc
-      rescue Patch::IndexException
-        raise FailedTestException.new(ins['value'], ins['path'])
-      end
+      expected = Pointer.new(ins['path']).eval doc
 
       unless expected == ins['value']
         raise FailedTestException.new(ins['value'], ins['path'])
@@ -135,6 +137,7 @@ module Hana
       obj  = Pointer.eval list, doc
 
       if Array === obj
+        raise Patch::IndexError unless key =~ /\A\d+\Z/
         obj[key.to_i] = ins['value']
       else
         obj[key] = ins['value']
@@ -167,6 +170,7 @@ module Hana
 
     def rm_op obj, key
       if Array === obj
+        raise Patch::IndexError unless key =~ /\A\d+\Z/
         obj.delete_at key.to_i
       else
         obj.delete key

data/test/helper.rb

@@ -1,7 +1,59 @@
 require 'minitest/autorun'
 require 'hana'
+require 'json'
 
 module Hana
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < Minitest::Test
+    TESTDIR = File.dirname File.expand_path __FILE__
+
+    def self.read_test_json_file file
+      Module.new {
+        tests = JSON.load File.read file
+        tests.each_with_index do |test, i|
+          next unless test['doc']
+
+          define_method("test_#{test['comment'] || i }") do
+            skip "disabled" if test['disabled']
+
+            doc   = test['doc']
+            patch = test['patch']
+
+            patch = Hana::Patch.new patch
+
+            if test['error']
+              assert_raises(*ex(test['error'])) do
+                patch.apply doc
+              end
+            else
+              assert_equal(test['expected'] || doc, patch.apply(doc))
+            end
+          end
+        end
+      }
+    end
+
+    def self.skip regexp, message
+      instance_methods.grep(regexp).each do |method|
+        define_method(method) { skip message }
+      end
+    end
+
+    private
+
+    def ex msg
+      case msg
+      when /Out of bounds/i then [Hana::Patch::OutOfBoundsException]
+      when /Object operation on array/ then
+        [Hana::Patch::ObjectOperationOnArrayException]
+      when /test op shouldn't get array element/ then
+        [Hana::Patch::IndexError, Hana::Patch::ObjectOperationOnArrayException]
+      when /bad number$/ then
+        [Hana::Patch::IndexError, Hana::Patch::ObjectOperationOnArrayException]
+      when /missing|non-existant/ then
+        [Hana::Patch::MissingTargetException]
+      else
+        [Hana::Patch::FailedTestException]
+      end
+    end
   end
 end

data/test/mine.json

@@ -0,0 +1,36 @@
+[
+    { "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 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" }
+]

data/test/test_ietf.rb

@@ -1,42 +1,20 @@
 require 'helper'
-require 'json'
 
 module Hana
   class TestIETF < TestCase
-    TESTDIR = File.dirname File.expand_path __FILE__
-    json    = File.read File.join TESTDIR, 'json-patch-tests', 'tests.json'
-    tests = JSON.load json
-    tests.each_with_index do |test, i|
-      next unless test['doc']
-
-      define_method("test_#{test['comment'] || i }") do
-        skip "disabled" if test['disabled']
-
-        doc   = test['doc']
-        patch = test['patch']
-
-        patch = Hana::Patch.new patch
+    filename = File.join TESTDIR, 'json-patch-tests', 'tests.json'
+    include read_test_json_file filename
+  end
 
-        if test['error']
-          assert_raises(ex(test['error'])) do
-            patch.apply doc
-          end
-        else
-          assert_equal(test['expected'] || doc, patch.apply(doc))
-        end
-      end
-    end
+  class TestSpec < TestCase
+    filename = File.join TESTDIR, 'json-patch-tests', 'spec_tests.json'
+    include read_test_json_file filename
 
-    private
+    skip(/A\.13/, 'This test depends on the JSON parser')
+  end
 
-    def ex msg
-      case msg
-      when /Out of bounds/i then Hana::Patch::OutOfBoundsException
-      when /Object operation on array/ then
-        Hana::Patch::ObjectOperationOnArrayException
-      else
-        Hana::Patch::FailedTestException
-      end
-    end
+  class MyTests < TestCase
+    filename = File.join TESTDIR, 'mine.json'
+    include read_test_json_file filename
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hana
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -72,6 +72,7 @@ files:
 - test/json-patch-tests/README.md
 - test/json-patch-tests/spec_tests.json
 - test/json-patch-tests/tests.json
+- test/mine.json
 - test/test_hana.rb
 - test/test_ietf.rb
 - .gemtest