glimmer-dsl-opal 0.4.0 → 0.7.0

data/lib/glimmer-dsl-swt.rb

@@ -17,6 +17,7 @@ end
 class File
   class << self
     def read(*args, &block)
+      # TODO implement via asset downloads in the future
       # No Op in Opal
     end
   end

data/lib/glimmer/data_binding/element_binding.rb

@@ -4,6 +4,7 @@ require 'glimmer/data_binding/observer'
 module Glimmer
   module DataBinding
     class ElementBinding
+      # TODO consider renaming to WidgetBinding since it's no longer dealing with elements directly yet widgets instead
       include Glimmer
       include Observable
       include Observer
@@ -27,7 +28,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/table_items_binding.rb

@@ -12,26 +12,32 @@ module Glimmer
       include DataBinding::Observer
 
       def initialize(parent, model_binding, column_properties)
-        @last_model_collection = nil
+        @last_populated_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.data = @model_binding
         ##@table.on_widget_disposed do |dispose_event| # doesn't seem needed within Opal
         ##  unregister_all_observables
         ##end
+        if @table.respond_to?(:column_properties=)
+          @table.column_properties = @column_properties
+        else # assume custom widget
+         @table.body_root.column_properties = @column_properties
+        end
+        @table_observer_registration = observe(model_binding)
+        call
       end
 
       def call(new_model_collection=nil)
+        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+        table_cells = @table.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
+        model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
+        return if table_cells == model_cells
         if new_model_collection and new_model_collection.is_a?(Array)
-          observe(new_model_collection, @column_properties)
+#           @table_items_observer_registration&.unobserve
+          @table_items_observer_registration = observe(new_model_collection, @column_properties)
+          add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
         populate_table(@model_collection, @table, @column_properties)
@@ -39,8 +45,8 @@ module Glimmer
       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
+        return if model_collection&.sort_by(&:hash) == @last_populated_model_collection&.sort_by(&:hash)
+        @last_populated_model_collection = model_collection
         # TODO improve performance
         selected_table_item_models = parent.selection.map(&:get_data)
         old_items = parent.items
@@ -55,16 +61,21 @@ module Glimmer
           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.selection = selected_table_items
         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      
+        return if model_collection == @last_sorted_model_collection
+        if model_collection == @last_populated_model_collection
+          # Reapply the last table sort. The model collection has just been populated since it diverged from what it was before
+          parent.sort!
+        else
+          # The model collection was sorted by the model, but beyond sorting, it did not change from the last populated model collection.
+          parent.items = parent.items.sort_by { |item| model_collection.index(item.get_data) }
+          @last_sorted_model_collection = @last_populated_model_collection = model_collection
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,41 @@
+# Copyright (c) 2007-2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+
+module Glimmer
+  module DSL
+    module Opal
+      class BlockPropertyExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          block_given? and
+            args.size == 0 and
+            parent.respond_to?("#{keyword}_block=")
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send("#{keyword}_block=", block)
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/element_binding'
+
+module Glimmer
+  module DSL
+    module Opal
+      class CheckboxGroupSelectionDataBindingExpression < Expression
+ 
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            (parent.is_a?(Glimmer::SWT::Custom::CheckboxGroup) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::Custom::CheckboxGroup)) ) 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]
+  
+          #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
+          # TODO consider delegating some of this work
+          widget_binding = DataBinding::ElementBinding.new(parent, 'items')
+          widget_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          widget_binding.observe(model, model_binding.options_property_name)
+  
+          widget_binding = DataBinding::ElementBinding.new(parent, 'selection')
+          widget_binding.call(model_binding.evaluate_property)
+          widget_binding.observe(model, model_binding.property_name_expression)
+  
+          parent.on_widget_selected do
+            model_binding.call(widget_binding.evaluate_property)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -26,6 +26,8 @@ require 'glimmer/dsl/top_level_expression'
 require 'glimmer/ui/custom_widget'
 require 'glimmer/ui/custom_shell'
 require 'glimmer/swt/make_shift_shell_proxy'
+require 'glimmer/swt/custom/radio_group'
+require 'glimmer/swt/custom/checkbox_group'
 
 module Glimmer
   module DSL
@@ -42,7 +44,7 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
-          if !Glimmer::UI::CustomShell.requested? && custom_widget_class.ancestors.include?(Glimmer::UI::CustomShell)
+          if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
             if Glimmer::SWT::DisplayProxy.instance.shells.empty?
               custom_widget_class.new(parent, *args, {}, &block)
             else
@@ -52,7 +54,7 @@ module Glimmer
                 'custom_shell' => keyword
               }.merge(options)
               param_string = params.to_a.map {|k, v| "#{k}=#{URI.encode_www_form_component(v)}"}.join('&')
-              url = "#{`document.location.href`}?#{param_string}"            
+              url = "#{`document.location.href`}?#{param_string}"
               `window.open(#{url})`
                # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
               Glimmer::SWT::MakeShiftShellProxy.new
@@ -64,7 +66,7 @@ module Glimmer
               custom_shell_keyword = parameters.delete('custom_shell')
               CustomWidgetExpression.new.interpret(nil, custom_shell_keyword, *[parameters])
               `history.pushState(#{parameters.reject {|k,v| k == 'custom_shell_handled'}}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string.sub('&custom_shell_handled=true', '')}"})`
-              # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method            
+              # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
               Glimmer::SWT::MakeShiftShellProxy.new
             else
               custom_widget_class&.new(parent, *args, {}, &block)

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

@@ -23,6 +23,9 @@ require 'glimmer/dsl/opal/rgb_expression'
 require 'glimmer/dsl/opal/rgba_expression'
 require 'glimmer/dsl/opal/custom_widget_expression'
 require 'glimmer/dsl/opal/swt_expression'
+require 'glimmer/dsl/opal/radio_group_selection_data_binding_expression'
+require 'glimmer/dsl/opal/checkbox_group_selection_data_binding_expression'
+require 'glimmer/dsl/opal/block_property_expression'
 
 module Glimmer
   module DSL
@@ -35,9 +38,12 @@ module Glimmer
          table_items_data_binding
          combo_selection_data_binding
          list_selection_data_binding
+         radio_group_selection_data_binding
+         checkbox_group_selection_data_binding
          data_binding
          font
          layout
+         block_property
          property
          widget
        ]

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

@@ -7,9 +7,10 @@ module Glimmer
         include TopLevelExpression
 
         def can_interpret?(parent, keyword, *args, &block)          
-          parent and 
-            parent.respond_to?(:set_attribute) and 
-            keyword and 
+          parent and
+            parent.respond_to?(:set_attribute) and
+            parent.respond_to?(keyword, *args) and
+            keyword and
             block.nil?
         end
 

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/element_binding'
+
+module Glimmer
+  module DSL
+    module Opal
+      class RadioGroupSelectionDataBindingExpression < Expression
+ 
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            (parent.is_a?(Glimmer::SWT::Custom::RadioGroup) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::Custom::RadioGroup)) ) 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]
+  
+          #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
+          # TODO consider delegating some of this work
+          widget_binding = DataBinding::ElementBinding.new(parent, 'items')
+          widget_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          widget_binding.observe(model, model_binding.options_property_name)
+  
+          widget_binding = DataBinding::ElementBinding.new(parent, 'selection')
+          widget_binding.call(model_binding.evaluate_property)
+          widget_binding.observe(model, model_binding.property_name_expression)
+  
+          parent.on_widget_selected do
+            model_binding.call(widget_binding.evaluate_property)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,14 +13,14 @@ module Glimmer
         include TopLevelExpression
         include ParentExpression
 
-        def interpret(parent, keyword, *args, &block)          
+        def interpret(parent, keyword, *args, &block)
           if Glimmer::UI::CustomShell.requested_and_not_handled?
             parameters = Glimmer::UI::CustomShell.request_parameter_string.split("&").map {|str| str.split("=")}.to_h
             `history.pushState(#{parameters.merge('custom_shell_handled' => 'true')}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string}&custom_shell_handled=true"})`
             custom_shell_keyword = parameters.delete('custom_shell')
             CustomWidgetExpression.new.interpret(nil, custom_shell_keyword, *[parameters])
             `history.pushState(#{parameters.reject {|k,v| k == 'custom_shell_handled'}}, document.title, #{"?#{Glimmer::UI::CustomShell.encoded_request_parameter_string.sub('&custom_shell_handled=true', '')}"})`
-            # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method            
+            # just a placeholder that has an open method # TODO return an actual CustomShell in the future that does the work happening above in the #open method
             Glimmer::SWT::MakeShiftShellProxy.new
           else
             Glimmer::SWT::ShellProxy.new(*args)
@@ -30,6 +30,11 @@ module Glimmer
         def add_content(parent, &content)
           content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy)
         end
+
+        def add_content(parent, &block)
+          super(parent, &block)
+          parent.post_add_content
+        end
       end
     end
   end

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

@@ -16,7 +16,12 @@ module Glimmer
         end
 
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::WidgetProxy.for(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
+        end
+
+        def add_content(parent, &block)
+          super(parent, &block)
+          parent.post_add_content
         end
       end
     end

data/lib/glimmer/engine.rb

@@ -0,0 +1,9 @@
+module Glimmer
+  class Engine < ::Rails::Engine
+    isolate_namespace Glimmer
+
+    initializer "glimmer.assets.precompile" do |app|
+      app.config.assets.precompile += %w( glimmer/glimmer.css )
+    end
+  end
+end

data/lib/glimmer/swt.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/glimmer/swt/button_proxy.rb

@@ -1,8 +1,22 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/radio_proxy'
+require 'glimmer/swt/checkbox_proxy'
 
 module Glimmer
   module SWT
     class ButtonProxy < WidgetProxy
+      class << self
+        def create(keyword, parent, args, block)
+          if args.to_a.include?(:radio)
+            RadioProxy.new(parent, args, block)
+          elsif args.to_a.include?(:check)
+            CheckboxProxy.new(parent, args, block)
+          else
+            new(parent, args, block)
+          end
+        end
+      end
+    
       attr_reader :text
       
       def text=(value)
@@ -18,7 +32,7 @@ module Glimmer
         {
           'on_widget_selected' => {
             event: 'click'
-          }, 
+          },
         }
       end
       
@@ -30,7 +44,7 @@ module Glimmer
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px; min-height: 27px;').merge(input_disabled)) {
+          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 32px; min-height: 32px;').merge(input_disabled)) {
             input_text.to_s == '' ? '&nbsp;' : input_text
           }
         }.to_s