depth 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12186cff293335e8e867ec9c826644c4b175160c
-  data.tar.gz: 1de2bcf3603c3838ae27c95f4b3f4cd3d961ee4b
+  metadata.gz: 85d067842e7799d193a25834e13a66d7b8fd7375
+  data.tar.gz: e6af288638c9e95b1a9e3d3fd9a245a05ce17320
 SHA512:
-  metadata.gz: a3d24285ec52b1ac2f878ab29a6287c548794a7e0dfd1e50eb6d4d2e916df996434a404690cb83b58a3ccf36961217843c5e647f76ea4d831749b272ba8c6bd7
-  data.tar.gz: c65350a161b063d0c855a05a58a9bcfe089cf503f9a462f2ec686f00239de91049233f99154216ddcc7813595125a9f9b83c8a4e6f41f0df488ec7ab991d223d
+  metadata.gz: 207ae9111a988453a18d33b25c5ba1d70e0249d655874377de02d4f82b6b30b86b9b57b3778a03052b20b828b0f1bd8f859dd601a765937a5d4dd6b4ac3deba8
+  data.tar.gz: 012ac2126a5aa29cacf5806fef20cc0686378715b708c5decdcf9d57c975ba78b0c90869449476ef94d52e0486721caef036c29eff93f7c17d10b3ef0a121c6c

data/lib/depth/actions.rb

@@ -4,28 +4,55 @@ module Depth
     def base
       raise NoMethodError.new('should be overridden')
     end
+
+    def next_proc
+      raise NoMethodError.new('should be overridden')
+    end
+
+    def creation_proc
+      raise NoMethodError.new('should be overridden')
+    end
+
+    def key_transformer
+      raise NoMethodError.new('should be overridden')
+    end
     #:nocov:
 
     def set(route, value)
       route = RouteElement.convert_route(route)
-      object = route[0 ... -1].reduce(Traverser.new(base)) { |t, route_el|
+      base_traverser = Traverser.new(
+        base, next_proc: next_proc,
+        creation_proc: creation_proc,
+        key_transformer: key_transformer
+      )
+      object = route[0 ... -1].reduce(base_traverser) { |t, route_el|
         t.next_or_create(route_el.key) { route_el.create }
       }.object
-      object[route.last.key] = value
+      original_key = route.last.key
+      transformed_key = key_transformer.call(object, route.last.key)
+      creation_proc.call(object, transformed_key, value, original_key)
     end
 
     def find(route, create: false, default: nil)
+      return self if route.empty?
       route = RouteElement.convert_route(route)
-      parent = route[0 ... -1].reduce(Traverser.new(base)) { |t, route_el|
+      base_traverser = Traverser.new(
+        base, next_proc: next_proc,
+        creation_proc: creation_proc,
+        key_transformer: key_transformer
+      )
+      parent = route[0 ... -1].reduce(base_traverser) { |t, route_el|
         if create
           t.next_or_create(route_el.key) { route_el.create }
         else
           t.next(route_el.key)
         end
       }.object
-      object = parent ? parent[route.last.key] : nil
+      original_key = route.last.key
+      transformed_key = key_transformer.call(parent, route.last.key)
+      object = parent ? next_proc.call(parent, transformed_key, original_key) : nil
       return object unless object.nil?
-      return parent[route.last.key] = default if create && default
+      return creation_proc.call(parent, transformed_key, default, original_key) if create && default
       default
     end
 
@@ -34,7 +61,8 @@ module Depth
       route = RouteElement.convert_route(route)
       value = find(route) unless value
       new_route = (route[0 ... -1] << RouteElement.convert(key))
-      set(new_route, value) # ensure it exists
+      # ensure it exists
+      set(new_route, value)
       old_key = route.last.key
       return unless old_key != key
       delete(route)
@@ -42,13 +70,19 @@ module Depth
 
     def delete(route)
       route = RouteElement.convert_route(route)
-      traverser = route[0...-1].reduce(Traverser.new(base)) do |t, route_el|
+      base_traverser = Traverser.new(
+        base, next_proc: next_proc,
+        creation_proc: creation_proc,
+        key_transformer: key_transformer
+      )
+      traverser = route[0...-1].reduce(base_traverser) do |t, route_el|
         t.next(route_el.key)
       end
+      last_key = key_transformer.call(traverser.object, route.last.key)
       if traverser.array?
-        traverser.object.delete_at(route.last.key)
+        traverser.object.delete_at(last_key)
       elsif traverser.hash?
-        traverser.object.delete(route.last.key)
+        traverser.object.delete(last_key)
       end
     end
   end

data/lib/depth/complex_hash.rb

@@ -2,10 +2,19 @@ module Depth
   class ComplexHash
     include Depth::Actions
     include Depth::Enumeration::Enumerable
-    attr_reader :base
+    DEFAULT_KEY_TRANSFORMER = proc { |obj, key| key }
+    DEFAULT_NEXT_PROC = proc { |obj, key| obj[key] }
+    DEFAULT_CREATION_PROC = proc { |obj, key, val| obj[key] = val }
+    attr_reader :base, :next_proc, :creation_proc, :key_transformer
     alias_method :to_h, :base
-    def initialize(base = {})
+    def initialize(base = {},
+                   key_transformer: DEFAULT_KEY_TRANSFORMER,
+                   next_proc: DEFAULT_NEXT_PROC,
+                   creation_proc: DEFAULT_CREATION_PROC)
       @base = base
+      @next_proc = next_proc
+      @creation_proc = creation_proc
+      @key_transformer = key_transformer
     end
   end
 end

data/lib/depth/traverser.rb

@@ -1,5 +1,17 @@
 module Depth
-  class Traverser < Struct.new(:object)
+  class Traverser
+
+    attr_reader :object
+
+    def initialize(object,
+                   key_transformer:,
+                   next_proc:, creation_proc:)
+      @object = object
+      @next_proc = next_proc
+      @creation_proc = creation_proc
+      @key_transformer = key_transformer
+    end
+
     def array?
       object.is_a?(Array)
     end
@@ -9,14 +21,43 @@ module Depth
     end
 
     def next(key_or_index)
-      return Traverser.new(nil) if object.nil?
-      Traverser.new(object[key_or_index])
+      original_key = key_or_index
+      key_or_index = key_transformer.call(object, key_or_index)
+      next_object = if object.nil?
+                      nil
+                    else
+                      next_proc.call(object, key_or_index, original_key)
+                    end
+
+      Traverser.new(
+        next_object,
+        key_transformer: key_transformer,
+        next_proc: next_proc,
+        creation_proc: creation_proc
+      )
     end
 
     def next_or_create(key_or_index, &block)
-      return Traverser.new(nil) if object.nil?
-      object[key_or_index] = block.call if object[key_or_index].nil?
-      Traverser.new(object[key_or_index])
+      original_key = key_or_index
+      key_or_index = key_transformer.call(object, key_or_index)
+      return Traverser.new(
+        nil,
+        key_transformer: key_transformer,
+        next_proc: next_proc,
+        creation_proc: creation_proc
+      ) if object.nil?
+      next_object = next_proc.call(object, key_or_index, original_key)
+      creation_proc.call(object, key_or_index, block.call, original_key) if next_object.nil?
+      Traverser.new(
+        # Refetch it to allow for creation
+        next_proc.call(object, key_or_index, original_key),
+        key_transformer: key_transformer,
+        next_proc: next_proc,
+        creation_proc: creation_proc
+      )
     end
+
+  private
+    attr_reader :next_proc, :creation_proc, :key_transformer
   end
 end

data/lib/depth/version.rb

@@ -1,3 +1,3 @@
 module Depth
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/depth/actions_spec.rb

@@ -6,9 +6,13 @@ module Depth
     let(:actions_class) do
       Class.new do
         include Actions
-        attr_reader :base
-        def initialize(base)
+        attr_reader :base, :next_proc, :creation_proc,
+          :key_transformer
+        def initialize(base, next_proc:, key_transformer:, creation_proc:)
           @base = base
+          @next_proc = next_proc
+          @creation_proc = creation_proc
+          @key_transformer = key_transformer
         end
       end
     end
@@ -24,9 +28,71 @@ module Depth
       ]}
     end
 
