glimmer-dsl-swt 4.24.0.2 → 4.24.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4fbbf7e487d4ee6667d7b9b30833ce767ae9c14c0cfd90c893f40269a8d8c2e
-  data.tar.gz: 49750266d23f5a59e4123aaa02b9864c6907366e6be70dcac69b0ef5c96aabc7
+  metadata.gz: 4ed904011b359114245bc0485e75023e038fa9b208a2a818aaba46b923e94f4c
+  data.tar.gz: 0a1d365ab053b96ee367716aedb6a1ecf4a2057fa051736709c1dce8f87914a1
 SHA512:
-  metadata.gz: 36d166223378ffa459eb42d2154432be06c4efe7305ffeaa34683476fa08267bf6dd94c2ba5056a8b534fbdedbeda8aa5702a6f5bb6baec593461d9fb2f66547
-  data.tar.gz: 55736839c473741195ac69ac63ed0e01efebb6d9c3867f77756172e8b636fa8f1c69c97a7fe46827112a72cd0c73b11cabfa2df11c65a1ee4886307b98d1faff
+  metadata.gz: bd0c8206fd81b65e1df28ed4cfa65c3926a79fa5481d7952b8c79b4e2fe8df3b05038ff8d027b5cd0e719fc2343daf9a90b4a70ef26e11919f90b7deb32fd76f
+  data.tar.gz: 2ba445c625a88d29701f7d7a37e92c6da6e3aa7c202eee23207ca7f723133fcc80484697d2e9e708b5b8c1c47fd19e9afeb1ba9f2e16746c6b7903719624489d

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 # Change Log
 
+## 4.24.1.0
+
+- Upgrade to JRuby 9.3.6.0
+- Speed up app scaffolding by dropping packaging from the scaffolding steps as there is no point in packaging an unfinished product
+- Refactor/simplify Hello, Canvas Path!
+
 ## 4.24.0.2
 
-- Extend Hello, Canvas Data-Binding! to support quadratic bezier curves, cubic bezier curves, and Drag & Drop of endpoints / control points
+- Update Hello, Canvas Data-Binding! to support quadratic bezier curves, cubic bezier curves, and Drag & Drop of endpoints / control points
 - Fix issue with data-binding `quad` & `cubic` path shape `point_array`
 
 ## 4.24.0.1

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.2
+# [<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
 ## 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.2 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.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.
 
 **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).
 
@@ -306,7 +306,7 @@ https://www.eclipse.org/swt/faq.php
 
 - 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))
+- 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))
 - 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.0.2
+jgem install glimmer-dsl-swt -v 4.24.1.0
 ```
 
 `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.0.2'
