glimmer-dsl-opal 0.0.7 → 0.0.8

data/lib/glimmer/opal/table_proxy.rb

@@ -0,0 +1,149 @@
+require 'glimmer/opal/element_proxy'
+require 'glimmer/opal/table_column'
+
+module Glimmer
+  module Opal
+    class TableProxy < ElementProxy
+      attr_reader :columns, :selection
+      attr_accessor :column_properties
+      alias items children
+      
+      def initialize(parent, args)
+        super(parent, args)
+        @columns = []
+        @children = []
+        @selection = []
+      end
+      
+      # Only table_columns may be added as children
+      def add_child(child)
+        if child.is_a?(TableColumn)
+          @columns << child
+          columns_dom << child.dom
+        else
+          @children << child        
+          items_dom << child.dom
+        end
+      end
+      
+      def remove_all
+        items.clear
+        @items_dom = nil
+      end
+      
+      def selection=(new_selection)
+        changed = (@selection + new_selection) - (@selection & new_selection)
+        @selection = new_selection
+        changed.each(&:redraw)
+      end
+      
+      def items=(new_items)
+        @children = new_items
+        redraw
+      end
+      
+      def search(&condition)
+        items.select {|item| condition.nil? || condition.call(item)}
+      end      
+      
+      def index_of(item)
+        items.index(item)
+      end
+      
+      def select(index, meta = false)
+        new_selection = @selection.clone
+        selected_item = items[index]
+        if @selection.include?(selected_item)
+          new_selection.delete(selected_item) if meta
+        else
+          new_selection = [] if !meta || (!has_style?(:multi) && @selection.to_a.size >= 1)
+          new_selection << selected_item
+        end
+        self.selection = new_selection
+      end
+      
+      def edit_table_item(table_item, column_index)
+        table_item.edit(column_index)
+      end
+      
+      def selector
+        super + ' tbody'
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_mouse_down' => {
+            event: 'mousedown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                event.singleton_class.send(:define_method, :table_item=) do |item|
+                  @table_item = item
+                end
+                event.singleton_class.send(:define_method, :table_item) do
+                  @table_item
+                end
+                table_row = event.target.ancestors('tr').first
+                table_data = event.target.ancestors('td').first
+                event.table_item = items.detect {|item| item.id == table_row.attributes['id']}
+                event.singleton_class.send(:define_method, :column_index) do
+                  (table_data || event.target).attributes['data-column-index']
+                end
+                event_listener.call(event)              
+              }
+            }
+          }
+        }
+      end
+      
+      def redraw
+        if @dom
+          old_dom = @dom
+          @dom = nil
+          old_dom.replace dom
+        else
+          dom
+        end
+        if @last_redrawn_children != @children
+          items_dom.clear
+          @last_redrawn_children = @children
+          @children = []
+          @last_redrawn_children.each do |child|            
+            add_child(child)
+          end
+        end
+      end
+
+      def columns_dom        
+        @columns_dom ||= DOM {
+          tr {
+          }
+        }
+      end
+      
+      def thead_dom
+        @thead_dom ||= DOM {
+          thead {
+          }
+        }.tap {|the_dom| the_dom << columns_dom }
+      end
+      
+      def items_dom        
+        @items_dom ||= DOM {
+          tbody {
+          }
+        }
+      end
+      
+      def dom
+        table_id = id
+        table_id_style = css
+        table_id_css_classes = css_classes
+        table_id_css_classes_string = table_id_css_classes.to_a.join(' ')
+        @dom ||= DOM {
+          table(id: table_id, style: table_id_style, class: table_id_css_classes_string) {            
+          }
+        }.tap {|the_dom| the_dom >> thead_dom }.tap {|the_dom| the_dom << items_dom }
+      end
+    end
+  end
+end

data/lib/samples/elaborate/contact_manager.rb

@@ -81,8 +81,7 @@ class ContactManager
               @contact_manager_presenter.toggle_sort(:email)
             }
           }
-          items bind(@contact_manager_presenter, :results),
-          column_properties(:first_name, :last_name, :email)
+          items bind(@contact_manager_presenter, :results), column_properties(:first_name, :last_name, :email)
           on_mouse_down { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
           }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - AndyMaleh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -168,18 +168,16 @@ 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/column_properties_expression.rb
 - lib/glimmer/dsl/opal/combo_expression.rb
 - lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/composite_expression.rb
@@ -196,13 +194,11 @@ files:
 - lib/glimmer/dsl/opal/shell_expression.rb
 - lib/glimmer/dsl/opal/tab_folder_expression.rb
 - lib/glimmer/dsl/opal/tab_item_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/text_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/display_proxy.rb
 - lib/glimmer/opal/div_proxy.rb
 - lib/glimmer/opal/document_proxy.rb
@@ -220,6 +216,9 @@ files:
 - lib/glimmer/opal/select_proxy.rb
 - lib/glimmer/opal/tab_folder.rb
 - lib/glimmer/opal/tab_item.rb
+- lib/glimmer/opal/table_column.rb
+- lib/glimmer/opal/table_item.rb
+- lib/glimmer/opal/table_proxy.rb
 - lib/samples/elaborate/contact_manager.rb
 - lib/samples/elaborate/contact_manager/contact.rb
 - lib/samples/elaborate/contact_manager/contact_manager_presenter.rb
@@ -243,7 +242,7 @@ homepage: http://github.com/AndyObtiva/glimmer-dsl-opal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,7 +258,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