glimmer 0.1.10.470 → 0.1.11.SWT4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2743000710bdc46b908035ea211c466ff52e32df467e3c0e33298751c15c35d1
-  data.tar.gz: a5ec8756834000ff7be8efdfdf0d083c3635971a5fe9927b199d10f01526a4ad
+  metadata.gz: e969215624dc4b042727fb8cf0ab47397e9b70e499b59df66ce971b45acb54d7
+  data.tar.gz: 84f2da9b3e691d1360d7a9db1345b11a7ecbd00adc15f7c8176fd7ed27023db3
 SHA512:
-  metadata.gz: 5f16cd9964a83cf1de59bb2ed56a7c526486b99fa7d38fb48f154295699fe86ee36acfe556e375e12113f8f34a069da7c5de894ebb89aff75d3b3decdac8809e
-  data.tar.gz: 6e2bf4e9bd8f7bc39765a7fca70d78dcf705edf663bb465d504b581d0a35a9e4284c557f997c7376cd391f76ef36642df4adac3a6f542b26d4ae17f289a0197d
+  metadata.gz: 3cc0172f53ed935dfe09ce6dd3f154c563e71c3fa6d403a2772acb5c36d6f2cb06143c8fb77b01590eafa2a0dded33a158977cd805244f603f092540326863ee
+  data.tar.gz: dee9c61db200aeec1573631c4767ad9488d8b806df361e538c665457380ef7f74cdf919b0ff09366a96a1bad5f66113659262fe5fb041b8ce8c2dbe7198f69d9

data/README.markdown

@@ -45,7 +45,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.1.10.470'
+gem 'glimmer', '~> 0.1.11.SWT4.14'
 ```
 
 And, then run:
@@ -57,7 +57,7 @@ bundle install
 
 Run this command to get directly:
 ```
-gem install glimmer -v 0.1.10.470
+gem install glimmer -v 0.1.11.SWT4.14
 ```
 
 ## Usage
@@ -109,11 +109,15 @@ 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, :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.
 
-The second example demonstrates computed value data binding whereby the value of `name` depends on changes to both `first_name` and `last_name`
+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`
 
 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.
 
@@ -170,6 +174,12 @@ Windows is supported by JRuby and the Eclipse SWT library Glimmer runs on. Howev
 
 Same as Windows
 
+## Feature Suggestions
+
+These features have been suggested. You might see them in a future version of Glimmer. You are welcome to contribute more feature suggestions.
+
+- bind_collection: an iterator that enables spawning widgets based on a collection (e.g. spawn 2 `AddressWidget`s if `user.addresses` bind collection contains 2 addresses)
+
 ## Contributing to Glimmer
 
 Please follow these instructions if you would like to help us develop Glimmer:

data/RELEASE.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+** 0.1.11.SWT4.14 **
+- Upgraded SWT to version 4.14
+
+** 0.1.11.470 **
+- Nested property data binding support
+
 ** 0.1.10.470 **
 - Support Tree data-binding (one-way from model to tree)
 

data/VERSION

@@ -1 +1 @@
-0.1.10.470
+0.1.11.SWT4.14

data/config/swt.yml

@@ -0,0 +1,5 @@
+SWT:
+  '4.14':
+    mac_x86_64: http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.14-201912100610/swt-4.14-cocoa-macosx-x86_64.zip
+    linux_x86_64: http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.14-201912100610/swt-4.14-gtk-linux-x86_64.zip
+    windows_x86_64: http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.14-201912100610/swt-4.14-win32-win32-x86_64.zip

data/glimmer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 0.1.10.470 ruby lib
+# stub: glimmer 0.1.11.SWT4.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "0.1.10.470"
+  s.version = "0.1.11.SWT4.14"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2019-11-27"
+  s.date = "2020-02-28"
   s.description = "JRuby Desktop UI DSL + Data-Binding library that enables easy and efficient authoring of user-interfaces using the robust platform-independent Eclipse SWT library".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "bin/girb",
     "bin/girb_runner.rb",
     "bin/glimmer",
+    "config/swt.yml",
     "glimmer.gemspec",
     "images/Bitter-sweet.jpg",
     "lib/command_handler.rb",
@@ -44,19 +45,21 @@ Gem::Specification.new do |s|
     "lib/command_handlers/combo_selection_data_binding_command_handler.rb",
     "lib/command_handlers/data_binding_command_handler.rb",
     "lib/command_handlers/list_selection_data_binding_command_handler.rb",
-    "lib/command_handlers/models/list_observer.rb",
-    "lib/command_handlers/models/model_observer.rb",
+    "lib/command_handlers/models/block_observer.rb",
+    "lib/command_handlers/models/list_selection_binding.rb",
+    "lib/command_handlers/models/model_binding.rb",
     "lib/command_handlers/models/observable_array.rb",
     "lib/command_handlers/models/observable_model.rb",
