glimmer 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d28368bdf3ae26dcee4ddc661bdeee07fdf932f7c7c8fb45c27de98d4f43dc
-  data.tar.gz: b30a42a8f18f74fca414937f068ebcaeee31ba4f76c3afb1be866b9958647426
+  metadata.gz: c22f962213e82b271d67b69d910604e73ab8a257e8a797fa58feb2d97d6c199e
+  data.tar.gz: eee60acdf118d572196ef4a2c1eca7705093ea9d3db2fcea1a05bb612710f05b
 SHA512:
-  metadata.gz: 5f0728a1a263ff3c8c841a508d3b250910d2ddf548284029dcea23364522d436f408fe49b10683981241144d4e2bf6a20ab718ce75ed04244c6f9dc0ca51be07
-  data.tar.gz: 411965a314069222d27aaddfdbcbe129665725e73d082d6c15805adb188e1a1fc89d62578dc2712972684d8f5f59313b6868667b245cfdfee66f06ad6ef521e9
+  metadata.gz: 360edce8ae04be32396a272ad947897d256c171759f3304ed4f3b521a208540a2834e05a3140fe61de166337858bbd85c13655d02b92b1cd13e60b44b78cb0d6
+  data.tar.gz: 482df9f676948f24f68e665899c15e7e14b78f40f100580771a4af943fd524b676ae140f19cf1d7b370d2ef1fb5e3c4bff9f0e2eb4a8cb1cb95884c74be6ef37

data/README.md

