glimmer 1.0.3 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.8

data/glimmer.gemspec

@@ -2,20 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer 1.0.3 ruby lib
+# stub: glimmer 1.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer".freeze
-  s.version = "1.0.3"
+  s.version = "1.0.8"
 
   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 = "2020-11-15"
-  s.description = "Glimmer is a Ruby DSL Framework consisting of a DSL Engine and Observable/Observer/Data-Binding Library. Used in the Glimmer DSL for SWT (JRuby Desktop Development GUI Library), the Glimmer DSL for Tk (Ruby Desktop Development GUI Library), the Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps), the Glimmer DSL for XML (& HTML), and the Glimmer DSL for CSS.".freeze
+  s.date = "2021-01-19"
+  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"
   ]
@@ -55,26 +54,28 @@ 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<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.8.23"])
+    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.8.23"])
+    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"])

data/lib/glimmer.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -22,6 +22,7 @@
 require 'logger'
 require 'set'
 require 'array_include_methods'
+require 'concurrent-ruby'
 
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
@@ -70,7 +71,7 @@ module Glimmer
       end
       Glimmer.loop_last_data = new_loop_data
       Glimmer::Config.logger.info {"Interpreting keyword: #{method_symbol}"}
-      Glimmer::DSL::Engine.interpret(method_symbol, *args, &block)    
+      Glimmer::DSL::Engine.interpret(method_symbol, *args, &block)
     end
   rescue InvalidKeywordError => e
     Glimmer::Config.logger.error {"Encountered an invalid keyword at this object: #{self}"}

data/lib/glimmer/config.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -46,7 +46,7 @@ module Glimmer
       end
       
       # Returns Glimmer logger (standard Ruby logger)
-      def logger      
+      def logger
         reset_logger! unless defined? @@logger
         @@logger
       end
@@ -56,7 +56,7 @@ module Glimmer
       end
   
       def reset_logger!
-        self.logger = Logger.new(STDOUT).tap do |logger| 
+        self.logger = Logger.new(STDOUT).tap do |logger|
           logger.level = Logger::ERROR
           begin
             logger.level = ENV['GLIMMER_LOGGER_LEVEL'].strip.downcase if ENV['GLIMMER_LOGGER_LEVEL']

data/lib/glimmer/data_binding/model_binding.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -33,7 +33,7 @@ module Glimmer
       def initialize(base_model, property_name_expression, binding_options = nil)
         @base_model = base_model
         @property_name_expression = property_name_expression
-        @binding_options = binding_options || {}
+        @binding_options = binding_options || Concurrent::Hash.new
         if computed?
           @computed_model_bindings = computed_by.map do |computed_by_property_expression|
             self.class.new(base_model, computed_by_property_expression)
@@ -120,9 +120,9 @@ module Glimmer
       end
 
       def nested_property_observers_for(observer)
-        @nested_property_observers_collection ||= {}
+        @nested_property_observers_collection ||= Concurrent::Hash.new
         unless @nested_property_observers_collection.has_key?(observer)
-          @nested_property_observers_collection[observer] = nested_property_names.reduce({}) do |output, property_name|
+          @nested_property_observers_collection[observer] = nested_property_names.reduce(Concurrent::Hash.new) do |output, property_name|
             output.merge(
               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)
@@ -164,7 +164,7 @@ module Glimmer
       end
 
       def computed_observer_for(observer)
-        @computed_observer_collection ||= {}
+        @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)
@@ -209,7 +209,7 @@ module Glimmer
       def call(value)
         return if model.nil?
         converted_value = value
-        invoke_property_writer(model, "#{property_name}=", converted_value) unless evaluate_property == converted_value
+        invoke_property_writer(model, "#{property_name}=", converted_value) unless converted_value == evaluate_property
       end
 
       def evaluate_property
@@ -242,7 +242,7 @@ module Glimmer
       end
 
       def invoke_property_writer(object, property_expression, value)
-        return if @binding_options[:read_only]
+        raise "Cannot invoke `#{property_expression}` because ModelBinding#binding_options[:read_only]=true" if @binding_options[:read_only]
         value = convert_on_write(value)
         if property_indexed?(property_expression)
           property_method = '[]='

data/lib/glimmer/data_binding/observable.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/data_binding/observable_array.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -34,7 +34,7 @@ module Glimmer
         element_properties = element_properties.flatten.compact.uniq
         return observer if has_observer?(observer) && has_observer_element_properties?(observer, element_properties)
         property_observer_list << observer
-        observer_element_properties[observer] = element_properties_for(observer) + Set.new(element_properties)
+        observer_element_properties[observer] = element_properties_for(observer) + Concurrent::Set.new(element_properties)
         each { |element| add_element_observer(element, observer) }
         observer
       end
@@ -55,7 +55,7 @@ module Glimmer
         element_properties = element_properties.flatten.compact.uniq
         if !element_properties.empty?
           old_element_properties = element_properties_for(observer)
-          observer_element_properties[observer] = element_properties_for(observer) - Set.new(element_properties)
+          observer_element_properties[observer] = element_properties_for(observer) - Concurrent::Set.new(element_properties)
           each { |element| element_properties.each { |property| observer.unobserve(element, property) } }
         end
         if element_properties_for(observer).empty?
@@ -87,15 +87,15 @@ module Glimmer
       end
 
       def property_observer_list
-        @property_observer_list ||= Set.new
+        @property_observer_list ||= Concurrent::Set.new
       end
 
       def observer_element_properties
-        @observer_element_properties ||= {}
+        @observer_element_properties ||= Concurrent::Hash.new
       end
 
       def element_properties_for(observer)
-        observer_element_properties[observer] ||= Set.new
+        observer_element_properties[observer] ||= Concurrent::Set.new
       end
 
       def notify_observers

data/lib/glimmer/data_binding/observable_model.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -43,7 +43,7 @@ module Glimmer
         lambda do |value|
           old_value = self.send(property_name)
           unregister_dependent_observers(property_name, old_value)
-          self.send("__original_#{property_writer_name}", value)
+          self.send("__original__#{property_writer_name}", value)
           notify_observers(property_name)
           ensure_array_object_observer(property_name, value, old_value)
         end
@@ -57,7 +57,26 @@ module Glimmer
       end
 
       def remove_observer(observer, property_name)
-        property_observer_list(property_name).delete(observer)
+        if has_observer?(observer, property_name)
+          property_observer_list(property_name).delete(observer)
+          observer.unobserve(self, property_name)
+        end
+      end
+
+      def remove_observers(property_name)
+        property_observer_hash[property_name.to_sym].each do |observer|
+          remove_observer(observer, property_name)
+        end
+        property_observer_hash.delete(property_name.to_sym)
+      end
+
+      def remove_all_observers
+        all_observers = property_observer_hash.clone
+        property_observer_hash.keys.each do |property_name|
+          remove_observers(property_name)
+        end
+        property_observer_hash.clear
+        all_observers
       end
 
       def has_observer?(observer, property_name)
@@ -73,7 +92,7 @@ module Glimmer
       end
 
       def property_observer_list(property_name)
-        property_observer_hash[property_name.to_sym] = Set.new unless property_observer_hash[property_name.to_sym]
+        property_observer_hash[property_name.to_sym] = Concurrent::Set.new unless property_observer_hash[property_name.to_sym]
         property_observer_hash[property_name.to_sym]
       end
 
@@ -86,9 +105,9 @@ module Glimmer
         method(property_writer_name)
         ensure_array_object_observer(property_name, send(property_name))
         begin
-          singleton_method("__original_#{property_writer_name}")
+          method("__original__#{property_writer_name}")
         rescue
-          define_singleton_method("__original_#{property_writer_name}", property_writer_method(property_writer_name))
+          define_singleton_method("__original__#{property_writer_name}", property_writer_method(property_writer_name))
           define_singleton_method(property_writer_name, &PROPERTY_WRITER_FACTORY.call(property_name))
         end
       rescue => e
@@ -107,7 +126,7 @@ module Glimmer
       end
 
       def ensure_array_object_observer(property_name, object, old_object = nil)
-        return unless object.is_a?(Array)
+        return unless object&.is_a?(Array)
         array_object_observer = array_object_observer_for(property_name)
         array_observer_registration = array_object_observer.observe(object)
         property_observer_list(property_name).each do |observer|
@@ -118,7 +137,7 @@ module Glimmer
       end
 
       def array_object_observer_for(property_name)
-        @array_object_observers ||= {}
+        @array_object_observers ||= Concurrent::Hash.new
         @array_object_observers[property_name] = ObservableModel::Notifier.new(self, property_name) unless @array_object_observers.has_key?(property_name)
         @array_object_observers[property_name]
       end

data/lib/glimmer/data_binding/observer.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -51,6 +51,7 @@ module Glimmer
           observer.unobserve(observable, property)
         end
         alias unobserve unregister
+        alias deregister unregister
       end
 
       class << self
@@ -60,7 +61,7 @@ module Glimmer
       end
 
       def registrations
-        @registrations ||= Set.new
+        @registrations ||= Concurrent::Set.new
       end
 
       def registration_for(observable, property = nil)
@@ -74,7 +75,7 @@ module Glimmer
       end
 
       def dependents_for(registration)
-        dependents[registration] ||= Set.new
+        dependents[registration] ||= Concurrent::Set.new
       end
 
       # registers observer in an observable on a property (optional)
@@ -99,13 +100,14 @@ module Glimmer
       def unregister(observable, property = nil)
         return unless observable.is_a?(Observable)
         # TODO optimize performance in the future via indexing and/or making a registration official object/class
-        observable.remove_observer(*[self, property].compact)
         registration = registration_for(observable, property)
         dependents_for(registration).each do |dependent|
           dependent.unregister
           remove_dependent(registration => dependent)
         end
-        registrations.delete(registration)
+        registrations.delete(registration).tap do |registration|
+          observable.remove_observer(*[self, property].compact)
+        end
       end
       alias unobserve unregister
 

data/lib/glimmer/dsl/engine.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -28,7 +28,7 @@ module Glimmer
   module DSL
     # Glimmer DSL Engine
     #
-    # Follows Interpreter and Chain of Responsibility Design Patterns
+    # Follows Interpreter, Chain of Responsibility, and Singleton Design Patterns
     #
     # When DSL engine interprets an expression, it attempts to handle
     # with ordered expression array specified via `.expressions=` method.
@@ -51,19 +51,19 @@ module Glimmer
             end
             if interpretation
               interpretation
-            else              
+            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}"
+              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}"
               else
                 Glimmer::Config.logger.info {"#{static_expression.class.name} will handle expression keyword #{keyword}"}
                 Glimmer::DSL::Engine.interpret_expression(static_expression, keyword, *args, &block)
               end
             end
-          end              
-        end      
+          end
+        end
       end
       
       class << self
@@ -86,7 +86,7 @@ module Glimmer
         end
 
         def disabled_dsls
-          @disabled_dsls ||= []
+          @disabled_dsls ||= Concurrent::Array.new
         end
 
         def enabled_dsls=(dsl_names)
@@ -109,13 +109,13 @@ module Glimmer
 
         # Dynamic expression chains of responsibility indexed by dsl
         def dynamic_expression_chains_of_responsibility
-          @dynamic_expression_chains_of_responsibility ||= {}
+          @dynamic_expression_chains_of_responsibility ||= Concurrent::Hash.new
         end
 
         # Static expressions indexed by keyword and dsl
         def static_expressions
-          @static_expressions ||= {}
-        end        
+          @static_expressions ||= Concurrent::Hash.new
+        end
 
         # Sets dynamic expression chains of responsibility. Useful for internal testing
         attr_writer :dynamic_expression_chains_of_responsibility
@@ -132,7 +132,7 @@ module Glimmer
         # Pattern when interpretting a DSL expression
         def add_dynamic_expressions(dsl_namespace, *expression_names)
           expression_names = expression_names.flatten
-          dsl = dsl_namespace.name.split("::").last.downcase.to_sym          
+          dsl = dsl_namespace.name.split("::").last.downcase.to_sym
           dynamic_expression_chains_of_responsibility[dsl] = expression_names.reverse.map do |expression_name|
             expression_class(dsl_namespace, expression_name).new
           end.reduce(nil) do |last_expresion_handler, expression|
@@ -140,14 +140,14 @@ module Glimmer
             expression_handler = ExpressionHandler.new(expression)
             expression_handler.next = last_expresion_handler if last_expresion_handler
             expression_handler
-          end                   
+          end
         end
 
         def add_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] ||= {}
+          static_expressions[keyword] ||= Concurrent::Hash.new
           static_expressions[keyword][static_expression_dsl] = static_expression
           Glimmer.send(:define_method, keyword, &STATIC_EXPRESSION_METHOD_FACTORY.call(keyword))
         end
@@ -161,10 +161,11 @@ module Glimmer
         end
 
         # Interprets Glimmer dynamic DSL expression consisting of keyword, args, and block (e.g. shell(:no_resize) { ... })
-        def interpret(keyword, *args, &block)          
+        def interpret(keyword, *args, &block)
           return puts(MESSAGE_NO_DSLS) if no_dsls?
           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
           dsl_stack.push(dynamic_expression_dsl || dsl)
           expression = dynamic_expression_chains_of_responsibility[dsl].handle(parent, keyword, *args, &block)
           interpret_expression(expression, keyword, *args, &block)
@@ -185,7 +186,7 @@ module Glimmer
         def add_content(parent, expression, &block)
           if block_given? && expression.is_a?(ParentExpression)
             dsl_stack.push(expression.class.dsl)
-            parent_stack.push(parent) 
+            parent_stack.push(parent)
             begin
               expression.add_content(parent, &block)
             ensure
@@ -202,16 +203,16 @@ module Glimmer
         def_delegator :parent_stack, :last, :parent
 
         def parent_stack
-          parent_stacks[dsl] ||= []
+          parent_stacks[dsl] ||= Concurrent::Array.new
         end
 
         def parent_stacks
-          @parent_stacks ||= {}
+          @parent_stacks ||= Concurrent::Hash.new
         end
 
         # Enables multiple DSLs to play well with each other when mixing together
         def dsl_stack
-          @dsl_stack ||= []
+          @dsl_stack ||= Concurrent::Array.new
         end
       end
     end