glimmer-dsl-opal 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c73ae51d66f5e2955bd4c4c8b639d6081a8445594699d4a2f2b71244903d3277
-  data.tar.gz: bff8c03439d137acd926baece557b609e0805adbf28b822984cd70f7b63666fc
+  metadata.gz: 2989fcd48ddac2b782271cebca14b5a7615926251c14f2aef3fe878d177f7e41
+  data.tar.gz: 7001fa83285f8e16bf5ba5a86004963324f271a5a795c6c45b0aa71c5fd53a3c
 SHA512:
-  metadata.gz: 1bfba5a1bc6d5f6267e0622d3376d1567c40b5c06a7fcb49a8e7f3c5845a8b66214eaa897b2ebf9a8cb68d2a5cfbf5a83d3c4870250e6d9d901c39bbe9bf7d59
-  data.tar.gz: 285627b7e3d843d9c3f54ef169d96463e4abe3047580a92eacb314d0b302675e9b5799b92e2be02c73f8af039743f35610b4d25ce84cabf4c60d826c797dd150
+  metadata.gz: e24b36f65ca89e2e4880b81ae6ac6fba81c4a1ae2c832a87e43a6401ee6f90b2014a223cac2c218374dc895cfece65c5c145ed9a637256310f1b3a7fac9e3e2b
+  data.tar.gz: d0f249102835911d3eb48f15ac87303376c935b54f17dd4f94ff5ab4db0d8ac6f780ea49ed8cd3c98e52d11c5dbad6975f34635f33f9064f26adca1dee47166e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.6.1
+
+- Fix issue with rendering date_time without a block
+- Made listener event handling async to improve performance when triggering multiple events
+- Brought Tic Tac Toe sample up-to-date with changes in Glimmer DSL for SWT
+- Fixed silent error encountered in rendering custom widgets
+
 ## 0.6.0
 
 - Hello, Date Time! 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 Opal 0.6.0 (Auto-Webify Desktop Apps)
+# [<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 Opal (Auto-Webify Desktop Apps)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-opal.svg)](http://badge.fury.io/rb/glimmer-dsl-opal)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -8,7 +8,7 @@
 
 Glimmer DSL for Opal successfully reuses the entire [Glimmer](https://github.com/AndyObtiva/glimmer) core DSL engine in [Opal Ruby](https://opalrb.com/) inside a web browser, and as such inherits the full range of powerful Glimmer desktop [data-binding](https://github.com/AndyObtiva/glimmer#data-binding) capabilities for the web.
 
-NOTE: Alpha Version 0.6.0 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
+NOTE: Alpha Version 0.6.1 only supports bare-minimum capabilities for the following [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) [samples](https://github.com/AndyObtiva/glimmer#samples):
 
 Hello:
 
@@ -102,9 +102,13 @@ Event loop:
 
 ## Setup
 
-(NOTE: if you run into issues, keep in mind this is a very early experimental and incomplete alpha. Also, there is a slight chance issues you encounter are fixed in master or some other branch that you could check out instead)
+(NOTE: if you run into issues, keep in mind this is a very early experimental and incomplete alpha. Also, there is a slight chance any issues you encounter are fixed in master or some other branch that you could check out instead)
 
-Please install a Rails 5 gem:
+The [glimmer-dsl-opal](https://rubygems.org/gems/glimmer-dsl-opal) gem is a Rails Engine gem that includes assets.
+
+Please follow the following steps to setup.
+
+Install a Rails 5 gem:
 
 ```
 gem install rails -v5.2.4.4
@@ -122,7 +126,7 @@ Add the following to `Gemfile`:
 gem 'opal-rails', '~> 1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.6.0'
+gem 'glimmer-dsl-opal', '~> 0.6.1'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
@@ -156,7 +160,7 @@ require 'glimmer-dsl-opal' # brings opal and other dependencies automatically
 Edit `app/views/layouts/application.html.erb` and add the following below other `stylesheet_link_tag` declarations:
 
 ```erb
-<%= stylesheet_link_tag    'glimmer', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag    'glimmer/glimmer', media: 'all', 'data-turbolinks-track': 'reload' %>
 ```
 
 Open a `Document.ready?` block and add inside it Glimmer GUI DSL code or a require statement for one of the samples below.
@@ -1769,6 +1773,7 @@ class TicTacToe
     @tic_tac_toe_board = Board.new
     @shell = shell {
       text "Tic-Tac-Toe"
+      minimum_size 150, 178
       composite {
         grid_layout 3, true
         (1..3).each { |row|
@@ -1777,6 +1782,7 @@ class TicTacToe
               layout_data :fill, :fill, true, true
               text        bind(@tic_tac_toe_board[row, column], :sign)
               enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)
               }

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/app/assets/stylesheets/{glimmer.css → glimmer/glimmer.css}

@@ -10,6 +10,6 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require_tree ./glimmer
+ *= require_tree .
  *= require_self
  */

data/lib/glimmer-dsl-opal.rb

@@ -5,7 +5,7 @@ GLIMMER_DSL_OPAL_LIB = File.join(GLIMMER_DSL_OPAL_ROOT, 'lib')
  
 $LOAD_PATH.unshift(GLIMMER_DSL_OPAL_LIB)
 
-if RUBY_PLATFORM == 'opal'
+if RUBY_ENGINE == 'opal'
 #   GLIMMER_DSL_OPAL_MISSING = File.join(GLIMMER_DSL_OPAL_ROOT, 'lib', 'glimmer-dsl-opal', 'missing')
    
 #   $LOAD_PATH.unshift(GLIMMER_DSL_OPAL_MISSING) # missing Ruby classes/methods
@@ -56,5 +56,5 @@ if RUBY_PLATFORM == 'opal'
     result ||= method == 'handle'
   end
 else
-  require "glimmer/engine"
+  require_relative 'glimmer/engine'
 end

data/lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2020 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_relative "tic_tac_toe/board"
 
 class TicTacToe
@@ -7,6 +28,7 @@ class TicTacToe
     @tic_tac_toe_board = Board.new
     @shell = shell {
       text "Tic-Tac-Toe"
+      minimum_size 150, 178
       composite {
         grid_layout 3, true
         (1..3).each { |row|
@@ -15,6 +37,7 @@ class TicTacToe
               layout_data :fill, :fill, true, true
               text        bind(@tic_tac_toe_board[row, column], :sign)
               enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)
               }

data/lib/glimmer/dsl/opal/custom_widget_expression.rb

@@ -44,7 +44,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
-          if !Glimmer::UI::CustomShell.requested? && custom_widget_class.ancestors.include?(Glimmer::UI::CustomShell)
+          if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
             if Glimmer::SWT::DisplayProxy.instance.shells.empty?
               custom_widget_class.new(parent, *args, {}, &block)
             else

data/lib/glimmer/dsl/opal/widget_expression.rb

@@ -16,7 +16,7 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
         end
 
         def add_content(parent, &block)

data/lib/glimmer/engine.rb

@@ -3,7 +3,7 @@ module Glimmer
     isolate_namespace Glimmer
 
     initializer "glimmer.assets.precompile" do |app|
-      app.config.assets.precompile += %w( glimmer.css jquery-ui.css jquery-ui.structure.css jquery-ui.theme.css jquery.ui.timepicker.css )
+      app.config.assets.precompile += %w( glimmer/glimmer.css )
     end
   end
 end

data/lib/glimmer/swt/button_proxy.rb

@@ -6,13 +6,13 @@ module Glimmer
   module SWT
     class ButtonProxy < WidgetProxy
       class << self
-        def create(keyword, parent, args)
+        def create(keyword, parent, args, block)
           if args.to_a.include?(:radio)
-            RadioProxy.new(parent, args)
+            RadioProxy.new(parent, args, block)
           elsif args.to_a.include?(:check)
-            CheckboxProxy.new(parent, args)
+            CheckboxProxy.new(parent, args, block)
           else
-            new(parent, args)
+            new(parent, args, block)
           end
         end
       end
@@ -44,7 +44,7 @@ module Glimmer
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px; min-height: 27px;').merge(input_disabled)) {
+          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 32px; min-height: 32px;').merge(input_disabled)) {
             input_text.to_s == '' ? '&nbsp;' : input_text
           }
         }.to_s

data/lib/glimmer/swt/color_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 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
@@ -28,44 +28,44 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class ColorProxy
       SWT_COLOR_TRANSLATION = {
-        "widget_foreground"                   => [0, 0, 0], 
-        "blue"                                => [0, 0, 255], 
-        "widget_dark_shadow"                  => [0, 0, 0], 
-        "title_foreground"                    => [0, 0, 0], 
-        "yellow"                              => [255, 255, 0], 
-        "widget_highlight_shadow"             => [255, 255, 255], 
-        "dark_cyan"                           => [0, 128, 128], 
-        "list_foreground"                     => [0, 0, 0], 
-        "dark_blue"                           => [0, 0, 128], 
-        "dark_yellow"                         => [128, 128, 0], 
-        "cyan"                                => [0, 255, 255], 
-        "info_background"                     => [236, 235, 236], 
-        "link_foreground"                     => [0, 104, 218], 
-        "title_inactive_foreground"           => [0, 0, 0], 
-        "title_background_gradient"           => [179, 215, 255], 
-        "red"                                 => [255, 0, 0], 
-        "title_inactive_background_gradient"  => [220, 220, 220], 
-        "transparent"                         => [255, 255, 255], 
-        "widget_light_shadow"                 => [232, 232, 232], 
-        "dark_magenta"                        => [128, 0, 128], 
-        "white"                               => [255, 255, 255], 
-        "list_selection"                      => [179, 215, 255], 
-        "gray"                                => [192, 192, 192], 
-        "widget_border"                       => [0, 0, 0], 
-        "widget_background"                   => [236, 236, 236], 
-        "info_foreground"                     => [0, 0, 0], 
-        "title_inactive_background"           => [220, 220, 220], 
-        "widget_disabled_foreground"          => [220, 220, 220], 
-        "list_background"                     => [255, 255, 255], 
-        "magenta"                             => [255, 0, 255], 
-        "title_background"                    => [0, 99, 225], 
-        "text_disabled_background"            => [255, 255, 255], 
-        "black"                               => [0, 0, 0], 
-        "dark_gray"                           => [128, 128, 128], 
-        "list_selection_text"                 => [0, 0, 0], 
-        "dark_red"                            => [128, 0, 0], 
-        "widget_normal_shadow"                => [159, 159, 159], 
-        "dark_green"                          => [0, 128, 0], 
+        "widget_foreground"                   => [0, 0, 0],
+        "blue"                                => [0, 0, 255],
+        "widget_dark_shadow"                  => [0, 0, 0],
+        "title_foreground"                    => [0, 0, 0],
+        "yellow"                              => [255, 255, 0],
+        "widget_highlight_shadow"             => [255, 255, 255],
+        "dark_cyan"                           => [0, 128, 128],
+        "list_foreground"                     => [0, 0, 0],
+        "dark_blue"                           => [0, 0, 128],
+        "dark_yellow"                         => [128, 128, 0],
+        "cyan"                                => [0, 255, 255],
+        "info_background"                     => [236, 235, 236],
+        "link_foreground"                     => [0, 104, 218],
+        "title_inactive_foreground"           => [0, 0, 0],
+        "title_background_gradient"           => [179, 215, 255],
+        "red"                                 => [255, 0, 0],
+        "title_inactive_background_gradient"  => [220, 220, 220],
+        "transparent"                         => [255, 255, 255],
+        "widget_light_shadow"                 => [232, 232, 232],
+        "dark_magenta"                        => [128, 0, 128],
+        "white"                               => [255, 255, 255],
+        "list_selection"                      => [179, 215, 255],
+        "gray"                                => [192, 192, 192],
+        "widget_border"                       => [0, 0, 0],
+        "widget_background"                   => [236, 236, 236],
+        "info_foreground"                     => [0, 0, 0],
+        "title_inactive_background"           => [220, 220, 220],
+        "widget_disabled_foreground"          => [220, 220, 220],
+        "list_background"                     => [255, 255, 255],
+        "magenta"                             => [255, 0, 255],
+        "title_background"                    => [0, 99, 225],
+        "text_disabled_background"            => [255, 255, 255],
+        "black"                               => [0, 0, 0],
+        "dark_gray"                           => [128, 128, 128],
+        "list_selection_text"                 => [0, 0, 0],
+        "dark_red"                            => [128, 0, 0],
+        "widget_normal_shadow"                => [159, 159, 159],
+        "dark_green"                          => [0, 128, 0],
         "green"                               => [0, 255, 0]
       }
     
@@ -87,19 +87,19 @@ module Glimmer
       # rgba is 4 arguments representing Red, Green, Blue, and Alpha numeric values
       #
       def initialize(*args)
-        @args = args        
+        @args = args
         case @args.size
         when 1
           @alpha = nil
-          if @args.first.is_a?(String) || @args.first.is_a?(Symbol)              
-            standard_color = @args.first.to_s.downcase.sub('COLOR_', '')             
+          if @args.first.is_a?(String) || @args.first.is_a?(Symbol)
+            standard_color = @args.first.to_s.downcase.sub('COLOR_', '')
             @red, @green, @blue = SWT_COLOR_TRANSLATION[standard_color]
           else
             @red, @green, @blue = [0, 0, 0]
           end
         when 3..4
           @red, @green, @blue, @alpha = @args
-        end        
+        end
       end
       
       def to_css

data/lib/glimmer/swt/combo_proxy.rb

@@ -7,8 +7,8 @@ module Glimmer
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @items = []
       end
       

data/lib/glimmer/swt/composite_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
     class CompositeProxy < WidgetProxy
       attr_reader :layout
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @layout = GridLayoutProxy.new(self, [])
       end
       

data/lib/glimmer/swt/date_time_proxy.rb

@@ -4,7 +4,7 @@ module Glimmer
   module SWT
     class DateTimeProxy < WidgetProxy
       class << self
-        def create(keyword, parent, args)
+        def create(keyword, parent, args, block)
           case keyword
           when 'date'
             args += [:date]
@@ -15,12 +15,13 @@ module Glimmer
           when 'calendar'
             args += [:calendar]
           end
-          new(parent, args)
+          new(parent, args, block)
         end
       end
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        post_add_content if block.nil?
       end
       
       def post_add_content

data/lib/glimmer/swt/display_proxy.rb

@@ -66,10 +66,10 @@ module Glimmer
                   event_listener.call(event) if event.key_code != 13 && (event.key_code == 127 || event.key_code <= 31)
                 }
               }
-            }          
+            }
           ]
         }
-      end      
+      end
       
       def shells
         @shells ||= []

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -68,7 +68,7 @@ module Glimmer
             elsif vertical?
               margin_bottom "#{@spacing}px"
             end
-          }          
+          }
           s("##{@parent.id} > :last-child") {
             if horizontal?
               margin_right 0

data/lib/glimmer/swt/label_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
     class LabelProxy < WidgetProxy
       attr_reader :text, :background_image, :image, :alignment
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         self.alignment = [:left, :center, :right].detect {|align| args.detect { |arg| SWTProxy[align] == arg } }
       end
 

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -4,14 +4,14 @@ module Glimmer
   module SWT
     class LayoutDataProxy
       include Glimmer::SWT::PropertyOwner
-      attr_reader :parent, 
-                  :args, 
-                  :horizontal_alignment, 
-                  :vertical_alignment, 
-                  :horizontal_span, 
-                  :vertical_span, 
-                  :horizontal_indent, 
-                  :vertical_indent, 
+      attr_reader :parent,
+                  :args,
+                  :horizontal_alignment,
+                  :vertical_alignment,
+                  :horizontal_span,
+                  :vertical_span,
+                  :horizontal_indent,
+                  :vertical_indent,
                   :grab_excess_horizontal_space,
                   :grab_excess_vertical_space,
                   :width_hint,

data/lib/glimmer/swt/layout_proxy.rb

@@ -25,21 +25,21 @@ module Glimmer
         def layout_exists?(keyword)
           !!layout_class(keyword)
         end
-      end      
+      end
       
       attr_reader :parent, :args
         
-      def initialize(parent, args)      
+      def initialize(parent, args)
         @parent = parent
         @parent = parent.body_root if @parent.is_a?(Glimmer::UI::CustomWidget)
         @parent.css_classes.each do |css_class|
           @parent.remove_css_class(css_class) if css_class.include?('layout')
         end
-        @args = args        
+        @args = args
         @parent.add_css_class(css_class)
         @parent.layout = self
         self.margin_width = 15 if respond_to?(:margin_width=)
-        self.margin_height = 15 if respond_to?(:margin_height=)        
+        self.margin_height = 15 if respond_to?(:margin_height=)
       end
 
       def css_class

data/lib/glimmer/swt/list_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
       ITEM_EMPTY = '_____'
       attr_reader :items, :selection
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @selection = []
       end
       

data/lib/glimmer/swt/message_box_proxy.rb

@@ -5,10 +5,11 @@ module Glimmer
     class MessageBoxProxy < WidgetProxy
       attr_reader :text, :message
       
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         i = 0
         @parent = parent
         @args = args
+        @block = block
         @children = Set.new
         @enabled = true
         content do

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -5,8 +5,8 @@ module Glimmer
     class TabFolderProxy < WidgetProxy
       attr_reader :tabs
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @tabs = []
       end
       

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -4,10 +4,10 @@ module Glimmer
   module SWT
     class TabItemProxy < CompositeProxy
       include Glimmer
-      attr_reader :text, :content_visible      
+      attr_reader :text, :content_visible
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         content {
           on_widget_selected {
             @parent.hide_all_tab_content
@@ -35,7 +35,7 @@ module Glimmer
     
       def selector
         super + '-tab'
-      end      
+      end
       
       def observation_request_to_event_mapping
         {
@@ -47,7 +47,7 @@ module Glimmer
       
       def listener_path
         tab_path
-      end      
+      end
       
       def tab_path
         "#{parent.tabs_path} > ##{tab_id}"
@@ -72,13 +72,13 @@ module Glimmer
       
       # This contains the tab content
       def dom
-        tab_item_id = id        
+        tab_item_id = id
         tab_item_class_string = [name, 'hide'].join(' ')
         @dom ||= html {
           div(id: tab_item_id, class: tab_item_class_string) {
           }
         }.to_s
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/table_item_proxy.rb

@@ -5,8 +5,8 @@ module Glimmer
     class TableItemProxy < WidgetProxy
       attr_reader :data
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         on_widget_selected { |event|
           parent.select(parent.index_of(self), event.meta?)
         }
@@ -70,11 +70,11 @@ module Glimmer
             redraw
           end
         end
-        table_item_edit_cancel_handler = lambda do |event|           
+        table_item_edit_cancel_handler = lambda do |event|
           Async::Task.new do
             table_item_edit_handler.call(event, true)
           end
-        end   
+        end
         table_item_edit_key_handler = lambda do |event|
           Async::Task.new do
             if event.key_code == 13
@@ -91,7 +91,7 @@ module Glimmer
             Async::Task.new do
               table_item_input.focus
               table_item_input.on('keyup', &table_item_edit_key_handler)
-              table_item_input.on('focusout', &table_item_edit_cancel_handler)                
+              table_item_input.on('focusout', &table_item_edit_cancel_handler)
             end
           end
         end
@@ -132,7 +132,7 @@ module Glimmer
           tr(id: table_item_id, style: table_item_id_style, class: table_item_css_classes.to_a.join(' ')) {
             table_item_text_array.each_with_index do |table_item_text, column_index|
               td('data-column-index' => column_index) {
-                if @edit_column_index == column_index                  
+                if @edit_column_index == column_index
                   input(type: 'text', value: table_item_text, style: "max-width: #{table_item_max_width - 11}px;")
                 else
                   table_item_text

data/lib/glimmer/swt/table_proxy.rb

@@ -8,8 +8,8 @@ module Glimmer
       attr_accessor :column_properties
       alias items children
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @columns = []
         @children = []
         @selection = []

data/lib/glimmer/swt/widget_proxy.rb

@@ -33,9 +33,9 @@ module Glimmer
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
-        def for(keyword, parent, args)
+        def for(keyword, parent, args, block)
           the_widget_class = widget_class(keyword)
-          the_widget_class.respond_to?(:create) ? the_widget_class.create(keyword, parent, args) : the_widget_class.new(parent, args)
+          the_widget_class.respond_to?(:create) ? the_widget_class.create(keyword, parent, args, block) : the_widget_class.new(parent, args, block)
         end
         
         def widget_class(keyword)
@@ -97,9 +97,10 @@ module Glimmer
 #         end,
       }
       
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         @parent = parent
         @args = args
+        @block = block
         @children = Set.new # TODO consider moving to composite
         @enabled = true
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
@@ -305,16 +306,23 @@ module Glimmer
           @observation_requests[keyword] << event_listener
           event = mapping[:event]
           event_handler = mapping[:event_handler]
+          event_element_css_selector = mapping[:event_element_css_selector]
           potential_event_listener = event_handler&.call(event_listener)
           event_listener = potential_event_listener || event_listener
-          delegate = listener_dom_element.on(event, &event_listener)
+          async_event_listener = lambda do |event|
+            Async::Task.new do
+              event_listener.call(event)
+            end
+          end
+          the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
+          delegate = the_listener_dom_element.on(event, &async_event_listener)
         end
         # TODO update code below for new WidgetProxy API
         EventListenerProxy.new(element_proxy: self, event: event, selector: selector, delegate: delegate)
       end
       
       def add_observer(observer, property_name)
-        property_listener_installers = self.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+        property_listener_installers = self.class&.ancestors&.to_a.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.to_a.each do |widget_listener_installer|
           widget_listener_installer.call(observer)
@@ -466,7 +474,7 @@ module Glimmer
 #               }
 #             end,
 #           },
-          DateTimeProxy => { #radio?
+          DateTimeProxy => {
             :date_time => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(date_time)
@@ -506,6 +514,7 @@ require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'

data/lib/glimmer/ui/custom_widget.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 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
@@ -89,7 +89,7 @@ module Glimmer
         def included(klass)
           klass.extend(ClassMethods)
           unless klass.name.include?('Glimmer::UI::CustomShell')
-            klass.include(Glimmer) 
+            klass.include(Glimmer)
             Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass)
           end
         end
@@ -107,7 +107,7 @@ module Glimmer
               end
               begin
                 constant = result.const_get(namespace)
-                return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
+                return constant if constant&.respond_to?(:ancestors) && constant&.ancestors&.to_a.include?(Glimmer::UI::CustomWidget)
                 constant
               rescue => e
                 # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
@@ -158,7 +158,7 @@ module Glimmer
           args = []
         end
         options ||= {}
-        args = options.delete('swt_style').split(',').map(&:to_sym) if options['swt_style']                
+        args = options.delete('swt_style').split(',').map(&:to_sym) if options['swt_style']
         @args = args
         @swt_style = SWT::SWTProxy[*@args]
         options ||= {}
@@ -244,7 +244,7 @@ module Glimmer
 
       def has_style?(symbol)
         @args.include?(symbol) # not a very solid implementation. Bring SWT constants eventually
-      end      
+      end
 
       def async_exec(&block)
         SWT::DisplayProxy.instance.async_exec(&block)
@@ -273,7 +273,7 @@ module Glimmer
         end
       end
 
-      alias local_respond_to? respond_to?      
+      alias local_respond_to? respond_to?
       def respond_to?(method, *args, &block)
         super or
           can_handle_observation_request?(method) or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -217,7 +217,7 @@ files:
 - app/assets/images/glimmer/images/ui-icons_777777_256x240.png
 - app/assets/images/glimmer/images/ui-icons_cc0000_256x240.png
 - app/assets/images/glimmer/images/ui-icons_ffffff_256x240.png
-- app/assets/stylesheets/glimmer.css
+- app/assets/stylesheets/glimmer/glimmer.css
 - app/assets/stylesheets/glimmer/jquery-ui.css
 - app/assets/stylesheets/glimmer/jquery-ui.structure.css
 - app/assets/stylesheets/glimmer/jquery-ui.theme.css