glimmer-dsl-opal 0.3.0 → 0.6.1

data/lib/glimmer-dsl-swt.rb

@@ -0,0 +1,37 @@
+class OS
+  class << self
+    def windows?
+      # No Op in Opal
+    end
+    
+    def mac?
+      # No Op in Opal
+    end
+    
+    def linux?
+      # No Op in Opal
+    end
+  end
+end
+
+class File
+  class << self
+    def read(*args, &block)
+      # TODO implement via asset downloads in the future
+      # No Op in Opal
+    end
+  end
+end
+
+class Display
+  class << self
+    def setAppName(app_name)
+      # No Op in Opal
+    end
+    def setAppVersion(version)
+      # No Op in Opal
+    end
+  end
+end
+
+require 'glimmer-dsl-opal'

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/async_exec_expression.rb

@@ -1,16 +1,32 @@
+# 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/static_expression'
-require 'glimmer/dsl/top_level_expression'
-require 'glimmer/swt/display_proxy'
+require 'glimmer/dsl/opal/exec_expression'
 
 module Glimmer
   module DSL
     module Opal
       class AsyncExecExpression < StaticExpression
-        include TopLevelExpression
-
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::DisplayProxy.instance.async_exec(&block)
-        end
+        include ExecExpression
       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
@@ -25,6 +25,9 @@ require 'glimmer/dsl/parent_expression'
 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
@@ -41,19 +44,33 @@ 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)
-            options = args.last.is_a?(Hash) ? args.pop : {}
-            options = options.merge('swt_style' => args.join(',')) unless args.join(',').empty?
-            params = {
-              '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}"
-            `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
-            Struct.new(:open).new(true)
-          else          
-            custom_widget_class.new(parent, *args, options, &block)
+          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
+              options = args.last.is_a?(Hash) ? args.pop : {}
+              options = options.merge('swt_style' => args.join(',')) unless args.join(',').empty?
+              params = {
+                '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}"
+              `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
+            end
+          else
+            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
+              Glimmer::SWT::MakeShiftShellProxy.new
+            else
+              custom_widget_class&.new(parent, *args, {}, &block)
+            end
           end
         end
         

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

@@ -0,0 +1,40 @@
+# 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/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class DisplayExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::DisplayProxy.instance(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -5,10 +5,12 @@ require 'glimmer/dsl/opal/widget_expression'
 require 'glimmer/dsl/opal/property_expression'
 require 'glimmer/dsl/opal/bind_expression'
 require 'glimmer/dsl/opal/data_binding_expression'
+require 'glimmer/dsl/opal/display_expression'
 require 'glimmer/dsl/opal/combo_selection_data_binding_expression'
 require 'glimmer/dsl/opal/widget_listener_expression'
 require 'glimmer/dsl/opal/message_box_expression'
 require 'glimmer/dsl/opal/async_exec_expression'
+require 'glimmer/dsl/opal/sync_exec_expression'
 require 'glimmer/dsl/opal/observe_expression'
 require 'glimmer/dsl/opal/layout_expression'
 require 'glimmer/dsl/opal/layout_data_expression'
@@ -21,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
@@ -33,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/exec_expression.rb

@@ -0,0 +1,55 @@
+# 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/top_level_expression'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      # Mixin for common code in async_exec and sync_exec expressions
+      # Uses name in subclass to auto-derive exec_operation
+      module ExecExpression
+        include TopLevelExpression
+
+        def exec_operation
+          @exec_operation ||= self.class.name.split(/::/).last.sub(/Expression$/, '').underscore
+        end
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == exec_operation and
+            block_given? and
+            args.empty?
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::DisplayProxy.instance.send(exec_operation) do |*args|
+            begin
+              block.call(*args)
+            rescue => e
+              Glimmer::Config.logger.error e.full_message
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ require 'glimmer/dsl/static_expression'
 require 'glimmer/dsl/top_level_expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/shell_proxy'
+require 'glimmer/swt/make_shift_shell_proxy'
 require 'glimmer/ui/custom_shell'
 require 'glimmer/dsl/opal/custom_widget_expression'
 
@@ -20,7 +21,7 @@ module Glimmer
             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
-            Struct.new(:open).new(true)
+            Glimmer::SWT::MakeShiftShellProxy.new
           else
             Glimmer::SWT::ShellProxy.new(*args)
           end
@@ -29,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