glimmer-dsl-swt 4.20.13.18 → 4.20.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41658f842e145c053d12a6b5b07d93607523a2400092aa2fe0d1017d2683fa93
-  data.tar.gz: c5fc77baf99b69ebe8f06f7550feed02a47adcb2417cca0e205be0182f4a22c6
+  metadata.gz: ff80eeabdc2f2185c4c15a9a02bb3d6d06596f5bc803fa6badbdf6a22a9c6dec
+  data.tar.gz: 7b86a2fb40bd3423e1e6f24534de4e09dc865da4671add6d3db493a9c53e1a69
 SHA512:
-  metadata.gz: bd12243a6229d64c56dc1a7fd18717b50f02e873d3d3e3c0088e6c95f86791d2f0f719efc4f02769097eceaa3e0c791044c2e0ec85d1d85ee6ec3f6edc4b612d
-  data.tar.gz: f25ea6a7597d29aa16d095b886ce6d0a5d367a4523c9fadd726c093f7f5ec7d2e4aed18f9666d9871b3b5403c0250502e8c6178545166ceedd10c5c663d2a1c5
+  metadata.gz: c90efdd83bee0f72a24525e8c33b8e36b9242be961995576f0251bbef139ffe41b7af4a99063f72bc1074c83c7252fd03263e02b037d2a5f831ca193c74aa71a
+  data.tar.gz: fe2c6640ee05b3f55481c1355debb96252d5428e6443a5d0df06f915fe8018da58157a07e2fcc3df2b5648fc54797dc1c1d6dd9af4a766d5c5a84950e8816997

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### 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
 

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.14.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.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.14.0 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).
+[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).
 
@@ -321,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.14.0
+jgem install glimmer-dsl-swt -v 4.20.13.18
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -349,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.14.0'
+gem 'glimmer-dsl-swt', '~> 4.20.13.18'
 ```
 
 And, then run:
@@ -370,7 +370,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.14.0
+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.18
+4.20.14.0

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.18
+  version: 4.20.14.0
 platform: ruby
 authors:
 - Andy Maleh
@@ -15,7 +15,7 @@ dependencies:
     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: