glimmer 1.0.8 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3b9d6aa82ade846c56a4c1128d51fdcb7fcffbd5aa4e0c3a30272556538a07
-  data.tar.gz: bdbc807624d438309c9b6f5581056412d68008b14b60b28016cdd486b1d05270
+  metadata.gz: 8406be710971b09333b5620c761f4f2e8f462386f97c4921f945947ad6592967
+  data.tar.gz: b10c91c73e32356c3a8de92ad19f8364e2b1005fab08a0acc34db42bedadcdb3
 SHA512:
-  metadata.gz: af20767a864c17dcb33decb04c24439f34a103dd1205e0adb79983227dcef684dfd7af6c1a6ccde7b9541befb7ddc027aa74d25dc0f07cc4c857cb2079b0f835
-  data.tar.gz: 9a1e882342a1a08912e365d2e7950e195b50a83b7a554a4df2de447151c324c1b91ecc93d56e10aaaf248b2dace385e184439ac50717bf81e8d39c4ef08e8d76
+  metadata.gz: da71f67bc904f0141492508e3f084386e98bf4a148d24431672bbe96154dab20a08458cc64f647c1ea3d8204e0278d236917568f12b43c50e68e5a05b67304a0
+  data.tar.gz: 1d28c8c659c5a10621085e719586b0e096d17538550b868beb9fc1f31a2ddfa09093ee7832a420c00d0ebd81d5ff3c40f8730d6c96defebbc351c19e1aa6f38e

data/CHANGELOG.md