@@ -118,6 +118,7 @@ NOTE: Glimmer is in beta mode. Please help make better by [contributing](#contri
       - [SWT Proxies](#swt-proxies)
       - [Dialog](#dialog)
       - [Menus](#menus)
+      - [ScrolledComposite](#scrolledcomposite)
     - [Widget Styles](#widget-styles)
       - [Explicit SWT Style Bit](#explicit-swt-style-bit)
       - [Negative SWT Style Bits](#negative-swt-style-bits)
@@ -143,6 +144,7 @@ NOTE: Glimmer is in beta mode. Please help make better by [contributing](#contri
       - [Content/Options Example](#contentoptions-example)
       - [Custom Widget Lifecycle Hooks](#custom-widget-lifecycle-hooks)
       - [Gotcha](#gotcha)
+      - [Final Notes](#final-notes)
     - [Custom Shells](#custom-shells)
     - [Drag and Drop](#drag-and-drop)
     - [Miscellaneous](#miscellaneous)
@@ -153,13 +155,13 @@ NOTE: Glimmer is in beta mode. Please help make better by [contributing](#contri
       - [Browser Widget](#browser-widget)
   - [Glimmer Configuration](#glimmer-configuration)
     - [logger](#logger)
-    - [import_swt_packages](#import_swt_packages)
-    - [loop_max_count](#loop_max_count)
+    - [import_swt_packages](#importswtpackages)
+    - [loop_max_count](#loopmaxcount)
   - [Glimmer Style Guide](#glimmer-style-guide)
   - [SWT Reference](#swt-reference)
   - [Samples](#samples)
     - [Hello Samples](#hello-samples)
-      - [Hello, World!](#hello-world-sample)
+      - [Hello, World! Sample](#hello-world-sample)
       - [Hello, Tab!](#hello-tab)
       - [Hello, Combo!](#hello-combo)
       - [Hello, List Single Selection!](#hello-list-single-selection)
@@ -168,14 +170,18 @@ NOTE: Glimmer is in beta mode. Please help make better by [contributing](#contri
       - [Hello, Message Box!](#hello-message-box)
       - [Hello, Browser!](#hello-browser)
       - [Hello, Drag and Drop!](#hello-drag-and-drop)
+      - [Hello, Menu Bar!](#hello-menu-bar)
+      - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
     - [Elaborate Samples](#elaborate-samples)
       - [Login](#login)
-      - [Tic Tac Toe](#tic-tac-toe-sample)
+      - [Tic Tac Toe Sample](#tic-tac-toe-sample)
       - [Contact Manager](#contact-manager)
     - [External Samples](#external-samples)
       - [Glimmer Calculator](#glimmer-calculator)
       - [Gladiator](#gladiator)
   - [In Production](#in-production)
+    - [Math Bowling](#math-bowling)
+    - [Are We There Yet?](#are-we-there-yet)
   - [Packaging & Distribution](#packaging--distribution)
     - [Packaging Defaults](#packaging-defaults)
     - [Packaging Configuration](#packaging-configuration)
@@ -191,6 +197,7 @@ NOTE: Glimmer is in beta mode. Please help make better by [contributing](#contri
   - [Change Log](#change-log)
   - [Contributing](#contributing)
   - [Contributors](#contributors)
+  - [Hire Me](#hire-me)
   - [License](#license)
 
 ## Background
@@ -244,7 +251,7 @@ Otherwise, Option 2 ([Bundler](#option-2-bundler)) is recommended for building G
 
 Run this command to install directly:
 ```
-jgem install glimmer-dsl-swt -v 0.2.2
+jgem install glimmer-dsl-swt -v 0.3.0
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -262,7 +269,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 0.2.2'
+gem 'glimmer-dsl-swt', '~> 0.3.0'
 ```
 
 And, then run:
@@ -320,6 +327,7 @@ glimmer list:custom_shell_gems[query]                             # List Glimmer
 glimmer list:custom_widget_gems[query]                            # List Glimmer custom widget gems available at rubygems.org (query is optional)
 glimmer list:dsl_gems[query]                                      # List Glimmer DSL gems available at rubygems.org (query is optional)
 glimmer package                                                   # Package app for distribution (generating config, jar, and native files)
+glimmer package:clean                                             # Clean by removing "dist" and "packages" directories
 glimmer package:config                                            # Generate JAR config file
 glimmer package:jar                                               # Generate JAR file
 glimmer package:native                                            # Generate Native files (DMG/PKG/APP on the Mac)
@@ -561,7 +569,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    0.1.0     AndyMaleh   Glimmer DSL for CSS    
   Opal   glimmer-dsl-opal   0.0.9     AndyMaleh   Glimmer DSL for Opal   
-  Swt    glimmer-dsl-swt    0.2.2     AndyMaleh   Glimmer DSL for SWT    
+  Swt    glimmer-dsl-swt    0.3.0     AndyMaleh   Glimmer DSL for SWT    
   Xml    glimmer-dsl-xml    0.1.0     AndyMaleh   Glimmer DSL for XML    
                                                                          
 ```
@@ -935,7 +943,7 @@ shell { |shell_proxy|
 Example of a Pop Up Context Menu (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 
 ```ruby
-  shell { |shell_proxy|
+shell { |shell_proxy|
   text 'Hello, Pop Up Context Menu!'
   grid_layout
   label {
@@ -971,6 +979,13 @@ Example of a Pop Up Context Menu (you may copy/paste in [`girb`](#girb-glimmer-i
 }.open
 ```
 
+#### ScrolledComposite
+
+Glimmer provides smart defaults for the `scrolled_composite` widget by:
+- Automatically setting the nested widget as its content (meaning use can just like a plain old `composite` to add scrolling)
+- Automatically setting the :h_scroll and :v_scroll SWT styles (can be set manually if only one of either :h_scroll or :v_scroll is desired )
+- Automatically setting the expand horizontal and expand vertical SWT properties to `true`
+
 ### Widget Styles
 
 SWT widgets receive `SWT` styles in their constructor as per this guide:
@@ -1568,6 +1583,9 @@ shell {
     }
     items bind(group, :people), column_properties(:name, :age, :adult)
     selection bind(group, :selected_person)
+    on_mouse_up { |event|
+      @table.edit_table_item(event.table_item, event.column_index)
+    }    
   }
 }
 ```
@@ -1575,6 +1593,7 @@ shell {
 The code above includes two data-bindings:
 - Table `items`, which first bind to the model collection property (group.people), and then maps each column property (name, age, adult) for displaying each table item column. 
 - Table `selection`, which binds the single table item selected by the user to the attribute denoted by the `bind` keyword (or binds multiple table items selected for a table with `:multi` SWT style)
+- The `on_mouse_up` event handler invokes `@table.edit_table_item(event.table_item, event.column_index)` to start edit mode on the clicked table item cell, and then saves or cancel depending on whether the user hits ENTER or ESC once done editing (or focus-out after either making a change or not making any changes.)
 
 Additionally, Table `items` data-binding automatically stores each node model unto the SWT TableItem object via `setData` method. This enables things like searchability.
 
@@ -1594,6 +1613,67 @@ This automatically leverages the SWT TableEditor custom class behind the scenes,
 passed table item text into something else. 
 It automatically persists the change to `items` data-bound model on ENTER/FOCUS-OUT or cancels on ESC/NO-CHANGE.
 
+##### Table Sorting
+
+Glimmer automatically adds sorting support to the SWT `Table` widget. 
+
+Check out the [Contact Manager](#contact-manager) sample for an example. 
+You may click on any column and it will sort by ascending order first and descending if you click again.
+
+Glimmer automatic table sorting supports `String`, `Integer`, and `Float` columns out of the box as well as any column data that is comparable.
+
+In cases where data is nil, depending on the data-type, it is automatically converted to `Float` with `to_f`, `Integer` with `to_i`, or `String` with `to_s`.
+
+Should you have a special data type that could not be compared automatically, Glimmer offers the following 3 alternatives for custom sorting:
+- `sort_property`: this may be set to an alternative property to the one data-bound to the table column. For example, a table column called 'adult', which returns `true` or `false` may be sorted with `sort_property :dob` instead. This also support multi-property (aka multi-column) sorting (e.g. `sort_property :dob, :name`). 
+- `sort_by(&block)`: this works just like Ruby `Enumerable` `sort_by`. The block receives the table column data as argument.
+- `sort(&comparator)`: this works just like Ruby `Enumerable` `sort`. The comparator block receives two objects from the table column data.
+
+You may also set `additional_sort_properties` on the parent `table` widget to have secondary sorting applied. For example, if you set `additional_sort_properties :name, :project_name`, then whenever you sort by `:name`, it additionally sorts by `:project_name` afterwards, and vice versa. This only works for columns that either have no custom sort set or have a `sort_property` with one property only (but no sort or sort_by block)
+
+Example:
+
+```ruby
+# ...
+  table {
+    table_column {
+      text 'Task'
+      width 120
+    }
+    table_column {
+      text 'Project'
+      width 120
+    }
+    table_column {
+      text 'Duration (hours)'
+      width 120
+      sort_property :duration_in_hours
+    }
+    table_column {
+      text 'Priority'
+      width 120
+      sort_by { |value| ['High', 'Medium', 'Low'].index(value) }
+    }
+    table_column {
+      text 'Start Date'
+      width 120
+      sort { |d1, d2| d1.to_date <=> d2.to_date }
+    }
+    additional_sort_properties :project_name, :duration_in_hours, :name
+    items bind(Task, :list), column_properties(:name, :project_name, :duration, :priority, :start_date)
+    # ...
+  }
+# ...
+```
+
+Here is an explanation of the example above:
+- Task and Project table columns are data-bound to the `:name` and `:project_name` properties and sorted through them automatically
+- Task Duration table column is data-bound to the `:duration` property, but sorted via the `:duration_in_hours` property instead
+- Task Priority table column has a custom sort_by block
+- Task Start Date table column has a custom sort comparator block
+- Additional (secondary) sort properties are applied when sorting by Task, Project, or Duration in the order specified
+
+
 #### Tree
 
 The SWT Tree widget visualizes a tree data-structure, such as an employment or composition hierarchy.
@@ -2521,6 +2601,10 @@ For hello-type simple samples, check the following.
 
 #### Hello, World! Sample
 
+Code:
+
+[samples/hello/hello_world.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_world.rb)
+
 Run:
 
 ```
@@ -2531,6 +2615,10 @@ glimmer samples/hello/hello_world.rb
 
 #### Hello, Tab!
 
+Code:
+
+[samples/hello/hello_tab.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_tab.rb)
+
 Run:
 
 ```
@@ -2544,6 +2632,10 @@ glimmer samples/hello/hello_tab.rb
 
 This sample demonstrates combo data-binding.
 
+Code:
+
+[samples/hello/hello_combo.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_combo.rb)
+
 Run:
 
 ```
@@ -2557,6 +2649,10 @@ glimmer samples/hello/hello_combo.rb
 
 This sample demonstrates list single-selection data-binding.
 
+Code:
+
+[samples/hello/hello_list_single_selection.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_list_single_selection.rb)
+
 Run:
 
 ```
@@ -2569,6 +2665,10 @@ glimmer samples/hello/hello_list_single_selection.rb
 
 This sample demonstrates list multi-selection data-binding.
 
+Code:
+
+[samples/hello/hello_list_multi_selection.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_list_multi_selection.rb)
+
 Run:
 
 ```
@@ -2581,6 +2681,10 @@ glimmer samples/hello/hello_list_multi_selection.rb
 
 This sample demonstrates computed data-binding.
 
+Code:
+
+[samples/hello/hello_computed.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_computed.rb)
+
 Run:
 
 ```
@@ -2593,6 +2697,10 @@ glimmer samples/hello/hello_computed.rb
 
 This sample demonstrates a `message_box` dialog.
 
+Code:
+
+[samples/hello/hello_message_box.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_message_box.rb)
+
 Run:
 
 ```
@@ -2606,6 +2714,10 @@ glimmer samples/hello/hello_message_box.rb
 
 This sample demonstrates the `browser` widget.
 
+Code:
+
+[samples/hello/hello_browser.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_browser.rb)
+
 Run:
 
 ```
@@ -2618,6 +2730,10 @@ glimmer samples/hello/hello_browser.rb
 
 This sample demonstrates drag and drop in Glimmer.
 
+Code:
+
+[samples/hello/hello_drag_and_drop.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_drag_and_drop.rb)
+
 Run:
 
 ```
@@ -2630,6 +2746,10 @@ glimmer samples/hello/hello_drag_and_drop.rb
 
 This sample demonstrates menus in Glimmer.
 
+Code:
+
+[samples/hello/hello_menu_bar.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_menu_bar.rb)
+
 Run:
 
 ```
@@ -2644,6 +2764,10 @@ glimmer samples/hello/hello_menu_bar.rb
 
 This sample demonstrates pop up context menus in Glimmer.
 
+Code:
+
+[samples/hello/hello_pop_up_context_menu.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_pop_up_context_menu.rb)
+
 Run:
 
 ```
@@ -2659,8 +2783,16 @@ For more elaborate samples, check the following:
 
 #### Login
 
+This sample demonstrates basic data-binding, password and text fields, and field enablement data-binding.
+
+Code:
+
+[samples/elaborate/login.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/login.rb)
+
+Run:
+
 ```
-glimmer samples/elaborate/login.rb # demonstrates basic data-binding
+glimmer samples/elaborate/login.rb
 ```
 
 ![Login](images/glimmer-login.png)
@@ -2669,8 +2801,16 @@ glimmer samples/elaborate/login.rb # demonstrates basic data-binding
 
 #### Tic Tac Toe Sample
 
+This sample demonstrates a full MVC application, including GUI layout, text and enablement data-binding, and test-driven development (has [specs](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/tic_tac_toe/board_spec.rb)).
+
+Code:
+
+[samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/tic_tac_toe.rb)
+
+Run:
+
 ```
-glimmer samples/elaborate/tic_tac_toe.rb # demonstrates a full MVC application
+glimmer samples/elaborate/tic_tac_toe.rb
 ```
 
 ![Tic Tac Toe](images/glimmer-tic-tac-toe.png)
@@ -2679,8 +2819,16 @@ glimmer samples/elaborate/tic_tac_toe.rb # demonstrates a full MVC application
 
 #### Contact Manager
 
+This sample demonstrates table data-binding, sorting, filtering, GUI layout, MVP pattern, and test-driven development (has [specs](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/spec/samples/elaborate/contact_manager/contact_manager_presenter_spec.rb)).
+
+Code:
+
+[samples/elaborate/contact_manager.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/elaborate/contact_manager.rb)
+
+Run:
+
 ```
-glimmer samples/elaborate/contact_manager.rb # demonstrates table data-binding
+glimmer samples/elaborate/contact_manager.rb
 ```
 
 Contact Manager
@@ -2707,17 +2855,17 @@ Contact Manager - Edit Done
 
 #### Glimmer Calculator
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-calculator/v1.0.0/glimmer-cs-calculator-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-calculator)
+[<img alt="Glimmer Calculator Icon" src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-calculator/master/glimmer-cs-calculator-icon.png" height=40 /> Glimmer Calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) is a basic calculator sample project demonstrating data-binding and TDD (test-driven-development) with Glimmer following the MVP pattern (Model-View-Presenter).
 
-[Glimmer Calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) is a basic calculator sample project demonstrating data-binding and TDD (test-driven-development) with Glimmer following the MVP pattern (Model-View-Presenter).
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-calculator/master/glimmer-cs-calculator-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-calculator)
 
 #### Gladiator
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-gladiator.png" />](https://github.com/AndyObtiva/glimmer-cs-gladiator)
-
-[Gladiator](https://github.com/AndyObtiva/glimmer-cs-gladiator) (short for Glimmer Editor) is a Glimmer sample project under on-going development.
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 /> Gladiator](https://github.com/AndyObtiva/glimmer-cs-gladiator) (short for Glimmer Editor) is a Glimmer sample project under on-going development.
 You may check it out to learn how to build a Glimmer Custom Shell gem.
 
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-gladiator.png" />](https://github.com/AndyObtiva/glimmer-cs-gladiator)
+
 Gladiator is a good demonstration of:
 - MVP Pattern
 - Tree data-binding
@@ -2730,10 +2878,14 @@ Gladiator is a good demonstration of:
 
 ## In Production
 
-The following production apps have been built with Glimmer:
+The following production apps have been built with Glimmer.
+
+### Math Bowling
 
 [<img alt="Math Bowling Logo" src="https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/images/math-bowling-logo.png" width="40" />Math Bowling](https://github.com/AndyObtiva/MathBowling): an educational math game for elementary level kids
 
+### Are We There Yet?
+
 [<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): A tool that helps you learn when your small projects will finish
 
 If you have a Glimmer app you would like referenced here, please mention in a Pull Request. 

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/glimmer/dsl/engine.rb

@@ -110,43 +110,36 @@ module Glimmer
           static_expressions[keyword] ||= {}
           static_expressions[keyword][static_expression_dsl] = static_expression
           Glimmer.send(:define_method, keyword) do |*args, &block|
-            begin
-              if Glimmer::DSL::Engine.no_dsls?
-                puts Glimmer::DSL::Engine::MESSAGE_NO_DSLS
-              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?
-                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
-                    interpretation = Glimmer::DSL::Engine.interpret(keyword, *args, &block)
-                  rescue => e
-                    Glimmer::DSL::Engine.reset
-                    raise e if static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression)
-                  end
+            if Glimmer::DSL::Engine.no_dsls?
+              puts Glimmer::DSL::Engine::MESSAGE_NO_DSLS
+            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?
+              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
+                  interpretation = Glimmer::DSL::Engine.interpret(keyword, *args, &block)
+                rescue => e
+                  raise e if static_expression_dsl.nil? || !Glimmer::DSL::Engine.static_expressions[keyword][static_expression_dsl].is_a?(TopLevelExpression)
                 end
-                if interpretation
-                  interpretation
-                else              
-                  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.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}"
-                  else
-                    Glimmer::Config.logger&.debug "#{static_expression.class.name} will handle expression keyword #{keyword}"
-                    static_expression.interpret(Glimmer::DSL::Engine.parent, keyword, *args, &block).tap do |ui_object|
-                      Glimmer::DSL::Engine.add_content(ui_object, static_expression, &block) unless block.nil?
-                      Glimmer::DSL::Engine.dsl_stack.pop
-                    end
+              end
+              if interpretation
+                interpretation
+              else              
+                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.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}"
+                else
+                  Glimmer::Config.logger&.debug "#{static_expression.class.name} will handle expression keyword #{keyword}"
+                  static_expression.interpret(Glimmer::DSL::Engine.parent, keyword, *args, &block).tap do |ui_object|
+                    Glimmer::DSL::Engine.add_content(ui_object, static_expression, &block) unless block.nil?
+                    Glimmer::DSL::Engine.dsl_stack.pop
                   end
                 end
-              end              
-            rescue StandardError => e
-#               Glimmer::DSL::Engine.dsl_stack.pop
-                Glimmer::DSL::Engine.reset
-              raise e
-            end
+              end
+            end              
           end
         end
 
@@ -172,10 +165,6 @@ module Glimmer
             add_content(ui_object, expression, &block)
             dsl_stack.pop
           end
-        rescue StandardError => e
-#           dsl_stack.pop
-          reset
-          raise e
         end
 
         # Adds content block to parent UI object
@@ -187,9 +176,12 @@ module Glimmer
           if block_given? && expression.is_a?(ParentExpression)
             dsl_stack.push(expression.class.dsl)
             parent_stack.push(parent) 
-            expression.add_content(parent, &block)
-            parent_stack.pop
-            dsl_stack.pop
+            begin
+              expression.add_content(parent, &block)
+            ensure
+              parent_stack.pop
+              dsl_stack.pop
+            end
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement