glimmer 0.10.2 → 1.0.2

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.2

data/glimmer.gemspec

@@ -0,0 +1,83 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: glimmer 1.0.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "glimmer".freeze
+  s.version = "1.0.2"
+
+  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-10-27"
+  s.description = "Glimmer is a Ruby DSL engine with support for 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.email = "andy.am@gmail.com".freeze
+  s.extra_rdoc_files = [
+    "CHANGELOG.md",
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "LICENSE.txt",
+    "PROCESS.md",
+    "README.md",
+    "VERSION",
+    "glimmer.gemspec",
+    "lib/glimmer.rb",
+    "lib/glimmer/config.rb",
+    "lib/glimmer/data_binding/model_binding.rb",
+    "lib/glimmer/data_binding/observable.rb",
+    "lib/glimmer/data_binding/observable_array.rb",
+    "lib/glimmer/data_binding/observable_model.rb",
+    "lib/glimmer/data_binding/observer.rb",
+    "lib/glimmer/dsl/engine.rb",
+    "lib/glimmer/dsl/expression.rb",
+    "lib/glimmer/dsl/expression_handler.rb",
+    "lib/glimmer/dsl/parent_expression.rb",
+    "lib/glimmer/dsl/static_expression.rb",
+    "lib/glimmer/dsl/top_level_expression.rb",
+    "lib/glimmer/error.rb",
+    "lib/glimmer/invalid_keyword_error.rb"
+  ]
+  s.homepage = "http://github.com/AndyObtiva/glimmer".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.4".freeze
+  s.summary = "Glimmer Ruby DSL Engine".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<array_include_methods>.freeze, [">= 1.0.3", "< 2.0.0"])
+    s.add_runtime_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.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<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.3", "< 2.0.0"])
+    s.add_dependency(%q<facets>.freeze, [">= 3.1.0", "< 4.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<simplecov>.freeze, ["~> 0.16.1"])
+    s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+    s.add_dependency(%q<rake-tui>.freeze, [">= 0"])
+  end
+end
+

data/lib/glimmer.rb

@@ -1,7 +1,24 @@
-# Glimmer - a JRuby DSL that enables easy and efficient authoring of user
-# interfaces using the robust platform-independent Eclipse SWT library. Glimmer
-# comes with built-in data-binding support to greatly facilitate synchronizing
-# UI with domain models.
+# Copyright (c) 2007-2020 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 'logger'
 require 'set'
 require 'array_include_methods'
@@ -38,22 +55,23 @@ module Glimmer
   end
 
   def method_missing(method_symbol, *args, &block)
-    new_loop_data = [method_symbol, args, block]
-    if new_loop_data == Glimmer.loop_last_data
-      Glimmer.loop_increment!
-      raise "Glimmer looped #{Config.loop_max_count} times with keyword '#{new_loop_data[0]}'! Check code for errors." if Glimmer.loop == Config.loop_max_count
-    else
-      Glimmer.loop_reset!
-    end
-    Glimmer.loop_last_data = new_loop_data
     # This if statement speeds up Glimmer in girb or whenever directly including on main object
     is_excluded = Config.excluded_keyword_checkers.reduce(false) {|result, checker| result || instance_exec(method_symbol, *args, &checker) }
-    raise ExcludedKeywordError, "Glimmer excluded keyword: #{method_symbol}" if is_excluded
-    Glimmer::Config.logger.info {"Interpreting keyword: #{method_symbol}"}
-    Glimmer::DSL::Engine.interpret(method_symbol, *args, &block)
-  rescue ExcludedKeywordError => e
-    # TODO add a feature to show excluded keywords optionally for debugging purposes
-    super(method_symbol, *args, &block)
+    if is_excluded
+      Glimmer::Config.logger.debug "Glimmer excluded keyword: #{method_symbol}" if Glimmer::Config.log_excluded_keywords?
+      super(method_symbol, *args, &block)
+    else
+      new_loop_data = [method_symbol, args, block]
+      if new_loop_data == Glimmer.loop_last_data
+        Glimmer.loop_increment!
+        raise "Glimmer looped #{Config.loop_max_count} times with keyword '#{new_loop_data[0]}'! Check code for errors." if Glimmer.loop == Config.loop_max_count
+      else
+        Glimmer.loop_reset!
+      end
+      Glimmer.loop_last_data = new_loop_data
+      Glimmer::Config.logger.info {"Interpreting keyword: #{method_symbol}"}
+      Glimmer::DSL::Engine.interpret(method_symbol, *args, &block)    
+    end
   rescue InvalidKeywordError => e
     Glimmer::Config.logger.error {"Encountered an invalid keyword at this object: #{self}"}
     Glimmer::Config.logger.error {e.full_message}
@@ -62,6 +80,5 @@ module Glimmer
 end
 
 require 'glimmer/error'
-require 'glimmer/excluded_keyword_error'
 require 'glimmer/invalid_keyword_error'
 require 'glimmer/dsl/engine'

data/lib/glimmer/config.rb

@@ -1,10 +1,33 @@
+# Copyright (c) 2007-2020 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 Config
     class << self
       LOOP_MAX_COUNT_DEFAULT = 100
-      REGEX_METHODS_EXCLUDED = /^(to_|\[)/
+      REGEX_METHODS_EXCLUDED = /^(to_|\[|load_iseq)/
       
       attr_writer :loop_max_count
+      attr_accessor :log_excluded_keywords
+      alias log_excluded_keywords? log_excluded_keywords
       
       def excluded_keyword_checkers
         @excluded_keyword_checkers ||= reset_excluded_keyword_checkers!
@@ -34,7 +57,12 @@ module Glimmer
   
       def reset_logger!
         self.logger = Logger.new(STDOUT).tap do |logger| 
-          logger.level = ENV['GLIMMER_LOGGER_LEVEL'] ? ENV['GLIMMER_LOGGER_LEVEL'].downcase : Logger::ERROR
+          logger.level = Logger::ERROR
+          begin
+            logger.level = ENV['GLIMMER_LOGGER_LEVEL'].strip.downcase if ENV['GLIMMER_LOGGER_LEVEL']
+          rescue => e
+            puts e.message
+          end
         end
       end
     end

data/lib/glimmer/data_binding/model_binding.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2020 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/data_binding/observable'
 require 'glimmer/data_binding/observer'
 
@@ -7,7 +28,7 @@ module Glimmer
       include Observable
       include Observer
 
-      attr_reader :binding_options
+      attr_reader :binding_options, :property_name_expression
 
       def initialize(base_model, property_name_expression, binding_options = nil)
         @base_model = base_model
@@ -60,19 +81,10 @@ module Glimmer
       end
 
       def apply_converter(converter, value)
-        if converter.nil?
-          value
-        elsif converter.is_a?(String) || converter.is_a?(Symbol)
-          if value.respond_to?(converter)
-            value.send(converter)
-          else
-            raise Glimmer::Error, "Unsupported bind converter: #{converter.inspect}"
-          end
-        elsif converter.respond_to?(:call, value)
-          converter.call(value)
-        else
-          raise Glimmer::Error, "Unsupported bind converter: #{converter.inspect}"
-        end
+        return value if converter.nil?          
+        return value.send(converter) if (converter.is_a?(String) || converter.is_a?(Symbol)) && value.respond_to?(converter)          
+        return converter.call(value) if converter.respond_to?(:call, value)          
+        raise Glimmer::Error, "Unsupported bind converter: #{converter.inspect}"
       end
 
       # All nested property names
@@ -99,10 +111,6 @@ module Glimmer
         property_name_expression.match(/[.\[]/)
       end
 
-      def property_name_expression
-        @property_name_expression
-      end
-
       def computed?
         !computed_by.empty?
       end
@@ -179,17 +187,19 @@ module Glimmer
           model, property_name = zip
           nested_property_observer = nested_property_observers[property_name]
           previous_index = i - 1
-          parent_model = previous_index.negative? ? self : nested_models[previous_index]
-          parent_property_name = previous_index.negative? ? nil : nested_property_names[previous_index]
-          parent_observer = previous_index.negative? ? observer : nested_property_observers[parent_property_name]
+          if previous_index.negative?
+            parent_model = self
+            parent_property_name = nil
+            parent_observer = observer
+          else
+            parent_model = nested_models[previous_index]
+            parent_property_name = nested_property_names[previous_index]
+            parent_observer = nested_property_observers[parent_property_name]
+          end
           parent_property_name = nil if parent_property_name.to_s.start_with?('[')
           unless model.nil?
-            if property_indexed?(property_name)
-              # TODO figure out a way to deal with this more uniformly
-              observer_registration = nested_property_observer.observe(model)
-            else
-              observer_registration = nested_property_observer.observe(model, property_name)
-            end
+            # TODO figure out a way to deal with this more uniformly
+            observer_registration = property_indexed?(property_name) ? nested_property_observer.observe(model) : nested_property_observer.observe(model, property_name)
             parent_registration = parent_observer.registration_for(parent_model, parent_property_name)
             parent_observer.add_dependent(parent_registration => observer_registration)
           end

data/lib/glimmer/data_binding/observable.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2020 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/error'
 
 module Glimmer

data/lib/glimmer/data_binding/observable_array.rb

@@ -1,13 +1,32 @@
-require 'set'
-require 'array_include_methods'
+# Copyright (c) 2007-2020 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 'set'
 require 'glimmer/data_binding/observable'
+require 'array_include_methods'
 
 using ArrayIncludeMethods
 
 module Glimmer
   module DataBinding
-    # TODO prefix utility methods with double-underscore
     module ObservableArray
       include Observable
 
@@ -37,11 +56,7 @@ module Glimmer
         if !element_properties.empty?
           old_element_properties = element_properties_for(observer)
           observer_element_properties[observer] = element_properties_for(observer) - Set.new(element_properties)
-          each do |element|
-            element_properties.each do |property|
-              observer.unobserve(element, property)
-            end
-          end
+          each { |element| element_properties.each { |property| observer.unobserve(element, property) } }
         end
         if element_properties_for(observer).empty?
           property_observer_list.delete(observer)
@@ -94,6 +109,7 @@ module Glimmer
         end
       end
       alias push <<
+      alias append <<
       
       def []=(index, value)
         old_value = self[index]
@@ -169,9 +185,7 @@ module Glimmer
             remove_element_observers(old_value)
           end
           super(&block).tap do
-            each do |element|
-              add_element_observers(element)
-            end
+            each { |element| add_element_observers(element) }
             notify_observers
           end
         else
@@ -181,9 +195,7 @@ module Glimmer
       alias map! collect!
 
       def compact!
-        super.tap do
-          notify_observers
-        end
+        super.tap { notify_observers }
       end
 
       def flatten!(level=nil)
@@ -192,17 +204,13 @@ module Glimmer
           remove_element_observers(old_value)
         end
         (level.nil? ? super() : super(level)).tap do
-          each do |element|
-            add_element_observers(element)
-          end
+          each { |element| add_element_observers(element) }
           notify_observers
         end
       end
 
       def rotate!(count=1)
-        super(count).tap do
-          notify_observers
-        end
+        super(count).tap { notify_observers }
       end
 
       def select!(&block)
@@ -221,9 +229,7 @@ module Glimmer
       end
 
       def shuffle!(hash = nil)
-        (hash.nil? ? super() : super(random: hash[:random])).tap do
-          notify_observers
-        end
+        (hash.nil? ? super() : super(random: hash[:random])).tap { notify_observers }
       end
 
       def slice!(arg1, arg2=nil)
@@ -238,15 +244,11 @@ module Glimmer
       end
 
       def sort!(&block)
-        (block.nil? ? super() : super(&block)).tap do
-          notify_observers
-        end
+        (block.nil? ? super() : super(&block)).tap { notify_observers }
       end
 
       def sort_by!(&block)
-        (block.nil? ? super() : super(&block)).tap do
-          notify_observers
-        end
+        (block.nil? ? super() : super(&block)).tap { notify_observers }
       end
 
       def uniq!(&block)
@@ -255,15 +257,23 @@ module Glimmer
           remove_element_observers(old_value)
         end
         (block.nil? ? super() : super(&block)).tap do
-          each do |element|
-            add_element_observers(element)
-          end
+          each { |element| add_element_observers(element) }
           notify_observers
         end
       end
 
+      def unshift(element)
+        super(element).tap do
+          add_element_observers(element)        
+          notify_observers
+        end
+      end
+      alias prepend unshift
+
       def reject!(&block)
-        if block_given?
+        if block.nil?
+          super
+        else
           old_array = Array.new(self)
           super(&block).tap do
             (old_array - self).each do |old_value|
@@ -272,17 +282,12 @@ module Glimmer
             end
             notify_observers
           end
-        else
-          super
         end
       end
       
       def unregister_dependent_observers(old_value)
-        # TODO look into optimizing this
         return unless old_value.is_a?(ObservableModel) || old_value.is_a?(ObservableArray)
-        property_observer_list.each do |observer|
-          observer.unregister_dependents_with_observable(observer.registration_for(self), old_value)
-        end
+        property_observer_list.each { |observer| observer.unregister_dependents_with_observable(observer.registration_for(self), old_value) }
       end
     end
   end