-    subject { actions_class.new(hash) }
+    let(:next_proc) { proc { |o, k| o[k] } }
+    let(:creation_proc) { proc { |o, k, v| o[k] = v } }
+    let(:key_transformer) { proc { |_, k| k } }
+
+    subject do
+      actions_class.new(
+        hash, next_proc: next_proc,
+        creation_proc: creation_proc,
+        key_transformer: key_transformer
+      )
+    end
 
     describe '#set' do
+      context 'with a key transformer' do
+        let(:key_transformer) do
+          proc { |_, k|
+            next(k) if k.to_s !~ /index_/
+            k.gsub(/index_/, '').to_i
+          }
+        end
+
+        it 'should still work' do
+          route = [['$and', :array], ['index_0', :hash],
+                   ['#weather', :hash], ['something', :array]]
+          expect do
+            subject.set(route, :test)
+          end.to change { hash['$and'][0]['#weather']['something'] }.to(:test)
+        end
+      end
+
+      context 'with a custom creation proc' do
+        let(:creation_proc) do
+          proc { |o, k, v| o[k] = '2' }
+        end
+
+        it 'should let me change the creation proc' do
+          route = [['$and', :array], [0, :hash],
+                   ['#weather', :hash], ['something', :array]]
+          expect do
+            subject.set(route, :test)
+          end.to change { hash['$and'][0]['#weather']['something'] }.to('2')
+
+        end
+      end
+
+      context 'with a custom next proc' do
+        let(:next_proc) do
+          proc { |obj, key|
+            if(obj.is_a?(Array))
+              obj.at(key)
+            else
+              obj.fetch(key)
+            end
+          }
+        end
+
+        it 'should allow me to change how I traverse the route' do
+          route = [['$and', :array], [0, :hash],
+                   ['#weather', :hash], ['something', :array]]
+          expect do
+            subject.set(route, :test)
+          end.to change { hash['$and'][0]['#weather']['something'] }.to(:test)
+        end
+      end
+
       it 'should let me set an existing value' do
         route = [['$and', :array], [0, :hash],
                  ['#weather', :hash], ['something', :array]]

data/spec/depth/enumerable_spec.rb

@@ -9,9 +9,13 @@ module Depth::Enumeration
       Class.new do
         include Depth::Actions
         include Depth::Enumeration::Enumerable
-        attr_reader :base
+        attr_reader :base, :creation_proc, :next_proc,
+          :key_transformer
         def initialize(base)
           @base = base
+          @creation_proc = proc { |o, k, v| o[k] = v }
+          @next_proc = proc { |o, k| o[k] }
+          @key_transformer = proc { |_, k| k }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depth
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler