accessory 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad93b39fc1164c938ed170896bfc5d6ef0c7d157a443b05395ef835fcaf6706
-  data.tar.gz: ac0cdef27d42a339c3b640ee06c8231f4e724b2b2e541eb081bc37d33542fa35
+  metadata.gz: c03753edaa94362541af5695a93547b6e1f3565f37aa82e7536b3e81d212eb7c
+  data.tar.gz: a3584fbf0b4ee32555feccd642c7225fd6c6f8f85563fcb03b542624f36f7660
 SHA512:
-  metadata.gz: ae8c4170a783795b4e436232f1051c7bd3b0ef39132af63fcc0055c27df97eaabcd981f00a338f38bf0a343a582e30db1dc7b2cc4026f07d8dfa93d47177df8c
-  data.tar.gz: f78e0b73341624deb56871906d2dc33e5791a7514f3c6bd9f3db955c6f7e09e95621827d9a7978ec21f5fb7ff1fbbad764feb271e676525e957355e7dd7b6fe1
+  metadata.gz: 61015ff40a150d474e43ec454a4c50cb0fd4021660a10cf65d61cd69ec4abe3293523fa53cceda199da7996ed5bea160efc45bf826724647fbc7020f0c666b57
+  data.tar.gz: 3ec8ca3a2f53df27e958621997102d6d10220a15f26c48dc6cdb3f56403f387d629d531433d93f05e6ced2f30ad7d046df0ae27ad620047715b3648bf2ec20dd

data/lib/accessory/accessors/all_accessor.rb

@@ -50,17 +50,28 @@ class Accessory::Accessors::AllAccessor < Accessory::Accessor
   def get_and_update(data)
     results = []
     new_data = []
+    dirty = false
 
     (data || []).each do |pos|
       case yield(pos)
-      in [result, new_value]
+      in [:clean, result, _]
+        results.push(result)
+        new_data.push(pos)
+        # ok
+      in [:dirty, result, new_value]
         results.push(result)
         new_data.push(new_value)
+        dirty = true
       in :pop
         results.push(pos)
+        dirty = true
       end
     end
 
-    [results, new_data]
+    if dirty
+      [:dirty, results, new_data]
+    else
+      [:clean, results, data]
+    end
   end
 end

data/lib/accessory/accessors/attribute_accessor.rb

@@ -88,12 +88,14 @@ class Accessory::Accessors::AttributeAccessor < Accessory::Accessor
     value = traverse_or_default(data)
 
     case yield(value)
-    in [result, new_value]
+    in [:clean, result, _]
+      [:clean, result, data]
+    in [:dirty, result, new_value]
       data.send(@setter_method_name, new_value)
-      [result, data]
+      [:dirty, result, data]
     in :pop
       data.send(@setter_method_name, nil)
-      [value, data]
+      [:dirty, value, data]
     end
   end
 end

data/lib/accessory/accessors/between_each_accessor.rb

@@ -75,15 +75,20 @@ class Accessory::Accessors::BetweenEachAccessor < Accessory::Accessor
   def get_and_update(data)
     results = []
     new_data = []
+    dirty = false
 
     positions = traverse_or_default(data || [])
 
     positions.each do |pos|
       case yield(pos)
-      in [result, new_value]
+      in [:clean, result, _]
+        results.push(result)
+      in [:dirty, result, new_value]
         new_data.push(new_value)
         results.push(result)
+        dirty = true
       in :pop
+        # ok
       end
 
       unless pos.last?
@@ -91,6 +96,10 @@ class Accessory::Accessors::BetweenEachAccessor < Accessory::Accessor
       end
     end
 
-    [results, new_data]
+    if dirty
+      [:dirty, results, new_data]
+    else
+      [:clean, results, data]
+    end
   end
 end

data/lib/accessory/accessors/betwixt_accessor.rb

@@ -100,12 +100,14 @@ class Accessory::Accessors::BetwixtAccessor < Accessory::Accessor
     pos = traverse_or_default(data || [])
 
     case yield(pos)
-    in [result, new_value]
+    in [:dirty, result, new_value]
       data ||= []
       data.insert(@offset, new_value)
-      [result, data]
+      [:dirty, result, data]
     in :pop
-      [nil, data]
+      [:clean, nil, data]
+    in [:clean, result, _]
+      [:clean, result, data]
     end
   end
 end

data/lib/accessory/accessors/filter_accessor.rb

@@ -65,6 +65,7 @@ class Accessory::Accessors::FilterAccessor < Accessory::Accessor
   def get_and_update(data)
     results = []
     new_data = []
+    dirty = false
 
     (data || []).each do |pos|
       unless @pred.call(pos)
