glimmer-dsl-swt 4.24.1.0 → 4.24.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed904011b359114245bc0485e75023e038fa9b208a2a818aaba46b923e94f4c
-  data.tar.gz: 0a1d365ab053b96ee367716aedb6a1ecf4a2057fa051736709c1dce8f87914a1
+  metadata.gz: 3e57512ecadc776545bfb55c46f485fca1e00d759274ae9e23f657e5715e2e3b
+  data.tar.gz: e532e61f73196e3fc6bb6c843603423f8988fae82b0a5b57b803640d79bdc5de
 SHA512:
-  metadata.gz: bd0c8206fd81b65e1df28ed4cfa65c3926a79fa5481d7952b8c79b4e2fe8df3b05038ff8d027b5cd0e719fc2343daf9a90b4a70ef26e11919f90b7deb32fd76f
-  data.tar.gz: 2ba445c625a88d29701f7d7a37e92c6da6e3aa7c202eee23207ca7f723133fcc80484697d2e9e708b5b8c1c47fd19e9afeb1ba9f2e16746c6b7903719624489d
+  metadata.gz: 8a35b9ff6d5ed82a46dabd6ce20def1a0c685b910734159897be8486adae3fdf535f46f8212fbe0a3974f92b6fa5dc801bf92cb712cc73e41f502a6c7fe7a320
+  data.tar.gz: a217d6e154f2f0b59d85d0421363bd5bf27a3707cfbd72b05b2a9f3e223d10b2ed3ec34fda2376966576efaa8862eca34d7ddcd556357c64bbb8ec1d3594e811

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 4.24.1.3
+
+- Fix Windows freezing issue with warbler during packaging with the `glimmer package` command (caused by bundler included in JRuby on JDK18, fixed by installing latest bundler)
+
+## 4.24.1.2
+
+- Fix issue where you cannot call `tab_item_proxy.text` or `tab_item_proxy.text = 'new text'` because its `swt_widget` is the contained `composite`
+- Refactor Parking sample to clarify rotation details
+
+## 4.24.1.1
+
+- Fix `jar-dependencies` gem version to v0.4.1 in scaffolded applications to avoid issue encountered in newly released v0.4.2
+
 ## 4.24.1.0
 
 - Upgrade to JRuby 9.3.6.0

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.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.24.1.3
 ## 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.1.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.1.3 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).
 
@@ -281,7 +281,7 @@ Audio is supported via the Java Sound library in a cross-platform approach and v
 
 ### Remaining Challenges
 
