glimmer-dsl-swt 4.18.7.5 → 4.18.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624d10930b3ed1e17b60131a6e42825b58c8b997e04ec3169099bc10f994e3e4
-  data.tar.gz: d05163b01c26b519866d831cd54d849632367270582c25e8237455cb18e2ed69
+  metadata.gz: f9004ad05389af266956ee36a467e07fa97845f64d8717e0c24b716ae81420ac
+  data.tar.gz: f78e73a1b5708769a03e5ad4747df729e7cbe93e9922845d35c5ae0cdba98bc5
 SHA512:
-  metadata.gz: 424f2c3aeecef6728ea5b2cfe1c00c6afda10b11f04bd14fa59150bc6e2fb07f4738c3deb681882431f13a2b0a8d6cbf292ef1f00ac2b5732f253830e13f00df
-  data.tar.gz: b0e44958872f55f23301191105dce94b4b59ecd60a4349a07caf0b4191bd37ba075d0f9dc1ff988598cfb922ebf5e133c589a3c693368e6d656c5ecf37691d57
+  metadata.gz: 6496f86ebe9ddd173de6d9d3853e6ea4bb39e069eed9951c0c4756647cc518cce4fe174918f18f6f05d18bd6a74fb474824e92c29bb0f57db9bcc9f72357e732
+  data.tar.gz: b78d493257309b1cf703b0e6894cd1158b1101be393cf85362ab210a6ce23cdd07ca254ab50f92d7e0251eb309dccf1478b77e71e06dccfbd2dc1b23cfee0bdb

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 4.18.7.6
+
+- Update the Hello, Code Text! sample to use data-binding
+- Fix issue with `code_text` data-binding
+
 ### 4.18.7.5
 
 - Update `ImageProxy` with missing methods `#size`, `#parent_proxy`, and `#parent`, needed for a better "Shapes in an Image" support.

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.18.7.5
+# [<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.18.7.6
 ## 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.18.7.5 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. 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.18.7.6 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. 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 receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) with your Ruby desktop GUI development needs! [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) brings great ideas to the table, such as declarative programming via domain specific languages, currently under-utilized in the GUI domain. That said, it may not be feature complete enough for everybody's needs, so please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) even better by providing feedback and [contributing](#contributing) when possible. The project is very active, so any feature suggestions that are accepted could be implemented within weeks if not days. Also, you are welcome to [hire me](#hire-me) full-time if you want long-term development of [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) for your project needs.
 
@@ -342,7 +342,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.7.5
+jgem install glimmer-dsl-swt -v 4.18.7.6
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -360,7 +360,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.18.7.5'
+gem 'glimmer-dsl-swt', '~> 4.18.7.6'
 ```
 
 And, then run:
@@ -381,7 +381,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.7.5
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.7.6
       
 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.18.7.5
+4.18.7.6

data/docs/reference/GLIMMER_COMMAND.md

@@ -569,10 +569,11 @@ Output:
 ```
 
   Glimmer Custom Shape Gems at rubygems.org:
