glimmer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8ff1cec163aa46e0b080c1cb6120839665172846db445d6c31e1593f18f8cf
-  data.tar.gz: 5dcd208fdae24f6ed7d3f8880ab98f4fa3dad05266135bdbf17a7f404de4b997
+  metadata.gz: 4916b9c2b6c19c4afbdb4a49cc586d7c1a12358a94ee5f425b78520227cf3c8f
+  data.tar.gz: 7ce6d54b43cfecb43fe395ab6a7b39d4db928ad674f9ce26b0635c457a611f91
 SHA512:
-  metadata.gz: 1090019bcd5de2ae940218ab836ccf1778ae1fd4fd4069e8fe52879746726677d968e1244a111dd17dd05149ec2881f47d4592db276d2f7f49f6e357774db72f
-  data.tar.gz: bdf6ba912826c63ff7c9289abb832ce6e3059c16fd857f195098a2dc02b995ce849e1e3cfd8d35e38922a553619759a9a72afb3ebb60bed0b6fe74ef623276a1
+  metadata.gz: c16290f6cd39289717bd5f2446d2d42a00c1b08298f5d1ddea658e8efaa738cfdfa2e79512fae0ba3120dcb9d07fef946967c3467f28916b91f9171fc147c5cb
+  data.tar.gz: f51597bec5ef7193ea66f089243b29fc90c0bf406abcb7aa2dc6e1c66f31aefd210c840682c47dbfd1732ebabda0331e95c3f1efd07072df93926fe3493a84ab

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.0
+jgem install glimmer -v 0.2.2
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.2.0'
+gem 'glimmer', '~> 0.2.2'
 ```
 
 And, then run:
@@ -131,6 +131,7 @@ Data-binding is done with `bind` command following widget property to bind and t
 Data-binding examples:
 - `text bind(contact, :first_name)`
 - `text bind(contact, 'address.street')`
+- `text bind(contact, 'addresses[1].street')`
 - `text bind(contact, :name, computed_by: [:first_name, :last_name])`
 
 The first example binds the text property of a widget like `label` to the first name of a contact model.
@@ -138,7 +139,9 @@ The first example binds the text property of a widget like `label` to the first
 The second example binds the text property of a widget like `label` to the nested street of
 the address of a contact. This is called nested property data binding.
 
-The third example demonstrates computed value data binding whereby the value of `name` depends on changes to both `first_name` and `last_name`
+The third example binds the text property of a widget like `label` to the nested indexed address street of a contact. This is called nested indexed property data binding.
+
+The fourth example demonstrates computed value data binding whereby the value of `name` depends on changes to both `first_name` and `last_name`
 
 You may learn more about Glimmer's syntax by reading the Eclipse Zone Tutorial mentioned in resources and opening up the samples under the `samples` folder.
 

data/lib/command_handlers/bind_command_handler.rb

@@ -44,14 +44,6 @@ class BindCommandHandler
     binding_options = args[2] if args[2].is_a?(Hash)
     binding_options = args[3] if args[3].is_a?(Hash)
     ModelBinding.new(args[0], args[1].to_s, property_type, binding_options)
-    #TODO replace ModelObserver with something else. It's inaccurate
-    # it doesn't observe the model, it updates it, observing the widget
-    # yet also contains information about observing the model, like the property
-    # to observe. That's the real object spit out here. Must name is something else.
-    # Maybe call ModelBinding and spin off Observer as ModelPropertyUpdateCommand
-    # similarly create a WidgetPropertyUpdateCommand (execute not update method)
-    # Have an observer be a general thin skeleton with an update method instead.
-    # In the future, switch observer to a simple block.
   end
 
 end

data/lib/command_handlers/models/block_observer.rb

@@ -7,7 +7,7 @@ class BlockObserver
     @updater = updater
   end
 
-  def update(changed_value)
+  def update(changed_value=nil)
     @updater.call(changed_value)
   end
 end

data/lib/command_handlers/models/model_binding.rb

@@ -23,8 +23,19 @@ class ModelBinding
   def nested_models
     @nested_models = [base_model]
     model_property_names.reduce(base_model) do |reduced_model, nested_model_property_name|
-      reduced_model.send(nested_model_property_name).tap do |new_reduced_model|
+      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)
+        end
         @nested_models << new_reduced_model
+        new_reduced_model
       end
     end
     @nested_models
@@ -39,9 +50,11 @@ class ModelBinding
     nested_property? ? nested_property_name : property_name_expression
   end
   # All nested property names
-  # e.g. property name expression "address.state" gives [:address, :state]
+  # e.g. property name expression "address.state" gives ['address', 'state']
+  # If there are any indexed property names, this returns indexes as properties.
+  # e.g. property name expression "addresses[1].state" gives ['addresses', '[1]', 'state']
   def nested_property_names
-    property_name_expression.split(".")
+    @nested_property_names ||= property_name_expression.split(".").map {|pne| pne.match(/([^\[]+)(\[[^\]]+\])?/).to_a.drop(1)}.flatten.compact
   end
   # Final nested property name
   # e.g. property name expression "address.state" gives :state
@@ -78,8 +91,15 @@ class ModelBinding
     if nested_property?
       nested_property_observers = nested_property_observers_for(observer)
       nested_models.zip(nested_property_names).each do |model, property_name|
-        model.extend ObservableModel unless model.is_a?(ObservableModel)
-        model.add_observer(property_name, nested_property_observers[property_name]) unless model.has_observer?(property_name, nested_property_observers[property_name])
+        unless model.nil?
+          if property_name.start_with?('[')
+            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
+            model.extend ObservableModel unless model.is_a?(ObservableModel)
+            model.add_observer(property_name, nested_property_observers[property_name]) unless model.has_observer?(property_name, nested_property_observers[property_name])
+          end
+        end
       end
     else
       model.extend ObservableModel unless model.is_a?(ObservableModel)
@@ -87,14 +107,15 @@ class ModelBinding
     end
   end
   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
   end
   def evaluate_property
-    model.send(property_name)
+    model.send(property_name) unless model.nil?
   end
   def evaluate_options_property
-    model.send(property_name + "_options")
+    model.send(property_name + "_options") unless model.nil?
   end
   def options_property_name
     self.property_name + "_options"

data/lib/command_handlers/models/observable_array.rb

@@ -11,6 +11,14 @@ module ObservableArray
     end
   end
 
+  def add_array_observer(observer)
+    property_observer_list << observer
+  end
+
+  def has_array_observer?(observer)
+    property_observer_list.include?(observer)
+  end
+
   def property_observer_list
     @property_observer_list = Set.new unless @property_observer_list
     @property_observer_list
@@ -21,31 +29,34 @@ module ObservableArray
   end
 
   def self.extend_object(array)
-    array.instance_eval("alias original_add <<")
+    array.instance_eval("alias __original_add__ <<")
     array.instance_eval <<-end_eval, __FILE__, __LINE__
       def <<(value)
-        self.original_add(value)
+        self.__original_add__(value)
         notify_observers
       end
     end_eval
 
-    notify_observers_on_invokation(array, "delete", 1)
-    notify_observers_on_invokation(array, "delete_at", 1)
+    array.instance_eval("alias __original_set_value__ []=")
+    array.instance_eval <<-end_eval, __FILE__, __LINE__
+      def []=(index, value)
+        self.__original_set_value__(index, value)
+        notify_observers
+      end
+    end_eval
+
+    notify_observers_on_invokation(array, "delete")
+    notify_observers_on_invokation(array, "delete_at")
     notify_observers_on_invokation(array, "clear")
 
     super
   end
 
-  def self.notify_observers_on_invokation(model, method, argument_count=0)
-    model.instance_eval "alias original_#{method} #{method}\n"
-    arguments = ""
-    for index in 1..argument_count
-      arguments += "argument" + index.to_s + ","
-    end
-    arguments = arguments[0..-2]
+  def self.notify_observers_on_invokation(model, method)
+    model.instance_eval "alias __original_#{method}__ #{method}\n"
     model.instance_eval <<-end_eval, __FILE__, __LINE__
-      def #{method}(#{arguments})
-        self.original_#{method}(#{arguments})
+      def #{method}(*args, &block)
+        self.__original_#{method}__(*args, &block)
         notify_observers
       end
     end_eval

data/lib/glimmer_application.rb

@@ -26,11 +26,11 @@ This runs the Glimmer application hello_world.rb
     end
 
     def jruby_command_options
-      "#{jruby_os_specific_options} -J-classpath \"#{swt_jar_file}\" -r glimmer"
+      "#{jruby_os_specific_options} -J-classpath \"#{swt_jar_file}\""
     end
 
     def launch(application)
-      system "jruby #{jruby_command_options} -S #{application}"
+      system "jruby #{jruby_command_options} -r glimmer -S #{application}"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - AndyMaleh