glimmer 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c1935b1d8ac63f8f79323e754e9a32a6c3ed8465db80da479a36e28f377d7a
-  data.tar.gz: 1b64ca831d6d2b911278abfd6156fa6267a9a88b82bc8a5a5a4bf7b35c09c403
+  metadata.gz: 31b586dfb4cb23af36ebd26ad97a46625fe122c64d9725b237c8f88f0c72ce71
+  data.tar.gz: 14ff7f5996588c4261cf4d102d5ffca28fc59cef5bd151d07c273038efae3da5
 SHA512:
-  metadata.gz: ccab304701eefa5bcd8560995878b2f50cf739f6ec092244b5a0bfdc686e15859f81f74c62939beaccb0efd5052a126adfe2dbde887afb13d697af7430b68f7f
-  data.tar.gz: 1ba3e00febd0b60e3c9105b0737c4a875c438cc450048c7cc49bc8d06a84eb0a311b3581d5c61845c3b0a17fd1ec7dbc554428d02b8d3853e048e14b3fcca9fb
+  metadata.gz: 6eb266dffd64ba21842038fd272c06a3342f3399b5729d178b966b9543dfdbb9eb45eea079782d0db205e68cc9b63a5a0a4222a9d77c9f5df2cacc01126fed51
+  data.tar.gz: 123a861f812ac0e4ee2e4c802255ff017c2459a65de79cb52863897a0b017fc8037d9b57eb8e041dc75005d68ee4a3835b07a7cd03f87c30f524c5fef67717ca

data/README.markdown

