glimmer-dsl-swt 4.20.1.0 → 4.20.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9779424dd8dd9fca77f9252ae072a455d2d74bf628952d02650a462bbc1021e
-  data.tar.gz: 1894fba96b987a4a6b7b3c6e65f5d8088396863e076deb69d90871aeff233229
+  metadata.gz: 833c707b308578391e1ce4676ed517d6297250cb9272f6f3c7539c2b538403c6
+  data.tar.gz: 9f9bc412c837ba8389333587638638b95534634464f5084e9471de028747dc9e
 SHA512:
-  metadata.gz: 4caa0f594b722c39b0ea2586be80a2b52362fac9c6ad0bcf0c53581525af4b96ded22090c681271795503f7f99094dc1721ef6eebdbe1d314a45ef9c9ff3815c
-  data.tar.gz: 67472ac71632e32e4ec6dd903a88895b2e73c0c6ce00f7ab40856f4cceda34b1e36c7ac326ba5dc6a5fe81c57645a3270e33676e02cd26f164f520e0a2ade335
+  metadata.gz: f46c2d58b167cd75c807fce955eae9a1abc6895414311b93fdf6950d54c8fc14f15384dd8a19bfef0f2503e2f732c73e79e342e9d03d7f9a69990844dacc9c81
+  data.tar.gz: 9e41adb252a09d397cb1b81cf91c9a37e89c95fdbf00b74134d38baaaac920ed74396df92b926e593b5ba4ae9005a7b43b3d64f4aec5576ef0ae237c0de35db2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 4.20.2.0
+
+- Shine data-binding syntax support for `tree` widget
+- Use Shine syntax in Hello, Tree! sample
+
 ### 4.20.1.0
 
 - Shine data-binding syntax support for `table` widget

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.1.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.2.0
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.1.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.2.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still an early alpha, so default back to `bind` whenever needed).
 
@@ -341,7 +341,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.1.0
+jgem install glimmer-dsl-swt -v 4.20.2.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -369,7 +369,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.20.1.0'
+gem 'glimmer-dsl-swt', '~> 4.20.2.0'
 ```
 
 And, then run:
@@ -390,7 +390,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.1.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.2.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.1.0
+4.20.2.0

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -34,10 +34,10 @@ module Glimmer
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
       
-      def initialize(parent, model_binding, tree_properties)
+      def initialize(parent, model_binding, tree_properties = nil)
         @tree = parent
         @model_binding = model_binding
-        @tree_properties = [tree_properties].flatten.first.to_h
+        @tree_properties = @model_binding.binding_options[:tree_properties] || @model_binding.binding_options[:tree_attributes] || [tree_properties].compact.flatten.first.to_h
         if @tree.respond_to?(:tree_properties=)
           @tree.tree_properties = @tree_properties
         else # assume custom widget

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

@@ -36,7 +36,7 @@ module Glimmer
             block.nil? and
             (
               (parent.respond_to?(:set_attribute) and parent.respond_to?(:has_attribute?) and parent.has_attribute?(keyword)) or
-              (parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(Table))
+              (parent.respond_to?(:swt_widget) and (parent.swt_widget.is_a?(Table) or parent.swt_widget.is_a?(Tree)))
             ) and
             !parent.is_a?(Glimmer::UI::CustomWidget) and
             !parent.is_a?(Glimmer::UI::CustomShape) and

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

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -30,15 +30,20 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def can_interpret?(parent, keyword, *args, &block)
-          initial_condition = ((keyword == "items") and block.nil? and parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(Tree))
-          return false unless initial_condition
-          raise Glimmer::Error, 'Tree items args must be 2' unless args.size == 2
-          raise Glimmer::Error, 'Tree items first arg must be a bind expression' unless args[0].is_a?(DataBinding::ModelBinding)
-          raise Glimmer::Error, 'Tree items data-binding initial value must not be an array yet a single item representing tree root' unless !args[0].evaluate_property.is_a?(Array)
-          raise Glimmer::Error, 'Tree items second arg must be an array' unless args[1].is_a?(Array)
-          raise Glimmer::Error, 'Tree items second arg must not be empty' unless !args[1].empty?
-          raise Glimmer::Error, 'Tree items second arg array elements must be of type hash' unless args[1].first.is_a?(Hash)
-          true
+          keyword == 'items' and
+            block.nil? and
+            parent.respond_to?(:swt_widget) and
+            parent.swt_widget.is_a?(Tree) and
+            args.size.between?(1, 2)
+          # TODO delete these checks if they are too granular
+#           return false unless initial_condition
+#           raise Glimmer::Error, 'Tree items args must be 1 or 2' unless args.size.between?(1, 2)
+#           raise Glimmer::Error, 'Tree items first arg must be a bind expression' unless args[0].is_a?(DataBinding::ModelBinding)
+#           raise Glimmer::Error, 'Tree items data-binding initial value must not be an array yet a single item representing tree root' unless !args[0].evaluate_property.is_a?(Array)
+#           raise Glimmer::Error, 'Tree items second arg must be an array' unless args[1].is_a?(Array)
+#           raise Glimmer::Error, 'Tree items second arg must not be empty' unless !args[1].empty?
+#           raise Glimmer::Error, 'Tree items second arg array elements must be of type hash' unless args[1].first.is_a?(Hash)
+#           true
         end
   
         def interpret(parent, keyword, *args, &block)

data/samples/elaborate/tetris.rb

@@ -102,14 +102,14 @@ class Tetris
   }
   
   after_body {
-    @game_over_observer = observe(@game, :game_over) do |game_over|
+    observe(@game, :game_over) do |game_over|
       if game_over
         show_high_score_dialog
       else
         start_moving_tetrominos_down
       end
     end
-    @show_high_scores_observer = observe(@game, :show_high_scores) do |show_high_scores|
+    observe(@game, :show_high_scores) do |show_high_scores|
       if show_high_scores
         show_high_score_dialog
       else

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -40,7 +40,7 @@ class Tetris
             type :vertical
             center true
           }
-          text 'Tetris'
+          text 'Glimmer Tetris'
           
           tetris_menu_bar(game: game)
           

data/samples/hello/hello_tree.rb

@@ -314,8 +314,8 @@ class HelloTree
             margin_height 5
           }
           @tree = tree {
-            items bind(Employee, :ceo), tree_properties(children: :subordinates, text: :to_s)
-            selection bind(Employee, :selected_employee)
+            items <= [Employee, :ceo, tree_properties: {children: :subordinates, text: :to_s}]
+            selection <=> [Employee, :selected_employee]
           }
         }
         
@@ -329,7 +329,7 @@ class HelloTree
           }
           text {
             layout_data(:fill, :center, true, false)
-            text bind(Employee, "selected_employee.first_name")
+            text <=> [Employee, "selected_employee.first_name"]
             font height: 16
           }
                   
@@ -340,7 +340,7 @@ class HelloTree
           }
           text {
             layout_data(:fill, :center, true, false)
-            text bind(Employee, "selected_employee.last_name")
+            text <=> [Employee, "selected_employee.last_name"]
             font height: 16
           }
                   
@@ -351,7 +351,7 @@ class HelloTree
           }
           combo {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.position")
+            selection <=> [Employee, "selected_employee.position"]
             font height: 16
           }
                   
@@ -373,7 +373,7 @@ class HelloTree
             spinner {
               maximum 999_999
               minimum 0
-              selection bind(Employee, "selected_employee.salary")
+              selection <=> [Employee, "selected_employee.salary"]
               font height: 16
             }
           }
@@ -385,7 +385,7 @@ class HelloTree
           }
           combo(:read_only) {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.health_insurance")
+            selection <=> [Employee, "selected_employee.health_insurance"]
             font height: 16
           }
                                                   
@@ -396,7 +396,7 @@ class HelloTree
           }
           combo(:read_only) {
             layout_data(:fill, :center, true, false)
-            selection bind(Employee, "selected_employee.desk_location")
+            selection <=> [Employee, "selected_employee.desk_location"]
             font height: 16
           }
               
@@ -414,7 +414,7 @@ class HelloTree
             spinner {
               maximum 100
               minimum 0
-              selection bind(Employee, "selected_employee.sales_bonus_percentage")
+              selection <=> [Employee, "selected_employee.sales_bonus_percentage"]
               font height: 16
             }
             label {
@@ -441,7 +441,7 @@ class HelloTree
             spinner {
               maximum 999_999
               minimum 0
-              selection bind(Employee, "selected_employee.merit_bonus")
+              selection <=> [Employee, "selected_employee.merit_bonus"]
               font height: 16
             }
           }
@@ -467,7 +467,7 @@ class HelloTree
                 maximum 999_999_00
                 minimum 0
                 increment 100
-                selection bind(Employee, "selected_employee.#{attribute}", on_read: ->(v) {v.to_f * 100}, on_write: ->(v) {v.to_f / 100})
+                selection <=> [Employee, "selected_employee.#{attribute}", on_read: ->(v) {v.to_f * 100}, on_write: ->(v) {v.to_f / 100}]
                 font height: 16
               }
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.1.0
+  version: 4.20.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement