glimmer-dsl-opal 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5d23c66c0aec896d96111427221f61325f4239f1f45f4b5115e3a99c922c2c
-  data.tar.gz: cc9205606ad7d07b24bc8755190de7a763ae5aff5380d59a6280ff291e0d0d6f
+  metadata.gz: be56447c904415b875ba3b0005c9b976eb942f0104aa5b8ab38ecb9ae5c2ea3c
+  data.tar.gz: 7dbfaa89ea361d08fed055ff163b723a3b0b8ae8ffd298d878175f5e2b78954f
 SHA512:
-  metadata.gz: 7c21c30a8f1c2b2601fa974bb241d1228de285429ea25df542adbb58d94100d27f953925610e21cff6629ffdd821a4084ca3fc6f1528592d0568df51d944abe7
-  data.tar.gz: '091ec964115f9672ef746ff7c3a5689df3a5b578acce8d32754c02c8fe193368e41e8113651452b678eb5d0d7d2d688872e79b0a35477219df61ebcf18fc3fd2'
+  metadata.gz: 8b1917799d722e876c3fa77e8d0b93bd0fe0eafa05c1fc0a7faebc4241e91bad634b2968adc9e4ffdad0541c8a11aa2d31fd56d5c819644a877d72f6deab2201
+  data.tar.gz: 571cc3bd410695e8c542334968a07503ee1a492e408cceccfb0f82a6681f6cdb9674924bbf7e7f794f394439fc55fbc7eae6012c04d8fc8bee2943e391b23541

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.10.2 (Pure Ruby Web GUI)
+# [<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.10.3 (Pure Ruby Web GUI)
 [![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)
 
@@ -141,7 +141,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.10.2 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.10.3 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -151,7 +151,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 
 ## Table of Contents
 
-- [Glimmer DSL for Opal 0.10.2 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0101-pure-ruby-web-gui)
+- [Glimmer DSL for Opal 0.10.3 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0101-pure-ruby-web-gui)
   - [Principles](#principles)
   - [Background](#background)
   - [Pre-requisites](#pre-requisites)
@@ -249,7 +249,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.10.2'
+gem 'glimmer-dsl-opal', '~> 0.10.3'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 
@@ -310,7 +310,7 @@ shell {
 
 ## Supported Glimmer DSL Keywords
 
-The following keywords from [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) have partial support in Opal:
+The following keywords from [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt) have fully functional partial support in Opal:
 
 Widgets:
 - `button`: featured in [Hello, Checkbox!](#hello-checkbox) / [Hello, Button!](#hello-button) / [Hello, Table!](#hello-table) / [Hello, Radio Group!](#hello-radio-group) / [Hello, Radio!](#hello-radio) / [Hello, Message Box!](#hello-message-box) / [Hello, List Single Selection!](#hello-list-single-selection) / [Hello, List Multi Selection!](#hello-list-multi-selection) / [Hello, Group!](#hello-group) / [Hello, Combo!](#hello-combo) / [Hello, Checkbox Group!](#hello-checkbox-group) / [Contact Manager](#contact-manager) / [Tic Tac Toe](#tic-tac-toe) / [Login](#login)

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/lib/glimmer-dsl-opal.rb

@@ -84,7 +84,7 @@ if RUBY_ENGINE == 'opal'
   Element.alias_native :select
   Element.alias_native :dialog
   
-  Glimmer::Config.loop_max_count = 10 # TODO disable
+  Glimmer::Config.loop_max_count = 300 # TODO disable
   
   original_logger_level = Glimmer::Config.logger.level
   Glimmer::Config.logger = Glimmer::Config::OpalLogger.new(STDOUT)

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

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

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

@@ -28,6 +28,7 @@ require 'glimmer/dsl/opal/checkbox_group_selection_data_binding_expression'
 require 'glimmer/dsl/opal/block_property_expression'
 require 'glimmer/dsl/opal/menu_expression'
 require 'glimmer/dsl/opal/dialog_expression'
+require 'glimmer/dsl/opal/shape_expression'
 
 module Glimmer
   module DSL
@@ -47,6 +48,7 @@ module Glimmer
          layout
          block_property
          property
+         shape
          widget
        ]
       )

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

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ShapeExpression < Expression
+        include ParentExpression
+        
+        INCLUDED_KEYWORDS = %w[rectangle polygon]
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          INCLUDED_KEYWORDS.include?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          # TODO
+        end
+        
+        def add_content(parent, &block)
+          # TODO
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/composite_proxy.rb

@@ -44,6 +44,8 @@ module Glimmer
             
     end
     
+    CanvasProxy = CompositeProxy # TODO implement fully eventually
+    
   end
   
 end

data/lib/glimmer/swt/display_proxy.rb

@@ -7,6 +7,9 @@ module Glimmer
         def instance
           @instance ||= new
         end
+        
+        attr_accessor :open_custom_shells_in_current_window
+        alias open_custom_shells_in_current_window? open_custom_shells_in_current_window
       end
       
       def initialize
@@ -62,6 +65,10 @@ module Glimmer
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
       
+      def beep
+        # TODO (simulate beep from SWT display flashing the screen and making a noise if possible)
+      end
+      
       def async_exec(proc_tracker = nil, &block)
         block = proc_tracker unless proc_tracker.nil?
         queue = nil # general queue
@@ -87,7 +94,34 @@ module Glimmer
                   event.singleton_class.define_method(:character) do
                     which || key_code
                   end
+                  event.define_singleton_method(:keyCode) {event.which}
+                  event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:character) {event.which.chr}
+                  event.define_singleton_method(:stateMask) do
+                    state_mask = 0
+                    state_mask |= SWTProxy[:alt] if event.alt_key
+                    state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                    state_mask |= SWTProxy[:shift] if event.shift_key
+                    state_mask |= SWTProxy[:command] if event.meta_key
+                    state_mask
+                  end
+                  event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                  doit = true
+                  event.define_singleton_method(:doit=) do |value|
+                    doit = value
+                  end
+                  event.define_singleton_method(:doit) { doit }
                   event_listener.call(event)
+                  
+                    # TODO Fix doit false, it's not stopping input
+                  unless doit
+                    event.prevent
+                    event.prevent_default
+                    event.stop_propagation
+                    event.stop_immediate_propagation
+                  end
+                  
+                  doit
                 }
               }
             },
@@ -98,7 +132,34 @@ module Glimmer
                   event.singleton_class.define_method(:character) do
                     which || key_code
                   end
+                  event.define_singleton_method(:keyCode) {event.which}
+                  event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:character) {event.which.chr}
+                  event.define_singleton_method(:stateMask) do
+                    state_mask = 0
+                    state_mask |= SWTProxy[:alt] if event.alt_key
+                    state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                    state_mask |= SWTProxy[:shift] if event.shift_key
+                    state_mask |= SWTProxy[:command] if event.meta_key
+                    state_mask
+                  end
+                  event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                  doit = true
+                  event.define_singleton_method(:doit=) do |value|
+                    doit = value
+                  end
+                  event.define_singleton_method(:doit) { doit }
                   event_listener.call(event) if event.key_code != 13 && (event.key_code == 127 || event.key_code <= 31)
+                  
+                    # TODO Fix doit false, it's not stopping input
+                  unless doit
+                    event.prevent
+                    event.prevent_default
+                    event.stop_propagation
+                    event.stop_immediate_propagation
+                  end
+                  
+                  doit
                 }
               }
             }
@@ -130,7 +191,7 @@ module Glimmer
             # TODO see if there are more intricate cases of opening a dialog from a widget listener handler
             if !message_box_open? && (!dialog_open? || queue&.dialog_ancestor == opened_dialogs.last) && ((!queue.nil? && async_exec_queues.keys.last == queue) || no_widget_handling_listener_work?)
               block = async_exec_queue(queue).pop
-              block.call
+              block&.call
               Async::Task.new(delay: 1, &executer) if async_exec_queue(queue).any?
             else
               Async::Task.new(delay: 100, &executer)

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -19,6 +19,23 @@ module Glimmer
         # TODO do the following instead of reapply
 #         @parent.add_css_class("num-columns-#{@num_columns}")
         # reinitialize # TODO reimplement without using reinitialize
+        layout_css = <<~CSS
+          grid-template-columns: #{'auto ' * @num_columns.to_i};
+          grid-row-gap: #{@vertical_spacing}px;
+          grid-column-gap: #{@horizontal_spacing}px;
+        CSS
+        if @parent.css_classes.include?('grid-layout')
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, value) unless key.nil?
+          end
+          if @parent.is_a?(GroupProxy)
+            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
+          end
+        else
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, 'initial') unless key.nil?
+          end
+        end
       end
       
       def make_columns_equal_width=(equal_width)
@@ -63,23 +80,6 @@ module Glimmer
         self.margin_width = 15
         self.margin_height = 15
         self.num_columns = @args.first || 1
-        layout_css = <<~CSS
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-        CSS
-        if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, value) unless key.nil?
-          end
-          if @parent.is_a?(GroupProxy)
-            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
-          end
-        else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, 'initial') unless key.nil?
-          end
-        end
       end
     end
   end

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -42,13 +42,17 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
         
       def initialize(parent, args)
         super(parent, args)
-        @type = args.first || :horizontal
-        self.pack = true
         @parent.dom_element.add_class('row-layout')
+        self.type = args.first || :horizontal
+        self.pack = true
+      end
+      
+      def type=(value)
+        @type = value
         @parent.dom_element.add_class(horizontal? ? 'row-layout-horizontal' : 'row-layout-vertical')
       end
       
@@ -75,6 +79,11 @@ module Glimmer
         end
       end
       
+      def fill=(value)
+        # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
+        self.pack(!value)
+      end
+      
       def center=(center_value)
         @center = center_value
         # Using padding for width since margin-right isn't getting respected with width 100%

data/lib/glimmer/ui/custom_shell.rb

@@ -28,15 +28,29 @@ module Glimmer
     module CustomShell
       include Glimmer::UI::CustomWidget
       
+      module ClassMethods
+        attr_reader :custom_shell
+        
+        def launch
+          @custom_shell = send(self.name.underscore.gsub('::', '__'))
+          @custom_shell.open
+        end
+        
+        def shutdown
+          @custom_shell.close
+        end
+      end
+      
       class << self
         def included(klass)
           klass.extend(CustomWidget::ClassMethods)
+          klass.extend(CustomShell::ClassMethods)
           klass.include(Glimmer)
           Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass)
           keyword = klass.name.split(':').last.underscore
           LocalStorage[keyword] = $LOADED_FEATURES.last
         end
-          
+        
         def request_parameter_string
           URI.decode_www_form_component(`document.location.href`.match(/\?(.*)$/).to_a[1].to_s)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +347,7 @@ files:
 - lib/glimmer/dsl/opal/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/rgb_expression.rb
 - lib/glimmer/dsl/opal/rgba_expression.rb
+- lib/glimmer/dsl/opal/shape_expression.rb
 - lib/glimmer/dsl/opal/shell_expression.rb
 - lib/glimmer/dsl/opal/swt_expression.rb
 - lib/glimmer/dsl/opal/sync_exec_expression.rb