@@ -1,4 +1,5 @@
-# Glimmer 0.7.0 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)
+[![Gem Version](https://badge.fury.io/rb/glimmer.svg)](http://badge.fury.io/rb/glimmer)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
 Glimmer is a native-UI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business components test-first afterwards.
@@ -45,7 +46,7 @@ shell {
           text        bind(@tic_tac_toe_board[row, column], :sign)
           enabled     bind(@tic_tac_toe_board[row, column], :empty)
           on_widget_selected {
-            @tic_tac_toe_board.mark_box(row, column)
+            @tic_tac_toe_board.mark(row, column)
           }
         }
       }
@@ -70,7 +71,7 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
 ## Table of Contents
 
 <!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
-- [Glimmer 0.7.0 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
+- [Glimmer 0.7.1 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
   - [Examples](#examples)
     - [Hello World](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
@@ -163,7 +164,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.7.0
+jgem install glimmer -v 0.7.1
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -174,7 +175,7 @@ Otherwise, you may also run `jruby -S gem install ...`
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.7.0'
+gem 'glimmer', '~> 0.7.1'
 ```
 
 And, then run:
@@ -226,6 +227,7 @@ glimmer package:jar                                               # Generate JAR
 glimmer package:native                                            # Generate Native files (DMG/PKG/APP on the Mac)
 glimmer scaffold[app_name]                                        # Scaffold a Glimmer application directory structure to begin building a new app
 glimmer scaffold:custom_shell[custom_shell_name,namespace]        # Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under app/views (namespace is optional)
+glimmer scaffold:custom_shell_gem[custom_widget_name,namespace]   # Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under its own Ruby gem project (namespace is required)
 glimmer scaffold:custom_widget[custom_widget_name,namespace]      # Scaffold a Glimmer::UI::CustomWidget subclass (represents a part of a view) under app/views (namespace is optional)
 glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]  # Scaffold a Glimmer::UI::CustomWidget subclass (represents a part of a view) under its own Ruby gem project (namespace is required)
 
@@ -234,13 +236,13 @@ automatically preloading the glimmer Ruby gem and SWT jar dependency.
 
 Optionally, extra Glimmer options, JRuby options and environment variables may be passed in.
 
-Concerning Glimmer options:
+Glimmer options:
 - "--debug"           : Displays extra debugging information and passes "--debug" to JRuby
 - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is "WARN")
 
-Example: glimmer samples/hello/hello_world.rb
+Example: glimmer samples/hello_world.rb
 
-This runs the Glimmer application samples/hello/hello_world.rb
+This runs the Glimmer application samples/hello_world.rb
 ```
 
 Example (Glimmer/JRuby option specified):
@@ -262,7 +264,7 @@ Launches samples/hello/hello_world.rb and samples/hello_tab.rb at the same time,
 Glimmer borrows from Rails the idea of Scaffolding, that is generating a structure for your app files that
 helps you get started just like true building scaffolding helps construction workers, civil engineers, and architects.
 
-Glimmer scaffolding goes way beyond just scaffolding the app files that Rails does. It also packages it and launches it, 
+Glimmer scaffolding goes beyond just scaffolding the app files that Rails does. It also packages it and launches it, 
 getting you to a running and delivered state of an advanced "Hello, World!" Glimmer application right off the bat.
 
 This should greatly facilitate building a new Glimmer app by helping you be productive and focus on app details while 
@@ -276,6 +278,8 @@ letting Glimmer scaffolding take care of initial app file structure concerns, su
 - Icon
 - Bin file for starting application
 
+NOTE: Scaffolding currently supports Mac packaging only at the moment. 
+
 #### App
 
 Before you start, make sure you are in a JRuby environment with Glimmer gem installed as per "Direct Install" pre-requisites. 
@@ -344,7 +348,7 @@ It is important to specify a namespace to avoid having your gem clash with exist
 
 The Ruby gem name will follow the convention "glimmer-cs-customwidgetname-namespace" (the 'cs' is for Custom Shell)
 
-Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. "glimmer-cs-gladiator" Ruby gem)
+Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. [glimmer-cs-gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) Ruby gem)
 
 Example: [https://github.com/AndyObtiva/glimmer-cs-gladiator](https://github.com/AndyObtiva/glimmer-cs-gladiator)
 
@@ -360,7 +364,7 @@ It is important to specify a namespace to avoid having your gem clash with exist
 
 The Ruby gem name will follow the convention "glimmer-cw-customwidgetname-namespace" (the 'cw' is for Custom Widget)
 
-Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. "glimmer-cw-video" Ruby gem)
+Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. [glimmer-cw-video](https://rubygems.org/gems/glimmer-cw-video) Ruby gem)
 
 Example: [https://github.com/AndyObtiva/glimmer-cw-video](https://github.com/AndyObtiva/glimmer-cw-video)
 
@@ -424,7 +428,7 @@ In Glimmer DSL, widgets are declared with lowercase underscored names mirroring
 - `list` instantiates `org.eclipse.swt.widgets.List`
 
 Every **widget** is sufficiently declared by name, but may optionally be accompanied with:
-- SWT **style** ***argument*** wrapped by parenthesis according to [Glimmer Style Guide](#glimmer-coding-style) (see [next section](#widget-styles) for details).
+- SWT **style** ***argument*** wrapped by parenthesis according to [Glimmer Style Guide](#glimmer-style-guide) (see [next section](#widget-styles) for details).
 - Ruby block containing **properties** (widget attributes) and **content** (nested widgets)
 
 For example, if we were to revisit `samples/hello/hello_world.rb` above (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
@@ -451,7 +455,7 @@ Note that `shell` instantiates the outer shell **widget**, in other words, the w
 # ...
 ```
 
-The first line declares a **property** called `text`, which sets the title of the shell (window) to `"Glimmer"`. **Properties** always have ***arguments*** (not wrapped by parenthesis according to [Glimmer Style Guide](#glimmer-coding-style)), such as the text `"Glimmer"` in this case, and do **NOT** have a ***block*** (this distinguishes them from **widget** declarations).
+The first line declares a **property** called `text`, which sets the title of the shell (window) to `"Glimmer"`. **Properties** always have ***arguments*** (not wrapped by parenthesis according to [Glimmer Style Guide](#glimmer-style-guide)), such as the text `"Glimmer"` in this case, and do **NOT** have a ***block*** (this distinguishes them from **widget** declarations).
 
 The second line declares the `label` **widget**, which is followed by a Ruby **content** ***block*** that contains its `text` **property** with value `"Hello, World!"`
 
@@ -690,7 +694,7 @@ SWT widgets receive `SWT` styles in their constructor as per this guide:
 
 https://wiki.eclipse.org/SWT_Widget_Style_Bits
 
-Glimmer DSL facilitates that by passing symbols representing `SWT` constants as widget method arguments (i.e. inside widget `()` parentheses according to [Glimmer Style Guide](#glimmer-coding-style). See example below) in lower case version (e.g. `SWT::MULTI` becomes `:multi`).
+Glimmer DSL facilitates that by passing symbols representing `SWT` constants as widget method arguments (i.e. inside widget `()` parentheses according to [Glimmer Style Guide](#glimmer-style-guide). See example below) in lower case version (e.g. `SWT::MULTI` becomes `:multi`).
 
 These styles customize widget look, feel, and behavior.
 
@@ -1817,6 +1821,15 @@ Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 puts @css
 ```
 
+##### Listing / Enabling / Disabling DSLs
+
+Glimmer provides a number of methods on Glimmer::DSL::Engine to configure DSL support or inquire about it:
+- `Glimmer::DSL::Engine.dsls`: Lists available Glimmer DSLs
+- `Glimmer::DSL::Engine.disable_dsl(dsl_name)`: Disables a specific DSL. Useful when there is no need for certain DSLs in a certain application.
+- `Glimmer::DSL::Engine.disabled_dsls': Lists disabled DSLs
+- `Glimmer::DSL::Engine.enable_dsl(dsl_name)`: Re-enables disabled DSL
+- `Glimmer::DSL::Engine.enabled_dsls=(dsl_names)`: Disables all DSLs except the ones specified.
+
 #### Video Widget
 
 ![Video Widget](images/glimmer-video-widget.png)
@@ -1968,7 +1981,7 @@ For example, after imports, `org.eclipse.swt.graphics.Color` can be referenced b
 Nonetheless, you can disable automatic import if needed via this Glimmer configuration option:
 
 ```ruby
-Glimmer.import_swt_packages = false
+Glimmer::Config.import_swt_packages = false
 ```
 
 To import SWT Java packages manually instead, you have 2 options:

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/bin/girb

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+trap "SIGINT" do
+  # No Op for irb
+end
+
 require_relative '../lib/glimmer/launcher'
 
 girb_runner = File.expand_path('../girb_runner.rb', __FILE__)

data/bin/girb_runner.rb

@@ -1,3 +1,13 @@
 require 'puts_debuggerer'
 
 include Glimmer
+
+# Hijack Shell#start_event_loop default behavior to ensure disposing a display upon closing a shell inside girb
+
+Glimmer::SWT::ShellProxy.class_eval do
+  alias start_event_loop_original start_event_loop
+  def start_event_loop
+    start_event_loop_original
+    Glimmer::SWT::DisplayProxy.instance.dispose
+  end
+end

data/lib/glimmer/data_binding/observable.rb

@@ -11,6 +11,11 @@ module Glimmer
       def remove_observer(observer, property_or_properties=nil)
         raise Error, 'Not implemented!'
       end
+ 
+      # Overriding inspect to avoid printing very long observer hierarchies
+      def inspect
+        "#<#{self.class.name}:0x#{self.hash.to_s(16)}>"
+      end
     end
   end
 end

data/lib/glimmer/dsl/engine.rb

@@ -49,7 +49,9 @@ module Glimmer
     
         # Resets Glimmer's engine activity and configuration. Useful in rspec before or after blocks in tests.
         def reset
-          parent_stack.clear
+          parent_stacks.values.each do |a_parent_stack|
+            a_parent_stack.clear
+          end
           dsl_stack.clear
           disabled_dsls.clear
         end
@@ -96,7 +98,8 @@ module Glimmer
               if retrieved_static_expression.nil? && Glimmer::DSL::Engine.dsl && (static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression))
                 begin
                   return Glimmer::DSL::Engine.interpret(keyword, *args, &block)
-                rescue => e 
+                rescue => e
+                  Glimmer::DSL::Engine.reset
                   raise e if static_expression_dsl.nil?
                 end
               end
@@ -113,7 +116,8 @@ module Glimmer
                 end
               end
             rescue => e
-              Glimmer::DSL::Engine.dsl_stack.pop
+#               Glimmer::DSL::Engine.dsl_stack.pop
+                Glimmer::DSL::Engine.reset
               raise e
             end
           end
@@ -138,7 +142,8 @@ module Glimmer
             dsl_stack.pop
           end
         rescue => e
-          dsl_stack.pop
+#           dsl_stack.pop
+          reset
           raise e
         end
 

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

@@ -9,6 +9,11 @@ module Glimmer
       class ShellExpression < StaticExpression
         include TopLevelExpression
         include ParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'shell' and
+            (parent.nil? or parent.is_a?(Glimmer::SWT::ShellProxy))
+        end
   
         def interpret(parent, keyword, *args, &block)
           args = [parent] + args unless parent.nil?

data/lib/glimmer/scaffold.rb

@@ -328,7 +328,7 @@ class Scaffold
     def spec_helper_file
       content = File.read('spec/spec_helper.rb')
       lines = content.split("\n")
-      require_line_index = lines.index(lines.detect {|l| l.include?('glimmer-cw-video') })
+      require_line_index = lines.index(lines.detect {|l| l.include?(current_dir_name) })
       lines[require_line_index...require_line_index] = [
         "require 'bundler/setup'",
         'Bundler.require(:default, :development)',

data/lib/glimmer/swt/shell_proxy.rb

@@ -39,6 +39,14 @@ module Glimmer
         @display ||= @swt_widget.getDisplay
         @swt_widget.setLayout(FillLayout.new)
         @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
+        on_event_show do
+          Thread.new do      
+            sleep(0.25)
+            async_exec do
+              @swt_widget.setActive
+            end
+          end
+        end
       end
 
       # Centers shell within monitor it is in

data/lib/glimmer/swt/widget_proxy.rb

@@ -172,6 +172,13 @@ module Glimmer
               }
             end
           },
+          Java::OrgEclipseSwtWidgets::MenuItem => {
+            :selection => proc do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },
           Java::OrgEclipseSwtWidgets::Spinner => {
             :selection => proc do |observer|
               on_widget_selected { |selection_event|
@@ -231,7 +238,7 @@ module Glimmer
       def add_observer(observer, property_name)
         property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
         widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.each do |widget_listener_installer|
+        widget_listener_installers.to_a.each do |widget_listener_installer|
           widget_listener_installer.call(observer)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -111,24 +111,24 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  name: rspec-mocks
-  type: :development
+        version: 6.2.1
+  name: rdoc
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-  name: rspec
+  name: rspec-mocks
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,15 +141,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
-  name: rdoc
+        version: 3.5.0
+  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: