glimmer-dsl-swt 4.18.2.5 → 4.18.3.4

data/VERSION

@@ -1 +1 @@
-4.18.2.5
+4.18.3.4

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.2.5 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.2.5"
+  s.version = "4.18.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-01-24"
+  s.date = "2021-01-30"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/menu_bar_expression.rb",
     "lib/glimmer/dsl/swt/menu_expression.rb",
     "lib/glimmer/dsl/swt/message_box_expression.rb",
+    "lib/glimmer/dsl/swt/multiply_expression.rb",
     "lib/glimmer/dsl/swt/observe_expression.rb",
     "lib/glimmer/dsl/swt/property_expression.rb",
     "lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb",
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/sync_exec_expression.rb",
     "lib/glimmer/dsl/swt/tab_item_expression.rb",
     "lib/glimmer/dsl/swt/table_items_data_binding_expression.rb",
+    "lib/glimmer/dsl/swt/transform_expression.rb",
     "lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/tree_properties_expression.rb",
     "lib/glimmer/dsl/swt/widget_expression.rb",
@@ -120,6 +122,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/tab_item_proxy.rb",
     "lib/glimmer/swt/table_column_proxy.rb",
     "lib/glimmer/swt/table_proxy.rb",
+    "lib/glimmer/swt/transform_proxy.rb",
     "lib/glimmer/swt/tree_proxy.rb",
     "lib/glimmer/swt/widget_listener_proxy.rb",
     "lib/glimmer/swt/widget_proxy.rb",
@@ -135,11 +138,13 @@ Gem::Specification.new do |s|
     "samples/elaborate/tetris.rb",
     "samples/elaborate/tetris/model/block.rb",
     "samples/elaborate/tetris/model/game.rb",
+    "samples/elaborate/tetris/model/past_game.rb",
     "samples/elaborate/tetris/model/tetromino.rb",
     "samples/elaborate/tetris/view/block.rb",
-    "samples/elaborate/tetris/view/game_over_dialog.rb",
+    "samples/elaborate/tetris/view/high_score_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",
     "samples/elaborate/tetris/view/score_lane.rb",
+    "samples/elaborate/tetris/view/tetris_menu_bar.rb",
     "samples/elaborate/tic_tac_toe.rb",
     "samples/elaborate/tic_tac_toe/board.rb",
     "samples/elaborate/tic_tac_toe/cell.rb",
@@ -148,6 +153,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_button.rb",
     "samples/hello/hello_canvas.rb",
     "samples/hello/hello_canvas_animation.rb",
+    "samples/hello/hello_canvas_transform.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
@@ -190,7 +196,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -209,7 +215,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
       s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -229,7 +235,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.11"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

data/lib/ext/glimmer/config.rb

@@ -32,6 +32,8 @@ module Glimmer
       'org.eclipse.swt.custom',
       'org.eclipse.swt.dnd',
     ]
+    DEFAULT_AUTO_SYNC_EXEC = false
+    GUI_THREAD = Thread.current
     
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
@@ -45,6 +47,22 @@ module Glimmer
         @@import_swt_packages
       end
       
+      # Tells Glimmer to avoid automatic use of sync_exec when invoking GUI calls from another thread (default: true)
+      def auto_sync_exec=(value)
+        @@auto_sync_exec = value
+      end
+  
+      # Returns whether Glimmer will import SWT packages into including class
+      def auto_sync_exec
+        @@auto_sync_exec = DEFAULT_AUTO_SYNC_EXEC if !defined?(@@auto_sync_exec)
+        @@auto_sync_exec
+      end
+      alias auto_sync_exec? auto_sync_exec
+      
+      def require_sync_exec?
+        Thread.current != GUI_THREAD
+      end
+      
       # Returns Logging Devices. Default is [:stdout, :syslog]
       def logging_devices
         unless defined? @@logging_devices
@@ -140,11 +158,10 @@ end
 
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
-  result = false
-  result ||= method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
-  result ||= ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
-  result ||= method == 'post_initialize_child'
-  result ||= method == 'handle'
-  result ||= method.end_with?('=')
-  result ||= ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
+  return true if method == 'post_initialize_child'
+  return true if method == 'handle'
+  return true if method.end_with?('=')
+  return true if ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
+  return true if method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
+  return true if ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
 end

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -36,7 +36,9 @@ module Glimmer
       def initialize(parent, model_binding, column_properties)
         @table = parent
         @model_binding = model_binding
+        @read_only_sort = @model_binding.binding_options[:read_only_sort]
         @table.swt_widget.data = @model_binding
+        @table.swt_widget.set_data('table_items_binding', self)
         @column_properties = column_properties
         @table.on_widget_disposed do |dispose_event|
           unregister_all_observables
@@ -50,8 +52,8 @@ module Glimmer
         call
       end
 
-      def call(new_model_collection=nil)
-        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+      def call(new_model_collection=nil, internal_sort: false)
+        new_model_collection = model_binding_evaluated_property = @model_binding.evaluate_property unless internal_sort # this ensures applying converters (e.g. :on_read)
         table_cells = @table.swt_widget.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
@@ -61,10 +63,10 @@ module Glimmer
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
-        populate_table(@model_collection, @table, @column_properties)
+        populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
       end
       
-      def populate_table(model_collection, parent, column_properties)
+      def populate_table(model_collection, parent, column_properties, internal_sort: false)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
         parent.swt_widget.items.each(&:dispose)
@@ -78,7 +80,8 @@ module Glimmer
         end
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.swt_widget.setSelection(selected_table_items)
-        parent.sort!
+        sorted_model_collection = parent.sort!(internal_sort: internal_sort)
+        call(sorted_model_collection, internal_sort: true) if @read_only_sort && !internal_sort && !sorted_model_collection.nil?
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
     end

data/lib/glimmer/data_binding/widget_binding.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -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
@@ -22,6 +22,8 @@
 require 'glimmer/data_binding/observable'
 require 'glimmer/data_binding/observer'
 
+require 'glimmer/swt/display_proxy'
+
 module Glimmer
   module DataBinding
     class WidgetBinding
@@ -44,10 +46,26 @@ module Glimmer
       
       def call(value)
         converted_value = translated_value = @translator.call(value)
-        @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
+      
+        update_operation = lambda do
+          if @widget.respond_to?(:disposed?) && @widget.disposed?
+            unregister_all_observables
+            return
+          end
+          @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
+        end
+        if Config.auto_sync_exec? && Config.require_sync_exec?
+          SWT::DisplayProxy.instance.sync_exec(&update_operation)
+        else
+          update_operation.call
+        end
       end
       
       def evaluate_property
+        if @widget.respond_to?(:disposed?) && @widget.disposed?
+          unregister_all_observables
+          return
+        end
         @widget.get_attribute(@property)
       end
     end

data/lib/glimmer/dsl/swt/dsl.rb

@@ -50,6 +50,7 @@ module Glimmer
           cursor
           font
           image
+          multiply
           property
           block_property
           widget

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -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
@@ -28,13 +28,21 @@ module Glimmer
       # image expression
       # Note: Cannot be a static expression because it clashes with image property expression
       class ImageExpression < Expression
+        include ParentExpression
+        
         def can_interpret?(parent, keyword, *args, &block)
-          keyword.to_s == 'image' and
-            (parent.nil? or !parent.respond_to?('image'))
+          (keyword == 'image') and
+            (parent.nil? or parent.respond_to?('image='))
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ImageProxy.new(*args)
+          args.unshift(parent) unless parent.nil?
+          Glimmer::SWT::ImageProxy.new(*args, &block)
+        end
+
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
         end
       end
     end

data/lib/glimmer/dsl/swt/layout_data_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -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
@@ -33,7 +33,7 @@ module Glimmer
         include ParentExpression
   
         def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'layout_data' and
+          super and
             parent.respond_to?(:swt_widget)
         end
   

data/lib/glimmer/dsl/swt/layout_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-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
@@ -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
@@ -23,6 +23,7 @@ require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/layout_proxy'
+require 'glimmer/swt/image_proxy'
 
 module Glimmer
   module DSL
@@ -31,6 +32,7 @@ module Glimmer
         include ParentExpression
   
         include_package 'org.eclipse.swt.widgets'
+        include_package 'org.eclipse.swt.graphics'
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword.to_s.end_with?('_layout') and

data/lib/glimmer/dsl/swt/multiply_expression.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2007-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/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # Special treatment for transform {multiply(){} } operation
+      class MultiplyExpression < Expression
+        include ParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'multiply' and
+            parent.is_a?(Glimmer::SWT::TransformProxy)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TransformProxy.new(parent, *args, multiply: true)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+      
+      end
+
+    end
+
+  end
+
+end

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

@@ -21,13 +21,15 @@
 
 require 'glimmer/dsl/expression'
 
+require 'glimmer/swt/transform_proxy'
+
 module Glimmer
   module DSL
     module SWT
       class PropertyExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           block.nil? and
-            args.size > 0 and
+            (args.size > 0 || parent.is_a?(Glimmer::SWT::TransformProxy)) and
             parent.respond_to?(:set_attribute) and
             parent.respond_to?(:has_attribute?) and
             parent.has_attribute?(keyword, *args) and
@@ -36,7 +38,7 @@ module Glimmer
   
         def interpret(parent, keyword, *args, &block)
           parent.set_attribute(keyword, *args)
-          nil
+          parent
         end
       end
     end

data/{samples/elaborate/tetris/view/game_over_dialog.rb → lib/glimmer/dsl/swt/transform_expression.rb}

@@ -19,54 +19,37 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Tetris
-  module View
-    class GameOverDialog
-      include Glimmer::UI::CustomShell
-  
-      options :parent_shell
-      
-      body {
-        dialog(parent_shell) {
-          row_layout {
-            type :vertical
-            center true
-          }
-          text 'Tetris'
-          
-          label(:center) {
-            text 'Game Over!'
-            font name: 'Menlo', height: 30, style: :bold
-          }
-          label # filler
-          button {
-            text 'Play Again?'
-            
-            on_widget_selected {
-              Model::Game.restart
-              
-              body_root.close
-            }
-          }
-          
-          on_shell_activated {
-            Model::Game.game_over = true
-            display.beep
-          }
-          
-          on_shell_closed {
-            exit_game
-          }
-          
-          on_key_pressed { |event|
-            exit_game if event.keyCode == swt(:cr)
-          }
-        }
-      }
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class TransformExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          super and
+            (parent.nil? or parent.is_a?(Glimmer::SWT::Custom::Shape))
+        end
+        
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TransformProxy.new(parent, *args)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
       
-      def exit_game
-        display.dispose if Model::Game.game_over?
       end
+      
     end
+    
   end
+  
 end