glimmer-dsl-opal 0.0.5 → 0.1.0

data/lib/samples/elaborate/login.rb

@@ -1,4 +1,3 @@
-require "java"
 require "observer"
 
 #Presents login screen data

data/lib/samples/elaborate/tic_tac_toe.rb

@@ -37,11 +37,11 @@ class TicTacToe
     display_game_over_message("Draw!")
   end
 
-  def display_game_over_message(message)
-    message_box = MessageBox.new(@shell.swt_widget)
-    message_box.setText("Game Over")
-    message_box.setMessage(message)
-    message_box.open
+  def display_game_over_message(message_text)
+    message_box(@shell) {
+      text 'Game Over'
+      message message_text
+    }.open
     @tic_tac_toe_board.reset
   end
 

data/lib/samples/hello/hello_computed.rb

@@ -1,19 +1,19 @@
-require_relative "hello_computed/contact"
+require_relative 'hello_computed/contact'
 
 class HelloComputed
   include Glimmer
 
   def initialize
     @contact = Contact.new(
-      first_name: "Barry",
-      last_name: "McKibbin",
+      first_name: 'Barry',
+      last_name: 'McKibbin',
       year_of_birth: 1985
     )
   end
 
   def launch
     shell {
-      text "Hello Computed"
+      text 'Hello, Computed!'
       composite {
         grid_layout {
           num_columns 2
@@ -21,44 +21,44 @@ class HelloComputed
           horizontal_spacing 20
           vertical_spacing 10
         }
-        label {text "First &Name: "}
+        label {text 'First &Name: '}
         text {
           text bind(@contact, :first_name)
           layout_data {
-            horizontalAlignment :fill
-            grabExcessHorizontalSpace true
+            horizontal_alignment :fill
+            grab_excess_horizontal_space true
           }
         }
-        label {text "&Last Name: "}
+        label {text '&Last Name: '}
         text {
           text bind(@contact, :last_name)
           layout_data {
-            horizontalAlignment :fill
-            grabExcessHorizontalSpace true
+            horizontal_alignment :fill
+            grab_excess_horizontal_space true
           }
         }
-        label {text "&Year of Birth: "}
+        label {text '&Year of Birth: '}
         text {
           text bind(@contact, :year_of_birth)
           layout_data {
-            horizontalAlignment :fill
-            grabExcessHorizontalSpace true
+            horizontal_alignment :fill
+            grab_excess_horizontal_space true
           }
         }
-        label {text "Name: "}
+        label {text 'Name: '}
         label {
           text bind(@contact, :name, computed_by: [:first_name, :last_name])
           layout_data {
-            horizontalAlignment :fill
-            grabExcessHorizontalSpace true
+            horizontal_alignment :fill
+            grab_excess_horizontal_space true
           }
         }
-        label {text "Age: "}
+        label {text 'Age: '}
         label {
           text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])
           layout_data {
-            horizontalAlignment :fill
-            grabExcessHorizontalSpace true
+            horizontal_alignment :fill
+            grab_excess_horizontal_space true
           }
         }
       }

data/lib/samples/hello/hello_tab.rb