-JRuby startup time is longer than that of CRuby, but has gotten a lot faster with newer CPUs, especially the latest Mac ARM64 processors. Thankfully, [there are work-arounds](https://andymaleh.blogspot.com/2021/03/glimmer-dsl-for-swt-41900-halved.html) that could make apps start as fast as instantly when needed.
+JRuby startup time is longer than that of CRuby, but has gotten a lot faster with newer CPUs, especially the latest Mac ARM64 processors (it is now about 2.5 seconds on Mac ARM64 processors like the M1 chip). Thankfully, [there are work-arounds](https://andymaleh.blogspot.com/2021/03/glimmer-dsl-for-swt-41900-halved.html) that could make apps start as fast as instantly when needed.
 
 Contributors who appreciate Glimmer's ultra-high productivity, maintainability, and extensibility might want to help report and resolve remaining challenges in its software architecture.
 
@@ -304,9 +304,9 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- 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)
+- JDK 18 is required / JDK 16 is the minimum except on Mac ARM64 where JDK 17 is the minimum (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.6.0 (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
+- JRuby 9.3.6.0 is required (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.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
 - Git (comes with Mac and Linux. Install on Windows: https://git-scm.com/download/win )
 
@@ -336,7 +336,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.1.0
+jgem install glimmer-dsl-swt -v 4.24.1.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -364,7 +364,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.1.0'
+gem 'glimmer-dsl-swt', '~> 4.24.1.3'
 ```
 
 And, then run:
@@ -387,7 +387,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.3
       
 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.1.0
+4.24.1.3

data/docs/reference/GLIMMER_SAMPLES.md

@@ -100,7 +100,7 @@ This brings up the [Glimmer Meta-Sample (The Sample of Samples)](/samples/elabor
 
 ![Glimmer Meta-Sample](/images/glimmer-meta-sample.png)
 
-You may edit the code of any sample before launching it by clicking on the "Launch" button. This helps you learn by experimenting with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button.
+You may edit the code of any sample before launching it by clicking on the "Launch" button. This helps you learn by experimenting with Glimmer GUI DSL syntax. To go back to original code, simply hit the "Reset" button. Also, for some samples, you can click the "Tutorial" button, and a YouTube video is played to guide you through learning the sample. The YouTube videos are played from the [Glimmer YouTube Channel](https://www.youtube.com/channel/UC5hzDE23HZXsZLAxYk2UJEw).
 
 Note that if you fail to run any sample through the Glimmer Meta-Sample for whatever reason, you could always run directly by cloning the project, running `bundle`, and then this command (drop the "bin" if you install the glimmer-dsl-swt gem instead):
 

data/lib/glimmer/rake_task/scaffold.rb

@@ -125,6 +125,7 @@ module Glimmer
         GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
         
           group :development do
+            gem 'jar-dependencies', '0.4.1'
             gem 'rspec', '~> 3.5.0'
             gem 'juwelier', '2.4.9'
             gem 'warbler', '2.0.5'
@@ -146,6 +147,7 @@ module Glimmer
           gem_name = file_name(app_name)
           gem_summary = human_name(app_name)
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -249,6 +251,7 @@ module Glimmer
             namespace = 'glimmer'
           end
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -316,6 +319,7 @@ module Glimmer
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
@@ -354,6 +358,7 @@ module Glimmer
           end
           
           return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install bundler --no-document" if OS.windows? # resolves freezing issue with warbler and bundler 2.2.29 included in JRuby
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
           return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -78,6 +78,23 @@ module Glimmer
         end
       end
       
+      ATTRIBUTES.each do |attribute|
+        define_method(attribute) do
+          auto_exec do
+            widget_proxy.send(attribute)
+          end
+        end
+        
+        define_method("#{attribute}=") do |value|
+          value.tap do
+            auto_exec do
+              widget_proxy.send("#{attribute}=", value)
+              shell_proxy.pack_same_size
+            end
+          end
+        end
+      end
+      
       def dispose
         auto_exec do
           swt_tab_item.setControl(nil)

data/samples/elaborate/meta_sample/tutorials.yml

@@ -23,3 +23,6 @@ Hello, Drag And Drop!: zJSG5ysow0M
 Hello, Canvas Drag And Drop!: e7taTbRrDAM
 Game Of Life: pDE79YRjOjs
 Hello, Canvas Data Binding!: PQ_Y8e5VeDo
+Hello, Canvas Path!: ThmNcXTldY8
+Hello, Canvas Transform!: ePIAF5EMsE0
+Parking: kw-6icVgDR4

data/samples/elaborate/parking.rb

@@ -26,10 +26,10 @@ require_relative 'parking/model/parking_presenter'
 class Parking
   include Glimmer::UI::CustomShell
     
+  CANVAS_LENGTH = 600
   FLOOR_COUNT = 4
   
   before_body do
-    @parking_spots = Model::ParkingSpot::LETTERS.clone
     @parking_presenter = Model::ParkingPresenter.new(FLOOR_COUNT)
   end
 
@@ -56,7 +56,6 @@ class Parking
         selection <=> [@parking_presenter, :selected_floor]
         
         on_widget_selected do
-          @parking_spots = Model::ParkingSpot::LETTERS.clone
           @canvas.dispose_shapes
           @canvas.content {
             parking_floor
@@ -65,8 +64,8 @@ class Parking
       }
       @canvas = canvas {
         layout_data {
-          width 600
-          height 600
+          width CANVAS_LENGTH
+          height CANVAS_LENGTH
         }
         
         background :dark_gray
@@ -77,42 +76,33 @@ class Parking
   }
   
   def parking_floor
-    parking_quad(67.5, 0, 125)
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(90)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(180)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(270)
-    }
+    parking_quad(67.5, 0, 125, 0)
+    parking_quad(67.5, 0, 125, 90)
+    parking_quad(67.5, 0, 125, 180)
+    parking_quad(67.5, 0, 125, 270)
   end
         
-  def parking_quad(location_x, location_y, length, &block)
+  def parking_quad(location_x, location_y, length, angle)
     distance = (1.0/3)*length
-    parking_spot(location_x, location_y, length, &block)
-    parking_spot(location_x + distance, location_y, length, &block)
-    parking_spot(location_x + 2*distance, location_y, length, &block)
-    parking_spot(location_x + 3*distance, location_y, length, &block)
+    parking_spot(location_x, location_y, length, angle)
+    parking_spot(location_x + distance, location_y, length, angle)
+    parking_spot(location_x + 2*distance, location_y, length, angle)
+    parking_spot(location_x + 3*distance, location_y, length, angle)
   end
       
-  def parking_spot(location_x, location_y, length, &block)
-    parking_spot_letter = @parking_spots.shift
+  def parking_spot(location_x, location_y, length, angle)
+    parking_spot_letter = next_parking_spot_letter
     height = length
     width = (2.0/3)*length
-    shape(location_x, location_y) { |the_shape|
+    
+    shape(location_x, location_y) {
       line_width (1.0/15)*length
       foreground :white
   
-      block&.call(the_shape)
-    
       rectangle(location_x, location_y, width, height) {
-        background <= [
-          @parking_presenter.floors[@parking_presenter.selected_floor - 1].parking_spots[parking_spot_letter],
-          :booked,
-          on_read: ->(b) {b ? :red : :dark_gray}
-        ]
+        background <= [parking_spot_for(parking_spot_letter), :booked,
+                        on_read: ->(value) {value ? :red : :dark_gray}
+                      ]
         
         text {
           x :default
@@ -123,7 +113,8 @@ class Parking
         
         on_mouse_up do
           begin
-            @parking_presenter.floors[@parking_presenter.selected_floor - 1].book!(parking_spot_letter)
+            selected_parking_floor.book!(parking_spot_letter)
+            
             message_box {
               text 'Parking Booked!'
               message "Floor #{@parking_presenter.selected_floor} Parking Spot #{parking_spot_letter} Is Booked!"
@@ -138,8 +129,29 @@ class Parking
       line(location_x, location_y, location_x + width, location_y)
       line(location_x + width, location_y, location_x + width, location_y + height)
       
+      # Rotate around the canvas center point
+      transform {
+        translation CANVAS_LENGTH/2.0, CANVAS_LENGTH/2.0
+        rotation angle
+        translation -CANVAS_LENGTH/2.0, -CANVAS_LENGTH/2.0
+      }
     }
   end
+  
+  def parking_spot_for(parking_spot_letter)
+    selected_parking_floor.parking_spots[parking_spot_letter]
+  end
+  
+  def selected_parking_floor
+    @parking_presenter.floors[@parking_presenter.selected_floor - 1]
+  end
+  
+  private
+  
+  def next_parking_spot_letter
+    @parking_spot_letters = Model::ParkingSpot::LETTERS.clone if @parking_spot_letters.nil? || @parking_spot_letters.empty?
+    @parking_spot_letters.shift
+  end
 end
   
 Parking.launch

data/samples/hello/hello_canvas_path.rb

@@ -52,6 +52,7 @@ class HelloCanvasPath
       
       canvas {
         layout_data :fill, :fill, true, true
+        
         background :white
         
         text('line', 15, 200) {

data/samples/hello/hello_canvas_transform.rb

@@ -19,12 +19,14 @@ shell {
         # also supports inversion, identity, shear, and multiplication {transform properties}
       }
     }
+    
     image(glimmer_logo, 0, 0) {
       transform {
         translation 110, 220
         scale 0.21, 0.21
       }
     }
+    
     image(glimmer_logo, 0, 0) {
       transform {
         translation 220, 220
@@ -32,6 +34,7 @@ shell {
         scale 0.21, 0.21
       }
     }
+    
     image(glimmer_logo, 0, 0) {
       transform {
         translation 220, 110

metadata

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