glimmer 0.1.8.470 → 0.1.9.470

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d1e6ed089bc7dd67eee706f264787cda60ebe2fc1c3fdf1697c277ff5adad4
-  data.tar.gz: 7c7b23d0827e273289502df018308c7ab383c6e7299e75c6da89a9034113af53
+  metadata.gz: 0067b97cd354df28d0f9c07542c18c86fbd0862d2d14791c49488a1bd999715d
+  data.tar.gz: 6f6107572403c58148bbb9e5eb6613c5252c264373bbc3c8bd2bae2305fd9e76
 SHA512:
-  metadata.gz: 917f8181c1085e246bca952bd4861974081a95486b415e7e6f6c1dcc465776b79ae02ad18b1071f40823c74fdc721186ae5d008a4e1cadd4da2a0da6db40136f
-  data.tar.gz: 2011b3eedcb1018624bdb872aef40f5900ba2892e680e5ec23cffd495fea4574fd34a66e9720263a343f4ae30e56a91adba5a87529fe9bcf50408cd0e2548c4d
+  metadata.gz: 9162f6be53c6cf3a5641e137ad112f2711a9d332fc8e3cfda52579fe0286505103b93d4f4f16952358ead6ffc1915cf90b93b38af548d88b38ccb828666dcac1
+  data.tar.gz: fa1841ff34f94cef66485767670a564d21c50d93f9c3a99a39653914385205bcbe1abca03b351697e776e9222ae3fe5741aefcf98d9214a4c7d8bb6416237e1e

data/Gemfile

@@ -4,12 +4,12 @@ gem 'facets', '3.1.0'
 gem 'os', '1.0.0'
 
 group :development do
-  gem "rspec", "~> 3.5.0"
   gem "rspec-mocks", "~> 3.5.0"
+  gem "rspec", "~> 3.5.0"
   gem "rdoc", "~> 2.3.0"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.3.0"
   gem "coveralls", "= 0.8.5", require: false
   gem "simplecov", "~> 0.10.0", require: nil
-  gem "puts_debuggerer", "0.6.1"
+  gem "puts_debuggerer", "~> 0.7.1"
 end

data/README.markdown

@@ -26,7 +26,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.1.8.470'
+gem 'glimmer', '~> 0.1.9.470'
 ```
 
 And, then run:
@@ -38,7 +38,7 @@ bundle install
 
 Run this command to get directly:
 ```
