glimmer-dsl-opal 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69a60c500b662de0e458896e7da698a769ed5823c924d591825d3bfd5845605
-  data.tar.gz: 223e76c5d758d5caecfa9843a491acb23302f9c1f1b3cf592af830bfefa4c114
+  metadata.gz: 7e5d23c66c0aec896d96111427221f61325f4239f1f45f4b5115e3a99c922c2c
+  data.tar.gz: cc9205606ad7d07b24bc8755190de7a763ae5aff5380d59a6280ff291e0d0d6f
 SHA512:
-  metadata.gz: 79b96f5af0774f9bf5e508af1a67aa6a80cb061f818b295b178dd01e65561003fb573b394f5c21fc03440cfb2f834f95260ae03e5558fb1c24ac9261520fa275
-  data.tar.gz: c9c643cd2043e1a62db4f7487f2c2a7a447b09ebc7f33d8d255c1cb6daf2ed78b19aab3be25f1efef7408df02ca61f757f455b69552b9ec4f8ac9c7e35b97291
+  metadata.gz: 7c21c30a8f1c2b2601fa974bb241d1228de285429ea25df542adbb58d94100d27f953925610e21cff6629ffdd821a4084ca3fc6f1528592d0568df51d944abe7
+  data.tar.gz: '091ec964115f9672ef746ff7c3a5689df3a5b578acce8d32754c02c8fe193368e41e8113651452b678eb5d0d7d2d688872e79b0a35477219df61ebcf18fc3fd2'

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.1 (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.2 (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.1 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.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))
 
 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.1 (Pure Ruby Web GUI)](#-glimmer-dsl-for-opal-0101-pure-ruby-web-gui)
+- [Glimmer DSL for Opal 0.10.2 (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.1'
+gem 'glimmer-dsl-opal', '~> 0.10.2'
 gem 'glimmer-dsl-xml', '~> 1.1.0', require: false
 gem 'glimmer-dsl-css', '~> 1.1.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

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 = 20 # TODO disable
+  Glimmer::Config.loop_max_count = 10 # TODO disable
   
   original_logger_level = Glimmer::Config.logger.level
   Glimmer::Config.logger = Glimmer::Config::OpalLogger.new(STDOUT)

data/lib/glimmer/swt/dialog_proxy.rb

@@ -68,9 +68,6 @@ module Glimmer
         @block = block
         @children = Set.new
         @enabled = true
-#         on_widget_selected {
-#           hide
-#         }
         DisplayProxy.instance.opened_dialogs.last&.suspend_event_handling
         DisplayProxy.instance.dialogs << self
         @parent.post_initialize_child(self)
@@ -90,7 +87,7 @@ module Glimmer
       end
       
       def open
-        owned_proc = Glimmer::Util::ProcTracker.new(owner: self) {
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
           shell.open(async: false) unless shell.open?
           unless @init
             dom_element.remove_class('hide')

data/lib/glimmer/swt/display_proxy.rb

@@ -64,17 +64,15 @@ module Glimmer
       
       def async_exec(proc_tracker = nil, &block)
         block = proc_tracker unless proc_tracker.nil?
-        can_open_modal = !modal_open?
-        return block.call if !can_open_modal && dialog_open? && block.respond_to?(:owner) && !block.owner.nil? && block.owner.is_a?(DialogProxy) && opened_dialogs.last == WidgetProxy.widget_handling_listener&.dialog_ancestor
-        return block.call if !can_open_modal && block.respond_to?(:owner) && !block.owner.nil? && block.owner.is_a?(MessageBoxProxy)
-        executer = lambda do
-          if !modal_open?
-            block.call
-          else
-            Async::Task.new(delay: 100, &executer)
-          end
+        queue = nil # general queue
+        if !proc_tracker.nil? && proc_tracker.invoked_from.to_s == 'open' && modal_open? &&
+           (
+             proc_tracker.owner.is_a?(MessageBoxProxy) ||
+             (dialog_open? && proc_tracker.owner.is_a?(DialogProxy) && opened_dialogs.last == WidgetProxy.widget_handling_listener&.dialog_ancestor)
+           )
+          queue = WidgetProxy.widget_handling_listener
         end
-        Async::Task.new(delay: 1, &executer)
+        schedule_async_exec(block, queue)
       end
       # sync_exec kept for API compatibility reasons
       alias sync_exec async_exec
@@ -107,6 +105,40 @@ module Glimmer
           ]
         }
       end
+      
+      private
+      
+      def async_exec_queues
+        @async_exec_queues ||= {}
+      end
+      
+      def async_exec_queue(widget_handling_listener = nil)
+        async_exec_queues[widget_handling_listener] ||= []
+      end
+      
+      def no_widget_handling_listener_work?
+        async_exec_queues.reject {|key, value| key.nil?}.values.reduce(:+).to_a.empty?
+      end
+      
+      def schedule_async_exec(block, queue)
+        async_exec_queue(queue).unshift(block)
+        
+        # TODO consider the need for locking to avoid race conditions (rare or impossible case)
+        if async_exec_queue(queue).size == 1
+          executer = lambda do
+            # queue could be a widget handling listener queue
+            # 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
+              Async::Task.new(delay: 1, &executer) if async_exec_queue(queue).any?
+            else
+              Async::Task.new(delay: 100, &executer)
+            end
+          end
+          Async::Task.new(delay: 1, &executer)
+        end
+      end
     end
   end
 end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -74,14 +74,13 @@ module Glimmer
         i = 0
         @parent = parent
         @parent = nil if parent.is_a?(LatestShellProxy)
-        @parent ||= DisplayProxy.instance.shells.last || ShellProxy.new([])
+        @parent ||= DisplayProxy.instance.shells.detect(&:open?) || ShellProxy.new([])
         @args = args
         @block = block
         @children = Set.new
         @enabled = true
         on_widget_selected {
           hide
-          @open = false
         }
         DisplayProxy.instance.message_boxes << self
       end
@@ -106,7 +105,7 @@ module Glimmer
       
       def open
         shell.open(async: false) unless shell.open?
-        owned_proc = Glimmer::Util::ProcTracker.new(owner: self) {
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
           parent.post_initialize_child(self)
           @open = true
         }
@@ -115,6 +114,7 @@ module Glimmer
       
       def hide
         dom_element.remove
+        @open = false
       end
       
       def content(&block)

data/lib/glimmer/util/proc_tracker.rb

@@ -23,12 +23,14 @@ require 'delegate'
 
 module Glimmer
   module Util
+    # Decorator that provides tracking facilities for Ruby procs, tracking owner (string), invoked_form method name (symbol/string), and called? (boolean)
     class ProcTracker < DelegateClass(Proc)
-      attr_reader :owner
+      attr_reader :owner, :invoked_from
       
-      def initialize(proc = nil, owner: nil, &block)
+      def initialize(proc = nil, owner: nil, invoked_from: nil, &block)
         super(proc || block)
         @owner = owner
+        @invoked_from = invoked_from
       end
       
       def call(*args)
@@ -41,7 +43,7 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        %w[owner called?].include?(method.to_s) || super(method, *args, &block)
+        %w[owner invoked_from called?].include?(method.to_s) || super(method, *args, &block)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -242,11 +242,9 @@ email: andy.am@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - VERSION

data/CHANGELOG.md

@@ -1,217 +0,0 @@
-# Change Log
-
-## 0.10.1
-
-- Delaying shell rendering till `#open` method is called as per the right expectation
-- When nesting dialogs on top of each other, disable all previously opened ones leaving only the top-most dialog active
-
-## 0.10.0
-
-- Hello, Dialog! Sample
-- Support `dialog` widget
-- Support `width` and `height` on `layout_data` for `row_layout`
-- Support `center` for `row_layout`
-
-## 0.9.3
-
-- Extracted pure Ruby Struct to pure-struct gem (since it's also used by YASL)
-- Alpha experimental incomplete implementation of Net::HTTP.post_form
-- Fixed issue with not being able to interact with a shell proxy (LatestShellProxy) after opening (made class autoupgradable to attached ShellProxy after document ready)
-
-## 0.9.2
-
-- Fixed issue with opening message_box after internalizing the Document.ready? block
-- Fixed issue with replacing newlines with HTML newlines in `label` and `message_box` text
-
-## 0.9.1
-
-- Log errors to error stream ($stderr) instead of standard out (STDOUT)
-- Fixed issue with opening shell caused by internalizing the Document.ready? block
-
-## 0.9.0
-
-- Support `menu_bar`
-- Hello, Menu Bar! Sample
-- Remove the need to call Document.ready? before opening a Glimmer shell
-- Support opening a message_box before creating a shell
-
-## 0.8.0
-
-- Hello, Pop Up Context Menu! Sample
-- Hello Message Box!
-- Update hello list samples
-- Support context menus `menu`/`menu_item` directly under a widget (using jQuery UI)
-- Support generating new lines when entering `label` `text` with \n (auto-converting to <br />)
-- Support generating new lines when entering `message_box` `message` with \n (auto-converting to <br />)
-- Support having any widget contribute static CSS to ShellProxy
-- Add Kernel#include_package shim to allow running JRuby include_package from Glimmer DSL for SWT without failing
-- Add WidgetProxy#swt_widget to allow running include_package from Glimmer DSL for SWT without failing
-
-## 0.7.5
-
-- Update login sample from Glimmer DSL for SWT's latest changes
-- Update contact_manager sample from Glimmer DSL for SWT's latest changes
-- Fixed issue regarding unavailable localStorage data when accessed by custom_widget_expression in hello_checkbox_group, hello_radio_group, and hello_custom_widget
-
-## 0.7.4
-
-- Hello, Button! Sample
-- Fix issue with aligning label as :left, :center, or :right via style style when fill_layout is used
-- Fix Hello, Browser sample by accessing https ssl website
-- Fix issue with filling space horizontally when using grid layout
-- Fix broken embedded `calendar` widget data-binding for hello_date_time.rb sample
-- Fix broken message_box after opening multiple shells
-- Fix issue with opening custom shells in new tabs/windows when CustomShell subclass is required conditionally
-
-## 0.7.3
-
-- Refactor to use to_collection gem
-- Fix issue with breaking `date`/`date_drop_down` data-binding as table editor on focus lost
-- Fix issue with requiring OS, File, and Display class after they've been extracted out
-
-## 0.7.2
-
-- `date_drop_down` `table_column` `editor`
-- `date` `table_column` `editor`
-- `time` `table_column` `editor`
-- Implement `on_focus_gained`, `on_focus_lost` universally on all widgets
-- Add support for Struct keyword_init to Opal
-- Fix issue with hello_table button/combo not being centered (yet stretched)
-- Fix issue with table item selection for booking not working after editing has been added
-- Fix escape keyboard event handling for combo table editor
-
-## 0.7.1
-
-- Combo table editor (enabled in Hello, Table! sample)
-- Fix issue with table cell selection for editing not working
-- Remove widget from parent upon dispose
-- Remove listeners upon widget dispose
-
-## 0.7.0
-
-- Hello, Table! Sample
-- `table` :editable style to enable auto-editing
-- `table` `header_visible` property to hide header when false
-- `table` `item_count` property to set minimum item count (fill empty rows when below in table items)
-- `table` selection data-binding
-- `table` built-in sorting support
-- `table_column` left text alignment and padding of 5px by default
-- `table` sort property and direction in GUI
-- `table_column` sort_property
-- `table_column` sort_by block
-- `table_column` sort block
-- `table` default sort via property, compare block, and property block
-- `table` additional sort properties
-- Prevent `table` unnecessary updates by comparing data to previous data and not updating when it's the same
-- Contact Manager sample support for on_key_pressed in text widgets upon hitting ENTER
-- Fix issue with edit table item error on sorting table
-
-## 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
-- Support `date_time`, `date`, `date_drop_down`, `time`, `calendar` keywords
-- Format Date/Time correctly as per SWT implementation by default
-- Make glimmer-dsl-opal gem into a Rails engine to support importing default static assets like CSS styles and images
-- Show drop down icon next to `date_drop_down` and `time`
-
-## 0.5.1
-
-- Fixed issue with Hello, Combo!, Hello, List...! samples
-
-## 0.5.0
-
-- Add `margin_top`, `margin_right`, `margin_bottom`, and `margin_left` to RowLayoutProxy
-- `radio`
-- Hello, Radio! Sample
-- `radio_group`
-- Hello, Radio Group! Sample
-- `checkbox`
-- Hello, Checkbox! Sample
-- `checkbox_group`
-- Fix issue with `label` `alignment` property
-- Fix issues with default `composite` `grid_layout` not getting its styles removed when setting `row_layout`
-- `button(:radio)` alias for `radio`
-- `check` alias for `checkbox`
-- `button(:check)` alias for `checkbox`
-- Hello, Group! Sample
-- Group widget
-
-## 0.4.0
-
-- Support `display` keyword representing an SWT Display
-- Support display `on_swt_keydown` event listener (display-wide widget observer)
-- Support `DisplayProxy#shells` method keeping track of open shell
-- Make a custom shell open in the same window if there is no shell open already
-- Support `sync_exec` keyword as just an alias to `async_exec`
-- Provide a makeshift require for 'glimmer-dsl-swt' that requires 'glimmer-dsl-opal' instead
-- Fake APIs on the web for OS.os?, File.read, Display.setAppName, Display.setAppVersion
-- Provide a minimal URI class that supports URI::encode_www_form_component and URI::decode_www_form_component from Ruby
-
-## 0.3.0
-
-- Support opening a custom shell in a browser tab/window by passing in query parameters to URL (e.g. ?custom_shell=keyword+option1=value1 etc...)
-- Make custom shells automatically open in a new tab/window (while standard shells continue to open in the same window by replacing its content)
-- Hello, Custom Shell! Sample
-
-## 0.2.0
-
-- Color support
-- Font support
-- Custom Widget Support
-- Hello, Custom Widget! sample
-- Updated Hello, Combo! sample to match the latest changes in Glimmer DSL for SWT
-- `SWT` full re-implementation in Opal as `Glimmer::SWT` with all the `SWT` style constants
-
-## 0.1.0
-
-- Code redesign to better match the glimmer-dsl-swt APIs
-- opal-jquery refactoring
-- opal-rspec test coverage
-
-## 0.0.9
-
-- Upgraded to glimmer gem v0.9.3
-- Fixed issue with missing Glimmer::Opal::ElementProxy#id=(value) method breaking Contact Manager sample Find feature
-
-## 0.0.8
-
-- Contact Manager sample support
-
-## 0.0.7
-
-- Tic Tac Toe sample support
-- Login sample support
-
-## 0.0.6
-
-- Hello, Tab! sample support
-
-## 0.0.5
-
-- Hello, Browser! sample support
-
-## 0.0.4
-
-- Hello, List Single Selection! sample support
-- Hello, List Multi Selection! sample support
-
-## 0.0.3
-
-- Hello, Computed! sample support
-
-## 0.0.2
-
-- Hello, Combo! sample support
-
-## 0.0.1
-
-- Initial support for webifying Glimmer SWT apps
-- Support for Shell and Label widgets (text property only).
-- Hello, World! sample support