accessory 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9880e7e5ea88c0b373a1cc3d5d4861788f368905c761b2ec3a7236d7282ada39
-  data.tar.gz: 7386d98dc728a663904564e0a6825de0d7690e806950e5e95d6e8b39d4d20cd6
+  metadata.gz: 1a19c2c9d6ea2aeed4a4b0140c027220e383faa178d89689ebc667256fd9e228
+  data.tar.gz: 0c4ead2a9dd32de8b51c9c9da52aefafa16b05c272da5393b0e3d365dc920708
 SHA512:
-  metadata.gz: dbee544b8dc699adb962559b98278d48edeed2a4d5b9c4d3c6c92ad3c4a38ffb4df5ced18274b465dfe68fd34dd15a50c06c2febae4e54049a4049d377cb10cd
-  data.tar.gz: 0d1be0f43650e87a1616b5c2ac968b7407c5d8e380abb7e30ad84823816d486341a2c1b791814c55695dc77f2bf0337df834816c2a703bacbb2a3f582f362907
+  metadata.gz: fddd92947828fe5fd287ac183a5e7a3d0215da01314dd766737d7b8bf26c7e078a9207c1b1504e69522964e6e9a72b9b45372b10f35111a41c67bec4798da90d
+  data.tar.gz: 4ad13454e5adcd7b6243075c53e0b52539cbbc1402ab19d118ff065dfd25d5ac2fc5d3b052a3cec3055837bedae117fb4bddb226a3bbf66915a996c1344d47ef

data/lib/accessory.rb

@@ -1,6 +1,3 @@
-##
-#
-
 module Accessory; end
 
 require 'accessory/version'

data/lib/accessory/access.rb

@@ -18,59 +18,59 @@ require 'accessory/accessors/last_accessor'
 #    include Accessory
 
 module Accessory::Access
-  # (see Accessory::SubscriptAccessor)
+  # (see Accessory::Accessors::SubscriptAccessor)
   def self.subscript(...)
-    Accessory::SubscriptAccessor.new(...)
+    Accessory::Accessors::SubscriptAccessor.new(...)
   end
 
-  # (see Accessory::AttributeAccessor)
+  # (see Accessory::Accessors::AttributeAccessor)
   def self.attr(...)
-    Accessory::AttributeAccessor.new(...)
+    Accessory::Accessors::AttributeAccessor.new(...)
   end
 
-  # (see Accessory::InstanceVariableAccessor)
+  # (see Accessory::Accessors::InstanceVariableAccessor)
   def self.ivar(...)
-    Accessory::InstanceVariableAccessor.new(...)
+    Accessory::Accessors::InstanceVariableAccessor.new(...)
   end
 
-  # (see Accessory::BetwixtAccessor)
+  # (see Accessory::Accessors::BetwixtAccessor)
   def self.betwixt(...)
-    Accessory::BetwixtAccessor.new(...)
+    Accessory::Accessors::BetwixtAccessor.new(...)
   end
 
-  # Alias for +Accessory::Access.betwixt(0)+. See {Access.betwixt}
+  # Alias for +Accessory::Accessors::Access.betwixt(0)+. See {Access.betwixt}
   def self.before_first
     self.betwixt(0)
   end
 
-  # Alias for +Accessory::Access.betwixt(-1)+. See {Access.betwixt}
+  # Alias for +Accessory::Accessors::Access.betwixt(-1)+. See {Access.betwixt}
   def self.after_last
     self.betwixt(-1)
   end
 
-  # (see Accessory::BetweenEachAccessor)
+  # (see Accessory::Accessors::BetweenEachAccessor)
   def self.between_each
-    Accessory::BetweenEachAccessor.new
+    Accessory::Accessors::BetweenEachAccessor.new
   end
 
-  # (see Accessory::AllAccessor)
+  # (see Accessory::Accessors::AllAccessor)
   def self.all
-    Accessory::AllAccessor.new
+    Accessory::Accessors::AllAccessor.new
   end
 
-  # (see Accessory::FirstAccessor)
+  # (see Accessory::Accessors::FirstAccessor)
   def self.first
-    Accessory::FirstAccessor.new
+    Accessory::Accessors::FirstAccessor.new
   end
 
-  # (see Accessory::LastAccessor)
+  # (see Accessory::Accessors::LastAccessor)
   def self.last
-    Accessory::LastAccessor.new
+    Accessory::Accessors::LastAccessor.new
   end
 
-  # (see Accessory::FilterAccessor)
+  # (see Accessory::Accessors::FilterAccessor)
   def self.filter(&pred)
-    Accessory::FilterAccessor.new(pred)
+    Accessory::Accessors::FilterAccessor.new(pred)
   end
 end
 
@@ -83,29 +83,29 @@ end
 # {Lens} or {BoundLens} from the addition of the accessor.
 
 module Accessory::Access::FluentHelpers
-  # (see Accessory::SubscriptAccessor)
+  # (see Accessory::Accessors::SubscriptAccessor)
   def subscript(...)
-    self.then(Accessory::SubscriptAccessor.new(...))
+    self.then(Accessory::Accessors::SubscriptAccessor.new(...))
   end
 
   # Alias for {#subscript}
   def [](...)
-    self.then(Accessory::SubscriptAccessor.new(...))
+    self.then(Accessory::Accessors::SubscriptAccessor.new(...))
   end
 
-  # (see Accessory::AttributeAccessor)
+  # (see Accessory::Accessors::AttributeAccessor)
   def attr(...)
-    self.then(Accessory::AttributeAccessor.new(...))
+    self.then(Accessory::Accessors::AttributeAccessor.new(...))
   end
 
-  # (see Accessory::InstanceVariableAccessor)
+  # (see Accessory::Accessors::InstanceVariableAccessor)
   def ivar(...)
-    self.then(Accessory::InstanceVariableAccessor.new(...))
+    self.then(Accessory::Accessors::InstanceVariableAccessor.new(...))
   end
 
-  # (see Accessory::BetwixtAccessor)
+  # (see Accessory::Accessors::BetwixtAccessor)
   def betwixt(...)
-    self.then(Accessory::BetwixtAccessor.new(...))
+    self.then(Accessory::Accessors::BetwixtAccessor.new(...))
   end
 
   # Alias for +#betwixt(0)+. See {#betwixt}
@@ -118,29 +118,29 @@ module Accessory::Access::FluentHelpers
     self.betwixt(-1)
   end
 
-  # (see Accessory::BetweenEachAccessor)
+  # (see Accessory::Accessors::BetweenEachAccessor)
   def between_each
-    self.then(Accessory::BetweenEachAccessor.new)
+    self.then(Accessory::Accessors::BetweenEachAccessor.new)
   end
 
-  # (see Accessory::AllAccessor)
+  # (see Accessory::Accessors::AllAccessor)
   def all
-    self.then(Accessory::AllAccessor.new)
+    self.then(Accessory::Accessors::AllAccessor.new)
   end
 
-  # (see Accessory::FirstAccessor)
+  # (see Accessory::Accessors::FirstAccessor)
   def first
-    self.then(Accessory::FirstAccessor.new)
+    self.then(Accessory::Accessors::FirstAccessor.new)
   end
 
-  # (see Accessory::LastAccessor)
+  # (see Accessory::Accessors::LastAccessor)
   def last
-    self.then(Accessory::LastAccessor.new)
+    self.then(Accessory::Accessors::LastAccessor.new)
   end
 
-  # (see Accessory::FilterAccessor)
+  # (see Accessory::Accessors::FilterAccessor)
   def filter(&pred)
-    self.then(Accessory::FilterAccessor.new(pred))
+    self.then(Accessory::Accessors::FilterAccessor.new(pred))
   end
 end
 

data/lib/accessory/accessor.rb

@@ -19,7 +19,7 @@ module Accessory; end
 # info):
 #
 # * {Accessor#traverse}
-# * {Accessor#default_data_constructor}
+# * {Accessor#ensure_valid}
 
 class Accessory::Accessor
   TERMINAL_DEFAULT_FN = lambda{ nil }
@@ -78,16 +78,13 @@ class Accessory::Accessor
   # call <tt>traverse_or_default(data)</tt> within your implementation to safely
   # get a traversal-result to operate on.
   #
-  # This method will return +nil+ if the input-data is +nil+, _without_ calling
-  # your {traverse} callback. This means that accessors that use
-  # {traverse_or_default} will _forward_ +nil+ traversal-results along the chain
-  # without being confused by them.
-  #
-  # If your {traverse} callback returns <tt>:error</tt>, a default value will
-  # be used. This is either the +default+ passed to {initialize} by your
-  # implementation calling <tt>super(default)</tt>; or it's the result of
-  # calling {default_data_constructor} on the successor-accessor in the accessor
-  # chain.
+  # The value returned by your {traverse} callback will be validated by your
+  # calling the {ensure_valid} callback of the _successor accessor_ in the Lens
+  # path. {ensure_valid} will replace any value it considers invalid with a
+  # reasonable default. This means you don't need to worry about what will
+  # happen if your traversal doesn't find a value and so returns +nil+. The
+  # successor's {ensure_valid} will replace that +nil+ with a value that works
+  # for it.
   def traverse_or_default(data)
     traversal_result = traverse(data) || @default_value
 
@@ -137,7 +134,8 @@ class Accessory::Accessor
   #   of the +get_result+s should replicate the data flow of {get}.
   # * the +new_value+ should be used to *replace* or *overwrite* the result of
   #   this accessor's traversal within +data+. For example, in
-  #   {SubscriptAccessor}, <tt>data[key] = new_value</tt> is executed.
+  #   {Accessors::SubscriptAccessor}, <tt>data[key] = new_value</tt> is
+  #   executed.
   #
   # In the <tt>:pop</tt> command case:
   # * the result of the traversal (*before* the yield) should be returned. This
@@ -145,7 +143,7 @@ class Accessory::Accessor
   #   traversal-results before feeding them into yield, in order to return them
   #   here.
   # * the traversal-result should be *removed* from +data+. For example, in
-  #   {SubscriptAccessor}, <tt>data.delete(key)</tt> is executed.
+  #   {Accessors::SubscriptAccessor}, <tt>data.delete(key)</tt> is executed.
   #
   # The successor in the accessor chain will receive the yielded
   # traversal-results as its own +data+.
@@ -198,9 +196,9 @@ class Accessory::Accessor
   #
   #
   # For example, if your accessor operates on +Enumerable+ values (like
-  # {AllAccessor}), then this method should validate that the +traversal_result+
-  # is +Enumerable+; and, if it isn't, return something that is — e.g. an empty
-  # +Array+.
+  # {Accessors::AllAccessor}), then this method should validate that the
+  # +traversal_result+ is +Enumerable+; and, if it isn't, return something that
+  # is — e.g. an empty +Array+.
   #
   # This logic is used to replace invalid intermediate values (e.g. `nil`s and
   # scalars) with containers during {Lens#put_in} et al.
@@ -214,3 +212,5 @@ class Accessory::Accessor
 
   # @!endgroup
 end
+
+module Accessory::Accessors; end

data/lib/accessory/accessors/all_accessor.rb

@@ -15,7 +15,7 @@ require 'accessory/accessor'
 #
 # * +Array.new+
 
-class Accessory::AllAccessor < Accessory::Accessor
+class Accessory::Accessors::AllAccessor < Accessory::Accessor
   # @!visibility private
   def ensure_valid(traversal_result)
     if traversal_result.kind_of?(Enumerable)
@@ -50,17 +50,28 @@ class Accessory::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