+    "lib/command_handlers/models/observer.rb",
     "lib/command_handlers/models/r_runnable.rb",
     "lib/command_handlers/models/r_shell.rb",
     "lib/command_handlers/models/r_tab_item_composite.rb",
     "lib/command_handlers/models/r_widget.rb",
     "lib/command_handlers/models/r_widget_listener.rb",
     "lib/command_handlers/models/r_widget_packages.rb",
-    "lib/command_handlers/models/table_items_updater.rb",
-    "lib/command_handlers/models/tree_items_updater.rb",
-    "lib/command_handlers/models/widget_observer.rb",
+    "lib/command_handlers/models/table_items_binding.rb",
+    "lib/command_handlers/models/tree_items_binding.rb",
+    "lib/command_handlers/models/widget_binding.rb",
     "lib/command_handlers/shell_command_handler.rb",
     "lib/command_handlers/tab_item_command_handler.rb",
     "lib/command_handlers/table_column_properties_data_binding_command_handler.rb",

data/lib/command_handlers/bind_command_handler.rb

@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/model_observer"
+require File.dirname(__FILE__) + "/models/model_binding"
 
 # Responsible for setting up the return value of the bind keyword (command symbol)
-# as a ModelObserver. It is then used by another command handler like
+# as a ModelBinding. It is then used by another command handler like
 # DataBindingCommandHandler for text and selection properties on Text and Spinner
 # or TableItemsDataBindingCommandHandler for items in a Table
 class BindCommandHandler
@@ -41,9 +41,17 @@ class BindCommandHandler
 
   def do_handle(parent, command_symbol, *args, &block)
     property_type = args[2] if (args.size == 3) && !args[2].is_a?(Hash)
-    observer_options = args[2] if args[2].is_a?(Hash)
-    observer_options = args[3] if args[3].is_a?(Hash)
-    ModelObserver.new(args[0], args[1].to_s, property_type, observer_options)
+    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/combo_selection_data_binding_command_handler.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + "/models/r_widget"
 class ComboSelectionDataBindingCommandHandler
   include CommandHandler
   include Glimmer
-  
+
   include_package 'org.eclipse.swt.widgets'
 
   def can_handle?(parent, command_symbol, *args, &block)
@@ -12,28 +12,28 @@ class ComboSelectionDataBindingCommandHandler
     parent.widget.is_a?(Combo) and
     command_symbol.to_s == "selection" and
     args.size == 1 and
-    args[0].is_a?(ModelObserver) and
+    args[0].is_a?(ModelBinding) and
     args[0].evaluate_options_property.is_a?(Array) and
     block == nil
   end
-  
+
   def do_handle(parent, command_symbol, *args, &block)
-    model_observer = args[0]
-    widget_observer = WidgetObserver.new(parent, "items")
-    widget_observer.update(model_observer.evaluate_options_property)
-    model = model_observer.model
+    model_binding = args[0]
+    widget_binding = WidgetBinding.new(parent, "items")
+    widget_binding.update(model_binding.evaluate_options_property)
+    model = model_binding.base_model
     model.extend ObservableModel unless model.is_a?(ObservableModel)
-    model.add_observer(model_observer.options_property_name, widget_observer)
+    model.add_observer(model_binding.options_property_name, widget_binding)
+
+    widget_binding = WidgetBinding.new(parent, "text")
+    widget_binding.update(model_binding.evaluate_property)
+    model.add_observer(model_binding.property_name_expression, widget_binding)
 
-    widget_observer = WidgetObserver.new(parent, "text")
-    widget_observer.update(model_observer.evaluate_property)
-    model.add_observer(model_observer.property_name, widget_observer)
-    
     add_contents(parent) {
       on_widget_selected {
-        model_observer.update(widget_observer.evaluate_property)
+        model_binding.update(widget_binding.evaluate_property)
       }
-    }    
+    }
   end
 
-end
+end

data/lib/command_handlers/data_binding_command_handler.rb

@@ -1,13 +1,13 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
 require File.dirname(__FILE__) + "/models/observable_model"
-require File.dirname(__FILE__) + "/models/model_observer"
-require File.dirname(__FILE__) + "/models/widget_observer"
+require File.dirname(__FILE__) + "/models/model_binding"
+require File.dirname(__FILE__) + "/models/widget_binding"
 
 # Responsible for wiring two-way data-binding for text and selection properties
 # on Text, Button, and Spinner widgets.
 # Does so by using the output of the bind(model, property) command in the form
-# of a ModelObserver, which is then connected to an anonymous widget observer
+# of a ModelBinding, which is then connected to an anonymous widget observer
 # (aka widget_data_binder as per widget_data_binders array)
 #
 # Depends on BindCommandHandler
