glimmer-dsl-opal 0.4.0 → 0.5.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/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
@@ -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,8 @@ 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'
 
 module Glimmer
   module DSL
@@ -35,6 +37,8 @@ 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

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/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(parent, args)
+          if args.to_a.include?(:radio)
+            RadioProxy.new(parent, args)
+          elsif args.to_a.include?(:check)
+            CheckboxProxy.new(parent, args)
+          else
+            new(parent, args)
+          end
+        end
+      end
+    
       attr_reader :text
       
       def text=(value)
@@ -18,7 +32,7 @@ module Glimmer
         {
           'on_widget_selected' => {
             event: 'click'
-          }, 
+          },
         }
       end
       

data/lib/glimmer/swt/checkbox_proxy.rb

@@ -0,0 +1,80 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class CheckboxProxy < WidgetProxy
+      STYLE=<<~CSS
+        .checkbox {
+          display: inline;
+        }
+        .checkbox-label {
+          display: inline;
+        }
+      CSS
+      # TODO consider reuse of logic in Radioproxy
+      attr_reader :text
+      
+      def text=(value)
+        @text = value
+        dom_element.val(@text)
+        label_dom_element.html(@text)
+      end
+
+      def selection
+        dom_element.prop('checked')
+      end
+      
+      def selection=(value)
+        @selection = value
+        dom_element.prop('checked', @selection)
+      end
+      
+      def element
+        'input'
+      end
+
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => {
+            event: 'change'
+          },
+        }
+      end
+      
+      def label_id
+        "#{id}-label"
+      end
+      
+      def label_class
+        "#{name}-label"
+      end
+      
+      def label_dom_element
+        Element.find("##{label_id}")
+      end
+      
+      def dom
+        check_text = @text
+        check_id = id
+        check_style = css
+        check_class = name
+        check_selection = @selection
+        options = {type: 'checkbox', id: check_id, name: parent.id, style: check_style, class: check_class, value: check_text, style: 'min-width: 27px;'}
+        options[checked: 'checked'] if check_selection
+        @dom ||= html {
+          span {
+            input(options) {
+            }
+            label(id: label_id, class: label_class, for: check_id) {
+              check_text
+            }
+          }
+        }.to_s
+      end
+      
+    end
+    
+    CheckProxy = CheckboxProxy # alias
+  end
+  
+end

data/lib/glimmer/swt/combo_proxy.rb

@@ -29,20 +29,20 @@ module Glimmer
           html {
             option(option_hash) {
               item
-            } 
+            }
           }.to_s
         end
         dom_element.html(items_dom)
       end
 
-      def observation_request_to_event_mapping      
+      def observation_request_to_event_mapping
         {
           'on_widget_selected' => {
             event: 'change',
             event_handler: -> (event_listener) {
-              -> (event) {                
+              -> (event) {
                 @text = event.target.value
-                event_listener.call(event)              
+                event_listener.call(event)
               }
             }
           }

data/lib/glimmer/swt/custom/checkbox_group.rb

@@ -0,0 +1,142 @@
+# 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/ui/custom_widget'
+
+module Glimmer
+  module SWT
+    module Custom
+      # A custom widget rendering a group of checkboxes generated via data-binding
+      class CheckboxGroup
+        include Glimmer::UI::CustomWidget
+        
+        body {
+          composite # just an empty composite to hold checkboxs upon data-binding `selection`
+        }
+        
+        def items=(text_array)
+          selection_value = selection
+          @items = Array[*text_array]
+          build_checkboxes
+        end
+        
+        def items
+          @items || []
+        end
+        
+        def selection=(selection_texts)
+          items.count.times do |index|
+            checkbox = checkboxes[index]
+            item = items[index]
+            checkbox_text = checkbox&.text
+            checkbox.selection = selection_texts.to_a.include?(checkbox_text)
+          end
+          selection_texts
+        end
+        
+        def selection
+          selection_indices.map do |selection_index|
+            checkboxes[selection_index]&.text
+          end
+        end
+        
+        def selection_indices=(indices)
+          self.selection=(indices.to_a.map {|index| items[index]})
+        end
+        alias select selection_indices=
+        
+        def selection_indices
+          checkboxes.each_with_index.map do |checkbox, index|
+            index if checkbox.selection
+          end.to_a.compact
+        end
+        
+        def checkboxes
+          @checkboxes ||= []
+        end
+        alias checks checkboxes
+        
+        def can_handle_observation_request?(observation_request)
+          checkboxes.first&.can_handle_observation_request?(observation_request) || super(observation_request)
+        end
+        
+        def handle_observation_request(observation_request, &block)
+          observation_requests << [observation_request, block]
+          delegate_observation_request_to_checkboxes(observation_request, &block)
+          super
+        end
+        
+        def delegate_observation_request_to_checkboxes(observation_request, &block)
+          if observation_request != 'on_widget_disposed'
+            checkboxes.count.times do |index|
+              checkbox = checkboxes[index]
+              checkbox.handle_observation_request(observation_request, &block) if checkbox.can_handle_observation_request?(observation_request)
+            end
+          end
+        end
+        
+        def observation_requests
+          @observation_requests ||= Set.new
+        end
+        
+        def has_attribute?(attribute_name, *args)
+          @checkboxes.to_a.map do |widget_proxy|
+            return true if widget_proxy.has_attribute?(attribute_name, *args)
+          end
+          super
+        end
+         
+        def set_attribute(attribute_name, *args)
+          excluded_attributes = ['selection']
+          unless excluded_attributes.include?(attribute_name.to_s)
+            @checkboxes.to_a.each do |widget_proxy|
+              widget_proxy.set_attribute(attribute_name, *args) if widget_proxy.has_attribute?(attribute_name, *args)
+            end
+          end
+          super
+        end
+        
+        private
+        
+        def build_checkboxes
+          current_selection = selection
+          @checkboxes = []
+          items.each do |item|
+            body_root.content {
+              checkboxes << checkbox { |checkbox_proxy|
+                text item
+                on_widget_selected {
+                  self.selection_indices = checkboxes.each_with_index.map {|cb, i| i if cb.selection}.to_a.compact
+                }
+              }
+            }
+          end
+          observation_requests.to_a.each do |observation_request, block|
+            delegate_observation_request_to_checkboxes(observation_request, &block)
+          end
+          self.selection = current_selection
+        end
+      end
+      
+      CheckGroup = CheckboxGroup # alias
+    end
+  end
+end