@@ -8,8 +8,8 @@ require 'accessory/accessor'
 # the getter/setter pair <tt>.foo</tt> and <tt>.foo=</tt>.
 #
 # The abstract "attribute" does not have to correspond to an actual
-# +attr_accessor+; the {AttributeAccessor} will work as long as the relevant
-# named getter/setter methods exist on the receiver.
+# +attr_accessor+; the AttributeAccessor will work as long as the
+# relevant named getter/setter methods exist on the receiver.
 #
 # *Aliases*
 # * {Access.attr}
@@ -19,7 +19,7 @@ require 'accessory/accessor'
 #
 # * +OpenStruct.new+
 
-class Accessory::AttributeAccessor < Accessory::Accessor
+class Accessory::Accessors::AttributeAccessor < Accessory::Accessor
   # @param attr_name [Symbol] the attribute name (i.e. name of the getter method)
   # @param default [Object] the default to use if the predecessor accessor passes +nil+ data
   def initialize(attr_name, default: nil)
@@ -88,12 +88,14 @@ class Accessory::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

@@ -5,7 +5,7 @@ require 'accessory/traversal_position/enumerable_before_offset'
 # Traverses the positions "between" the elements of an +Enumerable+, including
 # the positions at the "edges" (i.e. before the first, and after the last.)
 #
-# {BetweenEachAccessor} can be used with {Lens#put_in} to insert new
+# BetweenEachAccessor can be used with {Lens#put_in} to insert new
 # elements into an Enumerable between the existing ones.
 #
 # *Aliases*
@@ -16,7 +16,7 @@ require 'accessory/traversal_position/enumerable_before_offset'
 #
 # * +Array.new+
 
-class Accessory::BetweenEachAccessor < Accessory::Accessor
+class Accessory::Accessors::BetweenEachAccessor < Accessory::Accessor
   # @!visibility private
   def ensure_valid(traversal_result)
     if traversal_result.kind_of?(Enumerable)
@@ -75,15 +75,20 @@ class Accessory::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::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

@@ -13,10 +13,11 @@ require 'accessory/traversal_position/enumerable_before_offset'
 # The +offset+ in this accessor has equivalent semantics to the offset in
 # <tt>Array#insert(offset, obj)</tt>.
 #
-# {BetwixtAccessor} can be used with {Lens#put_in} to insert new
+# {Accessors::BetwixtAccessor} can be used with {Lens#put_in} to insert new
 # elements into an Enumerable between the existing ones. If you want to extend
 # an +Enumerable+ as you would with <tt>#push</tt> or <tt>#unshift</tt>, this
-# accessor will have better behavior than using {SubscriptAccessor} would.
+# accessor will have better behavior than using {Accessors::SubscriptAccessor}
+# would.
 #
 # *Aliases*
 # * {Access.betwixt}
@@ -26,7 +27,7 @@ require 'accessory/traversal_position/enumerable_before_offset'
 #
 # * +Array.new+
 
-class Accessory::BetwixtAccessor < Accessory::Accessor
+class Accessory::Accessors::BetwixtAccessor < Accessory::Accessor
   # @param offset [Integer] the cursor position (i.e. the index of the element after the cursor)
   # @param default [Object] the default to use if the predecessor accessor passes +nil+ data
   def initialize(offset, default: nil)
@@ -99,12 +100,14 @@ class Accessory::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

@@ -15,7 +15,7 @@ require 'accessory/accessor'
 #
 # * +Array.new+
 
-class Accessory::FilterAccessor < Accessory::Accessor
+class Accessory::Accessors::FilterAccessor < Accessory::Accessor
   # Returns a new instance of {FilterAccessor}.
   #
   # The predicate function may be passed in as either a positional argument,
@@ -65,6 +65,7 @@ class Accessory::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::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

@@ -4,8 +4,8 @@ require 'accessory/accessor'
 # Traverses into the "first" element within an +Enumerable+, using
 # <tt>#first</tt>.
 #
-# This accessor can be preferable to {SubscriptAccessor} for objects that
-# are not subscriptable, e.g. {Range}.
+# This accessor can be preferable to {Accessors::SubscriptAccessor} for objects
+# that are not subscriptable, e.g. +Range+.
 #
 # *Aliases*
 # * {Access.first}
@@ -15,7 +15,7 @@ require 'accessory/accessor'
 #
 # * +Array.new+
 
-class Accessory::FirstAccessor < Accessory::Accessor
+class Accessory::Accessors::FirstAccessor < Accessory::Accessor
   # @!visibility private
   def ensure_valid(traversal_result)
     if traversal_result.kind_of?(Enumerable)
@@ -58,16 +58,18 @@ class Accessory::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

@@ -14,7 +14,7 @@ require 'accessory/accessor'
 #
 # * +Object.new+
 
-class Accessory::InstanceVariableAccessor < Accessory::Accessor
+class Accessory::Accessors::InstanceVariableAccessor < Accessory::Accessor
   # @param ivar_name [Symbol] the instance-variable name
   # @param default [Object] the default to use if the predecessor accessor passes +nil+ data
   def initialize(ivar_name, default: nil)
@@ -70,12 +70,14 @@ class Accessory::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

@@ -4,8 +4,8 @@ require 'accessory/accessor'
 # Traverses into the "last" element within an +Enumerable+, using
 # <tt>#last</tt>.
 #
-# This accessor can be preferable to {SubscriptAccessor} for objects that
-# are not subscriptable, e.g. {Range}.
+# This accessor can be preferable to {Accessors::SubscriptAccessor} for objects
+# that are not subscriptable, e.g. +Range+.
 #
 # *Aliases*
 # * {Access.last}
@@ -15,7 +15,7 @@ require 'accessory/accessor'
 #
 # * +Array.new+
 
-class Accessory::LastAccessor < Accessory::Accessor
+class Accessory::Accessors::LastAccessor < Accessory::Accessor
   # @!visibility private
   def ensure_valid(traversal_result)
     if traversal_result.kind_of?(Enumerable)
@@ -58,16 +58,18 @@ class Accessory::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

@@ -29,9 +29,9 @@ require 'accessory/accessor'
 #   # default-constructs a Hash, not an Array
 #   [].lens[0][0].put_in(1) # => [{0=>1}]
 #
-# Other accessors ({FirstAccessor}, {BetwixtAccessor}, etc.) may fit your expectations more closely for +Array+ traversal.
+# Other accessors ({Accessors::FirstAccessor}, {Accessors::BetwixtAccessor}, etc.) may fit your expectations more closely for +Array+ traversal.
 
-class Accessory::SubscriptAccessor < Accessory::Accessor
+class Accessory::Accessors::SubscriptAccessor < Accessory::Accessor
   # @!visibility private
   def initialize(key, **kwargs)
     super(**kwargs)
@@ -92,12 +92,14 @@ class Accessory::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,17 @@ 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(data){ |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]
+      in :pop
+        :pop
+      end
+    end
+
     new_data
   end
 
@@ -178,7 +188,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 +201,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)
@@ -200,9 +211,9 @@ class Accessory::Lens
       when Accessory::Accessor
         part
       when Array
-        Accessory::SubscriptAccessor.new(part[0], default: part[1])
+        Accessory::Accessors::SubscriptAccessor.new(part[0], default: part[1])
       else
-        Accessory::SubscriptAccessor.new(part)
+        Accessory::Accessors::SubscriptAccessor.new(part)
       end
 
     unless @parts.empty?

data/lib/accessory/version.rb

@@ -1,3 +1,3 @@
 module Accessory
-  VERSION = "0.1.6"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: accessory
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Levi Aul
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies: []
-description:
+description: 
 email:
 - levi@leviaul.com
 executables: []
@@ -40,7 +40,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/tsutsu/accessory
   source_code_uri: https://github.com/tsutsu/accessory
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -48,15 +48,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Functional lenses for Ruby, borrowed from Elixir
 test_files: []