glimmer-dsl-opal 0.10.0 → 0.12.0

data/lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe.rb

@@ -35,8 +35,8 @@ class TicTacToe
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
-              text        bind(@tic_tac_toe_board[row, column], :sign)
-              enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              text        <= [@tic_tac_toe_board[row, column], :sign]
+              enabled     <= [@tic_tac_toe_board[row, column], :empty]
               font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)

data/lib/glimmer-dsl-opal/samples/hello/hello_button.rb

@@ -33,7 +33,7 @@ class HelloButton
       text 'Hello, Button!'
       
       button {
-        text bind(self, :count) {|value| "Click To Increment: #{value}  "}
+        text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
         
         on_widget_selected {
           self.count += 1

data/lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb

@@ -52,22 +52,22 @@ class HelloCheckbox
       composite {
         checkbox {
           text 'Skiing'
-          selection bind(person, :skiing)
+          selection <=> [person, :skiing]
         }
         
         checkbox {
           text 'Snowboarding'
-          selection bind(person, :snowboarding)
+          selection <=> [person, :snowboarding]
         }
         
         checkbox {
           text 'Snowmobiling'
-          selection bind(person, :snowmobiling)
+          selection <=> [person, :snowmobiling]
         }
         
         checkbox {
           text 'Snowshoeing'
-          selection bind(person, :snowshoeing)
+          selection <=> [person, :snowshoeing]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_combo.rb

@@ -46,7 +46,7 @@ class HelloCombo
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        selection bind(person, :country)
+        selection <=> [person, :country]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_computed.rb

@@ -46,7 +46,7 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
-          text bind(@contact, :first_name)
+          text <=> [@contact, :first_name]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -55,7 +55,7 @@ class HelloComputed
         
         label {text '&Last Name: '}
         text {
-          text bind(@contact, :last_name)
+          text <=> [@contact, :last_name]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -64,7 +64,7 @@ class HelloComputed
         
         label {text '&Year of Birth: '}
         text {
-          text bind(@contact, :year_of_birth)
+          text <=> [@contact, :year_of_birth]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -73,7 +73,7 @@ class HelloComputed
         
         label {text 'Name: '}
         label {
-          text bind(@contact, :name, computed_by: [:first_name, :last_name])
+          text <= [@contact, :name, computed_by: [:first_name, :last_name]]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true
@@ -82,7 +82,7 @@ class HelloComputed
         
         label {text 'Age: '}
         label {
-          text bind(@contact, :age, on_write: :to_i, computed_by: [:year_of_birth])
+          text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
           layout_data {
             horizontal_alignment :fill
             grab_excess_horizontal_space true

data/lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb

@@ -137,7 +137,7 @@ class HelloCustomShell
           width 360
         }
         
-        items bind(@email_system, :emails), column_properties(:date, :subject, :from)
+        items <=> [@email_system, :emails, column_attributes: [:date, :subject, :from]]
         
         on_mouse_up { |event|
           email = event.table_item.get_data

data/lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb

@@ -42,19 +42,19 @@ class HelloDateTime
       }
       
       date { # alias for date_time(:date)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       date_drop_down { # alias for date_time(:date, :drop_down)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       time { # alias for date_time(:time)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
       
       calendar { # alias for date_time(:calendar)
-        date_time bind(person, :date_of_birth)
+        date_time <=> [person, :date_of_birth]
       }
     }.open
   end

data/lib/glimmer-dsl-opal/samples/hello/hello_group.rb

@@ -54,12 +54,12 @@ class HelloGroup
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection <=> [person, :male]
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection <=> [person, :female]
         }
       }
       
@@ -71,22 +71,22 @@ class HelloGroup
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection <=> [person, :child]
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection <=> [person, :teen]
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection <=> [person, :adult]
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection <=> [person, :senior]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb

@@ -59,7 +59,7 @@ class HelloListMultiSelection
       text 'Hello, List Multi Selection!'
       
       list(:multi) {
-        selection bind(person, :provinces)
+        selection <=> [person, :provinces]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb

@@ -44,7 +44,7 @@ class HelloListSingleSelection
       text 'Hello, List Single Selection!'
       
       list {
-        selection bind(person, :country)
+        selection <=> [person, :country]
       }
       
       button {

data/lib/glimmer-dsl-opal/samples/hello/hello_radio.rb

@@ -56,12 +56,12 @@ class HelloRadio
         
         radio {
           text 'Male'
-          selection bind(person, :male)
+          selection <=> [person, :male]
         }
         
         radio {
           text 'Female'
-          selection bind(person, :female)
+          selection <=> [person, :female]
         }
       }
       
@@ -75,22 +75,22 @@ class HelloRadio
         
         radio {
           text 'Child'
-          selection bind(person, :child)
+          selection <=> [person, :child]
         }
         
         radio {
           text 'Teen'
-          selection bind(person, :teen)
+          selection <=> [person, :teen]
         }
         
         radio {
           text 'Adult'
-          selection bind(person, :adult)
+          selection <=> [person, :adult]
         }
         
         radio {
           text 'Senior'
-          selection bind(person, :senior)
+          selection <=> [person, :senior]
         }
       }
       

data/lib/glimmer-dsl-opal/samples/hello/hello_table.rb

@@ -237,10 +237,10 @@ class HelloTable
         }
         
         # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-        items bind(BaseballGame, :schedule), column_properties(:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion)
+        items <=> [BaseballGame, :schedule, column_attributes: [:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion]]
         
         # Data-bind table selection
-        selection bind(BaseballGame, :selected_game)
+        selection <=> [BaseballGame, :selected_game]
         
         # Default initial sort property
         sort_property :date

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -11,11 +11,12 @@ module Glimmer
       include DataBinding::Observable
       include DataBinding::Observer
 
-      def initialize(parent, model_binding, column_properties)
+      def initialize(parent, model_binding, column_properties = nil)
         @last_populated_model_collection = nil
         @table = parent
         @model_binding = model_binding
-        @column_properties = column_properties
+        @column_properties = model_binding.binding_options[:column_attributes] || model_binding.binding_options[:column_properties] || column_properties # TODO
+        @table.editable = false if model_binding.binding_options[:read_only]
         @table.data = @model_binding
         ##@table.on_widget_disposed do |dispose_event| # doesn't seem needed within Opal
         ##  unregister_all_observables

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

@@ -1,36 +1,35 @@
+# Copyright (c) 2020-2021 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/bind_expression'
 require 'glimmer/data_binding/model_binding'
 
 module Glimmer
   module DSL
     module Opal
       # Responsible for setting up the return value of the bind keyword (command symbol)
-      # as a ModelBinding. It is then used by another command handler like
-      # DataBindingCommandHandler for text and selection properties on Text and Spinner
-      # or TableItemsDataBindingCommandHandler for items in a Table
+      # as a ModelBinding. It is then used by other data-binding expressions
       class BindExpression < StaticExpression
-        def can_interpret?(parent, keyword, *args, &block)
-          (
-            keyword == 'bind' and
-              (
-                (
-                  (args.size == 2) and
-                    textual?(args[1])
-                ) ||
-                  (
-                    (args.size == 3) and
-                      textual?(args[1]) and
-                      (args[2].is_a?(Hash))
-                  )
-              )
-          )
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          binding_options = args[2] || {}
-          binding_options[:on_read] = binding_options.delete(:on_read) || binding_options.delete('on_read') || block
-          DataBinding::ModelBinding.new(args[0], args[1].to_s, binding_options)
-        end
+        include Glimmer::DSL::BindExpression
       end
     end
   end

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

@@ -51,7 +51,7 @@ module Glimmer
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
           if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
-            if Glimmer::SWT::DisplayProxy.instance.shells.empty?
+            if Glimmer::SWT::DisplayProxy.instance.shells.empty? || Glimmer::SWT::DisplayProxy.open_custom_shells_in_current_window?
               custom_widget_class.new(parent, *args, {}, &block)
             else
               options = args.last.is_a?(Hash) ? args.pop : {}
@@ -80,12 +80,12 @@ module Glimmer
           end
         end
         
-        def add_content(parent, &content)
-          content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy) || parent.is_a?(Glimmer::UI::CustomShell)
-        end
-        
+        # TODO delete if no longer needed
+#         def add_content(parent, &content)
+#           content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy) || parent.is_a?(Glimmer::UI::CustomShell)
+#         end
   
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return unless parent.is_a?(Glimmer::UI::CustomWidget)
           # TODO consider avoiding source_location
           if block.source_location == parent.content&.__getobj__.source_location

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

@@ -28,6 +28,8 @@ require 'glimmer/dsl/opal/checkbox_group_selection_data_binding_expression'
 require 'glimmer/dsl/opal/block_property_expression'
 require 'glimmer/dsl/opal/menu_expression'
 require 'glimmer/dsl/opal/dialog_expression'
+require 'glimmer/dsl/opal/shape_expression'
+require 'glimmer/dsl/opal/shine_data_binding_expression'
 
 module Glimmer
   module DSL
@@ -47,6 +49,8 @@ module Glimmer
          layout
          block_property
          property
+         shine_data_binding
+         shape
          widget
        ]
       )

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

@@ -47,7 +47,7 @@ module Glimmer
           Glimmer::SWT::MenuProxy.new(parent, args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super(parent, &block)
           parent.post_add_content
         end

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

@@ -11,7 +11,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          parent = args.delete_at(0)
+          parent = args.delete_at(0) if !textual?(args.first)
           Glimmer::SWT::MessageBoxProxy.new(parent, args)
         end
       end

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

@@ -6,8 +6,9 @@ module Glimmer
       class PropertyExpression < StaticExpression
         include TopLevelExpression
 
-        def can_interpret?(parent, keyword, *args, &block)          
+        def can_interpret?(parent, keyword, *args, &block)
           parent and
+            (!args.empty?) and
             parent.respond_to?(:set_attribute) and
             parent.respond_to?(keyword, *args) and
             keyword and

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

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ShapeExpression < Expression
+        include ParentExpression
+        
+        INCLUDED_KEYWORDS = %w[rectangle polygon]
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          INCLUDED_KEYWORDS.include?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          # TODO
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          # TODO
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Glimmer
           end
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super(parent, &block)
           parent.post_add_content
         end