glimmer 0.7.1 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b586dfb4cb23af36ebd26ad97a46625fe122c64d9725b237c8f88f0c72ce71
-  data.tar.gz: 14ff7f5996588c4261cf4d102d5ffca28fc59cef5bd151d07c273038efae3da5
+  metadata.gz: 94497522f529a193db5b827f739dcf4eab4a23c0c0ac583d7352cd7bd8270a83
+  data.tar.gz: a7a6a6ff9816f5be2422b5bd53c020f8152b47a436cd2cc805690e3af3cb5612
 SHA512:
-  metadata.gz: 6eb266dffd64ba21842038fd272c06a3342f3399b5729d178b966b9543dfdbb9eb45eea079782d0db205e68cc9b63a5a0a4222a9d77c9f5df2cacc01126fed51
-  data.tar.gz: 123a861f812ac0e4ee2e4c802255ff017c2459a65de79cb52863897a0b017fc8037d9b57eb8e041dc75005d68ee4a3835b07a7cd03f87c30f524c5fef67717ca
+  metadata.gz: '095cae0665dbdb73713608a2b2ba9029e0693a33796e4e61ee8463f7f4dcdb385ef04f6fa5f1b3ef2cc48db11492b6bb1c6adff6eeb9de89639a7a1993c3ae1a'
+  data.tar.gz: 5513aac74d33b07ee14dbc430938e1f059a5a76a842d6dbbfef2b29c5fede52f2c57a3aea2053835b411da346bd3c7dca9bdddea385742363a6bf6ed8dbb7d40

data/{README.markdown → README.md}

