hana 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cbfce7020c1e6b550e0c4b08659f36ec2dcee8e
-  data.tar.gz: c3283388b7d72f50c74d66c693a154bfd3a223a4
+  metadata.gz: 47901af6a51be41cedcdbea157ab51919387f620
+  data.tar.gz: 533536f30bece16ab323ef9af184dbf7aca22e6f
 SHA512:
-  metadata.gz: 944e3a00cbd11622b76d000cd28ba368338b4483e5827da783ea2a6d8cda46d7e378fb9c2eb654b328774b2f97d4d3504232cb879a97f297f633a58c688ce526
-  data.tar.gz: c890fff53ef18b8ff1b4df345749e2097106e3a636e6cc307a9bed7bd757e591447115561dbeb861030f254159a1d088777d58ab35f9668d990314f2e623b10a
+  metadata.gz: 0720be506f273f9404ba4ac0f62b46599eec0935906e07542b6fbb95da6e5054193b87f96de888c7680cced1c543b551a193a02499f2b39cf3bfb597dc611e41
+  data.tar.gz: 840399954c106f206257c46f4d217a2ed06d23f84b92c0d30e59b65b77839c21d335ca806188da86621de5403195b4a941eefd421846576d3763af8a5dac8c4e

data/README.md

@@ -4,15 +4,14 @@
 
 ## DESCRIPTION:
 
-Implementation of [JSON Patch][1] and [JSON Pointer][2] drafts.
+Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.
 
 ## FEATURES/PROBLEMS:
 
-Implements draft specs of the [JSON Patch][1] and [JSON pointer][2] spec:
+Implements specs of the [JSON Patch][1] and [JSON pointer][2] RFCs:
 
-
-These are drafts, so it could change.  This works against Ruby objects, so you
-should load the JSON to Ruby, process it, then emit as JSON again.
+This works against Ruby objects, so you should load the JSON to Ruby,
+process it, then emit as JSON again.
 
 ## SYNOPSIS:
 
@@ -36,7 +35,7 @@ patch.apply('foo' => 'bar') # => {'baz' => 'qux', 'foo' => 'bar'}
 
 (The MIT License)
 
-Copyright (c) 2012 Aaron Patterson
+Copyright (c) 2012-2013 Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -57,5 +56,5 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[1]: http://tools.ietf.org/html/draft-ietf-appsawg-json-patch-03
-[2]: http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-01
+[1]: https://datatracker.ietf.org/doc/rfc6902/
+[2]: http://tools.ietf.org/html/rfc6901

data/lib/hana.rb

@@ -1,5 +1,5 @@
 module Hana
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   class Pointer
     include Enumerable
@@ -9,7 +9,6 @@ module Hana
     end
 
     def each(&block); @path.each(&block); end
-    def to_a;         @path.dup; end
 
     def eval object
       Pointer.eval @path, object
