glimmer 0.7.8 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.9.1

data/lib/glimmer.rb

@@ -2,14 +2,8 @@
 # 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.
-require 'facets'
-require 'super_module'
 require 'logger'
-require 'java'
 require 'set'
-require 'nested_inherited_jruby_include_package'
-require 'fileutils'
-require 'os'
 
 # Glimmer provides a JRuby Desktop UI DSL + Data-Binding functionality
 #
@@ -21,16 +15,6 @@ module Glimmer
   #TODO make it configurable to include or not include perhaps reverting to using included
   REGEX_METHODS_EXCLUDED = /^(to_|\[)/
 
-  class << self
-    def included(klass)
-      if Config.import_swt_packages
-        klass.include(SWT::Packages)
-        klass.extend(SWT::Packages)
-        klass.extend(Glimmer)
-      end
-    end
-  end
-
   def method_missing(method_symbol, *args, &block)
     # This if statement speeds up Glimmer in girb or whenever directly including on main object
     if method_symbol.to_s.match(REGEX_METHODS_EXCLUDED)
@@ -50,9 +34,6 @@ end
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 require 'glimmer/config'
-require 'glimmer/swt/packages'
-require 'glimmer/dsl/swt/dsl'
-require 'glimmer/dsl/xml/dsl'
-require 'glimmer/dsl/css/dsl'
 require 'glimmer/error'
 require 'glimmer/invalid_keyword_error'
+require 'glimmer/dsl/engine'

data/lib/glimmer/config.rb

@@ -1,19 +1,6 @@
 module Glimmer
   module Config
     class << self
-      # Tells Glimmer to import SWT packages into including class (default: true)
-      def import_swt_packages=(value)
-        @@import_swt_packages = !!value
-      end
-  
-      # Returns whether Glimmer will import SWT packages into including class
-      def import_swt_packages
-        unless defined? @@import_swt_packages
-          @@import_swt_packages = true
-        end
-        @@import_swt_packages
-      end
-  
       # Returns Glimmer logger (standard Ruby logger)
       def logger
         # unless defined? @@logger

data/lib/glimmer/dsl/engine.rb

@@ -1,4 +1,5 @@
-require 'glimmer'
+require 'facets/string/camelcase'
+
 require 'glimmer/dsl/expression_handler'
 
 module Glimmer
@@ -55,6 +56,10 @@ module Glimmer
           dsl_stack.clear
           disabled_dsls.clear
         end
+        
+        def no_dsls?
+          static_expressions.empty? && dynamic_expression_chains_of_responsibility.empty?
+        end
 
         # Dynamic expression chains of responsibility indexed by dsl
         def dynamic_expression_chains_of_responsibility
@@ -73,8 +78,9 @@ module Glimmer
         #
         # They are used in order following the Chain of Responsibility Design
         # Pattern when interpretting a DSL expression
-        def add_dynamic_expressions(dsl_namespace, expression_names)
-          dsl = dsl_namespace.name.split("::").last.downcase.to_sym
+        def add_dynamic_expressions(dsl_namespace, *expression_names)
+          expression_names = expression_names.flatten
+          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|
@@ -82,7 +88,7 @@ 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)
@@ -91,31 +97,36 @@ module Glimmer
           static_expression_dsl = static_expression.class.dsl
           static_expressions[keyword] ||= {}
           static_expressions[keyword][static_expression_dsl] = static_expression
-          Glimmer.define_method(keyword) do |*args, &block|
+          Glimmer.send(:define_method, keyword) do |*args, &block|
             begin
               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
-                  return Glimmer::DSL::Engine.interpret(keyword, *args, &block)
+                  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
               end
-              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}"
-                return 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
+              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 => e
+            rescue StandardError => e
 #               Glimmer::DSL::Engine.dsl_stack.pop
                 Glimmer::DSL::Engine.reset
               raise e
@@ -133,6 +144,10 @@ module Glimmer
 
         # Interprets Glimmer dynamic DSL expression consisting of keyword, args, and block (e.g. shell(:no_resize) { ... })
         def interpret(keyword, *args, &block)