@@ -1,12 +1,16 @@
-# Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.7.6 Beta (Desktop Development Library for Ruby)
 [![Gem Version](https://badge.fury.io/rb/glimmer.svg)](http://badge.fury.io/rb/glimmer)
-[![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
+[![Travis CI](https://travis-ci.com/AndyObtiva/glimmer.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer)
+<!-- [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master) -->
 
-Glimmer is a native-UI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business components test-first afterwards.
+Glimmer is a native-UI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business models test-first afterwards.
+
+[<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br /> 
+Featured in<br />JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do)
 
 ## Examples
 
-### Hello World
+### Hello, World!
 
 Glimmer code (from `samples/hello/hello_world.rb`):
 ```ruby
@@ -70,12 +74,10 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
 
 ## Table of Contents
 
-<!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
-- [Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
+- [Glimmer 0.7.6 Beta (Desktop Development Library for Ruby)](#glimmer-075-beta-desktop-development-library-for-ruby)
   - [Examples](#examples)
-    - [Hello World](#hello-world)
+    - [Hello, World!](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
-  - [Table of Contents](#table-of-contents)
   - [Background](#background)
   - [Platform Support](#platform-support)
   - [Pre-requisites](#pre-requisites)
@@ -85,6 +87,7 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
   - [Glimmer Command](#glimmer-command)
     - [Basic Usage](#basic-usage)
     - [Advanced Usage](#advanced-usage)
+    - [Scaffolding](#scaffolding)
   - [Girb (Glimmer irb) Command](#girb-glimmer-irb-command)
   - [Glimmer DSL Syntax](#glimmer-dsl-syntax)
     - [Widgets](#widgets)
@@ -99,6 +102,9 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
     - [Miscellaneous](#miscellaneous)
   - [Glimmer Style Guide](#glimmer-style-guide)
   - [Samples](#samples)
+    - [Hello Samples](#hello-samples)
+    - [Elaborate Samples](#elaborate-samples)
+  - [In Production](#in-production)
   - [SWT Reference](#swt-reference)
   - [SWT Packages](#swt-packages)
   - [Logging](#logging)
@@ -111,15 +117,14 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
     - [Self Signed Certificate](#self-signed-certificate)
     - [Gotchas](#gotchas)
   - [Resources](#resources)
+  - [Help](#help)
+    - [Issues](#issues)
+    - [IRC Channel](#irc-channel)
   - [Feature Suggestions](#feature-suggestions)
   - [Change Log](#change-log)
   - [Contributing](#contributing)
   - [Contributors](#contributors)
   - [License](#license)
-<!-- TOC END -->
-
-
-
 ## Background
 
 Ruby is a dynamically-typed object-oriented language, which provides great productivity gains due to its powerful expressive syntax and dynamic nature. While it is proven by the Ruby on Rails framework for web development, it currently lacks a robust platform-independent framework for building desktop applications. Given that Java libraries can now be utilized in Ruby code through JRuby, Eclipse technologies, such as SWT, JFace, and RCP can help fill the gap of desktop application development with Ruby.
@@ -164,7 +169,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.7.1
+jgem install glimmer -v 0.7.6
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -175,7 +180,7 @@ Otherwise, you may also run `jruby -S gem install ...`
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.7.1'
+gem 'glimmer', '~> 0.7.6'
 ```
 
 And, then run:
@@ -734,6 +739,7 @@ Glimmer ships with SWT style **smart defaults** so you wouldn't have to set them
 
 - `text(:border)`
 - `table(:border)`
+- `tree(:border, :virtual, :v_scroll, :h_scroll)`
 - `spinner(:border)`
 - `list(:border, :v_scroll)`
 - `button(:push)`
@@ -1075,7 +1081,7 @@ https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/
 
 Data-binding is done with `bind` command following widget property to bind and taking model and bindable attribute as arguments.
 
-Data-binding examples:
+#### General data-binding examples:
 
 `text bind(contact, :first_name)`
 
@@ -1098,6 +1104,10 @@ This example also specifies a converter on read of the model property, but via a
 
 This is a block shortcut version of the syntax above it. It facilitates formatting model data for read-only widgets since it's a very common view concern. It also saves the developer from having to create a separate formatter/presenter for the model when the view can be an active view that handles common simple formatting operations directly.
 
+`text bind(contact, 'address.street', read_only: true)
+
+This is read-ohly data-binding. It doesn't update contact.address.street when widget text property is changed.
+
 `text bind(contact, 'addresses[1].street')`
 
 This 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.
@@ -1116,6 +1126,8 @@ This example demonstrates nested indexed computed value data binding whereby the
 
 Example from [samples/hello/hello_combo.rb](samples/hello_combo.rb) sample (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 
+#### Combo
+
 ![Hello Combo](images/glimmer-hello-combo.png)
 
 ![Hello Combo](images/glimmer-hello-combo-expanded.png)
@@ -1159,6 +1171,8 @@ HelloCombo.new.launch
 
 `combo` widget is data-bound to the country of a person. Note that it expects `person` object to have `:country` attribute and `:country_options` attribute containing all available countries.
 
+#### List
+
 Example from [samples/hello/hello_list_single_selection.rb](samples/hello_list_single_selection.rb) sample:
 
 ![Hello List Single Selection](images/glimmer-hello-list-single-selection.png)
@@ -1240,6 +1254,45 @@ Note that in all the data-binding examples above, there was also an observer att
 
 You may learn more about Glimmer's data-binding syntax by reading the [Eclipse Zone Tutorial](http://eclipse.dzone.com/articles/an-introduction-glimmer) mentioned in resources and opening up the samples under the [samples](samples) directory.
 
+#### Tree
+
+The SWT Tree widget visualizes a tree data-structure, such as an employment or composition hierarchy.
+
+To data-bind a Tree, you need the root model, the children querying method, and the text display attribute on each child.
+
+This involves using the `bind` keyword mentioned above in addition to a special `tree_properties` keyword that takes the children and text attribute methods.
+
+Example:
+
+```ruby
+shell {      
+  @tree = tree {
+    items bind(company, :owner), tree_properties(children: :coworkers, text: :name)
+    selection bind(company, :selected_coworker)
+  }
+}
+```
+
+The code above includes two data-bindings:
+- Tree `items`, which first bind to the root node (company.owner), and then dig down via `coworkers` `children` method, using the `name` `text` attribute for displaying each tree item. 
+- Tree `selection`, which binds the single tree item selected by the user to the attribute denoted by the `bind` keyword
+
+Additionally, Tree `items` data-binding automatically stores each node model unto the SWT TreeItem object via `setData` method. This enables things like searchability.
+
+The tree widget in Glimmer is represented by a subclass of `WidgetProxy` called `TreeProxy`.
+TreeProxy includes a `depth_first_search` method that takes a block to look for a tree item.
+
+Example:
+
+```ruby
+found_array = @tree.depth_first_search { |tree_item| tree_item.getData == company.owner }
+```
+
+This finds the root node. The array is a Java array. This enables easy passing of it to SWT `Tree#setSelection` method, which expects a Java array of `TreeItem` objects.
+
+To edit a tree, you must invoke `TreeProxy#edit_selected_tree_item` or `TreeProxy#edit_tree_item`. This automatically leverages the SWT TreeEditor custom class behind the scenes, displaying
+a text widget to the user to change the selected or passed tree item text into something else. It automatically persists the change to `items` data-bound model on ENTER/FOCUS-OUT or cancels on ESC/NO-CHANGE.
+
 ### Observer
 
 Glimmer comes with `Observer` module, which is used internally for data-binding, but can also be used externally for custom use of the Observer Pattern. It is hidden when observing widgets, and used explicitly when observing models.
@@ -1925,7 +1978,7 @@ glimmer samples/elaborate/contact_manager.rb # demonstrates table data-binding
 glimmer samples/elaborate/tic_tac_toe.rb # demonstrates a full MVC application
 ```
 
-![Gladiator](images/glimmer-gladiator.png)
+![Gladiator](https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/v0.1.5/images/glimmer-gladiator.png)
 
 [Gladiator](https://github.com/AndyObtiva/glimmer-cs-gladiator) (short for Glimmer Editor) is a Glimmer sample project under on-going development.
 You may check it out to learn how to build a Glimmer Custom Shell gem.
@@ -2194,10 +2247,25 @@ Exec failed with code 2 command [[/usr/bin/SetFile, -c, icnC, /var/folders/4_/g1
 
 ## Resources
 
+* [Code Master Blog](http://andymaleh.blogspot.com/search/label/Glimmer)
 * [Eclipse Zone Tutorial](http://eclipse.dzone.com/articles/an-introduction-glimmer)
 * [InfoQ Article](http://www.infoq.com/news/2008/02/glimmer-jruby-swt)
 * [RubyConf 2008 Video](https://confreaks.tv/videos/rubyconf2008-desktop-development-with-glimmer)
-* [Code Blog](http://andymaleh.blogspot.com/search/label/Glimmer)
+* [JRuby Cookbook by Justin Edelson & Henry Liu](http://shop.oreilly.com/product/9780596519650.do)
+
+## Help
+
+### Issues
+
+You may submit [issues](https://github.com/AndyObtiva/glimmer/issues) on [GitHub](https://github.com/AndyObtiva/glimmer/issues).
+
+[Click here to submit an issue.](https://github.com/AndyObtiva/glimmer/issues)
+
+### IRC Channel
+
+If you need live help, try the [#glimmer](http://widget.mibbit.com/?settings=7514b8a196f8f1de939a351245db7aa8&server=irc.mibbit.net&channel=%23glimmer) IRC channel on [irc.mibbit.net](http://widget.mibbit.com/?settings=7514b8a196f8f1de939a351245db7aa8&server=irc.mibbit.net&channel=%23glimmer). If no one was available, you may [leave a GitHub issue](https://github.com/AndyObtiva/glimmer/issues) to schedule a meetup on IRC. 
+
+[Click here to connect to #glimmer IRC channel immediately via a web interface.](http://widget.mibbit.com/?settings=7514b8a196f8f1de939a351245db7aa8&server=irc.mibbit.net&channel=%23glimmer)
 
 ## Feature Suggestions
 

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.6

data/lib/glimmer/data_binding/model_binding.rb

@@ -203,10 +203,9 @@ module Glimmer
       end
 
       def evaluate_property
-        unless model.nil?
-          value = invoke_property_reader(model, property_name)
-          convert_on_read(value)        
-        end
+        value = nil        
+        value = invoke_property_reader(model, property_name) unless model.nil?
+        convert_on_read(value)
       end
 
       def evaluate_options_property
@@ -233,6 +232,7 @@ module Glimmer
       end
 
       def invoke_property_writer(object, property_expression, value)
+        return if @binding_options[:read_only]
         value = convert_on_write(value)
         if property_indexed?(property_expression)
           property_method = '[]='

data/lib/glimmer/data_binding/observable_model.rb

@@ -40,9 +40,7 @@ module Glimmer
       end
 
       def property_observer_hash
-        # TODO simplify with ||=
-        @property_observers = Hash.new unless @property_observers
-        @property_observers
+        @property_observers ||= Hash.new
       end
 
       def property_observer_list(property_name)

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -26,6 +26,7 @@ module Glimmer
 
       def call(model_collection=nil)
         if model_collection and model_collection.is_a?(Array)
+          # TODO clean observer registrations 
           observe(model_collection, @column_properties)
           @model_collection = model_collection
         end

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -17,7 +17,12 @@ module Glimmer
         @tree = parent
         @model_binding = model_binding
         @tree_properties = [tree_properties].flatten.first.to_h
-        call(@model_binding.evaluate_property)
+        if @tree.respond_to?(:tree_properties=)
+          @tree.tree_properties = @tree_properties
+        else # assume custom widget
+          @tree.body_root.tree_properties = @tree_properties
+        end
+        call
         model = model_binding.base_model
         observe(model, model_binding.property_name_expression)
         @tree.on_widget_disposed do |dispose_event|
@@ -25,26 +30,40 @@ module Glimmer
         end
       end
 
-      def call(model_tree_root_node=nil)
-        if model_tree_root_node and model_tree_root_node.respond_to?(@tree_properties[:children])
-          observe(model_tree_root_node, @tree_properties[:text])
-          observe(model_tree_root_node, @tree_properties[:children])
-          @model_tree_root_node = model_tree_root_node
-        end
+      def call(new_value=nil)
+        @model_tree_root_node = @model_binding.evaluate_property
         populate_tree(@model_tree_root_node, @tree, @tree_properties)
       end
 
       def populate_tree(model_tree_root_node, parent, tree_properties)
+        # TODO make it change things by delta instead of removing all
+        selected_tree_item_model = parent.swt_widget.getSelection.map(&:getData).first
+        old_tree_items = parent.all_tree_items
+        old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
+        old_tree_items.each do |tree_item|
+          tree_item.getData('observer_registrations').each do |key, observer_registration|
+            observer_registration.unregister
+          end          
+        end        
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
+        parent.all_tree_items.each { |ti| ti.setExpanded(!!old_tree_item_expansion_by_data[ti.getData]) }
+        tree_item_to_select = parent.depth_first_search {|ti| ti.getData == selected_tree_item_model}
+        parent.swt_widget.setSelection(tree_item_to_select)
       end
 
       def populate_tree_node(model_tree_node, parent, tree_properties)
-        table_item = TreeItem.new(parent, SWT::SWTProxy[:none])
-        table_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
+        return if model_tree_node.nil?
+        # TODO anticipate default tree properties if none were passed (like literal values text and children)
+        tree_item = TreeItem.new(parent, SWT::SWTProxy[:none])
+        observer_registrations = @tree_properties.reduce({}) do |hash, key_value_pair|
+          hash.merge(key_value_pair.first => observe(model_tree_node, key_value_pair.last))
+        end
+        tree_item.setData('observer_registrations', observer_registrations)
+        tree_item.setData(model_tree_node)
+        tree_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|
-          observe(child, @tree_properties[:text])
-          populate_tree_node(child, table_item, tree_properties)
+          populate_tree_node(child, tree_item, tree_properties)
         end
       end
     end

data/lib/glimmer/dsl/engine.rb

@@ -100,7 +100,7 @@ module Glimmer
                   return Glimmer::DSL::Engine.interpret(keyword, *args, &block)
                 rescue => e
                   Glimmer::DSL::Engine.reset
-                  raise e if static_expression_dsl.nil?
+                  raise e if static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression)
                 end
               end
               raise Glimmer::Error, "Unsupported keyword: #{keyword}" unless static_expression_dsl || retrieved_static_expression
@@ -153,12 +153,13 @@ module Glimmer
         #
         # For example, a shell widget would get properties set and children added
         def add_content(parent, expression, &block)
-          time = Time.now.to_f
-          dsl_stack.push(expression.class.dsl)
-          parent_stack.push(parent) if expression.is_a?(ParentExpression)
-          expression.add_content(parent, &block) if block_given?
-          parent_stack.pop if expression.is_a?(ParentExpression)
-          dsl_stack.pop
+          if block_given? && expression.is_a?(ParentExpression)
+            dsl_stack.push(expression.class.dsl)
+            parent_stack.push(parent) 
+            expression.add_content(parent, &block)
+            parent_stack.pop
+            dsl_stack.pop
+          end
         end
 
         # Current parent while evaluating Glimmer DSL (nil if just started or done evaluatiing)

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -17,7 +17,13 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::WidgetProxy.new(keyword, parent, args)
+          begin
+            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
+            widget_class = Glimmer::SWT.const_get(class_name)
+          rescue
+            widget_class = Glimmer::SWT::WidgetProxy
+          end
+          widget_class.new(keyword, parent, args)
         end
       end
     end
@@ -25,3 +31,4 @@ module Glimmer
 end
 
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/tree_proxy'

data/lib/glimmer/launcher.rb

@@ -116,6 +116,11 @@ module Glimmer
         end
       end
     end
+    
+    attr_reader :application_paths
+    attr_reader :env_vars
+    attr_reader :glimmer_options
+    attr_reader :jruby_options
 
     def initialize(raw_options)
       @application_paths = extract_application_paths(raw_options)
@@ -135,6 +140,7 @@ module Glimmer
     private
 
     def launch_application
+      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile'))
       threads = @application_paths.map do |application_path|
         Thread.new do
           self.class.launch(

data/lib/glimmer/scaffold.rb

@@ -286,8 +286,6 @@ class Scaffold
             app_view.open
           end
         end
-        
-        #{class_name(app_name)}.new.open
       MULTI_LINE_STRING
     end
 
@@ -307,8 +305,10 @@ class Scaffold
     def app_bin_file(app_name)
       <<~MULTI_LINE_STRING
         #!/usr/bin/env ruby
-
+        
         require_relative '../app/#{file_name(app_name)}'
+        
+        #{class_name(app_name)}.new.open
       MULTI_LINE_STRING
     end
 

data/lib/glimmer/swt/shell_proxy.rb

@@ -20,33 +20,39 @@ module Glimmer
       alias opened_before? opened_before
 
       # Instantiates ShellProxy with same arguments expected by SWT Shell
-      def initialize(*args)
-        if args.first.is_a?(ShellProxy)
-          args[0] = args[0].swt_widget
-        end
-        style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-        if style_args.any?
-          style_arg_start_index = args.index(style_args.first)
-          style_arg_last_index = args.index(style_args.last)
-          args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
-        end
-        if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
-          @display = DisplayProxy.instance.swt_display
-          args = [@display] + args
-        end
-        args = args.compact
-        @swt_widget = Shell.new(*args)
-        @display ||= @swt_widget.getDisplay
-        @swt_widget.setLayout(FillLayout.new)
-        @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
-        on_event_show do
-          Thread.new do      
-            sleep(0.25)
-            async_exec do
-              @swt_widget.setActive
+      # if swt_widget keyword arg was passed, then it is assumed the shell has already been instantiated
+      # and the proxy wraps it instead of creating a new one.
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
+            @display = DisplayProxy.instance.swt_display
+            args = [@display] + args
+          end
+          args = args.compact
+          @swt_widget = Shell.new(*args)
+          @swt_widget.setLayout(FillLayout.new)
+          @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
+          on_event_show do
+            Thread.new do      
+              sleep(0.25)
+              async_exec do
+                @swt_widget.setActive unless @swt_widget.isDisposed
+              end
             end
           end
         end
+        @display ||= @swt_widget.getDisplay
       end
 
       # Centers shell within monitor it is in
@@ -96,16 +102,14 @@ module Glimmer
       end
 
       def pack_same_size
-        minimum_size = @swt_widget.getMinimumSize
         bounds = @swt_widget.getBounds
-        @swt_widget.setMinimumSize(bounds.width, bounds.height)
-        listener = on_control_resized {
-          @swt_widget.setSize(bounds.width, bounds.height)
-          @swt_widget.setLocation(bounds.x, bounds.y)
-        }
+        width = @swt_widget.getBounds.width
+        height = @swt_widget.getBounds.height
+        x = @swt_widget.getBounds.x
+        y = @swt_widget.getBounds.y
         @swt_widget.pack
-        @swt_widget.removeControlListener(listener.swt_listener)
-        @swt_widget.setMinimumSize(minimum_size)
+        @swt_widget.setSize(width, height)
+        @swt_widget.setLocation(x, y)
       end
 
       def content(&block)

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -54,6 +54,12 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def dispose
+        swt_tab_item.setControl(nil)
+        swt_widget.dispose
+        swt_tab_item.dispose
+      end
     end
   end
 end

data/lib/glimmer/swt/tree_proxy.rb

@@ -0,0 +1,120 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TreeProxy < Glimmer::SWT::WidgetProxy
+      include Glimmer
+      
+      attr_reader :tree_editor, :tree_editor_text_proxy
+      attr_accessor :tree_properties
+      
+      def initialize(underscored_widget_name, parent, args)
+        super
+        @tree_editor = TreeEditor.new(swt_widget)
+        @tree_editor.horizontalAlignment = SWTProxy[:left]
+        @tree_editor.grabHorizontal = true
+        @tree_editor.minimumHeight = 20
+      end
+    
+      # Performs depth first search for tree items matching block condition
+      # If no condition block is passed, returns all tree items
+      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
+      def depth_first_search(&condition)
+        found = []
+        recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
+        found.to_java(TreeItem)
+      end
+      
+      # Returns all tree items including descendants
+      def all_tree_items
+        depth_first_search
+      end
+
+      def widget_property_listener_installers
+        super.merge({
+          Java::OrgEclipseSwtWidgets::Tree => {
+            selection: lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },        
+        })
+      end
+      
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_tree_item(before_write: nil, after_write: nil, after_cancel: nil)
+        edit_tree_item(swt_widget.getSelection.first, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+      end
+            
+      def edit_tree_item(tree_item, before_write: nil, after_write: nil, after_cancel: nil)
+        return if tree_item.nil?
+        content {
+          @tree_editor_text_proxy = text {
+            focus true
+            text tree_item.getText
+            action_taken = false
+            cancel = lambda {
+              @tree_editor_text_proxy.swt_widget.dispose
+              @tree_editor_text_proxy = nil
+              after_cancel&.call
+              @edit_in_progress = false
+            }
+            action = lambda { |event|
+              if !action_taken && !@edit_in_progress
+                action_taken = true
+                @edit_in_progress = true
+                new_text = @tree_editor_text_proxy.swt_widget.getText
+                if new_text == tree_item.getText
+                  cancel.call
+                else
+                  before_write&.call
+                  tree_item.setText(new_text)
+                  model = tree_item.getData
+                  model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
+                  edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
+                  swt_widget.showItem(edited_tree_item)
+                  @tree_editor_text_proxy.swt_widget.dispose
+                  @tree_editor_text_proxy = nil
+                  after_write&.call(edited_tree_item)
+                  @edit_in_progress = false
+                end
+              end
+            }
+            on_focus_lost(&action)
+            on_key_pressed { |key_event|
+              if key_event.keyCode == swt(:cr)
+                action.call(key_event)
+              elsif key_event.keyCode == swt(:esc)
+                cancel.call
+              end
+            }
+          }
+          @tree_editor_text_proxy.swt_widget.selectAll
+        }
+        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item);      
+      end
+      
+      private
+
+      def recursive_depth_first_search(tree_item, found, &condition)
+        return if tree_item.nil?
+        found << tree_item if condition.nil? || condition.call(tree_item)
+        tree_item.getItems.each do |child_tree_item|
+          recursive_depth_first_search(child_tree_item, found, &condition)
+        end
+      end
+      
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            depth_first_search {|ti| ti.getData == value}
+          end,
+        })
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -5,12 +5,29 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetListenerProxy
 
-      attr_reader :swt_listener
+      attr_reader :swt_widget, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
 
-      # TODO capture its widget and support unregistering 
-
-      def initialize(swt_listener)
+      def initialize(swt_widget:, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil)
+        @swt_widget = swt_widget
         @swt_listener = swt_listener
+        @widget_add_listener_method = widget_add_listener_method
+        @swt_listener_class = swt_listener_class
+        @swt_listener_method = swt_listener_method
+        @event_type = event_type
+        @swt_constant = swt_constant
+      end
+      
+      def widget_remove_listener_method
+        @widget_add_listener_method.sub('add', 'remove')
+      end      
+      
+      def unregister
+        # TODO consider renaming to deregister (and in Observer too)
+        if @event_type
+          @swt_widget.removeListener(@event_type, @swt_listener)
+        else
+          @swt_widget.send(widget_remove_listener_method, @swt_listener)
+        end
       end
     end
   end

data/lib/glimmer/swt/widget_proxy.rb

@@ -5,6 +5,8 @@ require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/data_binding/observable_widget'
 
+# TODO refactor to make file smaller and extract sub-widget-proxies out of this
+
 module Glimmer
   module SWT
     # Proxy for SWT Widget objects
@@ -23,6 +25,7 @@ module Glimmer
       DEFAULT_STYLES = {
         "text"        => [:border],
         "table"       => [:border],
+        "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
         "spinner"     => [:border],
         "styled_text" => [:border],
         "list"        => [:border, :v_scroll],
@@ -31,17 +34,17 @@ module Glimmer
       }
 
       DEFAULT_INITIALIZERS = {
-        "composite" => proc do |composite|
+        "composite" => lambda do |composite|
           composite.setLayout(GridLayout.new)
         end,
-        "table" => proc do |table|
+        "table" => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        "table_column" => proc do |table_column|
+        "table_column" => lambda do |table_column|
           table_column.setWidth(80)
         end,
-        "group" => proc do |group|
+        "group" => lambda do |group|
           group.setLayout(GridLayout.new)
         end,
       }
@@ -102,10 +105,24 @@ module Glimmer
         end
       end
 
+      def pack_same_size
+        bounds = @swt_widget.getBounds
+        listener = on_control_resized {
+          @swt_widget.setSize(bounds.width, bounds.height)
+          @swt_widget.setLocation(bounds.x, bounds.y)
+        }
+        if @swt_widget.is_a?(Composite)
+          @swt_widget.layout(true, true)
+        else
+          @swt_widget.pack(true)
+        end
+        @swt_widget.removeControlListener(listener.swt_listener)
+      end
+
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
-            :focus => proc do |observer|
+            :focus => lambda do |observer|
               on_focus_gained { |focus_event|
                 observer.call(true)
               }
@@ -115,12 +132,12 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtWidgets::Text => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
-            :caret_position => proc do |observer|
+            :caret_position => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
@@ -134,7 +151,21 @@ module Glimmer
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
-            :selection_count => proc do |observer|
+            :selection => lambda do |observer|
+              on_event_keydown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_keyup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mousedown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mouseup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end,
+            :selection_count => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
@@ -148,7 +179,7 @@ module Glimmer
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
-            :top_index => proc do |observer|
+            :top_index => lambda do |observer|
               @last_top_index = @swt_widget.getTopIndex
               on_paint_control { |event|
                 if @swt_widget.getTopIndex != @last_top_index
@@ -159,33 +190,33 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtCustom::StyledText => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
           },
           Java::OrgEclipseSwtWidgets::Button => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::MenuItem => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::Spinner => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
-          }
+          },
         }
       end
 
@@ -307,10 +338,12 @@ module Glimmer
       end
 
       def add_listener(underscored_listener_name, &block)
-        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
-        listener = listener_class.new(listener_method => block)
+        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
-        WidgetListenerProxy.new(listener)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
       end
 
       # Looks through SWT class add***Listener methods till it finds one for which
@@ -361,8 +394,10 @@ module Glimmer
 
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_widget.addListener(event_type, &block)
-        WidgetListenerProxy.new(@swt_widget.getListeners(event_type).last)
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        @swt_widget.addListener(event_type, &safe_block)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
 
       def widget_custom_attribute_mapping
@@ -395,7 +430,7 @@ module Glimmer
       end
 
       def property_type_converters
-        color_converter = proc do |value|
+        color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
           else
@@ -405,7 +440,7 @@ module Glimmer
         # TODO consider detecting type on widget method and automatically invoking right converter (e.g. :to_s for String, :to_i for Integer)
         @property_type_converters ||= {
           :background => color_converter,
-          :background_image => proc do |value|
+          :background_image => lambda do |value|
             if value.is_a?(String)
               if value.start_with?('uri:classloader')
                 value = value.sub(/^uri\:classloader\:\//, '')
@@ -426,7 +461,7 @@ module Glimmer
             end
           end,
           :foreground => color_converter,
-          :font => proc do |value|
+          :font => lambda do |value|
             if value.is_a?(Hash)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
@@ -434,17 +469,17 @@ module Glimmer
               value
             end
           end,
-          :items => proc do |value|
+          :items => lambda do |value|
             value.to_java :string
           end,
-          :text => proc do |value|
+          :text => lambda do |value|
             if swt_widget.is_a?(Browser)
               value.to_s
             else
               value.to_s
             end
           end,
-          :visible => proc do |value|
+          :visible => lambda do |value|
             !!value
           end,
         }

data/lib/glimmer/ui/custom_widget.rb

@@ -224,6 +224,10 @@ module Glimmer
       def dispose
         body_root.dispose
       end
+      
+      def method_missing(method, *args, &block)
+        body_root.send(method, *args, &block)
+      end
 
       private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.6
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -192,9 +192,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: JRuby Desktop UI DSL + Data-Binding native-UI cross-platform library
-  that enables productive and efficient authoring of desktop user-interfaces using
-  the robust Eclipse SWT library
+description: Desktop Development Library for Ruby
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -202,10 +200,10 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.markdown
+- README.md
 files:
 - LICENSE.txt
-- README.markdown
+- README.md
 - RUBY_VERSION
 - VERSION
 - bin/girb
@@ -292,6 +290,7 @@ files:
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
 - lib/glimmer/swt/widget_proxy.rb
 - lib/glimmer/ui/custom_shell.rb
@@ -327,5 +326,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop application development library
+summary: Desktop Development Library for Ruby
 test_files: []