@@ -19,6 +18,8 @@ module Hana
 
     def self.eval list, object
       list.inject(object) { |o, part|
+        return nil unless o
+
         if Array === o
           raise Patch::IndexError unless part =~ /\A\d+\Z/
           part = part.to_i
@@ -30,8 +31,8 @@ module Hana
     def self.parse path
       return [''] if path == '/'
 
-      path.sub(/^\//, '').split(/(?<!\^)\//).map! { |part|
-        part.gsub!(/\^[\/^]|~[01]/) { |m| ESC[m] }; part
+      path.sub(/^\//, '').split(/(?<!\^)\//).each { |part|
+        part.gsub!(/\^[\/^]|~[01]/) { |m| ESC[m] }
       }
     end
   end
@@ -69,8 +70,8 @@ module Hana
     VALID = Hash[%w{ add move test replace remove copy }.map { |x| [x,x]}] # :nodoc:
 
     def apply doc
-      @is.each_with_object(doc) { |ins, d|
-        send VALID.fetch(ins['op'].strip) { |k|
+      @is.inject(doc) { |d, ins|
+        send VALID.fetch(ins[OP].strip) { |k|
           raise Exception, "bad method `#{k}`"
         }, ins, d
       }
@@ -78,24 +79,30 @@ module Hana
 
     private
 
+    PATH  = 'path' # :nodoc:
+    FROM  = 'from' # :nodoc:
+    VALUE = 'value' # :nodoc:
+    OP    = 'op' # :nodoc:
+
     def add ins, doc
-      list = Pointer.parse ins['path']
+      list = Pointer.parse ins[PATH]
       key  = list.pop
       dest = Pointer.eval list, doc
-      obj  = ins['value']
+      obj  = ins[VALUE]
 
-      raise(MissingTargetException, ins['path']) unless dest
+      raise(MissingTargetException, ins[PATH]) unless dest
 
       if key
         add_op dest, key, obj
       else
         dest.replace obj
       end
+      doc
     end
 
     def move ins, doc
-      from     = Pointer.parse ins['from']
-      to       = Pointer.parse ins['path']
+      from     = Pointer.parse ins[FROM]
+      to       = Pointer.parse ins[PATH]
       from_key = from.pop
       key      = to.pop
       src      = Pointer.eval from, doc
@@ -103,11 +110,12 @@ module Hana
 
       obj = rm_op src, from_key
       add_op dest, key, obj
+      doc
     end
 
     def copy ins, doc
-      from     = Pointer.parse ins['from']
-      to       = Pointer.parse ins['path']
+      from     = Pointer.parse ins[FROM]
+      to       = Pointer.parse ins[PATH]
       from_key = from.pop
       key      = to.pop
       src      = Pointer.eval from, doc
@@ -121,34 +129,38 @@ module Hana
       end
 
       add_op dest, key, obj
+      doc
     end
 
     def test ins, doc
-      expected = Pointer.new(ins['path']).eval doc
+      expected = Pointer.new(ins[PATH]).eval doc
 
-      unless expected == ins['value']
-        raise FailedTestException.new(ins['value'], ins['path'])
+      unless expected == ins[VALUE]
+        raise FailedTestException.new(ins[VALUE], ins[PATH])
       end
+      doc
     end
 
     def replace ins, doc
-      list = Pointer.parse ins['path']
+      list = Pointer.parse ins[PATH]
       key  = list.pop
       obj  = Pointer.eval list, doc
 
       if Array === obj
         raise Patch::IndexError unless key =~ /\A\d+\Z/
-        obj[key.to_i] = ins['value']
+        obj[key.to_i] = ins[VALUE]
       else
-        obj[key] = ins['value']
+        obj[key] = ins[VALUE]
       end
+      doc
     end
 
     def remove ins, doc
-      list = Pointer.parse ins['path']
+      list = Pointer.parse ins[PATH]
       key  = list.pop
       obj  = Pointer.eval list, doc
       rm_op obj, key
+      doc
     end
 
     def check_index obj, key

data/test/test_hana.rb

@@ -10,6 +10,14 @@ class TestHana < Hana::TestCase
     end
   end
 
+  def test_mutate_to_a_does_not_impact_original
+    pointer = Hana::Pointer.new '/foo/bar/baz'
+    x = pointer.to_a
+    x << "omg"
+    assert_equal %w{ foo bar baz omg }, x
+    assert_equal %w{ foo bar baz }, pointer.to_a
+  end
+
   def test_split_many
     pointer = Hana::Pointer.new '/foo/bar/baz'
     assert_equal %w{ foo bar baz }, pointer.to_a
@@ -48,4 +56,12 @@ class TestHana < Hana::TestCase
     pointer = Hana::Pointer.new '/foo/1'
     assert_equal 'baz', pointer.eval('foo' => { '1' => 'baz' })
   end
+
+  def test_eval_many_below_missing
+    pointer = Hana::Pointer.new '/baz/foo/bar'
+    assert_nil pointer.eval('foo' => 'bar')
+
+    pointer = Hana::Pointer.new '/foo/bar/baz'
+    assert_nil pointer.eval('foo' => nil)
+  end
 end

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: hana
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-description: Implementation of [JSON Patch][1] and [JSON Pointer][2] drafts.
+        version: '3.13'
+description: Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.
 email:
 - aaron@tenderlovemaking.com
 executables: []
@@ -62,7 +62,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- .autotest
+- ".autotest"
+- ".gemtest"
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.md
@@ -75,32 +76,32 @@ files:
 - test/mine.json
 - test/test_hana.rb
 - test/test_ietf.rb
-- .gemtest
 homepage: http://github.com/tenderlove/hana
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: hana
-rubygems_version: 2.0.2
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Implementation of [JSON Patch][1] and [JSON Pointer][2] drafts.
+summary: Implementation of [JSON Patch][1] and [JSON Pointer][2] RFC.
 test_files:
 - test/test_hana.rb
 - test/test_ietf.rb