json-tools 0.0.1 → 0.0.2

data/lib/jsontools/jsontools.rb

@@ -180,12 +180,15 @@ module JsonTools
       
       def add params, target
         ptr = Pointer.new params['path']
-        fail if ptr.exists? target
         obj = ptr[target]
         fail if not (Array === obj || Hash === obj)
-        obj.insert JsonTools.fix_key(obj,ptr.last),params['value']
+        if (Array === obj && ptr.last == '-') 
+          obj.insert -1,params['value']
+        else
+          obj.insert JsonTools.fix_key(obj,ptr.last),params['value']
+        end
       rescue
-        raise FailedOperationError
+         raise FailedOperationError
       end
         
       def remove params, target
@@ -206,9 +209,9 @@ module JsonTools
       end
     
       def move_or_copy params, target, move=false 
-        from = Pointer.new params['path']
-        to = Pointer.new params['to']
-        fail if !from.exists?(target) || to.exists?(target)
+        from = Pointer.new params['from']
+        to = Pointer.new params['path']
+        fail if !from.exists?(target) #|| to.exists?(target)
         obj = from[target]
         val = obj[JsonTools.fix_key(obj,from.last)]
         remove(({'path'=>params['path']}), target) if move # we only remove it if we're doing a move operation
@@ -255,9 +258,7 @@ module JsonTools
     def self.string_check params, target, &block
       ptr = Pointer.new params['path']
       return false if !ptr.exists?(target)
-      parent, key = ptr[target], ptr.last
-      key = JsonTools.fix_key(parent, key)
-      val = parent[key]
+      val = ptr.value target
       return false unless String === val
       ignore_case = params['ignore_case']
       test_val = params['value']
@@ -271,9 +272,7 @@ module JsonTools
     def self.number_check params, target, &block
       ptr = Pointer.new params['path']
       return false if !ptr.exists?(target)
-      parent, key = ptr[target], ptr.last
-      key = JsonTools.fix_key(parent, key)
-      val = parent[key]
+      val = ptr.value target
       test_val = params['value']
       return false unless (Numeric === val && Numeric === test_val)
       yield val, test_val
@@ -295,9 +294,7 @@ module JsonTools
     def self.matches params, target
       ptr = Pointer.new params['path']
       return false if !ptr.exists?(target)
-      parent, key = ptr[target], ptr.last
-      key = JsonTools.fix_key(parent, key)
-      val = parent[key]
+      val = ptr.value target
       return false unless String === val
       ignore_case = params['ignore_case']
       test_val = params['value']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies: []
 description: A JSON Patch + Pointer + Predicates Implementation
 email: jasnell@gmail.com