@@ -3,6 +3,27 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+## 1.1.1
+
+- Ensured after_read hook truly happens after notifying observers in ModelBinding
+
+## 1.1.0
+
+- ModelBinding hooks for before_read, after_read, before_write, after_write
+
+## 1.0.11
+
+- Alias unregister as deregister everywhere
+- Optimize performance of `Glimmer::Config.excluded_keyword_checkers` in glimmer method_missing
+
+## 1.0.10
+
+- Avoid using concurrent-ruby in Opal
+
+## 1.0.9
+
+- Fixed issue with top-level static expressions sometimes not working (e.g. async_exec in DSL for SWT) with DSL detected as nil
+
 ## 1.0.8
 
 - Concurrent Array/Hash/Set data structures to better support parallel multi-threading

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 style="position: relative; top: 20px;" />](https://rubygems.org/gems/glimmer) Glimmer 1.0.8 - DSL Framework
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 style="position: relative; top: 20px;" />](https://rubygems.org/gems/glimmer) Glimmer - DSL Framework for Ruby GUI and More
 [![Gem Version](https://badge.fury.io/rb/glimmer.svg)](http://badge.fury.io/rb/glimmer)
 [![rspec](https://github.com/AndyObtiva/glimmer/workflows/rspec/badge.svg)](https://github.com/AndyObtiva/glimmer/actions?query=workflow%3Arspec)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
@@ -9,7 +9,7 @@
 
 **(The Original Glimmer Library Since 2007. Beware of Imitators!)**
 
-[**Glimmer**](https://rubygems.org/gems/glimmer) started out as a [GUI Library](https://github.com/AndyObtiva/glimmer-dsl-swt) and grew into a full-fledged [DSL Framework](#dsl-engine) with support for multiple GUI DSLs. Glimmer's namesake is referring to the Glimmer of Ruby in Graphical User Interfaces (contrary to popular myth perpetrated by [Charles Nutter](http://blog.headius.com/2007/11/tab-sweep.html), Glimmer has nothing to do with the ill-fated Whitney Houston movie, which does not in fact share the same name)
+[**Glimmer**](https://rubygems.org/gems/glimmer) started out as a [GUI Library](https://github.com/AndyObtiva/glimmer-dsl-swt) and grew into a full-fledged [DSL Framework](#dsl-engine) with support for multiple GUI DSLs. Glimmer's namesake is referring to the Glimmer of Ruby in Graphical User Interfaces (contrary to [popular myth](http://blog.headius.com/2007/11/tab-sweep.html) perpetrated by [Charles Nutter](http://blog.headius.com/2007/11/tab-sweep.html), Glimmer has nothing to do with the ill-fated Whitney Houston movie, which does not in fact share the same name)
 
 [<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)
@@ -32,19 +32,19 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS
-- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (Ruby Desktop Development GUI Library)
+- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
 
 [Glimmer and/or Glimmer DSLs receive two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer](https://rubygems.org/gems/glimmer) with your Ruby development needs.
 
 ## Table of Contents
 
-- [Glimmer 1.0.8](#-glimmer-108---dsl-framework)
+- [Glimmer](#-glimmer---dsl-framework-for-ruby-gui-and-more)
   - [Official DSLs](#official-dsls)
     - [Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](#glimmer-dsl-for-swt-jruby-desktop-development-gui-framework)
     - [Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)](#glimmer-dsl-for-opal-pure-ruby-web-gui-and-auto-webifier-of-desktop-apps)
     - [Glimmer DSL for XML (& HTML)](#glimmer-dsl-for-xml--html)
     - [Glimmer DSL for CSS](#glimmer-dsl-for-css)
-    - [Glimmer DSL for Tk (Ruby Desktop Development GUI Library)](#glimmer-dsl-for-tk-ruby-desktop-development-gui-library)
+    - [Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](#glimmer-dsl-for-tk-mri-ruby-desktop-development-gui-library)
   - [DSL Engine](#dsl-engine)
     - [Multi-DSL Support](#multi-dsl-support)
   - [Data-Binding Library](#data-binding-library)
@@ -76,6 +76,8 @@ To get started, visit the [Glimmer DSL for SWT project page](https://github.com/
 
 ##### Hello, World!
 
+![Hello World](images/glimmer-hello-world.png)
+
 Glimmer GUI code (from [samples/hello/hello_world.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_world.rb)):
 ```ruby
 include Glimmer
@@ -88,162 +90,141 @@ shell {
 }.open
 ```
 
-Glimmer app:
+##### Glimmer Tetris
 
-![Hello World](images/glimmer-hello-world.png)
+![Tetris](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-swt/v4.18.3.1/images/glimmer-tetris.png)
 
-##### Tic Tac Toe
-
-Glimmer GUI code (from [samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/tic_tac_toe.rb)):
+Glimmer GUI code (from [samples/elaborate/tetris.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/v4.18.3.1/samples/elaborate/tetris.rb)):
 
 ```ruby
 # ...
-    @shell = shell {
-      text "Tic-Tac-Toe"
-      minimum_size 150, 178
-      composite {
-        grid_layout 3, true
-        (1..3).each { |row|
-          (1..3).each { |column|
-            button {
-              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)
-              }
-            }
-          }
-        }
+    shell(:no_resize) {
+      grid_layout {
+        num_columns 2
+        make_columns_equal_width false
+        margin_width 0
+        margin_height 0
+        horizontal_spacing 0
+      }
+      
+      text 'Glimmer Tetris'
+      minimum_size 475, 500
+      background :gray
+      
+      tetris_menu_bar(game: game)
+            
+      playfield(game_playfield: game.playfield, playfield_width: playfield_width, playfield_height: playfield_height, block_size: BLOCK_SIZE)
+      
+      score_lane(game: game, block_size: BLOCK_SIZE) {
+        layout_data(:fill, :fill, true, true)
+      }
+      
+      on_widget_disposed {
+        deregister_observers
       }
     }
 # ...
 ```
 
-Glimmer app:
-
-![Tic Tac Toe](images/glimmer-tic-tac-toe-in-progress.png)
+##### Hello, Table!
 
-##### Contact Manager
+![Hello Table](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-swt/master/images/glimmer-hello-table.png)
 
-Glimmer GUI code (from [samples/elaborate/contact_manager.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/contact_manager.rb)):
+Glimmer GUI code (from [samples/hello/hello_table.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_table.rb)):
 
 ```ruby
 # ...
     shell {
-      text "Contact Manager"
-      composite {
-        group {
-          grid_layout(2, false) {
-            margin_width 0
-            margin_height 0
-          }
-          layout_data :fill, :center, true, false
-          text 'Lookup Contacts'
-          font height: 24
-          
-          label {
-            layout_data :right, :center, false, false
-            text "First &Name: "
-            font height: 16
-          }
-          text {
-            layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :first_name)
-            on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
-          }
-          
-          label {
-            layout_data :right, :center, false, false
-            text "&Last Name: "
-            font height: 16
-          }
-          text {
-            layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :last_name)
-            on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
-          }
-          
-          label {
-            layout_data :right, :center, false, false
-            text "&Email: "
-            font height: 16
-          }
-          text {
-            layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :email)
-            on_key_pressed {|key_event|
-              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-            }
-          }
-          
-          composite {
-            row_layout {
-              margin_width 0
-              margin_height 0
-            }
-            layout_data(:right, :center, false, false) {
-              horizontal_span 2
-            }
-            
-            button {
-              text "&Find"
-              on_widget_selected { @contact_manager_presenter.find }
-              on_key_pressed {|key_event|
-                @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
-              }
-            }
+      grid_layout
+      
+      text 'Hello, Table!'
+      
+      label {
+        layout_data :center, :center, true, false
+        
+        text 'Baseball Playoff Schedule'
+        font height: 30, style: :bold
+      }
+      
+      combo(:read_only) {
+        layout_data :center, :center, true, false
+        selection bind(BaseballGame, :playoff_type)
+        font height: 16
+      }
+      
+      table(:editable) { |table_proxy|
+        layout_data :fill, :fill, true, true
+      
+        table_column {
+          text 'Game Date'
+          width 150
+          sort_property :date # ensure sorting by real date value (not `game_date` string specified in items below)
+          editor :date_drop_down, property: :date_time
+        }
+        table_column {
+          text 'Game Time'
+          width 150
+          sort_property :time # ensure sorting by real time value (not `game_time` string specified in items below)
+          editor :time, property: :date_time
+        }
+        table_column {
+          text 'Ballpark'
+          width 180
+          editor :none
+        }
+        table_column {
+          text 'Home Team'
+          width 150
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
+        }
+        table_column {
+          text 'Away Team'
+          width 150
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
+        }
+        table_column {
+          text 'Promotion'
+          width 150
+          # default text editor is used here
+        }
+        
+        # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
+        items bind(BaseballGame, :schedule), column_properties(:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion)
+        
+        # Data-bind table selection
+        selection bind(BaseballGame, :selected_game)
+        
+        # Default initial sort property
+        sort_property :date
+        
+        # Sort by these additional properties after handling sort by the column the user clicked
+        additional_sort_properties :date, :time, :home_team, :away_team, :ballpark, :promotion
+        
+        menu {
+          menu_item {
+            text 'Book'
             
-            button {
-              text "&List All"
-              on_widget_selected { @contact_manager_presenter.list }
-              on_key_pressed {|key_event|
-                @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
-              }
+            on_widget_selected {
+              book_selected_game
             }
           }
         }
-
-        table(:multi) { |table_proxy|
-          layout_data {
-            horizontal_alignment :fill
-            vertical_alignment :fill
-            grab_excess_horizontal_space true
-            grab_excess_vertical_space true
-            height_hint 200
-          }
-          table_column {
-            text "First Name"
-            width 80
-          }
-          table_column {
-            text "Last Name"
-            width 80
-          }
-          table_column {
-            text "Email"
-            width 200
-          }
-          items bind(@contact_manager_presenter, :results),
-          column_properties(:first_name, :last_name, :email)
-          on_mouse_up { |event|
-            table_proxy.edit_table_item(event.table_item, event.column_index)
-          }
+      }
+      
+      button {
+        text 'Book Selected Game'
+        layout_data :center, :center, true, false
+        font height: 16
+        enabled bind(BaseballGame, :selected_game)
+        
+        on_widget_selected {
+          book_selected_game
         }
       }
     }.open
 # ...
 ```
 
-Glimmer App:
-
-![Contact Manager](images/glimmer-contact-manager.png)
-
 #### Production Desktop Apps Built with Glimmer DSL for SWT
 
 [<img alt="Are We There Yet Logo" src="https://raw.githubusercontent.com/AndyObtiva/are-we-there-yet/master/are-we-there-yet-logo.svg" width="40" />Are We There Yet?](https://github.com/AndyObtiva/are-we-there-yet) - Small Project Tracking App
@@ -254,6 +235,10 @@ Glimmer App:
 
 [![Math Bowling App Screenshot](https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/Math-Bowling-Screenshot.png)](https://github.com/AndyObtiva/MathBowling)
 
+[<img alt="Garderie Rainbow Daily Agenda Logo" src="https://raw.githubusercontent.com/AndyObtiva/garderie_rainbow_daily_agenda/master/images/garderie_rainbow_daily_agenda_logo.png" width="40" />Garderie Rainbow Daily Agenda](https://github.com/AndyObtiva/garderie_rainbow_daily_agenda) -  A child nursery daily agenda reporting desktop app
+
+[![Garderie Rainbow Daily Agenda App Screenshot](https://raw.githubusercontent.com/AndyObtiva/garderie_rainbow_daily_agenda/master/images/garderie_rainbow_daily_agenda_screenshot.png)](https://github.com/AndyObtiva/garderie_rainbow_daily_agenda)
+
 ### Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 
 [Glimmer DSL for Opal](https://github.com/AndyObtiva/glimmer-dsl-opal) is an experimental proof-of-concept web GUI adapter for [Glimmer](https://github.com/AndyObtiva/glimmer) desktop apps (i.e. apps built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)). It webifies them via [Rails](https://rubyonrails.org/), allowing Ruby desktop apps to run on the web via [Opal Ruby](https://opalrb.com/) without changing a line of code. Apps may then be custom-styled for the web with standard CSS.
@@ -418,9 +403,9 @@ shell {
     caret nil
   }
   command_button('AC')
-  operation_button('÷')
-  operation_button('×')
-  operation_button('−')
+  operation_button('÷')
+  operation_button('�')
+  operation_button('−')
   (7..9).each { |number|
     number_button(number)
   }
@@ -540,13 +525,13 @@ Output:
 body{font-size:1.1em;background:white}body > h1{background-color:red;font-size:2em}
 ```
 
-### Glimmer DSL for Tk (Ruby Desktop Development GUI Library)
+### Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
 
 [Tcl/Tk](https://www.tcl.tk/) has evolved into a practical desktop GUI toolkit due to gaining truely native looking widgets on Mac, Windows, and Linux in [Tk version 8.5](https://www.tcl.tk/software/tcltk/8.5.html#:~:text=Highlights%20of%20Tk%208.5&text=Font%20rendering%3A%20Now%20uses%20anti,and%20window%20layout%2C%20and%20more.).
 
 Additionally, [Ruby](https://www.ruby-lang.org/en/) 3.0 Ractor (formerly known as [Guilds](https://olivierlacan.com/posts/concurrency-in-ruby-3-with-guilds/)) supports truly parallel multi-threading, making both [MRI](https://github.com/ruby/ruby) and [Tk](https://www.tcl.tk/) finally viable for support in [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library) as an alternative to [JRuby on SWT](https://github.com/AndyObtiva/glimmer-dsl-swt).
 
-The trade-off is that while [SWT](https://www.eclipse.org/swt/) provides a plethora of high quality reusable widgets for the Enterprise (such as [Nebula](https://www.eclipse.org/nebula/)), [Tk](https://www.tcl.tk/) enables very fast app startup time via [MRI Ruby](https://www.ruby-lang.org/en/).
+The trade-off is that while [SWT](https://www.eclipse.org/swt/) provides a plethora of high quality reusable widgets for the Enterprise (such as [Nebula](https://www.eclipse.org/nebula/)), [Tk](https://www.tcl.tk/) enables very fast app startup time and a small memory footprint via [MRI Ruby](https://www.ruby-lang.org/en/).
 
 [Glimmer DSL for Tk](https://github.com/AndyObtiva/glimmer-dsl-tk) aims to provide a DSL similar to the [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) to enable more productive desktop development in Ruby with:
 - Declarative DSL syntax that visually maps to the GUI widget hierarchy
@@ -852,9 +837,11 @@ Example: `Glimmer::DSL::Engine.enabled_dsls = [:xml, :css]`
 
 ## Data-Binding Library
 
-Data-Binding enables binding GUI properties (like text and color) to Model attributes (like name and age).
+Data-Binding enables mapping GUI properties (like text and color) to Model attributes (like name and age).
+
+Glimmer enhances observed models automatically (including array operations like `<<` and `reject!`) on first observation. As such, you get automatic observable support, including nested and computed observations. No need to change your model code to data-bind it to the view or add repetitive boilerplate modules. View data-binding is truly decoupled from model logic by being able to observe any model attribute (Ruby attribute reader/writer combo or Ruby attribute reader alone for read-only data-binding when needed)
 
-It relies on the Observer Design Pattern and MVP (Model-View-Presenter) Architectural Pattern (a variation on MVC)
+This relies mainly on the Observer Design Pattern and the MVP (Model-View-Presenter) Architectural Pattern (a variation on MVC)
 
 These are the main classes concerning data-binding:
 - `Observer`: Provides general observer support including unique registration and deregistration for cleanup and prevention of memory leaks. Main methods concerned are: `call`, `register` (alias: `observe`), and `unregister` (alias: `unobserve` or `deregister`)
@@ -914,8 +901,8 @@ If you would like to contribute to Glimmer, please study up on Glimmer and [SWT]
 
 You may apply for contributing to any of these Glimmer DSL gems whether you prefer to focus on the desktop or web:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
-- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (Ruby Desktop Development GUI Library)
-- [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
+- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)
+- [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS
 

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.1.1

data/glimmer.gemspec

@@ -1,20 +1,21 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 1.0.8 ruby lib
+# stub: glimmer 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "1.0.8"
+  s.version = "1.1.1"
 
   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-01-19"
+  s.date = "2021-02-09"
   s.description = "Glimmer is a Ruby DSL Framework consisting of a DSL Engine and an Observable/Observer/Data-Binding Library. Used in the Glimmer DSL for SWT (JRuby Desktop Development GUI Framework), the Glimmer DSL for Tk (Ruby Desktop Development GUI Library), the Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps), the Glimmer DSL for XML (& HTML), and the Glimmer DSL for CSS.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
+    "CHANGELOG.md",
     "LICENSE.txt",
     "README.md"
   ]
@@ -40,31 +41,46 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/static_expression.rb",
     "lib/glimmer/dsl/top_level_expression.rb",
     "lib/glimmer/error.rb",
+    "lib/glimmer/ext/module.rb",
     "lib/glimmer/invalid_keyword_error.rb"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.4".freeze
-  s.summary = "Glimmer Ruby DSL Engine".freeze
+  s.rubygems_version = "3.0.6".freeze
+  s.summary = "Glimmer - DSL Engine for Ruby GUI and More".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
-  end
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
-    s.add_runtime_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])
-    s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 1.1.7", "< 2.0.0"])
-    s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.0"])
-    s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
-    s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.0", "< 3.0.0"])
-    s.add_development_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
-    s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
-    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
-    s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
-    s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
+      s.add_runtime_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])
+      s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 1.1.7", "< 2.0.0"])
+      s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.0", "< 3.0.0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
+      s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+      s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+      s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
+    else
+      s.add_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
+      s.add_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])
+      s.add_dependency(%q<concurrent-ruby>.freeze, [">= 1.1.7", "< 2.0.0"])
+      s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.0"])
+      s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.0.0", "< 3.0.0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
+      s.add_dependency(%q<coveralls>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+      s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+      s.add_dependency(%q<rake-tui>.freeze, [">= 0"])
+    end
   else
     s.add_dependency(%q<array_include_methods>.freeze, [">= 1.0.4", "< 2.0.0"])
     s.add_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.0.0"])

data/lib/glimmer.rb

@@ -22,11 +22,20 @@
 require 'logger'
 require 'set'
 require 'array_include_methods'
-require 'concurrent-ruby'
+if RUBY_ENGINE == 'opal'
+  module Concurrent
+    Array = ::Array
+    Hash = ::Hash
+    Set = ::Set
+  end
+else
+  require 'concurrent-ruby'
+end
 
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 require 'glimmer/config'
+require 'glimmer/ext/module'
 
 # Glimmer provides a JRuby Desktop UI DSL + Data-Binding functionality
 #
@@ -57,7 +66,9 @@ module Glimmer
 
   def method_missing(method_symbol, *args, &block)
     # This if statement speeds up Glimmer in girb or whenever directly including on main object
-    is_excluded = Config.excluded_keyword_checkers.reduce(false) {|result, checker| result || instance_exec(method_symbol, *args, &checker) }
+    is_excluded = Config.excluded_keyword_checkers.any? do |checker|
+      instance_exec(method_symbol, *args, &checker)
+    end
     if is_excluded
       Glimmer::Config.logger.debug "Glimmer excluded keyword: #{method_symbol}" if Glimmer::Config.log_excluded_keywords?
       super(method_symbol, *args, &block)

data/lib/glimmer/data_binding/model_binding.rb

@@ -49,9 +49,7 @@ module Glimmer
       def nested_models
         @nested_models = [base_model]
         model_property_names.reduce(base_model) do |reduced_model, nested_model_property_name|
-          if reduced_model.nil?
-            nil
-          else
+          if !reduced_model.nil?
             invoke_property_reader(reduced_model, nested_model_property_name).tap do |new_reduced_model|
               @nested_models << new_reduced_model
             end
@@ -72,21 +70,6 @@ module Glimmer
         nested_property? ? nested_property_name : property_name_expression
       end
 
-      def convert_on_read(value)
-        apply_converter(@binding_options[:on_read], value)
-      end
-
-      def convert_on_write(value)
-        apply_converter(@binding_options[:on_write], value)
-      end
-
-      def apply_converter(converter, value)
-        return value if converter.nil?
-        return value.send(converter) if (converter.is_a?(String) || converter.is_a?(Symbol)) && value.respond_to?(converter)
-        return converter.call(value) if converter.respond_to?(:call, value)
-        raise Glimmer::Error, "Unsupported bind converter: #{converter.inspect}"
-      end
-
       # All nested property names
       # e.g. property name expression "address.state" gives ['address', 'state']
       # If there are any indexed property names, this returns indexes as properties.
@@ -127,7 +110,10 @@ module Glimmer
               property_name => Observer.proc do |new_value|
                 # Ensure reattaching observers when a higher level nested property is updated (e.g. person.address changes reattaches person.address.street observer)
                 add_observer(observer)
-                observer.call(evaluate_property)
+                converted_value = evaluate_property
+                observer.call(converted_value).tap do
+                  apply_processor(@binding_options[:after_read], converted_value)
+                end
               end
             )
           end
@@ -142,7 +128,10 @@ module Glimmer
           add_nested_observers(observer)
         else
           model_binding_observer = Observer.proc do |new_value|
-            observer.call(evaluate_property)
+            converted_value = evaluate_property
+            observer.call(converted_value).tap do
+              apply_processor(@binding_options[:after_read], converted_value)
+            end
           end
           observer_registration = model_binding_observer.observe(model, property_name)
           my_registration = observer.registration_for(self)
@@ -167,7 +156,10 @@ module Glimmer
         @computed_observer_collection ||= Concurrent::Hash.new
         unless @computed_observer_collection.has_key?(observer)
           @computed_observer_collection[observer] = Observer.proc do |new_value|
-            observer.call(evaluate_property)
+            converted_value = evaluate_property
+            observer.call(converted_value).tap do
+              apply_processor(@binding_options[:after_read], converted_value)
+            end
           end
         end
         @computed_observer_collection[observer]
@@ -215,9 +207,10 @@ module Glimmer
       def evaluate_property
         value = nil
         value = invoke_property_reader(model, property_name) unless model.nil?
+        apply_processor(@binding_options[:before_read], value)
         convert_on_read(value)
       end
-
+      
       def evaluate_options_property
         model.send(options_property_name) unless model.nil?
       end
@@ -230,6 +223,29 @@ module Glimmer
         property_expression.to_s.start_with?('[')
       end
 
+      private
+
+      def convert_on_read(value)
+        apply_processor(@binding_options[:on_read], value)
+      end
+
+      def convert_on_write(value)
+        apply_processor(@binding_options[:on_write], value)
+      end
+
+      def apply_processor(processor, value)
+        return value if processor.nil?
+        return value.send(processor) if (processor.is_a?(String) || processor.is_a?(Symbol)) && value.respond_to?(processor)
+        return invoke_proc_with_exact_parameters(processor, value) if processor.respond_to?(:call)
+        raise Glimmer::Error, "Unsupported bind processor: #{processor.inspect}"
+      end
+
+      def invoke_proc_with_exact_parameters(proc_object, *args)
+        return if proc_object.nil?
+        args = args[0...proc_object.parameters.size]
+        proc_object.call(*args)
+      end
+
       def invoke_property_reader(object, property_expression)
         if property_indexed?(property_expression)
           property_method = '[]'
@@ -243,15 +259,17 @@ module Glimmer
 
       def invoke_property_writer(object, property_expression, value)
         raise "Cannot invoke `#{property_expression}` because ModelBinding#binding_options[:read_only]=true" if @binding_options[:read_only]
-        value = convert_on_write(value)
+        apply_processor(@binding_options[:before_write], value)
+        converted_value = convert_on_write(value)
         if property_indexed?(property_expression)
           property_method = '[]='
           property_argument = property_expression[1...-2]
           property_argument = property_argument.to_i if property_argument.match(/\d+/)
-          object.send(property_method, property_argument, value)
+          object.send(property_method, property_argument, converted_value)
         else
-          object.send(property_expression, value)
+          object.send(property_expression, converted_value)
         end
+        apply_processor(@binding_options[:after_write], converted_value)
       end
     end
   end

data/lib/glimmer/data_binding/observable_array.rb

@@ -289,6 +289,7 @@ module Glimmer
         return unless old_value.is_a?(ObservableModel) || old_value.is_a?(ObservableArray)
         property_observer_list.each { |observer| observer.unregister_dependents_with_observable(observer.registration_for(self), old_value) }
       end
+      alias deregister_dependent_observers unregister_dependent_observers
     end
   end
 end

data/lib/glimmer/data_binding/observable_model.rb

@@ -124,6 +124,7 @@ module Glimmer
         return unless old_value.is_a?(ObservableModel) || old_value.is_a?(ObservableArray)
         property_observer_list(property_name).each { |observer| observer.unregister_dependents_with_observable(observer.registration_for(self, property_name), old_value) }
       end
+      alias deregister_dependent_observers unregister_dependent_observers
 
       def ensure_array_object_observer(property_name, object, old_object = nil)
         return unless object&.is_a?(Array)

data/lib/glimmer/data_binding/observer.rb

@@ -110,6 +110,7 @@ module Glimmer
         end
       end
       alias unobserve unregister
+      alias deregister unregister
 
       def unregister_dependents_with_observable(registration, dependent_observable)
         thedependents = dependents_for(registration).select do |thedependent|
@@ -117,12 +118,15 @@ module Glimmer
         end
         thedependents.each(&:unregister)
       end
+      alias unobserve_dependents_with_observable unregister_dependents_with_observable
+      alias deregister_dependents_with_observable unregister_dependents_with_observable
 
       # cleans up all registrations in observables
       def unregister_all_observables
         registrations.each(&:unregister)
       end
       alias unobserve_all_observables unregister_all_observables
+      alias deregister_all_observables unregister_all_observables
 
       # add dependent observer to unregister when unregistering observer
       def add_dependent(parent_to_dependent_hash)

data/lib/glimmer/dsl/engine.rb

@@ -37,10 +37,11 @@ module Glimmer
       STATIC_EXPRESSION_METHOD_FACTORY = lambda do |keyword|
         lambda do |*args, &block|
           if Glimmer::DSL::Engine.no_dsls?
-            puts Glimmer::DSL::Engine::MESSAGE_NO_DSLS
+            puts Glimmer::DSL::Engine::MESSAGE_NO_DSLS # TODO consider switching to an error log statement
           else
             retrieved_static_expression = Glimmer::DSL::Engine.static_expressions[keyword][Glimmer::DSL::Engine.dsl]
-            static_expression_dsl = (Glimmer::DSL::Engine.static_expressions[keyword].keys - Glimmer::DSL::Engine.disabled_dsls).first if retrieved_static_expression.nil?
+            # TODO consider replacing Glimmer::DSL::Engine.static_expressions[keyword].keys - Glimmer::DSL::Engine.disabled_dsls with Glimmer::DSL::Engine.enabled_static_expression_dsls(keyword)
+            static_expression_dsl = (Glimmer::DSL::Engine.static_expressions[keyword].keys - Glimmer::DSL::Engine.disabled_dsls).first
             interpretation = nil
             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
@@ -55,8 +56,9 @@ module Glimmer
               raise Glimmer::Error, "Unsupported keyword: #{keyword}" unless static_expression_dsl || retrieved_static_expression
               Glimmer::DSL::Engine.dsl_stack.push(static_expression_dsl || Glimmer::DSL::Engine.dsl)
               static_expression = Glimmer::DSL::Engine.static_expressions[keyword][Glimmer::DSL::Engine.dsl]
-              if static_expression.nil? || !static_expression.can_interpret?(Glimmer::DSL::Engine.parent, keyword, *args, &block)
-                raise Error, "Invalid use of Glimmer keyword #{keyword} with args #{args} under parent #{Glimmer::DSL::Engine.parent.inspect}"
+              static_expression_can_interpret = nil
+              if static_expression.nil? || !(static_expression_can_interpret = static_expression.can_interpret?(Glimmer::DSL::Engine.parent, keyword, *args, &block))
+                raise Error, "Invalid use of Glimmer keyword #{keyword} with args #{args} under parent #{Glimmer::DSL::Engine.parent.inspect} with DSL #{Glimmer::DSL::Engine.dsl.inspect} and static expression #{static_expression.inspect} having can_interpret? as #{static_expression_can_interpret.inspect}"
               else
                 Glimmer::Config.logger.info {"#{static_expression.class.name} will handle expression keyword #{keyword}"}
                 Glimmer::DSL::Engine.interpret_expression(static_expression, keyword, *args, &block)
@@ -162,7 +164,7 @@ module Glimmer
 
         # Interprets Glimmer dynamic DSL expression consisting of keyword, args, and block (e.g. shell(:no_resize) { ... })
         def interpret(keyword, *args, &block)
-          return puts(MESSAGE_NO_DSLS) if no_dsls?
+          return puts(MESSAGE_NO_DSLS) if no_dsls? # TODO consider switching to an error log statement
           keyword = keyword.to_s
           dynamic_expression_dsl = (dynamic_expression_chains_of_responsibility.keys - disabled_dsls).first if dsl.nil?
           # TODO consider pushing this code into interpret_expresion to provide hooks that work around it regardless of static vs dynamic

data/lib/glimmer/ext/module.rb

@@ -0,0 +1,11 @@
+class Module
+  alias append_features_without_glimmer append_features
+  def append_features(mod)
+    if self == Glimmer && mod == Object
+      Glimmer::Config.logger.debug { 'Appending Glimmer to Singleton Class of main object (not appending to Object everywhere to avoid method pollution)' }
+      TOPLEVEL_BINDING.receiver.singleton_class.include(self)
+    else
+      append_features_without_glimmer(mod)
+    end
+  end
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: array_include_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -20,6 +19,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: array_include_methods
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,6 +39,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
+  name: facets
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -60,6 +59,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: concurrent-ruby
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,12 +71,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+  name: rspec-mocks
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,12 +85,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,12 +99,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: puts_debuggerer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+  name: puts_debuggerer
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +113,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +121,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 14.0.0
+  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 14.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -142,6 +141,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
+  name: jeweler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -153,7 +153,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -162,6 +161,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.0.0
+  name: rdoc
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,12 +173,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: coveralls
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,12 +187,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
+  name: simplecov
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -201,12 +201,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.16.1
 - !ruby/object:Gem::Dependency
-  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+  name: simplecov-lcov
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -215,12 +215,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: rake-tui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake-tui
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ email: andy.am@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -261,6 +262,7 @@ files:
 - lib/glimmer/dsl/static_expression.rb
 - lib/glimmer/dsl/top_level_expression.rb
 - lib/glimmer/error.rb
+- lib/glimmer/ext/module.rb
 - lib/glimmer/invalid_keyword_error.rb
 homepage: http://github.com/AndyObtiva/glimmer
 licenses:
@@ -281,8 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Glimmer Ruby DSL Engine
+summary: Glimmer - DSL Engine for Ruby GUI and More
 test_files: []