glimmer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4916b9c2b6c19c4afbdb4a49cc586d7c1a12358a94ee5f425b78520227cf3c8f
-  data.tar.gz: 7ce6d54b43cfecb43fe395ab6a7b39d4db928ad674f9ce26b0635c457a611f91
+  metadata.gz: b09d96f8f2a0923f53d0685bdae8743d99d42e2c50294852d3823bbb619ddffc
+  data.tar.gz: 50362bdb44afbd375bb580dcffc5f734c1ff372a10bbddbdeb8ec6600f9b8c06
 SHA512:
-  metadata.gz: c16290f6cd39289717bd5f2446d2d42a00c1b08298f5d1ddea658e8efaa738cfdfa2e79512fae0ba3120dcb9d07fef946967c3467f28916b91f9171fc147c5cb
-  data.tar.gz: f51597bec5ef7193ea66f089243b29fc90c0bf406abcb7aa2dc6e1c66f31aefd210c840682c47dbfd1732ebabda0331e95c3f1efd07072df93926fe3493a84ab
+  metadata.gz: 27fb9b837708455a6d68e24f8f6a5fdca9c812e1d5b45c9fea379e51365c5a08688ad116276d6b848cb19a29b97b50be6cdfbba36332bca20b7fc0c253b29789
+  data.tar.gz: 6cd85c6a1f08d33646e5a105293ed24fef06aecd54ccb82680ddd6e95f701fa0943ccc8370f61e39f58e7d3e531f8154e5889ddc5072bb3b24f3a7518a348a10

data/README.markdown

@@ -66,14 +66,14 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.2.2
+jgem install glimmer -v 0.2.3
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.2.2'
+gem 'glimmer', '~> 0.2.3'
 ```
 
 And, then run:

data/lib/command_handlers/models/model_binding.rb

@@ -26,16 +26,9 @@ class ModelBinding
       if reduced_model.nil?
         nil
       else
-        if nested_model_property_name.start_with?('[')
-          property_method = '[]'
-          property_argument = nested_model_property_name[1...-1]
-          property_argument = property_argument.to_i if property_argument.match(/\d+/)
-          new_reduced_model = reduced_model.send(property_method, property_argument)
-        else
-          new_reduced_model = reduced_model.send(nested_model_property_name)
+        invoke_property_reader(reduced_model, nested_model_property_name).tap do |new_reduced_model|
+          @nested_models << new_reduced_model
         end
-        @nested_models << new_reduced_model
-        new_reduced_model
       end
     end
     @nested_models
@@ -67,7 +60,7 @@ class ModelBinding
     nested_property_names[0...-1]
   end
   def nested_property?
-    property_name_expression.include?(".")
+    property_name_expression.match(/[.\[]/)
   end
   def property_name_expression
     @property_name_expression
@@ -92,7 +85,7 @@ class ModelBinding
       nested_property_observers = nested_property_observers_for(observer)
       nested_models.zip(nested_property_names).each do |model, property_name|
         unless model.nil?
-          if property_name.start_with?('[')
+          if property_indexed?(property_name)
             model.extend ObservableArray unless model.is_a?(ObservableArray)
             model.add_array_observer(nested_property_observers[property_name]) unless model.has_array_observer?(nested_property_observers[property_name])
           else
@@ -109,10 +102,10 @@ class ModelBinding
   def update(value)
     return if model.nil?
     converted_value = @@property_type_converters[@property_type].call(value)
-    model.send(property_name + "=", converted_value) unless evaluate_property == converted_value
+    invoke_property_writer(model, "#{property_name}=", converted_value) unless evaluate_property == converted_value
   end
   def evaluate_property
-    model.send(property_name) unless model.nil?
+    invoke_property_reader(model, property_name) unless model.nil?
   end
   def evaluate_options_property
     model.send(property_name + "_options") unless model.nil?
@@ -120,4 +113,27 @@ class ModelBinding
   def options_property_name
     self.property_name + "_options"
   end
+  def property_indexed?(property_expression)
+    property_expression.start_with?('[')
+  end
+  def invoke_property_reader(object, property_expression)
+    if property_indexed?(property_expression)
+      property_method = '[]'
+      property_argument = property_expression[1...-1]
+      property_argument = property_argument.to_i if property_argument.match(/\d+/)
+      object.send(property_method, property_argument)
+    else
+      object.send(property_expression)
+    end
+  end
+  def invoke_property_writer(object, property_expression, value)
+    if property_indexed?(property_expression)
+      property_method = '[]='
+      property_argument = property_expression[1...-2]
+      property_argument = property_argument.to_i if property_argument.match(/\d+/)
+      object.send(property_method, property_argument, value)
+    else
+      object.send(property_expression, value)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement