glimmer-dsl-opal 0.0.2 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.7

data/lib/glimmer-dsl-opal.rb

@@ -1,5 +1,5 @@
 require 'opal'
-require 'opal-parser'
+require 'opal-async'
 require 'glimmer'
 
 GLIMMER_DSL_OPAL_ROOT = File.expand_path('../..', __FILE__)
@@ -7,4 +7,5 @@ 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/dsl/opal/dsl'
+require 'glimmer/data_binding/ext/observable_model'

data/lib/glimmer/data_binding/element_binding.rb

@@ -24,7 +24,7 @@ module Glimmer
       
       def call(value)
         converted_value = translated_value = @translator.call(value)
-        @element.send(@property + '=', converted_value) unless evaluate_property == converted_value
+        @element.set_attribute(@property, converted_value) unless evaluate_property == converted_value
       end
       
       def evaluate_property

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

@@ -0,0 +1,51 @@
+require 'glimmer/data_binding/observable'
+require 'glimmer/data_binding/observer'
+
+module Glimmer
+  module DataBinding
+    # SWT List element selection binding
+    class ListSelectionBinding
+      include Glimmer
+      include Observable
+      include Observer
+
+      attr_reader :element_proxy
+
+      PROPERTY_TYPE_UPDATERS = {
+        :string => lambda { |element_proxy, value| element_proxy.select(element_proxy.index_of(value.to_s)) },
+        :array => lambda { |element_proxy, value| element_proxy.selection=(value || []) }
+      }
+
+      PROPERTY_EVALUATORS = {
+        :string => lambda do |selection_array|
+          return nil if selection_array.empty?
+          selection_array[0]
+        end,
+        :array => lambda do |selection_array|
+          selection_array
+        end
+      }
+
+      # Initialize with list element and property_type
+      # property_type :string represents default list single selection
+      # property_type :array represents list multi selection
+      def initialize(element_proxy, property_type)
+        property_type = :string if property_type.nil? or property_type == :undefined
+        @element_proxy = element_proxy
+        @property_type = property_type
+        @element_proxy.on_widget_disposed do |dispose_event|
+          unregister_all_observables
+        end
+      end
+
+      def call(value)
+        PROPERTY_TYPE_UPDATERS[@property_type].call(@element_proxy, value) unless evaluate_property == value
+      end
+
+      def evaluate_property
+        selection_array = @element_proxy.selection.to_a #TODO refactor send('selection') into proper method invocation
+        PROPERTY_EVALUATORS[@property_type].call(selection_array)
+      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/browser_expression.rb

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/opal/iframe_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class BrowserExpression < StaticExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::IframeProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
+          args << {type: 'button'}
           Glimmer::Opal::InputProxy.new(parent, args)
         end
       end

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

@@ -10,9 +10,20 @@ 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/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/tab_folder_expression'
+require 'glimmer/dsl/opal/tab_item_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_data_expression'
+require 'glimmer/dsl/opal/list_selection_data_binding_expression'
 
 module Glimmer
   module DSL
@@ -22,6 +33,9 @@ module Glimmer
        %w[
          widget_listener
          combo_selection_data_binding
+         list_selection_data_binding
+         data_binding
+         text
          property
        ]
       )

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

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/opal/grid_layout_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class GridLayoutExpression < StaticExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::GridLayoutProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/opal/layout_data_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class LayoutDataExpression < StaticExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::LayoutDataProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,42 @@
+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'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ListSelectionDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            parent.is_a?(Glimmer::Opal::ListProxy) and
+            args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            args[0].evaluate_options_property.is_a?(Array)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+          element_binding = DataBinding::ElementBinding.new(parent, 'items')
+          element_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          #TODO make this options observer dependent and all similar observers in widget specific data binding interpretrs
+          element_binding.observe(model, model_binding.options_property_name)
+  
+          property_type = :string
+          property_type = :array if parent.has_style?(:multi)
+          list_selection_binding = DataBinding::ListSelectionBinding.new(parent, property_type)
+          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
+        end
+      end
+    end
+  end
+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/opal/modal'
+
+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::Opal::Modal.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/property_expression.rb

@@ -7,11 +7,15 @@ module Glimmer
         include TopLevelExpression
 
         def can_interpret?(parent, keyword, *args, &block)          
-          parent and keyword and block.nil?
+          parent and parent.respond_to?(:set_attribute) and keyword and block.nil?
         end
 
         def interpret(parent, keyword, *args, &block)
-          parent.text = args.first.to_s
+          if keyword == 'text' # TODO move into property converters in element proxy
+            args = [args.first.to_s.gsub('&', '') ]
+          end
+          parent.set_attribute(keyword, *args)
+          args.first.to_s
         end
       end
     end

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

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/opal/tab_folder'
+
+module Glimmer
+  module DSL
+    module Opal
+      class TabFolderExpression < StaticExpression
+        include ParentExpression
+        
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::TabFolder.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/opal/tab_item'
+
+module Glimmer
+  module DSL
+    module Opal
+      class TabItemExpression < StaticExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::Opal::TabItem.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

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

data/lib/glimmer/opal/display_proxy.rb

@@ -0,0 +1,23 @@
+module Glimmer
+  module Opal
+    class DisplayProxy
+      class << self
+        def instance
+          @instance ||= new
+        end
+      end
+      
+      def async_exec(&block)
+        executer = lambda do
+          if $document.at_css('.modal')
+            sleep(0.05)
+            Async::Task.new(&executer)
+          else
+            block.call
+          end
+        end
+        Async::Task.new(&executer)
+      end
+    end
+  end
+end