glimmer 1.2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c30ea530add452134bdbe1b691612d1cbc1df62e9d96d934aba1b8208ac1bf
-  data.tar.gz: 2e54d62f536bd132379c195032e62b82e5f6f973f3aa95df002464c99ed39ce1
+  metadata.gz: 6a2d51ad333d0d08344d21c90f6bec78ec0cd09b61cd2d86b5d79ecf8374b7f6
+  data.tar.gz: c85f1d8f57ec0556ca3042d49050714908c763dbea9e911f10cde85dc5405b75
 SHA512:
-  metadata.gz: 2793b625f74e8fcbd17e1463aa87f4f5cdd7e63d9219f55d9a749f18ce56acef87a86147d227d4246251accc48d7bd451eef170d0e0c34fa4be1a1fa251a6bdb
-  data.tar.gz: 596cfae4c4545bb7d2bfcb8a6ef4c3be243f70f1dd129e27b16b718ed7b234ab9e5d685075cd6720c8459960c5966f4bd93f494a46d9a0adf7fba5902542d818
+  metadata.gz: 26211cca1888df8245ea8c1c76b74effac9370038e42474cbf1e7fb4b905c54a0f5b972dfdb4413293898fb75fea155779bfd49e15f118e7560cba5ffb13b3da
+  data.tar.gz: d56fe91c1eaac6730ef3b706a3e4adf467251cdc48f1ead6f2ea9070e85145ac3e2b774813d2222dd86dbfac0a416dfab54232f0e840cf0e1a28dc2acf7cc2fc

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+### 2.0.0
+
+- Extract Glimmer::DSL::BindExpression from Glimmer DSL for SWT
+- Make concurrent-ruby an optional dependency (automatically using its data-structure classes if present)
+
+### 1.3.1
+
+- Use `Concurrent::Array` instead of `Array` in `Glimmer::DataBinding::ModelBinding`
+
+### 1.3.0
+
+- Support the `Expression#around` hook, which executes code around both `interpret` and `add_content`
+
 ## 1.2.0
 
 - Alter `Engine`/`Expression`/`ParentExpression` API to pass `keyword` and `args` to `#add_content` method. This enables consumers to vary behavior based on `keyword` and `args`, not just `parent` and presence of `block`.

data/README.md

@@ -16,7 +16,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 [**Glimmer**](https://rubygems.org/gems/glimmer) is a DSL (Domain-Specific Language) Framework that consists of two things:
 - [DSL Engine](#dsl-engine): enables building internal DSLs embedded in Ruby (e.g. for GUI, XML, or CSS).
-- [Data-Binding Library](#data-binding-library): enables synchronizing GUI with Model Attributes bidirectionally.
+- [Data-Binding Library](#data-binding-library): enables synchronizing GUI with Model Attributes bidirectionally **(now with Shine syntax support in v2)**.
 
 [**Glimmer**](https://rubygems.org/gems/glimmer) is ***the cream of the crop*** when it comes to building DSLs in Ruby:
 - Supports building the tersest most concise domain specific language syntax in Ruby.
@@ -27,6 +27,8 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 - Multiple DSLs may be [mixed](#multi-dsl-support) together safely to achieve maximum expressability, composability, and productivity.
 - DSLs are fully configurable, so you may activate and deactivate DSLs as per your current needs only.
 
+Start by checking out Glimmer's original GUI DSL, which got extracted into its own gem: [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)
+
 [**Glimmer**](https://rubygems.org/gems/glimmer) supports the following DSLs:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)
@@ -34,8 +36,6 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 - [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 (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](#-glimmer---dsl-framework-for-ruby-gui-and-more)
@@ -102,6 +102,9 @@ Every `Expression` sublcass must specify two methods at least:
 
 For example, some parent widgets use their block for other reasons or process their children at very specific times, so they may override that method and disable it, or otherwise call `super` and do additional work.
 
+Otherwise, all expressions support the `around` hook method:
+- `around(parent, keyword, args, block, &interpret_and_add_content)`: a hook for executing code around both `interpret` and `add_content`. Clients may invoke `interpret_and_add_content.call` or `yield` when ready for interpretation. `parent`, `keyword`, `args`, and `block` are supplied in case they are needed in the `around` logic.
+
 Example of a dynamic expression:
 
 ```ruby
@@ -152,6 +155,9 @@ module Glimmer
 end
 ```
 
+An extra convenience expression module is included called `BindExpression`. It builds a `Glimmer::DataBinding::ModelBinding` object for [data-binding](#data-binding) purposes.
+You may learn more about it by looking at how [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) uses it.
+
 DSL expressions go into the `glimmer/dsl/{dsl_name}` namespace directory.
 
 Also, every DSL requires a `glimmer/dsl/{dsl_name}/dsl.rb` file, which configures the DSL into Glimmer via a call to:
@@ -201,7 +207,7 @@ end
 ### Setup
 
 Follow these steps to author a [Glimmer](https://rubygems.org/gems/glimmer) DSL:
-- Add `gem 'glimmer', '~> 1.2.0'` to `Gemfile` and run `bundle` or run `gem install glimmer -v1.2.0` and add `require 'glimmer'`
+- Add `gem 'glimmer', '~> 2.0.1'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.0.1` and add `require 'glimmer'`
 - Create `glimmer/dsl/[dsl_name]/dsl.rb`, which requires and adds all dynamic expressions for the [dsl_name] Glimmer DSL module as per the code shown in the previous section (or [Official DSLs](#official-dsls) as examples)
 - Create `glimmer/dsl/[dsl_name]/[expresion_name]_expresion.rb` for every [expresion_name] expression needed, whether dynamic or static
 
@@ -921,9 +927,9 @@ Glimmer app:
 
 ## Data-Binding Library
 
-Data-Binding enables mapping 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) for bidirectional or unidirectional synchronization and conversion as needed.
 
-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)
+Glimmer enhances observed models automatically (including array operations like `<<`, `delete`, 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)
 
 This relies mainly on the Observer Design Pattern and the MVP (Model-View-Presenter) Architectural Pattern (a variation on MVC)
 
@@ -933,6 +939,9 @@ These are the main classes concerning data-binding:
 - `ObservableModel`: Mixin module for any observable model with observable attributes. In addition to `Observable` methods, it has a `notify_observers` method to be called when changes occur. It automatically enhances all attribute setters (ending with `=`) to notify observers on changes. Also, it automatically handles observing array attributes using `ObservableArray` appropriately so they would notify observers upon array mutation changes.
 - `ObservableArray`: Mixin module for any observable array collection that automatically handles notifying observers upon performing array mutation operations (e.g. `push` or `delete`)
 - `ModelBinding`: a higher-level abstraction that relies on all the other observer/observable classes to support basic data-binding, nested data-binding, and computed data-binding
+- `Shine`: enables highly intuitive and visually expressive syntax to perform bidirectional (two-way) data-binding with `<=>` and unidirectional (one-way) data-binding with `<=`
+
+You may learn more from [Data-Binding](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#data-binding) and [Observer](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#observer) usage in [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt)
 
 ## Glimmer Process
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+2.0.1

data/glimmer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 1.2.0 ruby lib
+# stub: glimmer 2.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "1.2.0"
+  s.version = "2.0.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-03-03"
+  s.date = "2021-07-24"
   s.description = "Glimmer is a Ruby DSL Framework for Ruby GUI and More, 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 = [
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/glimmer/data_binding/observable_array.rb",
     "lib/glimmer/data_binding/observable_model.rb",
     "lib/glimmer/data_binding/observer.rb",
+    "lib/glimmer/data_binding/shine.rb",
+    "lib/glimmer/dsl/bind_expression.rb",
     "lib/glimmer/dsl/engine.rb",
     "lib/glimmer/dsl/expression.rb",
     "lib/glimmer/dsl/expression_handler.rb",
@@ -42,7 +44,8 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/top_level_expression.rb",
     "lib/glimmer/error.rb",
     "lib/glimmer/ext/module.rb",
-    "lib/glimmer/invalid_keyword_error.rb"
+    "lib/glimmer/invalid_keyword_error.rb",
+    "lib/glimmer/shim/concurrent.rb"
   ]
   s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
   s.licenses = ["MIT".freeze]
@@ -56,10 +59,9 @@ Gem::Specification.new do |s|
   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<puts_debuggerer>.freeze, ["~> 0.13"])
     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"])
@@ -70,10 +72,9 @@ Gem::Specification.new do |s|
   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<puts_debuggerer>.freeze, ["~> 0.13"])
     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"])

data/lib/glimmer.rb

@@ -22,18 +22,10 @@
 require 'logger'
 require 'set'
 require 'array_include_methods'
-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/shim/concurrent'
 require 'glimmer/config'
 require 'glimmer/ext/module'
 

data/lib/glimmer/data_binding/model_binding.rb

@@ -35,9 +35,9 @@ module Glimmer
         @property_name_expression = property_name_expression
         @binding_options = binding_options || Concurrent::Hash.new
         if computed?
-          @computed_model_bindings = computed_by.map do |computed_by_property_expression|
+          @computed_model_bindings = Concurrent::Array.new(computed_by.map do |computed_by_property_expression|
             self.class.new(base_model, computed_by_property_expression)
-          end
+          end)
         end
       end
 
@@ -47,7 +47,7 @@ module Glimmer
 
       # e.g. person.address.state returns [person, person.address]
       def nested_models
-        @nested_models = [base_model]
+        @nested_models = Concurrent::Array.new([base_model])
         model_property_names.reduce(base_model) do |reduced_model, nested_model_property_name|
           if !reduced_model.nil?
             invoke_property_reader(reduced_model, nested_model_property_name).tap do |new_reduced_model|
@@ -75,7 +75,7 @@ module Glimmer
       # If there are any indexed property names, this returns indexes as properties.
       # e.g. property name expression "addresses[1].state" gives ['addresses', '[1]', 'state']
       def nested_property_names
-        @nested_property_names ||= property_name_expression.split(".").map {|pne| pne.match(/([^\[]+)(\[[^\]]+\])?/).to_a.drop(1)}.flatten.compact
+        @nested_property_names ||= Concurrent::Array.new(property_name_expression.split(".").map {|pne| pne.match(/([^\[]+)(\[[^\]]+\])?/).to_a.drop(1)}.flatten.compact)
       end
 
       # Final nested property name
@@ -87,7 +87,7 @@ module Glimmer
       # Model representing nested property names
       # e.g. property name expression "address.state" gives [:address]
       def model_property_names
-        nested_property_names[0...-1]
+        Concurrent::Array.new(nested_property_names[0...-1])
       end
 
       def nested_property?
@@ -99,7 +99,7 @@ module Glimmer
       end
 
       def computed_by
-        [@binding_options[:computed_by]].flatten.compact
+        Concurrent::Array.new([@binding_options[:computed_by]].flatten.compact)
       end
 
       def nested_property_observers_for(observer)
@@ -175,7 +175,7 @@ module Glimmer
 
       def add_nested_observers(observer)
         nested_property_observers = nested_property_observers_for(observer)
-        nested_models.zip(nested_property_names).each_with_index do |zip, i|
+        Concurrent::Array.new(nested_models.zip(nested_property_names)).each_with_index do |zip, i|
           model, property_name = zip
           nested_property_observer = nested_property_observers[property_name]
           previous_index = i - 1
@@ -242,7 +242,12 @@ module Glimmer
 
       def invoke_proc_with_exact_parameters(proc_object, *args)
         return if proc_object.nil?
-        args = args[0...proc_object.parameters.size]
+        if RUBY_ENGINE == 'opal'
+          # opal doesn't support proc_object.parameters.size properly it seems
+          args = Concurrent::Array.new(args[0...1])
+        else
+          args = Concurrent::Array.new(args[0...proc_object.parameters.size])
+        end
         proc_object.call(*args)
       end
 

data/lib/glimmer/data_binding/observable_array.rb

@@ -130,6 +130,15 @@ module Glimmer
         end
       end
       
+      def shift
+        shifted_element = first
+        unregister_dependent_observers(shifted_element)
+        remove_element_observers(shifted_element)
+        super.tap do
+          notify_observers
+        end
+      end
+      
       def delete(element)
         unregister_dependent_observers(element)
         remove_element_observers(element)

data/lib/glimmer/data_binding/observable_model.rb

@@ -29,10 +29,12 @@ module Glimmer
 
       class Notifier
         include Observer
+        
         def initialize(observable_model, property_name)
           @observable_model = observable_model
           @property_name = property_name
         end
+        
         def call(new_value=nil)
           @observable_model.notify_observers(@property_name)
         end

data/lib/glimmer/data_binding/shine.rb

@@ -0,0 +1,56 @@
+# Copyright (c) 2007-2021 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.
+
+module Glimmer
+  module DataBinding
+    class Shine
+      include Glimmer
+      
+      def initialize(parent, parent_attribute)
+        @parent = parent
+        @parent_attribute = parent_attribute
+      end
+    
+      def <=>(other)
+        if other.is_a?(Array)
+          args_clone = other.clone
+          @parent.content {
+            send(@parent_attribute, bind(*args_clone))
+          }
+        end
+      end
+    
+      def <=(other)
+        if other.is_a?(Array)
+          args_clone = other.clone
+          if args_clone.last.is_a?(Hash)
+            args_clone.last[:read_only] = true
+          else
+            args_clone << {read_only: true}
+          end
+          @parent.content {
+            send(@parent_attribute, bind(*args_clone))
+          }
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/bind_expression.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2007-2021 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 'glimmer/dsl/static_expression'
+require 'glimmer/data_binding/model_binding'
+
+module Glimmer
+  module DSL
+    # Responsible for setting up the return value of the bind keyword (command symbol)
+    # as a ModelBinding. It is to be used as the argument of another data-binding expression.
+    module BindExpression
+      def can_interpret?(parent, keyword, *args, &block)
+        (
+          keyword == 'bind' and
+            (
+              (
+                (args.size == 2) and
+                  textual?(args[1])
+              ) ||
+                (
+                  (args.size == 3) and
+                    textual?(args[1]) and
+                    (args[2].is_a?(Hash))
+                )
+            )
+        )
+      end
+
+      def interpret(parent, keyword, *args, &block)
+        binding_options = args[2] || {}
+        binding_options[:on_read] = binding_options.delete(:on_read) || binding_options.delete('on_read') || block
+        DataBinding::ModelBinding.new(args[0], args[1].to_s, binding_options)
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/engine.rb

@@ -176,10 +176,14 @@ module Glimmer
         end
         
         def interpret_expression(expression, keyword, *args, &block)
-          expression.interpret(parent, keyword, *args, &block).tap do |ui_object|
-            add_content(ui_object, expression, keyword, *args, &block)
-            dsl_stack.pop
+          new_parent = nil
+          expression.around(parent, keyword, args, block) do
+            new_parent = expression.interpret(parent, keyword, *args, &block).tap do |new_parent|
+              add_content(new_parent, expression, keyword, *args, &block)
+              dsl_stack.pop
+            end
           end
+          new_parent
         end
 
         # Adds content block to parent UI object
@@ -187,12 +191,12 @@ module Glimmer
         # This allows evaluating parent UI object properties and children
         #
         # For example, a shell widget would get properties set and children added
-        def add_content(parent, expression, keyword, *args, &block)
+        def add_content(new_parent, expression, keyword, *args, &block)
           if block_given? && expression.is_a?(ParentExpression)
             dsl_stack.push(expression.class.dsl)
-            parent_stack.push(parent)
+            parent_stack.push(new_parent)
             begin
-              expression.add_content(parent, keyword, *args, &block)
+              expression.add_content(new_parent, keyword, *args, &block)
             ensure
               parent_stack.pop
               dsl_stack.pop

data/lib/glimmer/dsl/expression.rb

@@ -47,13 +47,23 @@ module Glimmer
         raise Error, "#interpret must be implemented by an Expression subclass"
       end
 
-      # Adds block content to specified parent UI object (Optional)
+      # Adds block content to newly interpreted parent object (Optional)
       #
       # Only expressions that receive a content block should implement
-      def add_content(parent, keyword, *args, &block)
+      def add_content(new_parent, keyword, *args, &block)
         # No Op by default
       end
-
+      
+      # Executes code around the `interpret_and_add_content` block,
+      # which invokes `interpret` and `add_content` when called without args
+      # (parent, keyword, args, block are supplied automatically).
+      # Clients may invoke yield as an alternative to calling `interpret_and_add_content` directly.
+      # This method takes parent, keyword, args, block in case they are needed
+      # in its around logic.
+      def around(parent, keyword, args, block, &interpret_and_add_content)
+        interpret_and_add_content.call
+      end
+      
       # Checks if object is a Symbol or a String
       def textual?(object)
         object.is_a?(Symbol) or object.is_a?(String)

data/lib/glimmer/dsl/parent_expression.rb

@@ -25,8 +25,11 @@ module Glimmer
   module DSL
     # Mixin that represents expressions that always have a content block
     module ParentExpression
-      def add_content(parent, keyword, *args, &block)
-        block.call(parent)
+      # Default implementation that simply invokes block content with newly interpreted parent object as an argument
+      #
+      # Only expressions that receive a content block should implement
+      def add_content(new_parent, keyword, *args, &block)
+        block.call(new_parent)
       end
     end
   end

data/lib/glimmer/dsl/static_expression.rb

@@ -50,7 +50,8 @@ module Glimmer
         end
       end
 
-      # Subclasses may optionally implement
+      # Subclasses may optionally implement, but by default it only ensures that
+      # the keyword matches lower case static expression class name minus `Expression`
       def can_interpret?(parent, keyword, *args, &block)
         true
       end

data/lib/glimmer/ext/module.rb

@@ -1,11 +1,13 @@
-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)
+unless RUBY_ENGINE == 'opal'
+  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
 end

data/lib/glimmer/shim/concurrent.rb

@@ -0,0 +1,10 @@
+require 'set'
+
+# Accommadate libraries that do not need or support concurrent-ruby (e.g. Glimmer DSL for Opal)
+if !Object.constants.include?(:Concurrent)
+  module Concurrent
+    Array = ::Array
+    Hash = ::Hash
+    Set = ::Set
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_include_methods
@@ -50,26 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -104,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +236,8 @@ files:
 - lib/glimmer/data_binding/observable_array.rb
 - lib/glimmer/data_binding/observable_model.rb
 - lib/glimmer/data_binding/observer.rb
+- lib/glimmer/data_binding/shine.rb
+- lib/glimmer/dsl/bind_expression.rb
 - lib/glimmer/dsl/engine.rb
 - lib/glimmer/dsl/expression.rb
 - lib/glimmer/dsl/expression_handler.rb
@@ -265,6 +247,7 @@ files:
 - lib/glimmer/error.rb
 - lib/glimmer/ext/module.rb
 - lib/glimmer/invalid_keyword_error.rb
+- lib/glimmer/shim/concurrent.rb
 homepage: http://github.com/AndyObtiva/glimmer
 licenses:
 - MIT