@@ -73,14 +74,23 @@ class Accessory::Accessors::FilterAccessor < Accessory::Accessor
       end
 
       case yield(pos)
-      in [result, new_value]
+      in [:clean, result, _]
+        results.push(result)
+        new_data.push(pos)
+      in [:dirty, result, new_value]
         results.push(result)
         new_data.push(new_value)
+        dirty = true
       in :pop
         results.push(pos)
+        dirty = true
       end
     end
 
-    [results, new_data]
+    if dirty
+      [:dirty, results, new_data]
+    else
+      [:clean, results, data]
+    end
   end
 end

data/lib/accessory/accessors/first_accessor.rb

@@ -58,16 +58,18 @@ class Accessory::Accessors::FirstAccessor < Accessory::Accessor
     old_value = traverse_or_default(data)
 
     case yield(old_value)
-    in [result, new_value]
+    in [:clean, result, _]
+      [:clean, result, data]
+    in [:dirty, result, new_value]
       if data.respond_to?(:"first=")
         data.first = new_value
       else
         data[0] = new_value
       end
-      [result, data]
+      [:dirty, result, data]
     in :pop
       data.delete_at(0)
-      [old_value, data]
+      [:dirty, old_value, data]
     end
   end
 end

data/lib/accessory/accessors/instance_variable_accessor.rb

@@ -70,12 +70,14 @@ class Accessory::Accessors::InstanceVariableAccessor < Accessory::Accessor
     value = traverse_or_default(data)
 
     case yield(value)
-    in [result, new_value]
+    in [:clean, result, _]
+      [:clean, result, data]
+    in [:dirty, result, new_value]
       data.instance_variable_set(@ivar_name, new_value)
-      [result, data]
+      [:dirty, result, data]
     in :pop
       data.remove_instance_variable(@ivar_name)
-      [value, data]
+      [:dirty, value, data]
     end
   end
 end

data/lib/accessory/accessors/last_accessor.rb

@@ -58,16 +58,18 @@ class Accessory::Accessors::LastAccessor < Accessory::Accessor
     old_value = traverse_or_default(data)
 
     case yield(old_value)
-    in [result, new_value]
+    in [:clean, result, _]
+      [:clean, result, data]
+    in [:dirty, result, new_value]
       if data.respond_to?(:"last=")
         data.last = new_value
       else
         data[-1] = new_value
       end
-      [result, data]
+      [:dirty, result, data]
     in :pop
       data.delete_at(-1)
-      [old_value, data]
+      [:dirty, old_value, data]
     end
   end
 end

data/lib/accessory/accessors/subscript_accessor.rb

@@ -92,12 +92,14 @@ class Accessory::Accessors::SubscriptAccessor < Accessory::Accessor
     value = traverse_or_default(data)
 
     case yield(value)
-    in [result, new_value]
+    in [:clean, result, _]
+      [:clean, result, data]
+    in [:dirty, result, new_value]
       data[@key] = new_value
-      [result, data]
+      [:dirty, result, data]
     in :pop
       data.delete(@key)
-      [value, data]
+      [:dirty, value, data]
     end
   end
 end

data/lib/accessory/lens.rb

@@ -164,7 +164,15 @@ class Accessory::Lens
   #   1. the _old_ value(s) found after all traversals, and
   #   2. the updated +subject+
   def update_in(subject, &new_value_fn)
-    _, new_data = self.get_and_update_in(subject){ |v| [nil, new_value_fn.call(v)] }
+    _, _, new_data = self.get_and_update_in(subject) do |v|
+      case new_value_fn.call(v)
+      in [:set, new_value]
+        [:dirty, nil, new_value]
+      in :keep
+        [:clean, nil, v]
+      end
+    end
+
     new_data
   end
 
@@ -178,7 +186,7 @@ class Accessory::Lens
   # @param new_value [Object] a replacement value at the traversal position.
   # @return [Object] the updated +subject+
   def put_in(subject, new_value)
-    _, new_data = self.get_and_update_in(subject){ [nil, new_value] }
+    _, _, new_data = self.get_and_update_in(subject){ [:dirty, nil, new_value] }
     new_data
   end
 
@@ -191,7 +199,8 @@ class Accessory::Lens
   # @param subject [Object] the data-structure to traverse
   # @return [Object] the updated +subject+
   def pop_in(subject)
-    self.get_and_update_in(subject){ :pop }
+    _, popped_item, new_data = self.get_and_update_in(subject){ :pop }
+    [popped_item, new_data]
   end
 
   def append_accessor!(part)

data/lib/accessory/version.rb

@@ -1,3 +1,3 @@
 module Accessory
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accessory
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Levi Aul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies: []
 description:
 email: