glimmer-dsl-opal 0.0.5 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/glimmer-dsl-opal.rb

@@ -1,10 +1,28 @@
 require 'opal'
-require 'opal-parser'
-require 'glimmer'
+if RUBY_PLATFORM == 'opal'
+  require 'opal-async'
+  require 'jquery' # included in glimmer-dsl-opal
+  require 'opal-jquery'
+  require 'glimmer'
 
-GLIMMER_DSL_OPAL_ROOT = File.expand_path('../..', __FILE__)
-GLIMMER_DSL_OPAL_LIB = File.join(GLIMMER_DSL_OPAL_ROOT, 'lib')
-
-$LOAD_PATH.unshift(GLIMMER_DSL_OPAL_LIB)
-
-require 'glimmer/dsl/opal/dsl' 
+  # Spiking async logging
+#   logger = Glimmer::Config.logger
+#   original_add_method = logger.class.instance_method(:add)
+#   logger.define_singleton_method("__original_add", original_add_method)
+#   logger.singleton_class.send(:define_method, :add) do |*args|
+#     Async::Timeout.new 10000 do
+#       __original_add(*args)
+#     end
+#   end  
+   
+  GLIMMER_DSL_OPAL_ROOT = File.expand_path('../..', __FILE__)
+  GLIMMER_DSL_OPAL_LIB = File.join(GLIMMER_DSL_OPAL_ROOT, 'lib')
+   
+  $LOAD_PATH.unshift(GLIMMER_DSL_OPAL_LIB)
+   
+  require 'glimmer/dsl/opal/dsl'
+  require 'glimmer/data_binding/ext/observable_model'
+   
+  require 'glimmer-dsl-xml'
+  Element.alias_native :replace_with, :replaceWith
+end

data/lib/glimmer/data_binding/element_binding.rb

@@ -27,7 +27,7 @@ module Glimmer
         @element.set_attribute(@property, converted_value) unless evaluate_property == converted_value
       end
       
-      def evaluate_property
+      def evaluate_property        
         @element.send(@property)
       end
     end

data/lib/glimmer/data_binding/ext/observable_model.rb

@@ -0,0 +1,40 @@
+require 'glimmer/data_binding/observable'
+require 'glimmer/data_binding/observer'
+require 'glimmer/opal/display_proxy'
+
+# This ensures all data-binding events happen async and block on modal display
+
+module Glimmer
+  module DataBinding
+    # TODO prefix utility methods with double-underscore
+    module ObservableModel
+      include Observable
+#       include Glimmer
+
+      def add_property_writer_observers(property_name)
+        property_writer_name = "#{property_name}="
+        method(property_writer_name)
+        ensure_array_object_observer(property_name, send(property_name))
+        begin
+          method("__original_#{property_writer_name}")
+        rescue
+          old_method = self.class.instance_method(property_writer_name)
+          define_singleton_method("__original_#{property_writer_name}", old_method)
+          define_singleton_method(property_writer_name) do |value|
+            old_value = self.send(property_name)
+            unregister_dependent_observers(property_name, old_value)
+            self.send("__original_#{property_writer_name}", value)
+#             Glimmer::Opal::DisplayProxy.instance.async_exec do
+            notify_observers(property_name)
+            ensure_array_object_observer(property_name, value, old_value)
+#             end
+          end
+        end
+      rescue => e
+        # ignore writing if no property writer exists
+        Glimmer::Config.logger&.debug "No need to observe property writer: #{property_writer_name}\n#{e.message}\n#{e.backtrace.join("\n")}"
+      end
+      
+    end
+  end
+end

data/lib/glimmer/data_binding/list_selection_binding.rb

@@ -39,7 +39,7 @@ module Glimmer
       end
 
       def call(value)
-        PROPERTY_TYPE_UPDATERS[@property_type].call(@element_proxy, value) unless evaluate_property == value
+        PROPERTY_TYPE_UPDATERS[@property_type].call(@element_proxy, value) unless !evaluate_property.is_a?(Array) && evaluate_property == value
       end
 
       def evaluate_property

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -0,0 +1,70 @@
+require 'glimmer/data_binding/observable_array'
+require 'glimmer/data_binding/observable_model'
+require 'glimmer/data_binding/observable'
+require 'glimmer/data_binding/observer'
+require 'glimmer/swt/table_proxy'
+require 'glimmer/swt/table_item_proxy'
+
+module Glimmer
+  module DataBinding
+    class TableItemsBinding
+      include DataBinding::Observable
+      include DataBinding::Observer
+
+      def initialize(parent, model_binding, column_properties)
+        @last_model_collection = nil
+        @table = parent
+        @model_binding = model_binding
+        @column_properties = column_properties
+        if @table.respond_to?(:column_properties=)
+          @table.column_properties = @column_properties
+        ##else # assume custom widget
+        ##  @table.body_root.column_properties = @column_properties
+        end
+        call(@model_binding.evaluate_property)
+        model = model_binding.base_model
+        observe(model, model_binding.property_name_expression)
+        ##@table.on_widget_disposed do |dispose_event| # doesn't seem needed within Opal
+        ##  unregister_all_observables
+        ##end
+      end
+
+      def call(new_model_collection=nil)
+        if new_model_collection and new_model_collection.is_a?(Array)
+          observe(new_model_collection, @column_properties)
+          @model_collection = new_model_collection
+        end
+        populate_table(@model_collection, @table, @column_properties)
+        sort_table(@model_collection, @table, @column_properties)
+      end
+      
+      def populate_table(model_collection, parent, column_properties)
+        return if model_collection&.sort_by(&:hash) == @last_model_collection&.sort_by(&:hash)
+        @last_model_collection = model_collection
+        # TODO improve performance
+        selected_table_item_models = parent.selection.map(&:get_data)
+        old_items = parent.items
+        old_item_ids_per_model = old_items.reduce({}) {|hash, item| hash.merge(item.get_data.hash => item.id) }
+        parent.remove_all
+        model_collection.each do |model|
+          table_item = Glimmer::SWT::TableItemProxy.new(parent)
+          for index in 0..(column_properties.size-1)
+            table_item.set_text(index, model.send(column_properties[index]).to_s)
+          end
+          table_item.set_data(model)
+          table_item.id = old_item_ids_per_model[model.hash] if old_item_ids_per_model[model.hash]
+        end
+        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
+        selected_table_items = [parent.items.first] if selected_table_items.empty? && !parent.items.empty?
+        parent.selection = selected_table_items unless selected_table_items.empty?
+        parent.redraw
+      end
+      
+      def sort_table(model_collection, parent, column_properties)
+        return if model_collection == @last_model_collection
+        parent.items = parent.items.sort_by { |item| model_collection.index(item.get_data) }
+        @last_model_collection = model_collection
+      end      
+    end
+  end
+end

data/lib/glimmer/dsl/opal/async_exec_expression.rb

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/opal/display_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class AsyncExecExpression < StaticExpression
+        include TopLevelExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::DisplayProxy.instance.async_exec(&block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/column_properties_expression.rb

@@ -0,0 +1,22 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/swt/table_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      # Responsible for providing a readable keyword (command symbol) to capture
+      # and return column properties for use in TreeItemsDataBindingCommandHandler
+      class ColumnPropertiesExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'column_properties' and
+            block.nil? and
+            parent.is_a?(Glimmer::SWT::TableProxy)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb

@@ -1,7 +1,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/element_binding'
-require 'glimmer/opal/select_proxy'
+require 'glimmer/swt/combo_proxy'
 
 module Glimmer
   module DSL
@@ -10,7 +10,7 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'selection' and
             block.nil? and
-            parent.is_a?(Glimmer::Opal::SelectProxy) and
+            parent.is_a?(Glimmer::SWT::ComboProxy) and
             args.size == 1 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)

data/lib/glimmer/dsl/opal/dsl.rb

@@ -1,24 +1,20 @@
-require 'opal'
-require 'browser'
-
 require 'glimmer/dsl/engine'
 # Dir[File.expand_path('../*_expression.rb', __FILE__)].each {|f| require f}
 require 'glimmer/dsl/opal/shell_expression'
-require 'glimmer/dsl/opal/label_expression'
+require 'glimmer/dsl/opal/widget_expression'
 require 'glimmer/dsl/opal/property_expression'
-require 'glimmer/dsl/opal/combo_expression'
-require 'glimmer/dsl/opal/composite_expression'
-require 'glimmer/dsl/opal/button_expression'
 require 'glimmer/dsl/opal/bind_expression'
 require 'glimmer/dsl/opal/data_binding_expression'
 require 'glimmer/dsl/opal/combo_selection_data_binding_expression'
 require 'glimmer/dsl/opal/widget_listener_expression'
-require 'glimmer/dsl/opal/grid_layout_expression'
-require 'glimmer/dsl/opal/text_expression'
-require 'glimmer/dsl/opal/list_expression'
-require 'glimmer/dsl/opal/browser_expression'
+require 'glimmer/dsl/opal/message_box_expression'
+require 'glimmer/dsl/opal/async_exec_expression'
+require 'glimmer/dsl/opal/observe_expression'
+require 'glimmer/dsl/opal/layout_expression'
 require 'glimmer/dsl/opal/layout_data_expression'
 require 'glimmer/dsl/opal/list_selection_data_binding_expression'
+require 'glimmer/dsl/opal/table_items_data_binding_expression'
+require 'glimmer/dsl/opal/column_properties_expression'
 
 module Glimmer
   module DSL
@@ -27,11 +23,13 @@ module Glimmer
        Opal,
        %w[
          widget_listener
+         table_items_data_binding
          combo_selection_data_binding
          list_selection_data_binding
          data_binding
-         text
+         layout
          property
+         widget
        ]
       )
     end

data/lib/glimmer/dsl/opal/layout_data_expression.rb

@@ -1,6 +1,6 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/layout_data_proxy'
+require 'glimmer/swt/layout_data_proxy'
 
 module Glimmer
   module DSL
@@ -9,7 +9,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::LayoutDataProxy.new(parent, args)
+          Glimmer::SWT::LayoutDataProxy.new(parent, args)
         end
       end
     end

data/lib/glimmer/dsl/opal/{text_expression.rb → layout_expression.rb}

@@ -1,20 +1,20 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/input_proxy'
+require 'glimmer/swt/layout_proxy'
 
 module Glimmer
   module DSL
     module Opal
-      class TextExpression < Expression
+      class LayoutExpression < Expression
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'text' and parent and block_given?
+          parent.is_a?(Glimmer::SWT::CompositeProxy) &&
+            Glimmer::SWT::LayoutProxy.layout_exists?(keyword)
         end
 
         def interpret(parent, keyword, *args, &block)
-          args << {type: 'text'}
-          Glimmer::Opal::InputProxy.new(parent, args)
+          Glimmer::SWT::LayoutProxy.for(keyword, parent, args)
         end
       end
     end

data/lib/glimmer/dsl/opal/list_selection_data_binding_expression.rb

@@ -2,7 +2,7 @@ require 'glimmer/dsl/expression'
 require 'glimmer/data_binding/model_binding'
 require 'glimmer/data_binding/element_binding'
 require 'glimmer/data_binding/list_selection_binding'
-require 'glimmer/opal/list_proxy'
+require 'glimmer/swt/list_proxy'
 
 module Glimmer
   module DSL
@@ -11,7 +11,7 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'selection' and
             block.nil? and
-            parent.is_a?(Glimmer::Opal::ListProxy) and
+            parent.is_a?(Glimmer::SWT::ListProxy) and
             args.size == 1 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)
@@ -31,7 +31,6 @@ module Glimmer
           list_selection_binding.call(model_binding.evaluate_property)
           #TODO check if nested data binding works for list widget and other widgets that need custom data binding
           list_selection_binding.observe(model, model_binding.property_name_expression)
-  
           parent.on_widget_selected do
             model_binding.call(list_selection_binding.evaluate_property)
           end

data/lib/glimmer/dsl/opal/message_box_expression.rb

@@ -0,0 +1,20 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/message_box_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class MessageBoxExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          parent = args.delete_at(0)
+          Glimmer::SWT::MessageBoxProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/observe_expression.rb

@@ -0,0 +1,32 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/data_binding/observer'
+require 'glimmer/data_binding/model_binding'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+
+        REGEX_NESTED_OR_INDEXED_PROPERTY = /([^\[]+)(\[[^\]]+\])?/
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'observe' and
+            block_given? and
+            (args.size == 2) and
+            textual?(args[1])
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          observer = DataBinding::Observer.proc(&block)
+          if args[1].to_s.match(REGEX_NESTED_OR_INDEXED_PROPERTY)
+            observer.observe(DataBinding::ModelBinding.new(args[0], args[1]))
+          else
+            observer.observe(args[0], args[1])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/shell_expression.rb

@@ -1,7 +1,7 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/document_proxy'
+require 'glimmer/swt/shell_proxy'
 
 module Glimmer
   module DSL
@@ -11,7 +11,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::DocumentProxy.new(args)
+          Glimmer::SWT::ShellProxy.new(*args)
         end
       end
     end

data/lib/glimmer/dsl/opal/{composite_expression.rb → table_column_expression.rb}

@@ -1,15 +1,15 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/div_proxy'
+require 'glimmer/opal/table_column'
 
 module Glimmer
   module DSL
     module Opal
-      class CompositeExpression < StaticExpression
+      class TableColumnExpression < StaticExpression
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::DivProxy.new(parent, args)
+          Glimmer::Opal::TableColumn.new(parent, args)
         end
       end
     end

data/lib/glimmer/dsl/opal/{list_expression.rb → table_expression.rb}

@@ -1,15 +1,15 @@
 require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/parent_expression'
-require 'glimmer/opal/list_proxy'
+require 'glimmer/swt/table_proxy'
 
 module Glimmer
   module DSL
     module Opal
-      class ListExpression < StaticExpression
+      class TableExpression < StaticExpression
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Opal::ListProxy.new(parent, args)
+          Glimmer::SWT::TableProxy.new(parent, args)
         end
       end
     end