glimmer-dsl-swt 4.23.1.0 → 4.23.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56654c61fc60401e8b1924bb81f474e5694ab7fc5c2c4a3b592932ccd348e0cb
-  data.tar.gz: daa2b79e4a10af9b093f21c6358eaaba1bb93e4dc7fbc8520c7c658ccc2b20f2
+  metadata.gz: 3c37ec4445272c326501c750fcbb49f51476bb3a65caca31c5d41d23e5c8ed7b
+  data.tar.gz: 78f436deedcd9bc89ff9123cc475510cb8276f26d1ff4f4baa835ea94c6a4d8c
 SHA512:
-  metadata.gz: a02f5c3157fdd1805902042d154f7f452258f56129905b7641ed7ea88a7178c6de64e36e07c8a99608a2db8f26094e90775ecc1ce1d1ed55062b573704a3f46e
-  data.tar.gz: 568739a4d7954ef9d12515dbe9e4a0b1ae60bb06887067a7636247e173da6dbe9ee0c9765c1e63a3d7be261ef552ad3cff7eae90be8317cac7a9f70634e98e39
+  metadata.gz: 16ca52eb3ce54d6483060ceb5c4ec9aa1d7faeb4cececd379fcef8d305e15dc12732a93ef06b6b373710f16155d9fff4cedd08c1bef49bdcf0c9573c60e56ebf
+  data.tar.gz: b656ab11c677463ecffe51591fb1eb06028f58d93c0037ee881d00f7c49815ad0f666e6cd91a02b7c373d9d2b30a58bd6501f7f93780a238b3654aedaf53bc3d

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # Change Log
 
+## 4.23.1.1
+
+- Switch order of buttons in Glimmer Meta-Sample to put Tutorial first
+- Make Glimmer Meta-Sample pull list of tutorials from GitHub to avoid needing to update gem when adding new tutorials
+
 ## 4.23.1.0
 
 - Upgrade to JRuby 9.3.4.0
 - Upgrade to glimmer 2.7.3
-- Add "Tutorial" button to Hello, Meta Sample! to show Youtube Video Tutorial
+- Add "Tutorial" button to Glimmer Meta-Sample to show Youtube Video Tutorial
 
 ## 4.23.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.23.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.23.1.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.23.1.0 includes [SWT 4.23](https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/), which was released on March 8, 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.23.1.1 includes [SWT 4.23](https://download.eclipse.org/eclipse/downloads/drops4/R-4.23-202203080310/), which was released on March 8, 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.
 
