glimmer-dsl-swt 4.24.0.0 → 4.24.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a25afed6b0f4010952764759059e90443cce1bd9f88c44bbd2d547321716413
-  data.tar.gz: f60fc6cbfb12a5119480730ee0024dd445ef2821bdcb8a029eaf7fcc8f0aba2d
+  metadata.gz: c637efeb5ad59518aa1929c81cd53967df42d6a2085ae777cfb366ddf7022418
+  data.tar.gz: c6f2aa15e48d2f0cfae428894ef85fb8a251f8574a0df55b9a0ade3a4a8d3b43
 SHA512:
-  metadata.gz: e13cf0dd856101fee5858774a859ef463ca03a9e032f5923e69d8f0333cc62624631a35bdfd19203f0b27347a983be18708474452ba3f195616610de7b77c8e8
-  data.tar.gz: 714d7c2457fb33a5da576c1f0c5d1e7b04f459a159d0c132ff2abf4af064bfba0db5791ec5cc2509933cbc375449b30572c9f61d5dfea3f86a80641ba4bc2512
+  metadata.gz: dca42a5d1f7f78bdb866995c66aacc164b9b44881a16c5cca5949b88b2b4948700860fa27fdf168c21ef4ab6dd90b2d053282070bddb1693256656683e1d970e
+  data.tar.gz: b159b74c670e2363335043d538c188af59c3fd8da288340c6f47feecbad9cfb27cb01a54bd0e318e5cd83290290c9f8832c6171e0bd8b24ea14fffbc9dabdfdf

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.24.0.1
+
+- Support declaratively setting shape data via `data` property
+- Update Hello, Canvas Drag and Drop! sample to set data in draggable shapes for a more sophisticated drag and drop example
+- Refactor Game of Life sample
+- Hello, Drag and Drop!, Hello, Canvas Drag and Drop!, and Game of Life Video Tutorials added to Glimmer Meta-Sample
+
 ## 4.24.0.0
 
 - Upgrade to SWT 4.24

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.24.0.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.24.0.1
 ## 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)
@@ -19,7 +19,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.0.0 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.0.1 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
 
 **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. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -301,7 +301,7 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 18 is recommended / JDK 16 is the minimum needed (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
+- JDK 18 is recommended / Minimum is JDK 16 on x64 platforms and Linux AARCH64, and JDK 17 on Mac ARM64 (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
 - [RVM](http://rvm.io) on Mac & Linux (not needed on Windows)
 - JRuby 9.3.4.0 (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.4.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
 - SWT 4.24 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem). Note that SWT supports ARM64/AARCH64 on Mac and Linux since version 4.20
@@ -333,7 +333,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.0.0
+jgem install glimmer-dsl-swt -v 4.24.0.1
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -361,7 +361,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.24.0.0'
+gem 'glimmer-dsl-swt', '~> 4.24.0.1'
 ```
 
 And, then run:
@@ -384,7 +384,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.0.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.0.1
       
 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.24.0.0
+4.24.0.1

data/lib/glimmer/swt/custom/shape.rb

@@ -562,7 +562,8 @@ module Glimmer
         end
         
         def has_attribute?(attribute_name, *args)
-          self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
+          attribute_name == 'data' or
+            self.class.gc_instance_methods.include?(attribute_setter(attribute_name)) or
             parameter_name?(attribute_name) or
             (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter(attribute_name), super: true))
         end
@@ -577,7 +578,9 @@ module Glimmer
           property_change = nil
           ruby_attribute_getter_name = ruby_attribute_getter(attribute_name)
           ruby_attribute_setter_name = ruby_attribute_setter(attribute_name)
-          if parameter_name?(attribute_name)
+          if attribute_name == 'data'
+            set_data(*args)
+          elsif parameter_name?(attribute_name)
             return if ruby_attribute_getter_name == (args.size == 1 ? args.first : args)
             set_parameter_attribute(ruby_attribute_getter_name, *args)
           elsif (respond_to?(attribute_name, super: true) and respond_to?(ruby_attribute_setter_name, super: true))

data/samples/elaborate/game_of_life.rb

@@ -48,7 +48,7 @@ class GameOfLife
         (0...HEIGHT).each do |row_index|
           (0...WIDTH).each do |column_index|
             rectangle(column_index*CELL_WIDTH, row_index*CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT) {
-              background <= [@grid.cell_rows[row_index][column_index], "alive", on_read: ->(a) {a ? :black : :white}]
+              background <= [@grid.cell_rows[row_index][column_index], :alive, on_read: ->(a) {a ? :black : :white}]
               
               on_mouse_down do
                 @grid.cell_rows[row_index][column_index].toggle_aliveness!
@@ -59,7 +59,7 @@ class GameOfLife
               end
 
               on_mouse_move do
-                @grid.cell_rows[row_index][column_index].alive = true if @drag_detected
+                @grid.cell_rows[row_index][column_index].live! if @drag_detected
               end
 
               on_mouse_up do

data/samples/elaborate/meta_sample/tutorials.yml

@@ -19,3 +19,6 @@ Hello, Date Time!: MpXbPEMUrns
 Hello, Sash Form!: F7j2TTpbX6s
 Hello, Cursor!: 4AYlo8n3WFc
 Hello, Tray Item!: VYXgIr5zxMM
+Hello, Drag And Drop!: zJSG5ysow0M
+Hello, Canvas Drag And Drop!: e7taTbRrDAM
+Game Of Life: pDE79YRjOjs

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2022 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer-dsl-swt'
 
 class HelloCanvasDragAndDrop
@@ -27,7 +48,9 @@ class HelloCanvasDragAndDrop
         background :white
         
         10.times do |n|
-          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+          value = rand(10)
+          oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+            data 'value', value
             background rgb(255, 165, 0)
             
             # declare shape as a drag source, which unlike `drag_and_move true`, it means the shape now
@@ -38,6 +61,12 @@ class HelloCanvasDragAndDrop
             oval(0, 0) {
               foreground :black
             }
+            
+            text {
+              x :default
+              y :default
+              string value.to_s
+            }
           }
         end
                                                           
@@ -70,7 +99,7 @@ class HelloCanvasDragAndDrop
               @number_shape = text {
                 x :default
                 y :default
-                string (ball_count + 1).to_s
+                string (ball_count + drop_event.dragged_shape.get_data('value')).to_s
               }
             }
             drop_event.dragged_shape.dispose

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.0.0
+  version: 4.24.0.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1.cr2
+  name: jruby-openssl
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1.cr2
 description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI
   cross-platform desktop development library written in JRuby, an OS-threaded faster
   JVM version of Ruby. It includes SWT 4.22 (released November 24, 2021). Glimmer's