+gem 'glimmer-dsl-swt', '~> 4.24.1.0'
 ```
 
 And, then run:
@@ -387,7 +387,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.0.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.3.4.0
+jruby-9.3.6.0

data/VERSION

@@ -1 +1 @@
-4.24.0.2
+4.24.1.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1077,7 +1077,7 @@ You may check out a more full-fledged example in [Hello, Sash Form!](/docs/refer
 
 ![Hello Browser](/images/glimmer-hello-browser.png)
 
-Glimmer supports the [SWT Browser widget](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html), which can load URLs or render HTML. It can even be instrumented with JavaScript when needed (though highly discouraged since it defeats the purpose of using Ruby except in very rare cases like leveraging a pre-existing web codebase in a desktop app).
+Glimmer DSL for SWT includes a basic [SWT Browser widget](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html), which can load URLs or render HTML. It supports WebKit, IE, and Edge browsers out of the box. Its JavaScript engine can even be instrumented with Ruby code if needed.
 
 Example loading a URL (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 
@@ -1114,7 +1114,11 @@ shell {
 
 This relies on Glimmer's [Multi-DSL Support](#multi-dsl-support) for building the HTML text using [Glimmer XML DSL](https://github.com/AndyObtiva/glimmer-dsl-xml).
 
-Learn more at the [SWT Browser widget](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html) API.
+Learn more at: 
+- [SWT Browser API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html)
+- [SWT Browser FAQ](https://www.eclipse.org/swt/faq.php#whatisbrowser).
+
+The built-in basic SWT `browser` widget might not satisfy all your needs. If so, consider the advanced 3rd-party browser widget [JxBrowser](https://www.teamdev.com/jxbrowser), which utilizes Google Chromium.
 
 ### Widget Styles
 
@@ -3562,7 +3566,7 @@ As they say, there are many ways to skin a cat! This is in line with the Ruby wa
 
 ### Canvas Path DSL
 
-Unlike common imperative GUI graphing toolkits, Glimmer enables declarative rendering of paths with the new Canvas Path DSL (Early Alpha) via the new `path { }` keyword and by nesting one of the following path segment keywords underneath:
+Unlike common imperative GUI graphing toolkits, Glimmer enables declarative rendering of paths with the Canvas Path DSL via the new `path { }` keyword and by nesting one of the following path segment keywords underneath:
 - `point(x1, y1)`: renders a Point (Dot) as part of a path.
 - `line(x1, y1, x2=nil, y2=nil)`: renders a Line as part of a path. If you drop x2, y2, it joins to the previous point automatically. You may repeat for a series of lines forming a curve.
 - `quad(x1, y1, x2, y2, x3=nil, y3=nil)`: renders a Quadratic Bezier Curve. If you drop x3 and y3, it joins to the previous point automatically.

data/lib/glimmer/rake_task/scaffold.rb

@@ -195,16 +195,12 @@ module Glimmer
             system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
           end
           write 'spec/spec_helper.rb', spec_helper_file
-          if OS.windows?
-            system "glimmer package" # TODO handle Windows with batch file
-            system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
+          if OS.mac?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
+          elsif OS.linux?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
-            if OS.mac?
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-            else
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
-            end
+            system "glimmer run"
           end
         end
     
@@ -294,16 +290,12 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          if OS.windows?
-            system "glimmer package" # TODO handle windows properly with batch file
-            system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
+          if OS.mac?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
+          elsif OS.linux?
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
-            if OS.mac?
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n JRUBY_OPTS=\"$JRUBY_OPTS -J-XstartOnFirstThread\" glimmer run\n'"
-            else
-              system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer run\n'"
-            end
+            system "glimmer run"
           end
           puts "Finished creating #{gem_name} Ruby gem."
           puts 'Edit Rakefile to configure gem details.'

data/samples/elaborate/meta_sample/tutorials.yml

@@ -22,3 +22,4 @@ Hello, Tray Item!: VYXgIr5zxMM
 Hello, Drag And Drop!: zJSG5ysow0M
 Hello, Canvas Drag And Drop!: e7taTbRrDAM
 Game Of Life: pDE79YRjOjs
+Hello, Canvas Data Binding!: PQ_Y8e5VeDo

data/samples/hello/hello_canvas_path.rb

@@ -20,101 +20,105 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer-dsl-swt'
-        
-include Glimmer
-  
-shell {
-  grid_layout {
-    margin_width 0
-    margin_height 0
-    margin_top 5
-  }
-  text 'Hello, Canvas Path!'
-  minimum_size 800, 700
-  
-  @button = button {
-    layout_data :center, :center, true, false
-    text 'Regenerate'
-    enabled false
-    
-    on_widget_selected do
-      @regenerate = true
-      @button.enabled = false
-    end
-  }
-  canvas {
-    layout_data :fill, :fill, true, true
-    background :white
-    
-    text('line', 15, 200) {
-      foreground :red
-    }
-    @path1 = path {
-      antialias :on
-      foreground :red
-    }
-    
-    text('quad', 15, 300) {
-      foreground :dark_green
-    }
-    @path2 = path {
-      antialias :on
-      foreground :dark_green
-    }
+
+class HelloCanvasPath
+  include Glimmer::UI::Application
     
-    text('cubic', 15, 400) {
-      foreground :blue
-    }
-    @path3 = path {
-      antialias :on
-      foreground :blue
+  after_body do
+    regenerate
+  end
+  
+  body {
+    shell {
+      grid_layout {
+        margin_width 0
+        margin_height 0
+        margin_top 5
+      }
+      
+      text 'Hello, Canvas Path!'
+      minimum_size 800, 700
+      
+      @button = button {
+        layout_data :center, :center, true, false
+        
+        text 'Regenerate'
+        enabled false
+        
+        on_widget_selected do
+          regenerate
+        end
+      }
+      
+      canvas {
+        layout_data :fill, :fill, true, true
+        background :white
+        
+        text('line', 15, 200) {
+          foreground :red
+        }
+        @path1 = path {
+          antialias :on
+          foreground :red
+        }
+        
+        text('quad', 15, 300) {
+          foreground :dark_green
+        }
+        @path2 = path {
+          antialias :on
+          foreground :dark_green
+        }
+        
+        text('cubic', 15, 400) {
+          foreground :blue
+        }
+        @path3 = path {
+          antialias :on
+          foreground :blue
+        }
+      }
+      
+      on_widget_disposed do
+        # safe to kill thread as data is in memory only, so no risk of data loss
+        @thread.kill
+      end
     }
   }
   
-  on_swt_show do
-    @regenerate = true
+  def regenerate
     @thread = Thread.new do
-      loop do
-        if @regenerate
-          @regenerate = false
-          @path1.clear
-          @path2.clear
-          @path3.clear
-          y1 = y2 = y3 = 300
-          700.times.each do |x|
-            x += 55
-            x1 = x - 2
-            x2 = x - 1
-            x3 = x
-            y1 = y3
-            y2 = y1
-            y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
-            @path1.content {
-              line(x1, y1 - 100)
-            }
-            if x % 2 == 0
-              @path2.content {
-                quad(x1, y1, x2, y2)
-              }
-            end
-            if x % 3 == 0
-              @path3.content {
-                cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
-              }
-            end
-            sleep(0.01)
-          end
-          @button.enabled = true
+      @button.enabled = false
+      @path1.clear
+      @path2.clear
+      @path3.clear
+      y1 = y2 = y3 = 300
+      700.times.each do |x|
+        x += 55
+        x1 = x - 2
+        x2 = x - 1
+        x3 = x
+        y1 = y3
+        y2 = y1
+        y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
+        @path1.content {
+          line(x1, y1 - 100)
+        }
+        if x % 2 == 0
+          @path2.content {
+            quad(x1, y1, x2, y2)
+          }
         end
-        sleep(0.1)
+        if x % 3 == 0
+          @path3.content {
+            cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
+          }
+        end
+        sleep(0.01)
       end
-            
+      @button.enabled = true
     end
-    
   end
-  
-  on_widget_disposed do
-    @thread.kill # safe to kill since data is in memory only
-  end
-  
-}.open
+end
+        
+HelloCanvasPath.launch

metadata

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