@@ -2,7 +2,7 @@ class HelloTab
   include Glimmer
   def launch
     shell {
-      text "Hello Tab"
+      text "Hello, Tab!"
       tab_folder {
         tab_item {
           text "English"
@@ -13,7 +13,7 @@ class HelloTab
         tab_item {
           text "French"
           label {
-            text "Bonjour Univers!"
+            text "Bonjour, Univers!"
           }
         }
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - AndyMaleh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
+        version: 0.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: puts_debuggerer
   requirement: !ruby/object:Gem::Requirement
@@ -132,28 +118,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0.alpha2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0.alpha2
+- !ruby/object:Gem::Dependency
+  name: opal-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: opal-async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: opal-browser
+  name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: glimmer-dsl-opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
 email: andy.am@gmail.com
 executables: []
@@ -168,48 +196,53 @@ files:
 - README.md
 - VERSION
 - lib/glimmer-dsl-opal.rb
-- lib/glimmer/config.rb
 - lib/glimmer/data_binding/element_binding.rb
+- lib/glimmer/data_binding/ext/observable_model.rb
 - lib/glimmer/data_binding/list_selection_binding.rb
 - lib/glimmer/data_binding/observable_element.rb
-- lib/glimmer/dsl/engine.rb
-- lib/glimmer/dsl/expression.rb
-- lib/glimmer/dsl/expression_handler.rb
+- lib/glimmer/data_binding/table_items_binding.rb
+- lib/glimmer/dsl/opal/async_exec_expression.rb
 - lib/glimmer/dsl/opal/bind_expression.rb
-- lib/glimmer/dsl/opal/browser_expression.rb
-- lib/glimmer/dsl/opal/button_expression.rb
-- lib/glimmer/dsl/opal/combo_expression.rb
+- lib/glimmer/dsl/opal/column_properties_expression.rb
 - lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb
-- lib/glimmer/dsl/opal/composite_expression.rb
 - lib/glimmer/dsl/opal/data_binding_expression.rb
 - lib/glimmer/dsl/opal/dsl.rb
-- lib/glimmer/dsl/opal/grid_layout_expression.rb
-- lib/glimmer/dsl/opal/label_expression.rb
 - lib/glimmer/dsl/opal/layout_data_expression.rb
-- lib/glimmer/dsl/opal/list_expression.rb
+- lib/glimmer/dsl/opal/layout_expression.rb
 - lib/glimmer/dsl/opal/list_selection_data_binding_expression.rb
+- lib/glimmer/dsl/opal/message_box_expression.rb
+- lib/glimmer/dsl/opal/observe_expression.rb
 - lib/glimmer/dsl/opal/property_expression.rb
 - lib/glimmer/dsl/opal/shell_expression.rb
-- lib/glimmer/dsl/opal/text_expression.rb
+- lib/glimmer/dsl/opal/table_column_expression.rb
+- lib/glimmer/dsl/opal/table_expression.rb
+- lib/glimmer/dsl/opal/table_items_data_binding_expression.rb
+- lib/glimmer/dsl/opal/widget_expression.rb
 - lib/glimmer/dsl/opal/widget_listener_expression.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
-- lib/glimmer/opal/div_proxy.rb
-- lib/glimmer/opal/document_proxy.rb
+- lib/glimmer/opal/display_proxy.rb
 - lib/glimmer/opal/element_proxy.rb
-- lib/glimmer/opal/event_listener_proxy.rb
-- lib/glimmer/opal/grid_layout_proxy.rb
-- lib/glimmer/opal/iframe_proxy.rb
-- lib/glimmer/opal/input_proxy.rb
-- lib/glimmer/opal/label_proxy.rb
-- lib/glimmer/opal/layout_data_proxy.rb
-- lib/glimmer/opal/list_proxy.rb
-- lib/glimmer/opal/point.rb
-- lib/glimmer/opal/property_owner.rb
-- lib/glimmer/opal/select_proxy.rb
+- lib/glimmer/swt/browser_proxy.rb
+- lib/glimmer/swt/button_proxy.rb
+- lib/glimmer/swt/combo_proxy.rb
+- lib/glimmer/swt/composite_proxy.rb
+- lib/glimmer/swt/event_listener_proxy.rb
+- lib/glimmer/swt/grid_layout_proxy.rb
+- lib/glimmer/swt/label_proxy.rb
+- lib/glimmer/swt/layout_data_proxy.rb
+- lib/glimmer/swt/layout_proxy.rb
+- lib/glimmer/swt/list_proxy.rb
+- lib/glimmer/swt/message_box_proxy.rb
+- lib/glimmer/swt/point.rb
+- lib/glimmer/swt/property_owner.rb
+- lib/glimmer/swt/shell_proxy.rb
+- lib/glimmer/swt/tab_folder_proxy.rb
+- lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/table_column_proxy.rb
+- lib/glimmer/swt/table_item_proxy.rb
+- lib/glimmer/swt/table_proxy.rb
+- lib/glimmer/swt/text_proxy.rb
+- lib/glimmer/swt/widget_proxy.rb
+- lib/jquery.js
 - lib/samples/elaborate/contact_manager.rb
 - lib/samples/elaborate/contact_manager/contact.rb
 - lib/samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -233,7 +266,7 @@ homepage: http://github.com/AndyObtiva/glimmer-dsl-opal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal
 test_files: []

data/lib/glimmer/config.rb

@@ -1,22 +0,0 @@
-module Glimmer
-  module Config
-    class << self
-      # Returns Glimmer logger (standard Ruby logger)
-      def logger
-        # unless defined? @@logger
-        #   @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
-        # end
-        @@logger if defined? @@logger
-      end
-  
-      def enable_logging
-        @@logger = Logger.new(STDOUT).tap {|logger| logger.level = Logger::WARN}
-      end
-    end
-  end
-end
-
-if ENV['GLIMMER_LOGGER_LEVEL']
-  Glimmer::Config.enable_logging
-  Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].downcase
-end

data/lib/glimmer/dsl/engine.rb

@@ -1,193 +0,0 @@
-require 'glimmer'
-require 'glimmer/dsl/expression_handler'
-
-module Glimmer
-  module DSL
-    # Glimmer DSL Engine
-    #
-    # Follows Interpreter and Chain of Responsibility Design Patterns
-    #
-    # When DSL engine interprets an expression, it attempts to handle
-    # with ordered expression array specified via `.expressions=` method.
-    class Engine
-      class << self
-        def dsl=(dsl_name)
-          dsl_name = dsl_name&.to_sym
-          if dsl_name
-            dsl_stack.push(dsl_name)
-          else
-            dsl_stack.clear
-          end
-        end
-        
-        def dsl
-          dsl_stack.last
-        end
-
-        def dsls
-          static_expressions.values.map(&:keys).flatten.uniq
-        end
-
-        def disable_dsl(dsl_name)
-          dsl_name = dsl_name.to_sym
-          disabled_dsls << dsl_name
-        end
-
-        def enable_dsl(dsl_name)
-          dsl_name = dsl_name.to_sym
-          disabled_dsls.delete(dsl_name)
-        end
-
-        def disabled_dsls
-          @disabled_dsls ||= []
-        end
-
-        def enabled_dsls=(dsl_names)
-          dsls.each {|dsl_name| disable_dsl(dsl_name)}
-          dsl_names.each {|dsl_name| enable_dsl(dsl_name)}
-        end
-    
-        # Resets Glimmer's engine activity and configuration. Useful in rspec before or after blocks in tests.
-        def reset
-          parent_stacks.values.each do |a_parent_stack|
-            a_parent_stack.clear
-          end
-          dsl_stack.clear
-          disabled_dsls.clear
-        end
-
-        # Dynamic expression chains of responsibility indexed by dsl
-        def dynamic_expression_chains_of_responsibility
-          @dynamic_expression_chains_of_responsibility ||= {}
-        end
-
-        # Static expressions indexed by keyword and dsl
-        def static_expressions
-          @static_expressions ||= {}
-        end
-
-        # Sets an ordered array of DSL expressions to support
-        #
-        # Every expression has an underscored name corresponding to an upper
-        # camelcase AbstractExpression subclass name in glimmer/dsl
-        #
-        # 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
-          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|
-            Glimmer::Config.logger&.debug "Adding dynamic expression: #{expression.class.name}"
-            expression_handler = ExpressionHandler.new(expression)
-            expression_handler.next = last_expresion_handler if last_expresion_handler
-            expression_handler
-          end                   
-        end
-
-        def add_static_expression(static_expression)
-          Glimmer::Config.logger&.debug "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][static_expression_dsl] = static_expression
-          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).last 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
-              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
-
-        def expression_class(dsl_namespace, expression_name)
-          dsl_namespace.const_get(expression_class_name(expression_name).to_sym)
-        end
-
-        def expression_class_name(expression_name)
-          "#{expression_name}_expression".camelcase(:upper)
-        end
-
-        # Interprets Glimmer dynamic DSL expression consisting of keyword, args, and block (e.g. shell(:no_resize) { ... })
-        def interpret(keyword, *args, &block)
-          keyword = keyword.to_s
-          dynamic_expression_dsl = (dynamic_expression_chains_of_responsibility.keys - disabled_dsls).last if dsl.nil?
-          dsl_stack.push(dynamic_expression_dsl || dsl)
-          expression = dynamic_expression_chains_of_responsibility[dsl].handle(parent, keyword, *args, &block)
-          expression.interpret(parent, keyword, *args, &block).tap do |ui_object|            
-            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
-        #
-        # This allows evaluating parent UI object properties and children
-        #
-        # For example, a shell widget would get properties set and children added
-        def add_content(parent, expression, &block)
-          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
-          end
-        end
-
-        # Current parent while evaluating Glimmer DSL (nil if just started or done evaluatiing)
-        #
-        # Parents are maintained in a stack while evaluating Glimmer DSL
-        # to ensure properly ordered interpretation of DSL syntax
-        def parent
-          parent_stack.last
-        end
-
-        def parent_stack
-          parent_stacks[dsl] ||= []
-        end
-
-        def parent_stacks
-          @parent_stacks ||= {}
-        end
-
-        # Enables multiple DSLs to play well with each other when mixing together
-        def dsl_stack
-          @dsl_stack ||= []
-        end
-      end
-    end
-  end
-end