@@ -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.23.1.0
+jgem install glimmer-dsl-swt -v 4.23.1.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.23.1.0'
+gem 'glimmer-dsl-swt', '~> 4.23.1.1'
 ```
 
 And, then run:
@@ -384,7 +384,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.23.1.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.23.1.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.23.1.0
+4.23.1.1

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

@@ -146,17 +146,11 @@ module Glimmer
               @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
                 layout_data(:right, :fill, false, true)
 
-                text bind(self,
-                  :styled_text_proxy_text,
-                  read_only: true,
-                  on_read: lambda { |text_value|
-                    line_numbers_text_from(text_value)
-                  },
-                  after_read: lambda {
-                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel unless styled_text_proxy_top_pixel.nil?
-                  }
-                )
-                top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
+                text <= [self, :styled_text_proxy_text,
+                          on_read: lambda { |text_value| line_numbers_text_from(text_value) },
+                          after_read: lambda { @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel unless styled_text_proxy_top_pixel.nil? }
+                        ]
+                top_pixel <= [self, :styled_text_proxy_top_pixel]
                 font name: @font_name, height: OS.mac? ? 15 : 12
                 background color(:widget_background)
                 foreground :dark_blue
@@ -190,8 +184,8 @@ module Glimmer
 #             custom_widget_property_owner # TODO implement to route properties here without declaring method_missing
             layout_data :fill, :fill, true, true if lines
             
-            text bind(self, :styled_text_proxy_text) if lines
-            top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
+            text <=> [self, :styled_text_proxy_text] if lines
+            top_pixel <=> [self, :styled_text_proxy_top_pixel] if lines
             font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             left_margin 5
@@ -223,10 +217,10 @@ module Glimmer
               }
             end
             
-            on_modify_text { |event|
+            on_modify_text do |event|
               # clear unnecessary syntax highlighting cache on text updates, and do it async to avoid affecting performance
               new_text = event.data
-              async_exec {
+              async_exec do
                 unless @syntax_highlighting.nil?
                   lines = new_text.to_s.split("\n")
                   line_diff = @syntax_highlighting.keys - lines
@@ -234,10 +228,10 @@ module Glimmer
                     @syntax_highlighting.delete(line)
                   end
                 end
-              }
-            }
+              end
+            end
                   
-            on_line_get_style { |line_style_event|
+            on_line_get_style do |line_style_event|
               begin
                 styles = []
                 style_data = nil
@@ -259,7 +253,7 @@ module Glimmer
                 Glimmer::Config.logger.error {e.message}
                 Glimmer::Config.logger.error {e.full_message}
               end
-            }
+            end
           }
         end
         

data/samples/elaborate/meta_sample/tutorials.yml

@@ -0,0 +1,14 @@
+---
+Hello, World!: Mi5phsSdNAA
+Hello, Message Box!: N0sDcr0xp40
+Hello, Tab!: cMwlYZ78uaQ
+Hello, Layout!: dAVFR9Y_thY
+Hello, File Dialog!: HwZRgdvKIDo
+Hello, Label!: i1PFHr-F8fQ
+Hello, Text!: pOaYB43G2pg
+Login: C_vSvXH9ISw
+Hello, Canvas Shape Listeners!: PV13YE-43M4
+Hello, Styled Text!: ahs54DPmmso
+Hello, Code Text!: y0rNzMURnHY
+Hello, Tree!: M-ZOFyzbEKo
+Hello, Table!: 3zyyXq7WJwc

data/samples/elaborate/meta_sample.rb

@@ -21,8 +21,15 @@
 
 require 'glimmer-dsl-swt'
 require 'fileutils'
+require 'yaml'
+require 'net/http'
 
 class Sample
+  UNEDITABLE = ['meta_sample.rb'] + (OS.windows? ? ['calculator.rb', 'weather.rb'] : [])  # Windows StyledText does not support unicode characters found in certain samples
+  URL_TUTORIALS = 'https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-swt/master/samples/elaborate/meta_sample/tutorials.yml'
+  FILE_TUTORIALS = File.expand_path(File.join('meta_sample', 'tutorials.yml'), __dir__)
+  TUTORIALS = YAML.load_file(FILE_TUTORIALS)
+  
   class << self
     def glimmer_directory
       File.expand_path('../../..', __FILE__)
@@ -39,28 +46,35 @@ class Sample
         @ensured_glimmer_directory = true
       end
     end
+    
+    def tutorials
+      if remote_tutorials && !remote_tutorials.empty? && remote_tutorials != local_tutorials
+        remote_tutorials
+      else
+        local_tutorials
+      end
+    end
+    
+    def remote_tutorials
+      if @remote_tutorials.nil?
+        remote_tutorials_response = Net::HTTP.get_response(URI(URL_TUTORIALS))
+        raise "Error downloading remote tutorial list from #{URL_TUTORIALS} (defaulting to local list): HTTP status #{remote_tutorials_response.code} #{remote_tutorials_response.message}!" unless remote_tutorials_response.code.to_i.between?(200, 299)
+        remote_tutorials_yaml = remote_tutorials_response.body
+        @remote_tutorials = YAML.load(remote_tutorials_yaml)
+      end
+      @remote_tutorials
+    rescue => e
+      Glimmer::Config.logger.error e.full_message
+      nil
+    end
+    
+    def local_tutorials
+      TUTORIALS
+    end
   end
   
   include Glimmer::DataBinding::ObservableModel
-  
-  UNEDITABLE = ['meta_sample.rb'] + (OS.windows? ? ['calculator.rb', 'weather.rb'] : [])  # Windows StyledText does not support unicode characters found in certain samples
-  
-  TEACHABLE = {
-    'Hello, World!'                  => 'Mi5phsSdNAA',
-    'Hello, Message Box!'            => 'N0sDcr0xp40',
-    'Hello, Tab!'                    => 'cMwlYZ78uaQ',
-    'Hello, Layout!'                 => 'dAVFR9Y_thY',
-    'Hello, File Dialog!'            => 'HwZRgdvKIDo',
-    'Hello, Label!'                  => 'i1PFHr-F8fQ',
-    'Hello, Text!'                   => 'pOaYB43G2pg',
-    'Login'                          => 'C_vSvXH9ISw',
-    'Hello, Canvas Shape Listeners!' => 'PV13YE-43M4',
-    'Hello, Styled Text!'            => 'ahs54DPmmso',
-    'Hello, Code Text!'              => 'y0rNzMURnHY',
-    'Hello, Tree!'                   => 'M-ZOFyzbEKo',
-    'Hello, Table!'                  => '3zyyXq7WJwc',
-  }
-
+    
   attr_accessor :sample_directory, :file, :selected
   
   def initialize(file, sample_directory: )
@@ -105,7 +119,7 @@ class Sample
   end
   
   def tutorial
-    TEACHABLE[name]
+    Sample.tutorials[name]
   end
     
   def file_relative_path
@@ -273,20 +287,6 @@ class MetaSampleApplication
               height_hint 96
             }
             
-            button {
-              text 'Launch'
-              font height: 25
-              enabled <= [SampleDirectory, 'selected_sample.launchable']
-              
-              on_widget_selected do
-                begin
-                  SampleDirectory.selected_sample.launch(@code_text.text)
-                rescue LoadError, StandardError, SyntaxError => launch_error
-                  error_dialog(message: launch_error.full_message).open
-                end
-              end
-            }
-            
             button {
               text 'Tutorial'
               font height: 25
@@ -303,6 +303,20 @@ class MetaSampleApplication
               end
             }
             
+            button {
+              text 'Launch'
+              font height: 25
+              enabled <= [SampleDirectory, 'selected_sample.launchable']
+              
+              on_widget_selected do
+                begin
+                  SampleDirectory.selected_sample.launch(@code_text.text)
+                rescue LoadError, StandardError, SyntaxError => launch_error
+                  error_dialog(message: launch_error.full_message).open
+                end
+              end
+            }
+            
             button {
               text 'Reset'
               font height: 25

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.23.1.0
+  version: 4.23.1.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -564,6 +564,7 @@ files:
 - samples/elaborate/login.rb
 - samples/elaborate/mandelbrot_fractal.rb
 - samples/elaborate/meta_sample.rb
+- samples/elaborate/meta_sample/tutorials.yml
 - samples/elaborate/metronome.rb
 - samples/elaborate/parking.rb
 - samples/elaborate/parking/model/parking_floor.rb