+          if no_dsls?
+            puts "Glimmer has no DSLs configured. Add glimmer-dsl-swt gem or visit https://github.com/AndyObtiva/glimmer#multi-dsl-support for more details.\n"
+            return
+          end
           keyword = keyword.to_s
           dynamic_expression_dsl = (dynamic_expression_chains_of_responsibility.keys - disabled_dsls).first if dsl.nil?
           dsl_stack.push(dynamic_expression_dsl || dsl)
@@ -141,7 +156,7 @@ module Glimmer
             add_content(ui_object, expression, &block)
             dsl_stack.pop
           end
-        rescue => e
+        rescue StandardError => e
 #           dsl_stack.pop
           reset
           raise e

data/lib/glimmer/dsl/expression.rb

@@ -1,6 +1,4 @@
 require 'glimmer/error'
-require 'glimmer/swt/widget_proxy'
-require 'glimmer/ui/custom_widget'
 
 module Glimmer
   module DSL
@@ -35,11 +33,6 @@ module Glimmer
         # No Op by default
       end
 
-      # Checks if parent object is a widget
-      def widget?(parent)
-        parent.is_a?(Glimmer::SWT::WidgetProxy) or parent.is_a?(Glimmer::UI::CustomWidget)
-      end
-
       # Checks if object is a Symbol or a String
       def textual?(object)
         object.is_a?(Symbol) or object.is_a?(String)

data/lib/glimmer/dsl/static_expression.rb

@@ -1,8 +1,8 @@
+require 'facets/string/underscore'
+
 require 'glimmer/error'
 require 'glimmer/dsl/engine'
 require 'glimmer/dsl/expression'
-require 'glimmer/swt/widget_proxy'
-require 'glimmer/ui/custom_widget'
 
 module Glimmer
   module DSL

metadata

@@ -1,174 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.9.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   name: facets
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  name: os
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
-  name: super_module
-  type: :runtime
+        version: 3.5.0
+  name: rspec-mocks
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
-  name: nested_inherited_jruby_include_package
-  type: :runtime
+        version: 3.5.0
+  name: rspec
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
-  name: warbler
-  type: :runtime
+        version: 0.8.1
+  name: puts_debuggerer
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 14.0.0
   name: rake
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: jeweler
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.9
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.2.1
-  name: rdoc
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  name: rspec-mocks
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 6.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  name: rspec
+        version: 7.0.0
+  name: rdoc
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
-  name: puts_debuggerer
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 6.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.1
-description: Desktop Development Library for Ruby
+        version: 7.0.0
+description: Ruby Desktop Development GUI Library (JRuby on SWT)
 email: andy.am@gmail.com
-executables:
-- glimmer
-- girb
+executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -176,107 +142,17 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
-- RUBY_VERSION
 - VERSION
-- bin/girb
-- bin/girb_runner.rb
-- bin/glimmer
-- icons/scaffold_app.icns
 - lib/glimmer.rb
 - lib/glimmer/config.rb
-- lib/glimmer/css/rule.rb
-- lib/glimmer/css/style_sheet.rb
-- lib/glimmer/data_binding/list_selection_binding.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/observable_widget.rb
-- lib/glimmer/data_binding/observer.rb
-- lib/glimmer/data_binding/shine.rb
-- lib/glimmer/data_binding/table_items_binding.rb
-- lib/glimmer/data_binding/tree_items_binding.rb
-- lib/glimmer/data_binding/widget_binding.rb
-- lib/glimmer/dsl/css/css_expression.rb
-- lib/glimmer/dsl/css/dsl.rb
-- lib/glimmer/dsl/css/dynamic_property_expression.rb
-- lib/glimmer/dsl/css/property_expression.rb
-- lib/glimmer/dsl/css/pv_expression.rb
-- lib/glimmer/dsl/css/rule_expression.rb
-- lib/glimmer/dsl/css/s_expression.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/swt/async_exec_expression.rb
-- lib/glimmer/dsl/swt/bind_expression.rb
-- lib/glimmer/dsl/swt/color_expression.rb
-- lib/glimmer/dsl/swt/column_properties_expression.rb
-- lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
-- lib/glimmer/dsl/swt/custom_widget_expression.rb
-- lib/glimmer/dsl/swt/data_binding_expression.rb
-- lib/glimmer/dsl/swt/dialog_expression.rb
-- lib/glimmer/dsl/swt/display_expression.rb
-- lib/glimmer/dsl/swt/dsl.rb
-- lib/glimmer/dsl/swt/exec_expression.rb
-- lib/glimmer/dsl/swt/layout_data_expression.rb
-- lib/glimmer/dsl/swt/layout_expression.rb
-- lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
-- lib/glimmer/dsl/swt/menu_bar_expression.rb
-- lib/glimmer/dsl/swt/menu_expression.rb
-- lib/glimmer/dsl/swt/observe_expression.rb
-- lib/glimmer/dsl/swt/property_expression.rb
-- lib/glimmer/dsl/swt/rgb_expression.rb
-- lib/glimmer/dsl/swt/rgba_expression.rb
-- lib/glimmer/dsl/swt/shell_expression.rb
-- lib/glimmer/dsl/swt/swt_expression.rb
-- lib/glimmer/dsl/swt/sync_exec_expression.rb
-- lib/glimmer/dsl/swt/tab_item_expression.rb
-- lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
-- lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
-- lib/glimmer/dsl/swt/tree_properties_expression.rb
-- lib/glimmer/dsl/swt/widget_expression.rb
-- lib/glimmer/dsl/swt/widget_listener_expression.rb
 - lib/glimmer/dsl/top_level_expression.rb
-- lib/glimmer/dsl/xml/dsl.rb
-- lib/glimmer/dsl/xml/html_expression.rb
-- lib/glimmer/dsl/xml/meta_expression.rb
-- lib/glimmer/dsl/xml/name_space_expression.rb
-- lib/glimmer/dsl/xml/node_parent_expression.rb
-- lib/glimmer/dsl/xml/tag_expression.rb
-- lib/glimmer/dsl/xml/text_expression.rb
-- lib/glimmer/dsl/xml/xml_expression.rb
 - lib/glimmer/error.rb
 - lib/glimmer/invalid_keyword_error.rb
-- lib/glimmer/launcher.rb
-- lib/glimmer/package.rb
-- lib/glimmer/rake_task.rb
-- lib/glimmer/scaffold.rb
-- lib/glimmer/swt/color_proxy.rb
-- lib/glimmer/swt/display_proxy.rb
-- lib/glimmer/swt/font_proxy.rb
-- lib/glimmer/swt/layout_data_proxy.rb
-- lib/glimmer/swt/layout_proxy.rb
-- lib/glimmer/swt/menu_proxy.rb
-- lib/glimmer/swt/packages.rb
-- lib/glimmer/swt/shell_proxy.rb
-- lib/glimmer/swt/swt_proxy.rb
-- lib/glimmer/swt/tab_item_proxy.rb
-- lib/glimmer/swt/tree_proxy.rb
-- lib/glimmer/swt/widget_listener_proxy.rb
-- lib/glimmer/swt/widget_proxy.rb
-- lib/glimmer/ui/custom_shell.rb
-- lib/glimmer/ui/custom_widget.rb
-- lib/glimmer/util/proc_tracker.rb
-- lib/glimmer/xml/depth_first_search_iterator.rb
-- lib/glimmer/xml/name_space_visitor.rb
-- lib/glimmer/xml/node.rb
-- lib/glimmer/xml/node_visitor.rb
-- lib/glimmer/xml/xml_visitor.rb
-- vendor/swt/linux/swt.jar
-- vendor/swt/mac/swt.jar
-- vendor/swt/windows/swt.jar
 homepage: http://github.com/AndyObtiva/glimmer
 licenses:
 - MIT
@@ -299,5 +175,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop Development Library for Ruby
+summary: Ruby Desktop Development GUI Library
 test_files: []