glimmer-dsl-swt 4.20.13.15 → 4.20.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f16ea275e3ce37889ed445d6cc3ab42bbcb7068eb1e57f51017d1625ac2582
-  data.tar.gz: d5dc4c387caa917f1c20db29cbf27c06148736b52bc7bd4cfb63d75854e866f6
+  metadata.gz: ff80eeabdc2f2185c4c15a9a02bb3d6d06596f5bc803fa6badbdf6a22a9c6dec
+  data.tar.gz: 7b86a2fb40bd3423e1e6f24534de4e09dc865da4671add6d3db493a9c53e1a69
 SHA512:
-  metadata.gz: 7e9ab4f42471a424a335d5f39a395639601b88c4694eeb016f4d5b3b2449114eea07e3395058892b22b1c4e5b9b11c1e1b3e24a0fc7b687393cfb8218c548142
-  data.tar.gz: 472f326d596fbcb2e551549bb6bb6411839acb86437ad789e4ecc29841facbd2a27c32a696ac4c2a2c68d8b754517a35fff7570a05441c18db5033f1774c671b
+  metadata.gz: c90efdd83bee0f72a24525e8c33b8e36b9242be961995576f0251bbef139ffe41b7af4a99063f72bc1074c83c7252fd03263e02b037d2a5f831ca193c74aa71a
+  data.tar.gz: fe2c6640ee05b3f55481c1355debb96252d5428e6443a5d0df06f915fe8018da58157a07e2fcc3df2b5648fc54797dc1c1d6dd9af4a766d5c5a84950e8816997

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+### 4.20.14.0
+
+- Extract ObserveExpression into Glimmer
+- Upgrade to Glimmer 2.1.0
+
+### 4.20.13.18
+
+- Change `arrow` widget default SWT style to include `:down`
+- Hello, Arrow! sample
+
+### 4.20.13.17
+
+- Hello, Slider! sample
+
+### 4.20.13.16
+
+- Fix issue with setting app name (via `Display.app_name=`) when app is not packaged (always gets set to Glimmer)
+- Fix Hello, Custom Shell! sample
+
 ### 4.20.13.15
 
 - Battleship elaborate sample

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.20.13.15
+# [<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.20.13.18
 ## 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)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.15 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.18 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (please report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -199,11 +199,6 @@ Glimmer app:
 
 [![Math Bowling App Screenshot](https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/Math-Bowling-Screenshot.png)](https://github.com/AndyObtiva/MathBowling)
 
-**Note:** I offer Glimmer DSL for SWT as a free and open-source [Ruby Gem](https://rubygems.org/gems/glimmer-dsl-swt) that represents my interests in Ruby Programming, Desktop GUI application development with SWT, Object Oriented Design, Design Patterns, and Software Architecture.
-Additionally, I am sharing my professional experience and expertise in Eclipse SWT given that I am an [EclipseCon](http://andymaleh.blogspot.com/2007/03/eclipsecon-2007-day-3.html)/[EclipseWorld](http://andymaleh.blogspot.com/2008/11/eclipseworld-2008-highlights.html) presenter and have built professional applications in SWT/JFace/RCP for Obtiva and the Pampered Chef in the past. This is also done in the hopes that it would indirectly bring me work in a field I am extremely passionate about.
-That said, please keep in mind that I myself am learning topics in Software Engineering too everyday, including newer editions of SWT and JRuby, which seem to pop up every quarter.
-If you see anything that needs to be improved, please do not hesitate to contact me on [Gitter](https://gitter.im/AndyObtiva/glimmer) or submit [Issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues)/[Pull-Requests](https://github.com/AndyObtiva/glimmer-dsl-swt/pulls).
-
 ## Table of contents
 
 - [Glimmer (JRuby Desktop Development GUI Framework)](#jruby-desktop-development-gui-framework)
@@ -326,7 +321,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.15
+jgem install glimmer-dsl-swt -v 4.20.13.18
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +349,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.20.13.15'
+gem 'glimmer-dsl-swt', '~> 4.20.13.18'
 ```
 
 And, then run:
@@ -375,7 +370,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.15
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.18
       
 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.20.13.15
+4.20.14.0

data/docs/reference/GLIMMER_SAMPLES.md

@@ -19,6 +19,7 @@
     - [Hello, Drag and Drop!](#hello-drag-and-drop)
     - [Hello, Menu Bar!](#hello-menu-bar)
     - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+    - [Hello, Arrow!](#hello-arrow)
     - [Hello, Custom Widget!](#hello-custom-widget)
     - [Hello, Custom Shell!](#hello-custom-shell)
     - [Hello, Sash Form!](#hello-sash-form)
@@ -33,6 +34,7 @@
     - [Hello, File Dialog!](#hello-file-dialog)
     - [Hello, Date Time!](#hello-date-time)
     - [Hello, Scale!](#hello-scale)
+    - [Hello, Slider!](#hello-slider)
     - [Hello, Spinner!](#hello-spinner)
     - [Hello, Table!](#hello-table)
     - [Hello, Link!](#hello-link)
@@ -399,6 +401,20 @@ Code:
 ![Hello Pop Up Context Menu](/images/glimmer-hello-pop-up-context-menu.png)
 ![Hello Pop Up Context Menu Popped Up](/images/glimmer-hello-pop-up-context-menu-popped-up.png)
 
+#### Hello, Arrow!
+
+This sample demonstrates `arrow` button (aka `button(:arrow)`).
+
+Code:
+
+[samples/hello/hello_arrow.rb](/samples/hello/hello_arrow.rb)
+
+![Hello Arrow](/images/glimmer-hello-arrow.png)
+
+![Hello Arrow Menu](/images/glimmer-hello-arrow-menu.png)
+
+![Hello Arrow Item Selected](/images/glimmer-hello-arrow-item-selected.png)
+
 #### Hello, Custom Widget!
 
 This sample demonstrates the use of a custom widget in Glimmer.
@@ -614,6 +630,18 @@ Hello, Scale!
 
 ![Hello Scale](/images/glimmer-hello-scale.png)
 
+#### Hello, Slider!
+
+This sample demonstrates the use of `slider` widget in Glimmer
+
+Code:
+
+[samples/hello/hello_slider.rb](/samples/hello/hello_slider.rb)
+
+Hello, Slider!
+
+![Hello Slider](/images/glimmer-hello-slider.png)
+
 #### Hello, Spinner!
 
 This sample demonstrates the use of `spinner` widget in Glimmer

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

@@ -21,7 +21,6 @@
 
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/bind_expression'
-require 'glimmer/data_binding/model_binding'
 
 module Glimmer
   module DSL

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

@@ -21,8 +21,7 @@
 
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
-require 'glimmer/data_binding/observer'
-require 'glimmer/data_binding/model_binding'
+require 'glimmer/dsl/observe_expression'
 require 'glimmer/ui/custom_widget'
 
 module Glimmer
@@ -30,23 +29,10 @@ module Glimmer
     module SWT
       class ObserveExpression < StaticExpression
         include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
 
-        REGEX_NESTED_OR_INDEXED_PROPERTY = /([^\[]+)(\[[^\]]+\])?/
-  
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'observe' and
-            block_given? and
-            (args.size == 2) and
-            textual?(args[1])
-        end
-  
         def interpret(parent, keyword, *args, &block)
-          observer = DataBinding::Observer.proc(&block)
-          if args[1].to_s.match(REGEX_NESTED_OR_INDEXED_PROPERTY)
-            observer_registration = observer.observe(DataBinding::ModelBinding.new(args[0], args[1]))
-          else
-            observer_registration = observer.observe(args[0], args[1])
-          end
+          observer_registration = super
           Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(observer_registration)
           observer_registration
         end

data/lib/glimmer/swt/display_proxy.rb

@@ -200,12 +200,14 @@ module Glimmer
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
           if OBSERVED_MENU_ITEMS.include?(event_name) && OS.mac?
-            system_menu = swt_display.getSystemMenu
-            menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-            listener = ConcreteListener.new(&block)
-            display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
-            Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
-            display_mac_event_registration
+            auto_exec do
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              listener = ConcreteListener.new(&block)
+              display_mac_event_registration = menu_item.addListener(SWTProxy[:Selection], listener)
+              Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(display_mac_event_registration)
+              display_mac_event_registration
+            end
           end
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -48,7 +48,7 @@ module Glimmer
       include Custom::Drawable
 
       DEFAULT_STYLES = {
-        'arrow'               => [:arrow],
+        'arrow'               => [:arrow, :down],
         'button'              => [:push],
         'canvas'              => ([:double_buffered] unless OS.mac?),
         'ccombo'              => [:border],

data/lib/glimmer/ui/custom_shell.rb

@@ -30,8 +30,8 @@ module Glimmer
       
       class << self
         def launch(*args, &content)
+          launched_custom_shell = send(keyword, *args, &content)
           auto_exec do
-            launched_custom_shell = send(keyword, *args, &content)
             launched_custom_shell.swt_widget.set_data('launched', true)
             launched_custom_shell.open
           end

data/lib/glimmer/ui/custom_widget.rb

@@ -176,16 +176,16 @@ module Glimmer
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content
-        execute_hook('before_body')
+        auto_exec { execute_hook('before_body') }
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
-        @body_root = instance_exec(&body_block)
+        @body_root = auto_exec { instance_exec(&body_block) }
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
         auto_exec do
           @swt_widget.set_data('custom_widget', self)
         end
-        execute_hook('after_body')
+        auto_exec { execute_hook('after_body') }
         auto_exec do
           @dispose_listener_registration = @body_root.on_widget_disposed do
             observer_registrations.compact.each(&:deregister)

data/samples/hello/hello_arrow.rb

@@ -0,0 +1,67 @@
+# Copyright (c) 2007-2021 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'
+
+include Glimmer
+
+shell {
+  row_layout(:vertical) {
+    fill true
+    center true
+  }
+  
+  text 'Hello, Arrow!'
+  
+  label(:center) {
+    text 'Click the arrow to get a menu.'
+  }
+  
+  arrow { # can be customized by passing `:arrow` SWT style + `:left`, `:right`, `:up`, or `:down` (default)
+    menu {
+      menu_item {
+        text 'Item &1'
+        
+        on_widget_selected do
+          message_box {
+            text 'Item 1'
+            message 'Item 1 selected!'
+          }.open
+        end
+      }
+      menu_item {
+        text 'Item &2'
+        
+        on_widget_selected do
+          message_box {
+            text 'Item 2'
+            message 'Item 2 selected!'
+          }.open
+        end
+      }
+    }
+    
+    on_widget_selected do |event|
+      event.widget.menu.visible = true
+    end
+  }
+    
+}.open

data/samples/hello/hello_custom_shell.rb

@@ -88,6 +88,8 @@ class EmailShell
 end
 
 class HelloCustomShell
+  include Glimmer
+  
   Email = Struct.new(:date, :subject, :from, :message, keyword_init: true)
   EmailSystem = Struct.new(:emails, keyword_init: true)
   

data/samples/hello/hello_slider.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2007-2021 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 HelloScale
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :value
+  
+  before_body do
+    @value = 50
+  end
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+        center true
+      }
+      
+      text 'Hello, Slider!'
+      
+      label(:center) {
+        text <= [self, :value]
+      }
+      
+      slider { # optionally takes :vertical or :horizontal (default) SWT style
+        minimum 0
+        maximum 110 # leave room for 10 extra (slider stops at 100)
+        page_increment 10 # page increment occurs when clicking area between slider and beginning or end
+        selection <=> [self, :value]
+      }
+        
+    }
+    
+  }
+end
+
+HelloScale.launch

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.15
+  version: 4.20.14.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -605,6 +605,7 @@ files:
 - samples/elaborate/timer/sounds/alarm1.wav
 - samples/elaborate/user_profile.rb
 - samples/elaborate/weather.rb
+- samples/hello/hello_arrow.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_button.rb
 - samples/hello/hello_c_combo.rb
@@ -652,6 +653,7 @@ files:
 - samples/hello/hello_scale.rb
 - samples/hello/hello_shape.rb
 - samples/hello/hello_shell.rb
+- samples/hello/hello_slider.rb
 - samples/hello/hello_spinner.rb
 - samples/hello/hello_styled_text.rb
 - samples/hello/hello_tab.rb