glimmer-dsl-opal 0.0.6 → 0.2.0

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/swt/display_proxy'
+
+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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# 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/color_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ColorExpression < StaticExpression
+        include TopLevelExpression
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::ColorProxy.new(*args)
+        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/custom_widget_expression.rb

@@ -0,0 +1,57 @@
+# 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'
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/ui/custom_widget'
+require 'glimmer/ui/custom_shell'
+
+module Glimmer
+  module DSL
+    module Opal
+      class CustomWidgetExpression < Expression
+        # TODO Make custom widgets automatically generate static expressions
+        include ParentExpression
+        include TopLevelExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          !!UI::CustomWidget.for(keyword)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          options = args.last.is_a?(Hash) ? args.pop : {}
+          UI::CustomWidget.for(keyword).new(parent, *args, options, &block)
+        end
+  
+        def add_content(parent, &block)
+          # TODO consider avoiding source_location
+          if block.source_location == parent.content&.__getobj__.source_location
+            parent.content.call(parent) unless parent.content.called?
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,26 +1,25 @@
-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/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_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'
+require 'glimmer/dsl/opal/font_expression'
+require 'glimmer/dsl/opal/color_expression'
+require 'glimmer/dsl/opal/rgb_expression'
+require 'glimmer/dsl/opal/rgba_expression'
+require 'glimmer/dsl/opal/custom_widget_expression'
 
 module Glimmer
   module DSL
@@ -28,12 +27,16 @@ module Glimmer
       Engine.add_dynamic_expressions(
        Opal,
        %w[
+         custom_widget
          widget_listener
+         table_items_data_binding
          combo_selection_data_binding
          list_selection_data_binding
          data_binding
-         text
+         font
+         layout
          property
+         widget
        ]
       )
     end

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

@@ -0,0 +1,47 @@
+# 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/dsl/top_level_expression'
+require 'glimmer/swt/font_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      # font expression
+      # Note: Cannot be a static expression because it clashes with font property expression
+      class FontExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'font' and     
+            (parent.nil? || !parent.respond_to?('font')) and
+            args.size == 1 and 
+            args.first.is_a?(Hash)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::FontProxy.new(*args)
+        end
+      end
+    end
+  end
+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/property_expression.rb

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

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

@@ -0,0 +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/opal/color_expression'
+require 'glimmer/swt/color_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class RgbExpression < ColorExpression
+      end
+    end
+  end
+end

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

@@ -0,0 +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/opal/color_expression'
+require 'glimmer/swt/color_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class RgbaExpression < ColorExpression
+      end
+    end
+  end
+end