@@ -19,28 +19,28 @@ class DataBindingCommandHandler
 
   @@widget_data_binders = {
     Java::OrgEclipseSwtWidgets::Text => {
-      :text => Proc.new do |rwidget, model_observer|
+      :text => Proc.new do |rwidget, model_binding|
         add_contents(rwidget) {
           on_modify_text { |modify_event|
-            model_observer.update(rwidget.widget.getText)
+            model_binding.update(rwidget.widget.getText)
           }
         }
         end,
       },
       Java::OrgEclipseSwtWidgets::Button => {
-        :selection => Proc.new do |rwidget, model_observer|
+        :selection => Proc.new do |rwidget, model_binding|
           add_contents(rwidget) {
             on_widget_selected { |selection_event|
-              model_observer.update(rwidget.widget.getSelection)
+              model_binding.update(rwidget.widget.getSelection)
             }
           }
         end
       },
       Java::OrgEclipseSwtWidgets::Spinner => {
-        :selection => Proc.new do |rwidget, model_observer|
+        :selection => Proc.new do |rwidget, model_binding|
           add_contents(rwidget) {
             on_widget_selected { |selection_event|
-              model_observer.update(rwidget.widget.getSelection)
+              model_binding.update(rwidget.widget.getSelection)
             }
           }
         end
@@ -50,25 +50,24 @@ class DataBindingCommandHandler
     def can_handle?(parent, command_symbol, *args, &block)
       (parent.is_a?(RWidget) and
        args.size == 1 and
-       args[0].is_a?(ModelObserver))
+       args[0].is_a?(ModelBinding))
     end
 
     def do_handle(parent, command_symbol, *args, &block)
-      model_observer = args[0]
-      widget_observer_parameters = [parent, command_symbol.to_s]
-      widget_observer_parameters << proc {|value| model_observer.evaluate_property} if model_observer.observer_options.has_key?(:computed_by)
-      widget_observer = WidgetObserver.new(*widget_observer_parameters)
-      widget_observer.update(model_observer.evaluate_property)
-      model = model_observer.model
-      model.extend ObservableModel unless model.is_a?(ObservableModel)
-      model.add_observer(model_observer.property_name, widget_observer)
-      computed_by_property_names = model_observer.observer_options[:computed_by]
+      model_binding = args[0]
+      widget_binding_parameters = [parent, command_symbol.to_s]
+      widget_binding_parameters << proc {|value| model_binding.evaluate_property} if model_binding.binding_options.has_key?(:computed_by)
+      widget_binding = WidgetBinding.new(*widget_binding_parameters)
+      widget_binding.update(model_binding.evaluate_property)
+      model = model_binding.model
+      model_binding.add_observer(widget_binding)
+      computed_by_property_names = model_binding.binding_options[:computed_by]
       computed_by_property_names&.each do |computed_by_property_name|
-        model.add_observer(computed_by_property_name, widget_observer)
+        model.add_observer(computed_by_property_name, widget_binding)
       end
       widget_data_binder_map = @@widget_data_binders[parent.widget.class]
       widget_data_binder = widget_data_binder_map[command_symbol.to_s.to_sym] if widget_data_binder_map
-      widget_data_binder.call(parent, model_observer) if widget_data_binder
+      widget_data_binder.call(parent, model_binding) if widget_data_binder
     end
 
   end

data/lib/command_handlers/list_selection_data_binding_command_handler.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/list_observer"
+require File.dirname(__FILE__) + "/models/list_selection_binding"
 
 class ListSelectionDataBindingCommandHandler
   include CommandHandler
   include Glimmer
-  
+
   include_package 'org.eclipse.swt.widgets'
 
   def can_handle?(parent, command_symbol, *args, &block)
@@ -13,30 +13,30 @@ class ListSelectionDataBindingCommandHandler
     parent.widget.is_a?(List) and
     command_symbol.to_s == "selection" and
     args.size == 1 and
-    args[0].is_a?(ModelObserver) and
+    args[0].is_a?(ModelBinding) and
     args[0].evaluate_options_property.is_a?(Array) and
     block == nil
   end
-  
+
   def do_handle(parent, command_symbol, *args, &block)
-    model_observer = args[0]
-    widget_observer = WidgetObserver.new(parent, "items")
-    widget_observer.update(model_observer.evaluate_options_property)
-    model = model_observer.model
+    model_binding = args[0]
+    widget_binding = WidgetBinding.new(parent, "items")
+    widget_binding.update(model_binding.evaluate_options_property)
+    model = model_binding.base_model
     model.extend ObservableModel unless model.is_a?(ObservableModel)
-    model.add_observer(model_observer.options_property_name, widget_observer)
+    model.add_observer(model_binding.options_property_name, widget_binding)
 
     property_type = :string
     property_type = :array if parent.has_style?(:multi)
-    list_observer = ListObserver.new(parent, property_type)
-    list_observer.update(model_observer.evaluate_property)
-    model.add_observer(model_observer.property_name, list_observer)
-    
+    list_selection_binding = ListSelectionBinding.new(parent, property_type)
+    list_selection_binding.update(model_binding.evaluate_property)
+    model.add_observer(model_binding.property_name_expression, list_selection_binding)
+
     add_contents(parent) {
       on_widget_selected {
-        model_observer.update(list_observer.evaluate_property)
+        model_binding.update(list_selection_binding.evaluate_property)
       }
     }
   end
 
-end
+end

data/lib/command_handlers/models/block_observer.rb

@@ -0,0 +1,13 @@
+# Observer that takes an updater block to process updates
+
+class BlockObserver
+  include Observer
+
+  def initialize(&updater)
+    @updater = updater
+  end
+
+  def update(changed_value)
+    @updater.call(changed_value)
+  end
+end

data/lib/command_handlers/models/{list_observer.rb → list_selection_binding.rb}

@@ -1,25 +1,32 @@
-class ListObserver
+require File.dirname(__FILE__) + "/observer"
+
+# SWT List widget selection binding
+class ListSelectionBinding
+  include Observer
+
   attr_reader :widget
   @@property_type_updaters = {
-    :string => lambda { |widget, value| widget.widget.select(widget.widget.index_of(value.to_s)) }, 
+    :string => lambda { |widget, value| widget.widget.select(widget.widget.index_of(value.to_s)) },
     :array => lambda { |widget, value| widget.widget.selection=((value or []).to_java :string) }
   }
   @@property_evaluators = {
-    :string => lambda do |selection_array|     
+    :string => lambda do |selection_array|
       return nil if selection_array.empty?
       selection_array[0]
-     end, 
-    :array => lambda do |selection_array| 
+     end,
+    :array => lambda do |selection_array|
       selection_array
     end
   }
+  # Initialize with list widget and property_type
+  # property_type :string represents default list single selection
+  # property_type :array represents list multi selection
   def initialize(widget, property_type)
     property_type = :string if property_type.nil? or property_type == :undefined
     @widget = widget
     @property_type = property_type
   end
   def update(value)
-    raise "hell" if value == ["Canada"]
     @@property_type_updaters[@property_type].call(@widget, value) unless evaluate_property == value
   end
   def evaluate_property
@@ -28,4 +35,3 @@ class ListObserver
     return property_value
   end
 end
-  

data/lib/command_handlers/models/model_binding.rb

@@ -0,0 +1,102 @@
+require File.dirname(__FILE__) + "/observer"
+
+class ModelBinding
+  include Observer
+
+  attr_reader :property_type, :binding_options
+  @@property_type_converters = {
+    :undefined => lambda { |value| value },
+    :fixnum => lambda { |value| value.to_i },
+    :array => lambda { |value| value.to_a }
+  }
+  def initialize(base_model, property_name_expression, property_type = :undefined, binding_options = nil)
+    property_type = :undefined if property_type.nil?
+    @base_model = base_model
+    @property_name_expression = property_name_expression
+    @property_type = property_type
+    @binding_options = binding_options || {}
+  end
+  def model
+    nested_property? ? nested_model : base_model
+  end
+  # e.g. person.address.state returns [person, person.address]
+  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|
+        @nested_models << new_reduced_model
+      end
+    end
+    @nested_models
+  end
+  def nested_model
+    nested_models.last
+  end
+  def base_model
+    @base_model
+  end
+  def property_name
+    nested_property? ? nested_property_name : property_name_expression
+  end
+  # All nested property names
+  # e.g. property name expression "address.state" gives [:address, :state]
+  def nested_property_names
+    property_name_expression.split(".")
+  end
+  # Final nested property name
+  # e.g. property name expression "address.state" gives :state
+  def nested_property_name
+    nested_property_names.last
+  end
+  # Model representing nested property names
+  # e.g. property name expression "address.state" gives [:address]
+  def model_property_names
+    nested_property_names[0...-1]
+  end
+  def nested_property?
+    property_name_expression.include?(".")
+  end
+  def property_name_expression
+    @property_name_expression
+  end
+  def nested_property_observers_for(observer)
+    @nested_property_observers_collection ||= {}
+    unless @nested_property_observers_collection.has_key?(observer)
+      @nested_property_observers_collection[observer] = nested_property_names.reduce({}) do |output, property_name|
+        output.merge(
+          property_name => BlockObserver.new do |changed_value|
+            # Ensure reattaching observers when a higher level nested property is updated (e.g. person.address changes reattaches person.address.street observer)
+            add_observer(observer)
+            observer.update(evaluate_property)
+          end
+        )
+      end
+    end
+    @nested_property_observers_collection[observer]
+  end
+  def add_observer(observer)
+    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])
+      end
+    else
+      model.extend ObservableModel unless model.is_a?(ObservableModel)
+      model.add_observer(property_name, observer)
+    end
+  end
+  def update(value)
+    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)
+  end
+  def evaluate_options_property
+    model.send(property_name + "_options")
+  end
+  def options_property_name
+    self.property_name + "_options"
+  end
+end