-                                                                                  
-  Name          Gem          Version     Author             Description           
-                                                                                  
-  Bevel   glimmer-cp-bevel   0.1.0     Andy Maleh   Bevel - Glimmer Custom Shape  
+                                                                                                     
+     Name                Gem             Version     Author                 Description              
+                                                                                                     
+  Bevel         glimmer-cp-bevel         0.1.1     Andy Maleh   Bevel - Glimmer Custom Shape         
+  Stickfigure   glimmer-cp-stickfigure   0.1.1     Andy Maleh   Stick Figure - Glimmer Custom Shape  
   
 ```
 

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.7.5 ruby lib
+# stub: glimmer-dsl-swt 4.18.7.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.7.5"
+  s.version = "4.18.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-03-13"
+  s.date = "2021-03-15"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -250,7 +250,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
-      s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
+      s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.12.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
       s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
       s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
@@ -268,7 +268,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
-      s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
+      s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.12.0", "< 2.0.0"])
       s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
       s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
       s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
@@ -287,7 +287,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<glimmer>.freeze, ["~> 1.2.0"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
-    s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
+    s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.12.0", "< 2.0.0"])
     s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
     s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
     s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])

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

@@ -64,16 +64,28 @@ module Glimmer
           respond_to?(method_name)
         end
         
+        def can_add_observer?(attribute_name)
+          @styled_text_proxy&.can_add_observer?(attribute_name) || super
+        end
+  
+        def add_observer(observer, attribute_name)
+          if @styled_text_proxy&.can_add_observer?(attribute_name)
+            @styled_text_proxy.add_observer(observer, attribute_name)
+          else
+            super
+          end
+        end
+                
         def can_handle_observation_request?(observation_request)
-          @styled_text_proxy.can_handle_observation_request?(observation_request)
-        rescue
-          super
+          @styled_text_proxy&.can_handle_observation_request?(observation_request) || super
         end
-        
+
         def handle_observation_request(observation_request, &block)
-          @styled_text_proxy.handle_observation_request(observation_request, &block)
-        rescue
-          super
+          if @styled_text_proxy&.can_handle_observation_request?(observation_request)
+            @styled_text_proxy.handle_observation_request(observation_request, &block)
+          else
+            super
+          end
         end
         
         def root_block=(block)

data/samples/hello/hello_code_text.rb

@@ -21,86 +21,154 @@
 
 require 'glimmer-dsl-swt'
 
-include Glimmer
-
-shell {
-  minimum_size 640, 480
-  text 'Hello, Code Text!'
+class HelloCodeText
+  include Glimmer::UI::CustomShell
   
-  tab_folder {
-    tab_item {
-      fill_layout
-      text 'Ruby (glimmer theme)'
-      code_text(language: 'ruby', theme: 'glimmer', lines: true) {
-        text <<~CODE
-          greeting = 'Hello, World!'
-          
-          include Glimmer
-          
-          shell {
-            text 'Glimmer'
-            
-            label {
-              text greeting
-              font height: 30, style: :bold
-            }
-          }.open
-        CODE
+  attr_accessor :ruby_code, :js_code, :html_code
+  
+  before_body {
+    self.ruby_code = <<~RUBY
+      greeting = 'Hello, World!'
+      
+      include Glimmer
+      
+      shell {
+        text 'Glimmer'
+        
+        label {
+          text greeting
+          font height: 30, style: :bold
+        }
+      }.open
+    RUBY
+    
+    self.js_code = <<~JS
+      function greet(greeting) {
+        alert(greeting);
       }
-    }
-    tab_item {
-      fill_layout
-      text 'JavaScript (pastie theme)'
-      # No border (SWT styles are passed explicitly)
-      code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
-        # With lines, the custom widget has a root composite, which can be configured separately
-        root {
-          grid_layout(2, false) {
-            margin_width 2
+      
+      var greetingString = 'Hello, World!';
+      
+      greet(greetingString);
+      
+      var moreGreetings = ['Howdy!', 'Aloha!', 'Hey!']
+      
+      for(var greeting of moreGreetings) {
+        greet(greeting)
+      }
+    JS
+    
+    self.html_code = <<~HTML
+      <html>
+        <body>
+          <section class="accordion">
+            <form method="post" id="name">
+              <label for="name">
+                Name
+              </label>
+              <input name="name" type="text" />
+              <input type="submit" />
+            </form>
+          </section>
+        </body>
+      </html>
+    HTML
+  }
+  
+  body {
+    shell {
+      minimum_size 640, 480
+      text 'Hello, Code Text!'
+      
+      tab_folder {
+        tab_item {
+          fill_layout
+          text 'Ruby (glimmer)'
+          code_text(language: 'ruby', theme: 'glimmer', lines: true) {
+            text bind(self, :ruby_code)
           }
-          background :white
         }
-        # With lines, the line numbers widget can be configured separately
-        line_numbers {
-          background :white
+        tab_item {
+          fill_layout
+          text 'Ruby (pastie)'
+          code_text(language: 'ruby', theme: 'pastie', lines: {width: 2}) {
+            text bind(self, :ruby_code)
+          }
         }
-        text <<~CODE
-          function greet(greeting) {
-            alert(greeting);
+        tab_item {
+          fill_layout
+          text 'Ruby (github)'
+          code_text(language: 'ruby', theme: 'github', lines: false) {
+            text bind(self, :ruby_code)
           }
-          
-          var greetingString = 'Hello, World!';
-          
-          greet(greetingString);
-          
-          var moreGreetings = ['Howdy!', 'Aloha!', 'Hey!']
-          
-          for(var greeting of moreGreetings) {
-            greet(greeting)
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (glimmer)'
+          # No border (SWT styles are passed explicitly)
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer', lines: true) {
+            # With lines, the custom widget has a root composite, which can be configured separately
+            root {
+              grid_layout(2, false) {
+                margin_width 2
+              }
+              background :white
+            }
+            # With lines, the line numbers widget can be configured separately
+            line_numbers {
+              background :white
+            }
+            text bind(self, :js_code)
           }
-        CODE
-      }
-    }
-    tab_item {
-      fill_layout
-      text 'HTML (github theme)'
-      code_text(language: 'html', theme: 'github') {
-        text <<~CODE
-          <html>
-            <body>
-              <section class="accordion">
-                <form method="post" id="name">
-                  <label for="name">
-                    Name
-                  </label>
-                  <input name="name" type="text" />
-                  <input type="submit" />
-                </form>
-              </section>
-            </body>
-          </html>
-        CODE
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (pastie)'
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+            root {
+              grid_layout(2, false) {
+                margin_width 2
+              }
+              background :white
+            }
+            line_numbers {
+              background :white
+            }
+            text bind(self, :js_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (github)'
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'github') { # default is lines: false
+            text bind(self, :js_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (glimmer)'
+          code_text(language: 'html', theme: 'glimmer', lines: true) {
+            text bind(self, :html_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (pastie)'
+          code_text(language: 'html', theme: 'pastie', lines: {width: 2}) {
+            text bind(self, :html_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (github)'
+          code_text(language: 'html', theme: 'github') { # default is lines: false
+            text bind(self, :html_code)
+          }
+        }
       }
     }
   }
-}.open
+  
+end
+
+HelloCodeText.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.7.5
+  version: 4.18.7.6
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0