glimmer 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ffd3369029bb8e3b291c4885ff034ec303595578341e947e21071d86bb90ad0
-  data.tar.gz: ba20e80562daf4dd96512e1c4dd4ff0dc3fb015a7039712c80805d2b211b95db
+  metadata.gz: b7e7983379ea9281e26719f66718fb706d475d3dd9904e20cfd51237625d9322
+  data.tar.gz: '08fa76d4f37a422a8d6b68845f22ce3a8f41f1b53c8a6d9dced1044c55a14aa6'
 SHA512:
-  metadata.gz: a5f25a4abf5eaa792ee955145cfb94449831d7b2da3479152d1d4bd2872eec053b3e9c730e3c94713a0a552a00215239bb6a907a191c3e29aea2e5ed2a307c7c
-  data.tar.gz: 5356bc6024b81b3524793fe7feb2b1d858a830af308ee002da5445cd172c04839a104a0e28cdff8c095045268a05b363cdea60fbdc052647aeab5c16f40979cf
+  metadata.gz: cc96cb57a317ebce264b45c916dd6f3d66ecafade85d95dcb357a45ee4a33aed8285f07a2168fd3dbf179d379170645ed7c07b9731a53293ad5817ce3056c875
+  data.tar.gz: 4d48a96a17918d61527e77a771755a7ffd6c08e365a0d128b51c047e33a57e03fbdfc3b92a45bcab32f7b9a6139140f3ad2eec90b987ed029cf6784aa4163414

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 Related Change Logs:
 - [glimmer-dsl-swt/CHANGELOG.md](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/CHANGELOG.md)
 
+### 2.7.1
+
+- Support upcased static expressions (in addition to default downcased ones)
+
 ### 2.7.0
 
 - Support Hash keyed properties via `ModelBinding` (e.g. property as `some_hash_attribute[:some_key]`, `some_hash_attribute['some_key']`, `some_hash_attribute["some_key"]`)

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.0
+# [<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.1
 ## 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)