data/lib/command_handlers/models/observable_model.rb

@@ -1,10 +1,19 @@
 require 'set'
+
+require File.dirname(__FILE__) + "/block_observer"
+
 module ObservableModel
 
-  def add_observer(property_name, observer)
+  # Takes observer as an object or a block updater
+  def add_observer(property_name, observer = nil, &updater)
+    observer ||= BlockObserver.new(&updater)
     property_observer_list(property_name) << observer
   end
 
+  def has_observer?(property_name, observer)
+    property_observer_list(property_name).include?(observer)
+  end
+
   def property_observer_hash
     @property_observers = Hash.new unless @property_observers
     @property_observers

data/lib/command_handlers/models/observer.rb

@@ -0,0 +1,9 @@
+# Mixin representing Observer trait from Observer Design Pattern
+# Allows classes to include without interfering with their
+# inheritance hierarchy.
+
+module Observer
+  def update(changed_value)
+    raise 'Not implemented!'
+  end
+end

data/lib/command_handlers/models/{table_items_updater.rb → table_items_binding.rb}

@@ -1,18 +1,20 @@
 require File.dirname(__FILE__) + "/observable_array"
 require File.dirname(__FILE__) + "/observable_model"
+require File.dirname(__FILE__) + "/observer"
 
-class TableItemsUpdater
+class TableItemsBinding
+  include Observer
   include_package 'org.eclipse.swt'
   include_package 'org.eclipse.swt.widgets'
-  
-  def initialize(parent, model_observer, column_properties)
+
+  def initialize(parent, model_binding, column_properties)
     @table = parent
-    @model_observer = model_observer
+    @model_binding = model_binding
     @column_properties = column_properties
-    update(@model_observer.evaluate_property)
-    model = model_observer.model
+    update(@model_binding.evaluate_property)
+    model = model_binding.base_model
     model.extend(ObservableModel) unless model.is_a?(ObservableModel)
-    model.add_observer(model_observer.property_name, self)
+    model.add_observer(model_binding.property_name_expression, self)
   end
   def update(model_collection=nil)
     if model_collection and model_collection.is_a?(Array)
@@ -31,6 +33,5 @@ class TableItemsUpdater
       end
     end
   end
-  
+
 end
-  

data/lib/command_handlers/models/{tree_items_updater.rb → tree_items_binding.rb}

@@ -1,18 +1,20 @@
 require File.dirname(__FILE__) + "/observable_array"
 require File.dirname(__FILE__) + "/observable_model"
+require File.dirname(__FILE__) + "/observer"
 
-class TreeItemsUpdater
+class TreeItemsBinding
+  include Observer
   include_package 'org.eclipse.swt'
   include_package 'org.eclipse.swt.widgets'
 
-  def initialize(parent, model_observer, tree_properties)
+  def initialize(parent, model_binding, tree_properties)
     @tree = parent
-    @model_observer = model_observer
+    @model_binding = model_binding
     @tree_properties = [tree_properties].flatten.first.to_h
-    update(@model_observer.evaluate_property)
-    model = model_observer.model
+    update(@model_binding.evaluate_property)
+    model = model_binding.base_model
     model.extend(ObservableModel) unless model.is_a?(ObservableModel)
-    model.add_observer(model_observer.property_name, self)
+    model.add_observer(model_binding.property_name_expression, self)
   end
   def update(model_tree_root_node=nil)
     if model_tree_root_node and model_tree_root_node.respond_to?(@tree_properties[:children])

data/lib/command_handlers/models/{widget_observer.rb → widget_binding.rb}

@@ -1,4 +1,8 @@
-class WidgetObserver
+require File.dirname(__FILE__) + "/observer"
+
+class WidgetBinding
+  include Observer
+  
   attr_reader :widget, :property
   @@property_type_converters = {
     :text => Proc.new { |value| value.to_s },

data/lib/command_handlers/table_items_data_binding_command_handler.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/table_items_updater"
+require File.dirname(__FILE__) + "/models/table_items_binding"
 
 #Depends on BindCommandHandler and TableColumnPropertiesDataBindingCommandHandler
 class TableItemsDataBindingCommandHandler
@@ -13,16 +13,16 @@ class TableItemsDataBindingCommandHandler
     parent.widget.is_a?(Table) and
     command_symbol.to_s == "items" and
     args.size == 2 and
-    args[0].is_a?(ModelObserver) and
+    args[0].is_a?(ModelBinding) and
     args[0].evaluate_property.is_a?(Array) and
     args[1].is_a?(Array) and
     block == nil
   end
 
   def do_handle(parent, command_symbol, *args, &block)
-    model_observer = args[0]
+    model_binding = args[0]
     column_properties = args[1]
-    TableItemsUpdater.new(parent, model_observer, column_properties)
+    TableItemsBinding.new(parent, model_binding, column_properties)
   end
 
 end

data/lib/command_handlers/tree_items_data_binding_command_handler.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/tree_items_updater"
+require File.dirname(__FILE__) + "/models/tree_items_binding"
 
 class TreeItemsDataBindingCommandHandler
   include CommandHandler
@@ -12,16 +12,16 @@ class TreeItemsDataBindingCommandHandler
     (parent.widget.is_a?(Tree)) and
     (command_symbol.to_s == "items") and
     (args.size == 2) and
-    (args[0].is_a?(ModelObserver)) and
+    (args[0].is_a?(ModelBinding)) and
     (!args[0].evaluate_property.is_a?(Array)) and
     (args[1].is_a?(Array) && !args[1].empty? && args[1].first.is_a?(Hash)) and
     (block == nil)
   end
 
   def do_handle(parent, command_symbol, *args, &block)
-    model_observer = args[0]
+    model_binding = args[0]
     tree_properties = args[1]
-    TreeItemsUpdater.new(parent, model_observer, tree_properties)
+    TreeItemsBinding.new(parent, model_binding, tree_properties)
   end
 
 end

data/lib/glimmer_application.rb

@@ -1,22 +1,21 @@
 require 'net/http'
 require 'fileutils'
 require 'os'
+require 'yaml'
 
 class GlimmerApplication
   SWT_ZIP_FILE = File.join(`echo ~`.strip, '.glimmer', 'vendor', 'swt.zip')
   SWT_JAR_FILE = File.join(File.dirname(SWT_ZIP_FILE), 'swt.jar')
 
   OPERATING_SYSTEMS = ["mac", "windows", "linux"]
-
-  SWT_URL = {
-    "mac_x86_64" => "http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.7-201706120950/swt-4.7-cocoa-macosx-x86_64.zip",
-    "linux_x86_64" => "http://mirror.cc.vt.edu/pub/eclipse/eclipse/downloads/drops4/R-4.7-201706120950/swt-4.7-gtk-linux-x86_64.zip",
-    "linux_x86" => "http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.7-201706120950/swt-4.7-gtk-linux-x86.zip",
-    "windows_x86_64" => "http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops4/R-4.7-201706120950/swt-4.7-win32-win32-x86_64.zip",
-    "windows_x86" => "http://eclipse.mirror.rafal.ca/eclipse/downloads/drops4/R-4.7-201706120950/swt-4.7-win32-win32-x86.zip"
-  }
-
-  attr_reader :setup_requested, :application
+  REGEX_SETUP = /--setup/
+  REGEX_SWT_VERSION = /[0-9]+[.0-9]*/
+  REGEX_APPLICATION = /.+/
+  REGEX_OPTIONS = [
+    REGEX_SETUP, REGEX_SWT_VERSION, REGEX_APPLICATION
+  ].map {|re| "(#{re})?"}.join("\s*")
+
+  attr_reader :setup_requested, :swt_version_specified, :application
   alias :setup_requested? :setup_requested
 
   # Accepts the following options string:
@@ -26,8 +25,10 @@ class GlimmerApplication
   # or
   # app_file_path.rb
   def initialize(options)
-    @setup_requested = options.first == '--setup'
-    @application = setup_requested? ? options[1] : options.first
+    options_regex_match = options.join(' ').match(REGEX_OPTIONS)
+    @setup_requested = !!options_regex_match[1]
+    @swt_version_specified = options_regex_match[2]
+    @application = options_regex_match[3]
   end
 
   def start
@@ -35,7 +36,7 @@ class GlimmerApplication
 
     setup if setup_requested? || !File.exist?(SWT_JAR_FILE)
 
-    if application
+    if application && File.exist?(SWT_JAR_FILE)
       puts "Starting Glimmer Application #{application}"
       system "ruby #{additional_options} -J-classpath \"#{SWT_JAR_FILE}\" #{application}"
     end
@@ -43,18 +44,21 @@ class GlimmerApplication
 
   def usage
     puts <<-MULTILINE
-Usage: glimmer [--setup] [application_ruby_file_path.rb]
+Usage: glimmer [--setup] [SWT_VERSION] [application_ruby_file_path.rb]
 
 Example 1: glimmer hello_combo.rb
 This runs the Glimmer application hello_combo.rb
-If the SWT Jar is missing, it downloads it and sets it up first.
+If the SWT Jar is missing, it first downloads the latest version supported.
 
 Example 2: glimmer --setup hello_combo.rb
 This performs setup and then runs the Glimmer application hello_combo.rb
-It downloads and sets up the SWT jar whether missing or not.
+It downloads and sets up the latest SWT jar whether missing or not.
 
 Example 3: glimmer --setup
-This downloads and sets up the SWT jar whether missing or not.
+This downloads and sets up the latest SWT jar whether missing or not.
+
+Example 4: glimmer --setup 4.14
+This downloads and sets up the SWT jar specified version 4.14 whether missing or not.
     MULTILINE
   end
 
@@ -65,6 +69,8 @@ This downloads and sets up the SWT jar whether missing or not.
     puts "Unzipping #{SWT_ZIP_FILE}"
     `unzip -o #{SWT_ZIP_FILE} -d #{File.dirname(SWT_ZIP_FILE)}`
     puts "Finished unzipping"
+  rescue => e
+    puts e.message
   end
 
   def download(file)
@@ -77,7 +83,21 @@ This downloads and sets up the SWT jar whether missing or not.
   end
 
   def platform_swt_url
-    SWT_URL[platform_swt_url_key]
+    swt_config[swt_version][platform_swt_url_key]
+  rescue
+    raise "SWT version #{swt_version} is not available for download!"
+  end
+
+  def swt_config
+    @swt_config ||= YAML.load_file(File.join(__FILE__, '..', '..', 'config', 'swt.yml'))['SWT']
+  end
+
+  def swt_version
+    swt_version_specified || swt_latest_version
+  end
+
+  def swt_latest_version
+    @swt_latest_version ||= swt_config.keys.max_by {|v| v.split('.').reverse.map(&:to_i).each_with_index.map {|n, i| n*(1000**i)}.sum}
   end
 
   def platform_swt_url_key

data/samples/hello_tab.rb

@@ -4,18 +4,18 @@ class HelloTab
   include Glimmer
   def launch
     shell {
-      text "SWT"
+      text "Hello Tab"
       tab_folder {
         tab_item {
-          text "Tab 1"
-          label { 
-            text "Hello World!" 
+          text "English"
+          label {
+            text "Hello World!"
           }
         }
         tab_item {
-          text "Tab 2"
-          label { 
-            text "Bonjour Univers!" 
+          text "French"
+          label {
+            text "Bonjour Univers!"
           }
         }
       }
@@ -23,4 +23,4 @@ class HelloTab
   end
 end
 
-HelloTab.new.launch
+HelloTab.new.launch

data/spec/lib/glimmer__data_binding__spec.rb

@@ -31,6 +31,14 @@ describe "Glimmer Data Binding" do
     end
   end
 
+  class Address
+    attr_accessor :street, :city, :state, :zip
+  end
+
+  class PersonWithNestedProperties
+    attr_accessor :address1, :address2
+  end
+
   it "tests text widget data binding string property" do
     person = Person.new
     person.name = "Bruce Ting"
@@ -284,4 +292,113 @@ describe "Glimmer Data Binding" do
     expect(person.adult).to eq(true)
   end
 
+  context "nested data binding" do
+
+    it "tests text widget data binding to nested string property" do
+      person = PersonWithNestedProperties.new
+      person.address1 = Address.new
+      person.address2 = Address.new
+
+      person.address1.street = "20 Naper Ave"
+      person.address1.city = "Indianapolis"
+      person.address1.state = "IN"
+      person.address1.zip = "46183"
+
+      person.address2.street = "101 Confession St"
+      person.address2.city = "Denver"
+      person.address2.state = "CO"
+      person.address2.zip = "80014"
+
+      @target = shell {
+        composite {
+          @address1_street_text_widget = text {
+            text bind(person, "address1.street")
+          }
+          @address1_city_text_widget = text {
+            text bind(person, "address1.city")
+          }
+          @address1_state_text_widget = text {
+            text bind(person, "address1.state")
+          }
+          @address1_zip_text_widget = text {
+            text bind(person, "address1.zip")
+          }
+        }
+        composite {
+          @address2_street_text_widget = text {
+            text bind(person, "address2.street")
+          }
+          @address2_city_text_widget = text {
+            text bind(person, "address2.city")
+          }
+          @address2_state_text_widget = text {
+            text bind(person, "address2.state")
+          }
+          @address2_zip_text_widget = text {
+            text bind(person, "address2.zip")
+          }
+        }
+      }
+
+      expect(@address1_street_text_widget.widget.getText).to eq("20 Naper Ave")
+      expect(@address1_city_text_widget.widget.getText).to eq("Indianapolis")
+      expect(@address1_state_text_widget.widget.getText).to eq("IN")
+      expect(@address1_zip_text_widget.widget.getText).to eq("46183")
+
+      expect(@address2_street_text_widget.widget.getText).to eq("101 Confession St")
+      expect(@address2_city_text_widget.widget.getText).to eq("Denver")
+      expect(@address2_state_text_widget.widget.getText).to eq("CO")
+      expect(@address2_zip_text_widget.widget.getText).to eq("80014")
+
+      person.address1.street = "123 Main St"
+      person.address1.city = "Chicago"
+      person.address1.state = "IL"
+      person.address1.zip = "60654"
+
+      person.address2.street = "100 Park Ave"
+      person.address2.city = "San Diego"
+      person.address2.state = "CA"
+      person.address2.zip = "92014"
+
+      expect(@address1_street_text_widget.widget.getText).to eq("123 Main St")
+      expect(@address1_city_text_widget.widget.getText).to eq("Chicago")
+      expect(@address1_state_text_widget.widget.getText).to eq("IL")
+      expect(@address1_zip_text_widget.widget.getText).to eq("60654")
+
+      expect(@address2_street_text_widget.widget.getText).to eq("100 Park Ave")
+      expect(@address2_city_text_widget.widget.getText).to eq("San Diego")
+      expect(@address2_state_text_widget.widget.getText).to eq("CA")
+      expect(@address2_zip_text_widget.widget.getText).to eq("92014")
+
+      person.address2 = person.address1
+
+      expect(@address2_street_text_widget.widget.getText).to eq("123 Main St")
+      expect(@address2_city_text_widget.widget.getText).to eq("Chicago")
+      expect(@address2_state_text_widget.widget.getText).to eq("IL")
+      expect(@address2_zip_text_widget.widget.getText).to eq("60654")
+
+      person.address2 = Address.new
+
+      person.address2.street = "101 Confession St"
+      person.address2.city = "Denver"
+      person.address2.state = "CO"
+      person.address2.zip = "80014"
+
+      expect(@address2_street_text_widget.widget.getText).to eq("101 Confession St")
+      expect(@address2_city_text_widget.widget.getText).to eq("Denver")
+      expect(@address2_state_text_widget.widget.getText).to eq("CO")
+      expect(@address2_zip_text_widget.widget.getText).to eq("80014")
+
+      person.address2.street = "123 Main St"
+      person.address2.city = "Chicago"
+      person.address2.state = "IL"
+      person.address2.zip = "60654"
+
+      expect(@address2_street_text_widget.widget.getText).to eq("123 Main St")
+      expect(@address2_city_text_widget.widget.getText).to eq("Chicago")
+      expect(@address2_state_text_widget.widget.getText).to eq("IL")
+      expect(@address2_zip_text_widget.widget.getText).to eq("60654")
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.1.10.470
+  version: 0.1.11.SWT4.14
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - bin/girb
 - bin/girb_runner.rb
 - bin/glimmer
+- config/swt.yml
 - glimmer.gemspec
 - images/Bitter-sweet.jpg
 - lib/command_handler.rb
@@ -171,19 +172,21 @@ files:
 - lib/command_handlers/combo_selection_data_binding_command_handler.rb
 - lib/command_handlers/data_binding_command_handler.rb
 - lib/command_handlers/list_selection_data_binding_command_handler.rb
-- lib/command_handlers/models/list_observer.rb
-- lib/command_handlers/models/model_observer.rb
+- lib/command_handlers/models/block_observer.rb
+- lib/command_handlers/models/list_selection_binding.rb
+- lib/command_handlers/models/model_binding.rb
 - lib/command_handlers/models/observable_array.rb
 - lib/command_handlers/models/observable_model.rb
+- lib/command_handlers/models/observer.rb
 - lib/command_handlers/models/r_runnable.rb
 - lib/command_handlers/models/r_shell.rb
 - lib/command_handlers/models/r_tab_item_composite.rb
 - lib/command_handlers/models/r_widget.rb
 - lib/command_handlers/models/r_widget_listener.rb
 - lib/command_handlers/models/r_widget_packages.rb
-- lib/command_handlers/models/table_items_updater.rb
-- lib/command_handlers/models/tree_items_updater.rb
-- lib/command_handlers/models/widget_observer.rb
+- lib/command_handlers/models/table_items_binding.rb
+- lib/command_handlers/models/tree_items_binding.rb
+- lib/command_handlers/models/widget_binding.rb
 - lib/command_handlers/shell_command_handler.rb
 - lib/command_handlers/tab_item_command_handler.rb
 - lib/command_handlers/table_column_properties_data_binding_command_handler.rb
@@ -255,9 +258,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.7.10

data/lib/command_handlers/models/model_observer.rb

@@ -1,28 +0,0 @@
-class ModelObserver
-  attr_reader :model, :property_name, :property_type, :observer_options
-  @@property_type_converters = {
-    :undefined => lambda { |value| value },
-    :fixnum => lambda { |value| value.to_i },
-    :array => lambda { |value| value.to_a }
-  }
-  def initialize(model, property_name, property_type = :undefined, observer_options = nil)
-    property_type = :undefined if property_type.nil?
-    @model = model
-    @property_name = property_name
-    @property_type = property_type
-    @observer_options = observer_options || {}
-  end
-  def update(value)
-    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)
-  end
-  def evaluate_options_property
-    @model.send(@property_name + "_options")
-  end
-  def options_property_name
-    self.property_name + "_options"
-  end
-end