glimmer 2.7.9 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2163c1191266b85c926cbaf5d5f4149f8842b1125bda5c3b432f7b7c708b8e1c
-  data.tar.gz: 1f563fd8350494de6c7acf5a3ccf4394ba51416388b2878002222c35dd49ba60
+  metadata.gz: 4328b442996344feac21d01f6bfb7037119bcf58268af600d562d52cf17d4ea1
+  data.tar.gz: 4ce40ca39815df4afd1690be4441b5c3931f58edd9760ef56c627cea82e85e50
 SHA512:
-  metadata.gz: 9a5cd83b2ec56d597338eb06739a44c3296f4528aa6424abdd0edf60513b26eb8e5163665419a0e6bc12d642adb313a48eae91b46b0ed7cc8a133ec74315b229
-  data.tar.gz: 8646449312b94c5683d8df9900dfbc420f8530c5778a69af10dc3cc18170a65a7bf017af18f9f4ad19aec2d47f9870aae1d723d6041204830bcfce817aefc82e
+  metadata.gz: e359fb49eab353f21ba61728d8730e1753df920f6925d0be2ab824be24283b5e2d03951ca1e062f6585eacc830f5113dae872cebf638127a834e551659a778ef
+  data.tar.gz: fd0d70e4a494f5fb7b1aba169c7f2fbb337988bf8548f42be0aad0ff146546c9facfa6f472e0ee427a1701bbff8cdccf6bd4e5bf3a5ce49f38067da526d33492

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+### 2.8.0
+
+- Support ability to interpret multiple DSL expression hierarchies, by suspending interpretation of a hierarchy, interpreting another until done, and then resuming interpretation of previous hierarchy until done too. That is done by starting a new expression hierarchy interpretation using `Glimmer::DSL::Engine::new_parent_stack` in the middle of interpreting another expression hierarchy.
+- Refactor/rename `Glimmer::DSL::Engine::parent_stacks` to `Glimmer::DSL::Engine::dsl_parent_stacks` and have it include an `Array` of `Array`s of parent stacks per DSL.
+
 ### 2.7.9
 
 - Optimize performance of `Glimmer::DataBinding::ObservableModel#add_observer` by removing `OpenStruct` constant check.

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 2.7.9
+# [<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 2.8.0
 ## 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)
@@ -268,7 +268,7 @@ end
 ### Setup
 
 Follow these steps to author a [Glimmer](https://rubygems.org/gems/glimmer) DSL:
-- Add `gem 'glimmer', '~> 2.7.9'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.7.9` and add `require 'glimmer'`
+- Add `gem 'glimmer', '~> 2.8.0'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.8.0` 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
 

data/VERSION

@@ -1 +1 @@
-2.7.9
+2.8.0

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 2.7.9 ruby lib
+# stub: glimmer 2.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "2.7.9"
+  s.version = "2.8.0"
 
   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 = "2024-07-02"
+  s.date = "2024-07-14"
   s.description = "Glimmer is a Ruby DSL Framework for Ruby GUI and More, consisting of a DSL Engine and a Data-Binding Library (including Observer Design Pattern, Observable Model, Observable Array, and Observable Hash). Used in Glimmer DSL for SWT (JRuby Desktop Development GUI Framework), Glimmer DSL for Web (Ruby in the Browser Web Frontend Framework), Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library and Winner of Fukuoka Ruby Award Competition 2022 Special Award), Glimmer DSL for Tk (Ruby Tk Desktop Development GUI Library), Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library), Glimmer DSL for FX (FOX Toolkit Ruby Desktop Development GUI Library), Glimmer DSL for WX (wxWidgets Ruby Desktop Development GUI Library), Glimmer DSL for Swing (JRuby Swing Desktop Development GUI Library), Glimmer DSL for JFX (JRuby JavaFX Desktop Development GUI Library), Glimmer DSL for XML (& HTML), and Glimmer DSL for CSS.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/glimmer/dsl/engine.rb

@@ -103,7 +103,7 @@ module Glimmer
     
         # Resets Glimmer's engine activity and configuration. Useful in rspec before or after blocks in tests.
         def reset
-          parent_stacks.values.each do |a_parent_stack|
+          dsl_parent_stacks.values.each do |a_parent_stack|
             a_parent_stack.clear
           end
           dsl_stack.clear
@@ -230,11 +230,11 @@ module Glimmer
         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(new_parent)
+            push_parent_into_parent_stack(new_parent)
             begin
               expression.add_content(new_parent, keyword, *args, &block)
             ensure
-              parent_stack.pop
+              pop_parent_from_parent_stack
               dsl_stack.pop
             end
           end
@@ -244,14 +244,34 @@ module Glimmer
         #
         # Parents are maintained in a stack while evaluating Glimmer DSL
         # to ensure properly ordered interpretation of DSL syntax
-        def_delegator :parent_stack, :last, :parent
+        def parent
+          parent_stack.last
+        end
+
+        def push_parent_into_parent_stack(parent)
+          parent_stack.push(parent)
+        end
 
+        def pop_parent_from_parent_stack
+          parent_stack.pop
+          parent_stacks.pop if parent_stacks.size > 1 && parent_stacks.last.empty?
+        end
+        
         def parent_stack
-          parent_stacks[dsl] ||= Concurrent::Array.new
+          new_parent_stack if parent_stacks.last.nil?
+          parent_stacks.last
+        end
+        
+        def new_parent_stack
+          parent_stacks.push(Concurrent::Array.new)
         end
 
         def parent_stacks
-          @parent_stacks ||= Concurrent::Hash.new
+          dsl_parent_stacks[dsl] ||= Concurrent::Array.new # TODO insted of having one array, we need to nest it within an array of arrays
+        end
+
+        def dsl_parent_stacks
+          @dsl_parent_stacks ||= Concurrent::Hash.new
         end
 
         # Enables multiple DSLs to play well with each other when mixing together

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.8.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_include_methods