@@ -34,7 +34,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
 [Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)](https://github.com/AndyObtiva/glimmer-dsl-swt) | Mac / Windows / Linux | Yes | Yes (Canvas Shape DSL) | Very Mature / Scaffolding / Native Executable Packaging / Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint | Java / JRuby
 [Glimmer DSL for Opal (Pure Ruby Web GUI and Auto-Webifier of Desktop Apps)](https://github.com/AndyObtiva/glimmer-dsl-opal) | All Web Browsers | No | Yes (Canvas Shape DSL) | Simpler than All JavaScript Technologies / Auto-Webify Desktop Apps | Setup Process / Incomplete Alpha | Rails
 [Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-libui) | Mac / Windows / Linux | Yes | Yes (Area API) | Very Simple Setup / Fast Startup Time / Light Memory Footprint | LibUI is an Incomplete Mid-Alpha Only | None Other Than MRI Ruby
-[Glimmer DSL for Tk (MRI Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-tk) | Mac / Windows / Linux | Some Native-Themed Widgets (Not Truly Native) | Yes (Canvas) | Fast Startup Time / Light Memory Footprint | Complicated setup / Widgets Do Not Look Truly Native, Espcially on Linux | ActiveTcl / MRI Ruby
+[Glimmer DSL for Tk (Ruby Tk Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-tk) | Mac / Windows / Linux | Some Native-Themed Widgets (Not Truly Native) | Yes (Canvas) | Fast Startup Time / Light Memory Footprint | Complicated setup / Widgets Do Not Look Truly Native, Espcially on Linux | ActiveTcl / MRI Ruby
 [Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-gtk) | Mac / Windows / Linux | Only on Linux | Yes (Cairo) | Complete Access to GNOME Features on Linux | Not Native on Mac and Windows | None Other Than MRI Ruby on Linux / Brew Packages on Mac / MSYS & MING Toolchains on Windows / MRI Ruby
 [Glimmer DSL for FX (FOX Toolkit Ruby Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-fx) | Mac (requires XQuartz) / Windows / Linux | No | Yes (Canvas) | No Prerequisites on Windows | Widgets Do Not Look Native / Mac Usage Obtrusively Starts XQuartz | None Other Than MRI Ruby on Windows / XQuarts on Mac / MRI Ruby
 [Glimmer DSL for JFX (JRuby JavaFX Desktop Development GUI Library)](https://github.com/AndyObtiva/glimmer-dsl-jfx) | Mac / Windows / Linux | No | Yes (javafx.scene.shape and javafx.scene.canvas) | Rich in Custom Widgets | Slow JRuby Startup Time / Heavy Memory Footprint / Widgets Do Not Look Native | Java / JRuby / JavaFX SDK
@@ -127,6 +127,9 @@ Every `Expression` sublcass must specify two methods at least:
 - `interpret(parent, keyword, *args, &block)`: to go ahead and interpret a DSL expression that qualified for interpretation
 
 `StaticExpression` sublcasses may skip the `can_interpret?` method since they include a default implementation for it that matches the name of the keyword from the class name by convention. For example, a `color` keyword would have a `ColorExpression` class, so `color` is inferred automatically from class name and used in deciding whether the class can handle a `color` keyword or not.
+`StaticExpression` may declare the following class method options (if any other than `downcased` (default) is set, then `downcased` must be set explicitly if needed):
+- `downcased true` (default): indicates that the StaticExpression expects downcased keywords (e.g. `COLOR {}`)
+- `upcased true`: indicates that the StaticExpression expects upcased keywords (e.g. `COLOR {}`). Note that upcased static expressions always expect either arguments parentheses or block curly braces to be invoked as a static expression method instead of a constant.
 
 `ParentExpression` subclasses can optionally override this extra method, which is included by default and simply invokes the parent's passed block to process its children:
 - `add_content(parent, keyword, *args, &block)`
@@ -241,7 +244,7 @@ end
 ### Setup
 
 Follow these steps to author a [Glimmer](https://rubygems.org/gems/glimmer) DSL:
-- Add `gem 'glimmer', '~> 2.7.0'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.7.0` and add `require 'glimmer'`
+- Add `gem 'glimmer', '~> 2.7.1'` to `Gemfile` and run `bundle` or run `gem install glimmer -v2.7.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
 

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.7.1

data/glimmer.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 2.7.0 ruby lib
+# stub: glimmer 2.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "2.7.0"
+  s.version = "2.7.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 = "2022-02-20"
-  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 (including Observable Model, Observable Array, and Observable Hash). Used in 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 Tk (Ruby Desktop Development GUI Library), Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI Library), Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library), Glimmer DSL for XML (& HTML), and Glimmer DSL for CSS.".freeze
+  s.date = "2022-02-26"
+  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 (including Observable Model, Observable Array, and Observable Hash). Used in 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 LibUI (Prerequisite-Free Ruby Desktop Development GUI Library), 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 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 = [
     "CHANGELOG.md",
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
   s.licenses = ["MIT".freeze]
   s.rubygems_version = "3.3.1".freeze
-  s.summary = "Glimmer - DSL Engine for Ruby GUI and More".freeze
+  s.summary = "Glimmer - DSL Framework for Ruby GUI and More".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/lib/glimmer/data_binding/observable_array.rb

@@ -47,8 +47,7 @@ module Glimmer
 
       def add_observer(observer, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        element_properties = args
-        element_properties = element_properties.flatten.compact.uniq
+        element_properties = args.flatten.compact.uniq
         return observer if has_observer?(observer) && has_observer_element_properties?(observer, element_properties)
         property_observer_list[observer] = options
         observer_element_properties[observer] = Concurrent::Set.new(Concurrent::Array.new(element_properties_for(observer).to_a) + Concurrent::Array.new(element_properties)) # converting to Array as a workaround to jruby-9.3.2.0 issue TODO remove this workaround when no longer needed

data/lib/glimmer/dsl/engine.rb

@@ -150,14 +150,35 @@ module Glimmer
           end
         end
 
-        def add_static_expression(static_expression)
+        def add_downcased_static_expression(static_expression)
           Glimmer::Config.logger.info {"Adding static expression: #{static_expression.class.name}"}
           keyword = static_expression.class.keyword
-          static_expression_dsl = static_expression.class.dsl
           static_expressions[keyword] ||= Concurrent::Hash.new
+          static_expression_dsl = static_expression.class.dsl
           static_expressions[keyword][static_expression_dsl] = static_expression
           Glimmer.send(:define_method, keyword, &STATIC_EXPRESSION_METHOD_FACTORY.call(keyword))
         end
+        alias add_static_expression add_downcased_static_expression
+        
+        def remove_downcased_static_expression(static_expression)
+          if !static_expression.class.downcased?
+            keyword = static_expression.class.keyword
+            static_expressions[keyword].delete(static_expression_dsl) if static_expressions[keyword]
+            static_expressions.delete(keyword) if static_expressions[keyword].empty?
+            Glimmer.send(:undef_method, keyword) if (Glimmer.method(keyword) rescue nil)
+          end
+        end
+        
+        def add_upcased_static_expression(static_expression)
+          if static_expression.class.upcased?
+            Glimmer::Config.logger.info {"Adding upcased static expression: #{static_expression.class.name}"}
+            keyword = static_expression.class.keyword
+            static_expression_dsl = static_expression.class.dsl
+            static_expressions[keyword.upcase] ||= Concurrent::Hash.new
+            static_expressions[keyword.upcase][static_expression_dsl] = static_expression
+            Glimmer.send(:define_method, keyword.upcase, &STATIC_EXPRESSION_METHOD_FACTORY.call(keyword.upcase))
+          end
+        end
 
         def expression_class(dsl_namespace, expression_name)
           dsl_namespace.const_get(expression_class_name(expression_name).to_sym)

data/lib/glimmer/dsl/static_expression.rb

@@ -44,16 +44,42 @@ module Glimmer
           Glimmer::DSL::Engine.add_static_expression(base.new)
           super
         end
-
+        
         def keyword
           @keyword ||= name.split(/::/).last.sub(/Expression$/, '').underscore
         end
+        
+        def downcased(value)
+          @downcased = value
+          Glimmer::DSL::Engine.add_downcased_static_expression(new) if @downcased
+        end
+        alias downcase downcased
+        
+        def downcased?
+          # default is true when no attributes are set
+          @downcased.nil? && @upcased.nil? ? true : @downcased
+        end
+        alias downcase? downcased?
+        
+        def upcased(value)
+          @upcased = value
+          Glimmer::DSL::Engine.add_upcased_static_expression(new) if @upcased
+        end
+        alias upcase upcased
+        
+        def upcased?
+          @upcased
+        end
+        alias upcase? upcased?
       end
 
       # 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
+        result = false
+        result ||= keyword.downcase == keyword if self.class.downcased?
+        result ||= keyword.upcase == keyword if self.class.upcased?
+        result
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_include_methods
@@ -206,10 +206,12 @@ description: Glimmer is a Ruby DSL Framework for Ruby GUI and More, consisting o
   a DSL Engine and an Observable / Observer / Data-Binding Library (including Observable
   Model, Observable Array, and Observable Hash). Used in 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 Tk (Ruby Desktop Development GUI
-  Library), Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop Development GUI
-  Library), Glimmer DSL for GTK (Ruby-GNOME Desktop Development GUI Library), Glimmer
-  DSL for XML (& HTML), and Glimmer DSL for CSS.
+  Auto-Webifier of Desktop Apps), Glimmer DSL for LibUI (Prerequisite-Free Ruby Desktop
+  Development GUI Library), 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 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.
 email: andy.am@gmail.com
 executables: []
 extensions: []
@@ -270,5 +272,5 @@ requirements: []
 rubygems_version: 3.3.1
 signing_key:
 specification_version: 4
-summary: Glimmer - DSL Engine for Ruby GUI and More
+summary: Glimmer - DSL Framework for Ruby GUI and More
 test_files: []