glimmer-dsl-swt 4.24.2.1 → 4.24.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcabd7cc1b4ab9c8c077fa97bb60d66f2da290707a49aed7d8cb49375fcee4d7
-  data.tar.gz: 5634d30ee03e7b20a7a4475c396b98e3bf0fdb1c063a4c42f0216a3ae4a119d6
+  metadata.gz: bec603d1fc189735e3334702098253e83b93e389785bc94305b174aa1d444219
+  data.tar.gz: c817d85d69f9118cd475fb331fc7fbc2ff7c318008d02ec9ee7667f8cc18a633
 SHA512:
-  metadata.gz: a1bef78b2591d3ef7e6b0217062769d4f0e9999a42458d69aab2e2d23afa05aafde87c236586f808b51a8ab66cc7e7b6cb48b092159e2dac0da73501cfb63fcd
-  data.tar.gz: bb449c8d49d5b8acdd2b71cecdbc37f44dbb33c09ab358fc90c1922c0de6cc38f788d5dbd72a5071d419c372c1db8bf7ca985dd0e798d2a9db0e90f241cda5b2
+  metadata.gz: ab1d611fad1cabafbd7cd2071aa0cb0603bd90e29a5796573e77b762ad4969b9b5add2da4306b89afb7d9b86393534bf514a2e54f1409d68319224d563592581
+  data.tar.gz: 66d6572c4d931df7c52fa5623bd4d0523eee7d906932a537e0936a27849e137269005db210609fbcd3c2d0e7726a4ff8d2b35dc315da1bfd019fee231366077a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.24.2.2
+
+- Upgrade to jruby-9.3.7.0
+- `code_text` can use external Rouge custom themes similar to `ext/rouge/themes/glimmer_dark`. When in Dark Mode, the specified custom theme must have the word 'dark' in its name to avoid forcing the `glimmer_dark` theme instead as per default behavior.
+- Look for 'Monospace' and 'Liberation Mono' fonts on Linux if 'Courier' is not available
+- Fix issue discovered in Red Hat Linux related to ImageExpression getting loaded before others and missing `require 'glimmer/dsl/parent_expression'` statement (issue does not happen in other operating systems that load classes in a different order)
+
 ## 4.24.2.1
 
 - Fix mistake of changing all themes to dark themes in Hello, Code Text! (not it works just like before)

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.2.1
+# [<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.2.2
 ## 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)
@@ -21,7 +21,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.2.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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.2.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.
 
 **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,9 +306,9 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- 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)
+- JDK 18 is required / JDK 16 is minimum except on Mac ARM64 where JDK 17 is 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 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))
+- JRuby 9.3.7.0 is required / JRuby 9.3.6.0 is minimum (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.7.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 )
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.2.1
+jgem install glimmer-dsl-swt -v 4.24.2.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,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.2.1'
+gem 'glimmer-dsl-swt', '~> 4.24.2.2'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.2
       
 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.6.0
+jruby-9.3.7.0

data/VERSION

@@ -1 +1 @@
-4.24.2.1
+4.24.2.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -4847,10 +4847,12 @@ Keep in mind that if the text grows and required a wider line numbers area, it g
 (default: `'glimmer'`)
 
 Changes syntax color highlighting theme. Can be one of the following:
-- glimmer
-- glimmer_dark (always applied when OS is in dark mode)
-- github
-- pastie
+- `'glimmer'`
+- `'glimmer_dark'` (always applied when OS is in Dark Mode unless you set another custom theme that has the word `dark` in its name, see more details below)
+- `'github'`
+- `'pastie'`
+
+Or you can simply implement a new [Rouge](https://github.com/rouge-ruby/rouge) **custom theme** just like the [github](https://github.com/rouge-ruby/rouge/blob/master/lib/rouge/themes/github.rb) theme or the glimmer theme: [lib/ext/rouge/themes/glimmer.rb](/lib/ext/rouge/themes/glimmer.rb)
 
 **language**
 (default: `'ruby'`)

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

@@ -19,9 +19,9 @@
 # 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/static_expression'
-require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 require 'glimmer/swt/dialog_proxy'
 

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

@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/display_proxy'
 
 module Glimmer

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

@@ -21,6 +21,7 @@
 
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/image_proxy'
 require 'glimmer/swt/widget_proxy'
 

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

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 require 'glimmer/swt/message_box_proxy'
 require 'glimmer/swt/swt_proxy'
@@ -38,7 +38,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
           potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
-          parent = nil          
+          parent = nil
           if potential_parent.is_a?(Shell)
             args.shift
             parent = potential_parent

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

@@ -20,8 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
 require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
 
 module Glimmer

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

@@ -41,6 +41,7 @@ module Glimmer
         end
         
         REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
+        FONT_NAMES_PREFERRED = ['Consolas', 'Courier', 'Monospace', 'Liberation Mono']
         
         # TODO support auto language detection
               
@@ -126,7 +127,7 @@ module Glimmer
           require 'ext/rouge/themes/glimmer'
           require 'ext/rouge/themes/glimmer_dark'
           @dark_mode = Java::OrgEclipseSwtWidgets::Display.system_dark_theme?
-          self.theme = 'glimmer_dark' if @dark_mode
+          self.theme = 'glimmer_dark' if @dark_mode && !theme.downcase.include?('dark')
           @dark_theme = theme.include?('dark')
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
           select_best_font
@@ -325,8 +326,9 @@ module Glimmer
         
         def select_best_font_name
           all_font_names = display.get_font_list(nil, true).map(&:name)
-          @font_name ||= 'Consolas' if all_font_names.include?('Consolas')
-          @font_name ||= 'Courier' if all_font_names.include?('Courier')
+          FONT_NAMES_PREFERRED.each do |font_name|
+            @font_name ||= font_name if all_font_names.include?(font_name)
+          end
           @font_name ||= all_font_names.find {|font_name| font_name.downcase.include?('mono')}
           @font_name
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.2.1
+  version: 4.24.2.2
 platform: ruby
 authors:
 - Andy Maleh