-gem install glimmer -v 0.1.8.470
+gem install glimmer -v 0.1.9.470
 ```
 
 ## Usage

data/TODO.md

@@ -2,5 +2,11 @@
 
 Here is a list of tasks to do (please delete once done):
 
-* Support Tree databinding
+* Support Tree databinding (bidirectional)
+* Figure out what is missing from table databinding (bidirectional?)
 * Explore rewriting shine with Ruby 2 support
+* Add a startup progress dialog (consider Glimmer branding)
+* Externalize constants to make easily configurable
+* Extract ListenerParent into its own file from WidgetListenerCommandHandler
+* Nested databinding support
+* Enhance XML DSL support (special characters, CDATA, escaped characters (#, {, }, .))

data/VERSION

@@ -1 +1 @@
-0.1.8.470
+0.1.9.470

data/bin/girb

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-
-system "irb -r #{File.expand_path(File.join(__FILE__, '..', 'girb_runner.rb'))}"
+require 'os'
+require_relative '../lib/glimmer_application'
+additional_options = OS.mac? ? "-J-XstartOnFirstThread" : ""
+system "ruby #{additional_options} -J-classpath \"#{GlimmerApplication::SWT_JAR_FILE}\" -S irb -r #{File.expand_path(File.join(__FILE__, '..', 'girb_runner.rb'))}"

data/bin/girb_runner.rb

@@ -1,5 +1 @@
-require_relative '../lib/glimmer_application'
-include Java
-$CLASSPATH << GlimmerApplication::SWT_JAR_FILE
 require_relative '../lib/glimmer'
-include Glimmer

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.8.470 ruby lib
+# stub: glimmer 0.1.9.470 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "0.1.8.470"
+  s.version = "0.1.9.470"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2017-07-23"
+  s.date = "2017-07-26"
   s.description = "JRuby DSL 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]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/command_handler_chain_factory.rb",
     "lib/command_handler_chain_link.rb",
     "lib/command_handlers.rb",
+    "lib/command_handlers/RELEASE.md",
     "lib/command_handlers/bind_command_handler.rb",
     "lib/command_handlers/combo_selection_data_binding_command_handler.rb",
     "lib/command_handlers/data_binding_command_handler.rb",
@@ -54,11 +55,14 @@ Gem::Specification.new do |s|
     "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/shell_command_handler.rb",
     "lib/command_handlers/tab_item_command_handler.rb",
     "lib/command_handlers/table_column_properties_data_binding_command_handler.rb",
     "lib/command_handlers/table_items_data_binding_command_handler.rb",
+    "lib/command_handlers/tree_items_data_binding_command_handler.rb",
+    "lib/command_handlers/tree_properties_data_binding_command_handler.rb",
     "lib/command_handlers/widget_command_handler.rb",
     "lib/command_handlers/widget_listener_command_handler.rb",
     "lib/command_handlers/widget_method_command_handler.rb",
@@ -101,6 +105,7 @@ Gem::Specification.new do |s|
     "spec/lib/glimmer__shine_data_binding__spec.rb",
     "spec/lib/glimmer__tab_item__spec.rb",
     "spec/lib/glimmer__table_data_binding__spec.rb",
+    "spec/lib/glimmer__tree_data_binding__spec.rb",
     "spec/lib/glimmer_spec.rb",
     "spec/lib/xml/glimmer_xml_spec.rb",
     "spec/samples/contactmanager/contact_manager_presenter_spec.rb",
@@ -118,37 +123,37 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facets>.freeze, ["= 3.1.0"])
       s.add_runtime_dependency(%q<os>.freeze, ["= 1.0.0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
       s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
       s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.5"])
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.10.0"])
-      s.add_development_dependency(%q<puts_debuggerer>.freeze, ["= 0.6.1"])
+      s.add_development_dependency(%q<puts_debuggerer>.freeze, ["~> 0.7.1"])
     else
       s.add_dependency(%q<facets>.freeze, ["= 3.1.0"])
       s.add_dependency(%q<os>.freeze, ["= 1.0.0"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
       s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
       s.add_dependency(%q<coveralls>.freeze, ["= 0.8.5"])
       s.add_dependency(%q<simplecov>.freeze, ["~> 0.10.0"])
-      s.add_dependency(%q<puts_debuggerer>.freeze, ["= 0.6.1"])
+      s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.7.1"])
     end
   else
     s.add_dependency(%q<facets>.freeze, ["= 3.1.0"])
     s.add_dependency(%q<os>.freeze, ["= 1.0.0"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.0"])
     s.add_dependency(%q<coveralls>.freeze, ["= 0.8.5"])
     s.add_dependency(%q<simplecov>.freeze, ["~> 0.10.0"])
-    s.add_dependency(%q<puts_debuggerer>.freeze, ["= 0.6.1"])
+    s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.7.1"])
   end
 end
 

data/lib/command_handlers.rb

@@ -5,6 +5,8 @@ require File.dirname(__FILE__) + "/command_handlers/bind_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/tab_item_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/combo_selection_data_binding_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/list_selection_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/tree_items_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/tree_properties_data_binding_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/table_items_data_binding_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/table_column_properties_data_binding_command_handler"
 require File.dirname(__FILE__) + "/command_handlers/data_binding_command_handler"
@@ -19,6 +21,8 @@ CommandHandlerChainFactory.def_dsl(:swt,
   TabItemCommandHandler.new,
   ComboSelectionDataBindingCommandHandler.new,
   ListSelectionDataBindingCommandHandler.new,
+  TreeItemsDataBindingCommandHandler.new,
+  TreePropertiesDataBindingCommandHandler.new,
   TableItemsDataBindingCommandHandler.new,
   TableColumnPropertiesDataBindingCommandHandler.new,
   DataBindingCommandHandler.new,

data/lib/command_handlers/RELEASE.md

@@ -0,0 +1,12 @@
+# Release Notes
+
+** 0.1.9.470 **
+- Support Tree data-binding (read-only from model to tree)
+
+** 0.1.8.470 **
+- girb support
+
+** 0.1.5.470 **
+- Glimmer now uses a Ruby Logger in debug mode to provide helpful debugging information
+- Glimmer has a smart new Ruby shell script for executing applications
+- Glimmer now downloads swt.jar automatically when missing (e.g. 1st run) on Mac, Windows, and Linux, and for x86 and x86-64 CPU architectures.

data/lib/command_handlers/bind_command_handler.rb

@@ -2,25 +2,40 @@ require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
 require File.dirname(__FILE__) + "/models/model_observer"
 
+# 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
+# DataBindingCommandHandler for text and selection properties on Text and Spinner
+# or TableItemsDataBindingCommandHandler for items in a Table
 class BindCommandHandler
   include CommandHandler
-  
+
   include_package 'org.eclipse.swt.widgets'
 
   def can_handle?(parent, command_symbol, *args, &block)
-    parent.is_a?(RWidget) and
-    command_symbol.to_s == "bind" and
-    (((args.size == 2) and
-    (args[1].is_a?(Symbol) or args[1].is_a?(String))) or
-    ((args.size == 3) and
-    (args[1].is_a?(Symbol) or args[1].is_a?(String)) and
-    (args[2].is_a?(Symbol) or args[2].is_a?(String)))) and
-    block == nil
+    (
+      parent.is_a?(RWidget) and
+      command_symbol.to_s == "bind" and
+      (
+        (
+          (args.size == 2) and
+          (
+            args[1].is_a?(Symbol) or
+            args[1].is_a?(String)
+          )
+        ) or
+        (
+          (args.size == 3) and
+          (args[1].is_a?(Symbol) or args[1].is_a?(String)) and
+          (args[2].is_a?(Symbol) or args[2].is_a?(String))
+        )
+      ) and
+      block == nil
+    )
   end
-  
+
   def do_handle(parent, command_symbol, *args, &block)
     property_type = args[2] if (args.size == 3)
     ModelObserver.new(args[0], args[1].to_s, property_type)
   end
-  
-end
+
+end

data/lib/command_handlers/data_binding_command_handler.rb

@@ -4,12 +4,19 @@ require File.dirname(__FILE__) + "/models/observable_model"
 require File.dirname(__FILE__) + "/models/model_observer"
 require File.dirname(__FILE__) + "/models/widget_observer"
 
-class DataBindingCommandHandler 
+# 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
+# (aka widget_data_binder as per widget_data_binders array)
+#
+# Depends on BindCommandHandler
+class DataBindingCommandHandler
   extend Glimmer
   include CommandHandler
-  
+
   include_package 'org.eclipse.swt.widgets'
-  
+
   @@widget_data_binders = {
     Java::OrgEclipseSwtWidgets::Text => {
       :text => Proc.new do |rwidget, model_observer|
@@ -38,14 +45,14 @@ class DataBindingCommandHandler
           }
         end
       }
-    }    
-    
+    }
+
     def can_handle?(parent, command_symbol, *args, &block)
-      parent.is_a?(RWidget) and
+      (parent.is_a?(RWidget) and
        args.size == 1 and
-       args[0].is_a?(ModelObserver)
+       args[0].is_a?(ModelObserver))
     end
-    
+
     def do_handle(parent, command_symbol, *args, &block)
       model_observer = args[0]
       widget_observer = WidgetObserver.new(parent, command_symbol.to_s)
@@ -57,5 +64,5 @@ class DataBindingCommandHandler
       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
     end
-    
+
   end

data/lib/command_handlers/models/observable_array.rb

@@ -1,9 +1,10 @@
+require 'set'
 module ObservableArray
-  
+
   def add_observer(element_properties, observer)
     property_observer_list << observer
     each do |element|
-      element_properties.each do |property|
+      [element_properties].flatten.each do |property|
         element.extend(ObservableModel) unless element.is_a?(ObservableModel)
         element.add_observer(property, observer)
       end
@@ -11,30 +12,30 @@ module ObservableArray
   end
 
   def property_observer_list
-    @property_observer_list = [] unless @property_observer_list
+    @property_observer_list = Set.new unless @property_observer_list
     @property_observer_list
   end
-  
+
   def notify_observers
     property_observer_list.each {|observer| observer.update}
   end
-  
+
   def self.extend_object(array)
     array.instance_eval("alias original_add <<")
     array.instance_eval <<-end_eval, __FILE__, __LINE__
-      def <<(value) 
-        self.original_add(value) 
-        notify_observers 
+      def <<(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)
     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 = ""
@@ -44,8 +45,8 @@ module ObservableArray
     arguments = arguments[0..-2]
     model.instance_eval <<-end_eval, __FILE__, __LINE__
       def #{method}(#{arguments})
-        self.original_#{method}(#{arguments}) 
-        notify_observers 
+        self.original_#{method}(#{arguments})
+        notify_observers
       end
     end_eval
   end

data/lib/command_handlers/models/observable_model.rb

@@ -1,5 +1,6 @@
+require 'set'
 module ObservableModel
-  
+
   def add_observer(property_name, observer)
     property_observer_list(property_name) << observer
   end
@@ -8,16 +9,16 @@ module ObservableModel
     @property_observers = Hash.new unless @property_observers
     @property_observers
   end
-  
+
   def property_observer_list(property_name)
-    property_observer_hash[property_name.to_sym] = [] unless property_observer_hash[property_name.to_sym]
+    property_observer_hash[property_name.to_sym] = Set.new unless property_observer_hash[property_name.to_sym]
     property_observer_hash[property_name.to_sym]
   end
-  
+
   def notify_observers(property_name)
     property_observer_list(property_name).each {|observer| observer.update(send(property_name))}
   end
-  
+
   class Updater
     def initialize(property_name, observable_model)
       @property_name = property_name
@@ -27,33 +28,33 @@ module ObservableModel
       @observable_model.notify_observers(@property_name)
     end
   end
-  
+
   def self.extend_object(model)
     super
     model.methods.each do |method|
       self.add_method_observers(model, method)
     end
   end
-  
+
   def self.add_method_observers(model, method)
     setter_method_pattern = /^(\w+=)$/
     if (method.match(setter_method_pattern))
       getter_method = method[0, method.length - 1]
       getter_value = model.send(getter_method)
-      if (getter_value.is_a?(Array) and 
+      if (getter_value.is_a?(Array) and
           !getter_value.is_a?(ObservableArray))
         getter_value.extend(ObservableArray)
         getter_value.add_observer([], Updater.new(getter_method, model))
       end
       model.instance_eval "alias original_#{method} #{method}\n"
       model.instance_eval <<-end_eval, __FILE__, __LINE__
-        def #{method}(value) 
+        def #{method}(value)
           self.original_#{method}(value)
           notify_observers('#{getter_method}')
           if (value.is_a?(Array) and !value.is_a?(ObservableArray))
             value.extend(ObservableArray)
             value.add_observer([], ObservableModel::Updater.new('#{getter_method}', self))
-          end  
+          end
         end
       end_eval
     end

data/lib/command_handlers/models/tree_items_updater.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + "/observable_array"
+require File.dirname(__FILE__) + "/observable_model"
+
+class TreeItemsUpdater
+  include_package 'org.eclipse.swt'
+  include_package 'org.eclipse.swt.widgets'
+
+  def initialize(parent, model_observer, tree_properties)
+    @tree = parent
+    @model_observer = model_observer
+    @tree_properties = [tree_properties].flatten.first.to_h
+    update(@model_observer.evaluate_property)
+    model = model_observer.model
+    model.extend(ObservableModel) unless model.is_a?(ObservableModel)
+    model.add_observer(model_observer.property_name, self)
+  end
+  def update(model_tree_root_node=nil)
+    if model_tree_root_node and model_tree_root_node.respond_to?(@tree_properties[:children])
+      model_tree_root_node.extend(ObservableModel) unless model_tree_root_node.is_a?(ObservableModel)
+      model_tree_root_node.add_observer(@tree_properties[:text], self)
+      model_tree_root_node.add_observer(@tree_properties[:children], self)
+      @model_tree_root_node = model_tree_root_node
+    end
+    populate_tree(@model_tree_root_node, @tree, @tree_properties)
+  end
+  def populate_tree(model_tree_root_node, parent, tree_properties)
+    parent.widget.removeAll
+    populate_tree_node(model_tree_root_node, parent.widget, tree_properties)
+  end
+  def populate_tree_node(model_tree_node, parent, tree_properties)
+    table_item = TreeItem.new(parent, SWT::NONE)
+    table_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
+      [model_tree_node && model_tree_node.send(tree_properties[:children])].flatten.to_a.compact.each do |child|
+      child.extend(ObservableModel) unless child.is_a?(ObservableModel)
+      child.add_observer(@tree_properties[:text], self)
+      populate_tree_node(child, table_item, tree_properties)
+    end
+  end
+
+end

data/lib/command_handlers/table_column_properties_data_binding_command_handler.rb

@@ -1,9 +1,11 @@
 require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
 
+# Responsible for providing a readable keyword (command symbol) to capture
+# and return column properties for use in TreeItemsDataBindingCommandHandler
 class TableColumnPropertiesDataBindingCommandHandler
   include CommandHandler
-  
+
   include_package 'org.eclipse.swt'
   include_package 'org.eclipse.swt.widgets'
 
@@ -13,9 +15,9 @@ class TableColumnPropertiesDataBindingCommandHandler
     command_symbol.to_s == "column_properties" and
     block == nil
   end
-  
+
   def do_handle(parent, command_symbol, *args, &block)
     args
   end
-  
-end
+
+end

data/lib/command_handlers/table_items_data_binding_command_handler.rb

@@ -2,9 +2,10 @@ require File.dirname(__FILE__) + "/../command_handler"
 require File.dirname(__FILE__) + "/models/r_widget"
 require File.dirname(__FILE__) + "/models/table_items_updater"
 
+#Depends on BindCommandHandler and TableColumnPropertiesDataBindingCommandHandler
 class TableItemsDataBindingCommandHandler
   include CommandHandler
-  
+
   include_package 'org.eclipse.swt.widgets'
 
   def can_handle?(parent, command_symbol, *args, &block)
@@ -17,11 +18,11 @@ class TableItemsDataBindingCommandHandler
     args[1].is_a?(Array) and
     block == nil
   end
-  
+
   def do_handle(parent, command_symbol, *args, &block)
     model_observer = args[0]
     column_properties = args[1]
     TableItemsUpdater.new(parent, model_observer, column_properties)
   end
 
-end
+end

data/lib/command_handlers/tree_items_data_binding_command_handler.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+require File.dirname(__FILE__) + "/models/tree_items_updater"
+
+class TreeItemsDataBindingCommandHandler
+  include CommandHandler
+
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    (parent.is_a?(RWidget)) and
+    (parent.widget.is_a?(Tree)) and
+    (command_symbol.to_s == "items") and
+    (args.size == 2) and
+    (args[0].is_a?(ModelObserver)) 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]
+    tree_properties = args[1]
+    TreeItemsUpdater.new(parent, model_observer, tree_properties)
+  end
+
+end

data/lib/command_handlers/tree_properties_data_binding_command_handler.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+# Responsible for providing a readable keyword (command symbol) to capture
+# and return tree properties for use in TreeItemsDataBindingCommandHandler
+class TreePropertiesDataBindingCommandHandler
+  include CommandHandler
+
+  include_package 'org.eclipse.swt'
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    parent.widget.is_a?(Tree) and
+    command_symbol.to_s == "tree_properties" and
+    block == nil
+  end
+
+  def do_handle(parent, command_symbol, *args, &block)
+    args
+  end
+
+end

data/samples/login.rb

@@ -4,81 +4,81 @@ require_relative "../lib/glimmer"
 
 #Presents login screen data
 class LoginPresenter
-  
+
   attr_accessor :user_name
   attr_accessor :password
   attr_accessor :status
-  
+
   def initialize
     @user_name = ""
     @password = ""
     @status = "Logged Out"
   end
-  
+
   def status=(status)
     @status = status
-    
-    #TODO add feature to bind dependent properties to master property
-    notify_observers("logged_in") 
+
+    #TODO add feature to bind dependent properties to master property (2017-07-25 nested data binding)
+    notify_observers("logged_in")
     notify_observers("logged_out")
   end
-  
+
   def logged_in
     self.status == "Logged In"
   end
-  
+
   def logged_out
     !self.logged_in
   end
-  
+
   def login
     self.status = "Logged In"
   end
-  
+
   def logout
     self.user_name = ""
     self.password = ""
     self.status = "Logged Out"
   end
-  
+
 end
 
 #Login screen
 class Login
   include_package 'org.eclipse.swt'
   include_package 'org.eclipse.swt.layout'
-  
+
   include Glimmer
-  
+
   def launch
     presenter = LoginPresenter.new
     @shell = shell {
       text "Login"
-      composite { 
+      composite {
         layout GridLayout.new(2, false) #two columns with differing widths
-        
+
         label { text "Username:" } # goes in column 1
         text {                     # goes in column 2
-          text bind(presenter, :user_name) 
+          text bind(presenter, :user_name)
           enabled bind(presenter, :logged_out)
-        } 
-        
-        label { text "Password:" } 
+        }
+
+        label { text "Password:" }
         text(:password, :border) {
-          text bind(presenter, :password) 
+          text bind(presenter, :password)
           enabled bind(presenter, :logged_out)
         }
-        
-        label { text "Status:" } 
+
+        label { text "Status:" }
         label { text bind(presenter, :status) }
-        
-        button { 
+
+        button {
           text "Login"
           enabled bind(presenter, :logged_out)
           on_widget_selected { presenter.login }
         }
-        
-        button { 
+
+        button {
           text "Logout"
           enabled bind(presenter, :logged_in)
           on_widget_selected { presenter.logout }

data/spec/lib/glimmer__data_binding__spec.rb

@@ -1,4 +1,4 @@
-   require 'spec_helper'
+require 'spec_helper'
 
 describe "Glimmer Data Binding" do
   include Glimmer

data/spec/lib/glimmer__tree_data_binding__spec.rb

@@ -0,0 +1,113 @@
+require "spec_helper"
+
+describe "Glimmer Tree Data Binding" do
+  include Glimmer
+
+	include_package 'org.eclipse.swt'
+	include_package 'org.eclipse.swt.widgets'
+	include_package 'org.eclipse.swt.layout'
+
+  before do
+    dsl :swt
+  end
+
+	after do
+  	@target.display.dispose if @target && @target.display
+	end
+
+  class Person
+    attr_accessor :name, :age, :adult, :people
+  end
+
+  class Manager < Person
+    def initialize
+      @people = []
+    end
+
+    attr_accessor :people
+  end
+
+  class Company
+    def initialize
+      @owner = []
+    end
+
+    attr_accessor :owner
+  end
+
+  it "data binds text widget to a string property" do
+    person1 = Person.new
+    person1.name = "Bruce Ting"
+    person1.age = 45
+    person1.adult = true
+
+    person2 = Person.new
+    person2.name = "Julia Fang"
+    person2.age = 17
+    person2.adult = false
+
+    manager = Manager.new
+    manager.name = "Tim Harkins"
+    manager.age = 79
+    manager.adult = true
+    manager.people << person1
+    manager.people << person2
+
+    company = Company.new
+    company.owner = manager
+
+    @target = shell {
+      @tree = tree(:virtual, :border) {
+        items bind(company, :owner), tree_properties(children: :people, text: :name)
+      }
+    }
+
+    expect(@tree.widget.getItems.size).to eq(1)
+
+    rootNode = @tree.widget.getItems[0]
+    expect(rootNode.getText()).to eq("Tim Harkins")
+
+    expect(rootNode.getItems.size).to eq(2)
+    node1 = rootNode.getItems[0]
+    node2 = rootNode.getItems[1]
+    expect(node1.getText()).to eq("Bruce Ting")
+    expect(node2.getText()).to eq("Julia Fang")
+
+    manager.name = "Tim Lee Harkins"
+
+    rootNode = @tree.widget.getItems[0]
+    expect(rootNode.getText()).to eq("Tim Lee Harkins")
+
+    person1.name = "Bruce A. Ting"
+    node1 = @tree.widget.getItems.first.getItems.first
+    expect(node1.getText()).to eq("Bruce A. Ting")
+
+    person2.name = "Julia Katherine Fang"
+    node2 = @tree.widget.getItems.first.getItems.last
+    expect(node2.getText()).to eq("Julia Katherine Fang")
+
+    person3 = Person.new
+    person3.name = "Bob David Kennith"
+    person3.age = 37
+    person3.adult = true
+
+    manager.people << person3
+    manager.people = manager.people
+
+    rootNode = @tree.widget.getItems.first
+    expect(rootNode.getItems.size).to eq(3)
+    node3 = rootNode.getItems.last
+    expect(node3.getText()).to eq("Bob David Kennith")
+
+    manager.people.delete_at(0)
+
+    rootNode = @tree.widget.getItems.first
+    expect(rootNode.getItems.size).to eq(2)
+    node1 = rootNode.getItems.first
+    node2 = rootNode.getItems.last
+    expect(node1.getText()).to eq("Julia Katherine Fang")
+    expect(node2.getText()).to eq("Bob David Kennith")
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'samples'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'glimmer'
+require 'puts_debuggerer'
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.1.8.470
+  version: 0.1.9.470
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-  name: rspec
+  name: rspec-mocks
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-  name: rspec-mocks
+  name: rspec
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,17 +139,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.1
   name: puts_debuggerer
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.1
 description: JRuby DSL that enables easy and efficient authoring of user-interfaces
   using the robust platform-independent Eclipse SWT library
 email: andy.am@gmail.com
@@ -180,6 +180,7 @@ files:
 - lib/command_handler_chain_factory.rb
 - lib/command_handler_chain_link.rb
 - lib/command_handlers.rb
+- lib/command_handlers/RELEASE.md
 - lib/command_handlers/bind_command_handler.rb
 - lib/command_handlers/combo_selection_data_binding_command_handler.rb
 - lib/command_handlers/data_binding_command_handler.rb
@@ -195,11 +196,14 @@ files:
 - 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/shell_command_handler.rb
 - lib/command_handlers/tab_item_command_handler.rb
 - lib/command_handlers/table_column_properties_data_binding_command_handler.rb
 - lib/command_handlers/table_items_data_binding_command_handler.rb
+- lib/command_handlers/tree_items_data_binding_command_handler.rb
+- lib/command_handlers/tree_properties_data_binding_command_handler.rb
 - lib/command_handlers/widget_command_handler.rb
 - lib/command_handlers/widget_listener_command_handler.rb
 - lib/command_handlers/widget_method_command_handler.rb
@@ -242,6 +246,7 @@ files:
 - spec/lib/glimmer__shine_data_binding__spec.rb
 - spec/lib/glimmer__tab_item__spec.rb
 - spec/lib/glimmer__table_data_binding__spec.rb
+- spec/lib/glimmer__tree_data_binding__spec.rb
 - spec/lib/glimmer_spec.rb
 - spec/lib/xml/glimmer_xml_spec.rb
 - spec/samples/contactmanager/contact_manager_presenter_spec.rb