glimmer-dsl-swt 4.24.4.5 → 4.24.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529a6e52ee5f12439588d4e74d7cb71cf571dc5708c0f30d4a8212fc93bbcd94
-  data.tar.gz: beee81b79e38eb8c4f06efae74cbcf449284dcfdc012662529b304272cd2c959
+  metadata.gz: e35a647a3770c1d5d57e5f7f8a26ad1f607e1c77719797643238f11e99ba9a55
+  data.tar.gz: dbf9f410d0c1008ad62e590811168ea8b0ec2e119dfc275a2feed6454cf5f1ff
 SHA512:
-  metadata.gz: 955e339c7ee47be0f1d2a400a83689b71a7a3c1737a0738ef58cd779f6ac2c805609bf81f462bb3b1dfcf6bfe421e31f18037b2a7139c5bf0877d7ae776d4377
-  data.tar.gz: ce4943970d11b34972bafe1138a0878431d5e5f5b6c5943edfa8b51f5591540f781c86eef1150e7ee4306d8ba3a38f4e3ca75e6dfa57b424dc13d37b1845921b
+  metadata.gz: a49ad225fa01ee4725a3103766ec7f7a4ecfea439df3d66ca3fc77448345766f4e60072691f903579d27d7a6999172581aadfcea5445c5ea973ef56894b40388
+  data.tar.gz: c4dc1ae979fccb36b594a368c7f49e48722782589fa65b432d2e04d0306cbf8b878b0e98418d49b9f14955dc5266e9bc1bf7eaee510d9b72d9ab63ac9785100a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 4.24.4.6
+
+- Support `refined_table` sorting (now clicking on headers sorts the entire `model_array` collection, not just the visible rows)
+- Support `table` `no_sort` attribute to disable sorting in general if needed
+- Fix issue with Tetris sample upon restart of game (WidgetProxy#shell_proxy method was failing for being disposed, now it retains a reference to parent that stays if disposed)
+
 ## 4.24.4.5
 
 - Support `refined_table` `:editable` SWT style and `model_array` bidirectional data-binding

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.4.5
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.4.6
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -21,7 +21,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.4.5 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.4.6 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.4.5
+jgem install glimmer-dsl-swt -v 4.24.4.6
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.24.4.5'
+gem 'glimmer-dsl-swt', '~> 4.24.4.6'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.5
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.6
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.24.4.5
+4.24.4.6

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

@@ -50,6 +50,7 @@ module Glimmer
               if new_widget_binding.property.to_s == 'model_array' && !@data_bound
                 @data_bound = true
                 model_binding = new_widget_binding.model_binding
+                configure_sorting
                 observe(self, :model_array) do
                   filter_and_paginate
                 end
@@ -210,6 +211,38 @@ module Glimmer
           self.page = corrected_page(page)
           self.refined_model_array = filtered_model_array[(page - 1) * per_page, per_page]
         end
+        
+        private
+        
+        def configure_sorting
+          @table_proxy.sort_strategy = lambda do
+            array = model_array.dup
+            array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
+            # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
+            if @table_proxy.sort_block
+              sorted_array = array.sort(&@table_proxy.sort_block)
+            elsif @table_proxy.sort_by_block
+              sorted_array = array.sort_by(&@table_proxy.sort_by_block)
+            else
+              sorted_array = array.sort_by do |object|
+                @table_proxy.sort_property.each_with_index.map do |a_sort_property, i|
+                  value = object.send(a_sort_property)
+                  # handle nil and difficult to compare types gracefully
+                  if @table_proxy.sort_type[i] == Integer
+                    value = value.to_i
+                  elsif @table_proxy.sort_type[i] == Float
+                    value = value.to_f
+                  elsif @table_proxy.sort_type[i] == String
+                    value = value.to_s
+                  end
+                  value
+                end
+              end
+            end
+            sorted_array = sorted_array.reverse if @table_proxy.sort_direction == :descending
+            self.model_array = sorted_array
+          end
+        end
       end
     end
   end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -27,15 +27,15 @@ module Glimmer
     # A proxy object representing SWT TableColumn
     # Accepts a :no_sort custom style to disable sorting on this column
     class TableColumnProxy < Glimmer::SWT::WidgetProxy
-      attr_reader :no_sort, :sort_property, :editor
+      attr_reader :sort_property, :editor
+      attr_accessor :no_sort, :sort_block, :sort_by_block
       alias no_sort? no_sort
-      attr_accessor :sort_block, :sort_by_block
       
       def initialize(underscored_widget_name, parent, args)
         @no_sort = args.delete(:no_sort)
         super
         on_widget_selected do |event|
-          parent.sort_by_column!(self)
+          parent.sort_by_column!(self) unless no_sort?
         end unless no_sort?
       end
       

data/lib/glimmer/swt/table_proxy.rb

@@ -247,7 +247,7 @@ module Glimmer
       
       attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable
       attr_writer :column_properties
-      attr_accessor :table_items_binding
+      attr_accessor :table_items_binding, :sort_strategy
       alias column_attributes= column_properties=
       alias editable? editable
       
@@ -398,36 +398,46 @@ module Glimmer
       
       def sort!(internal_sort: false)
         return unless sort_property && (sort_type || sort_block || sort_by_block)
-        original_array = array = model_binding.evaluate_property
-        array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
-        # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
-        if sort_block
-          sorted_array = array.sort(&sort_block)
-        elsif sort_by_block
-          sorted_array = array.sort_by(&sort_by_block)
+        if sort_strategy
+          sort_strategy.call
         else
-          sorted_array = array.sort_by do |object|
-            sort_property.each_with_index.map do |a_sort_property, i|
-              value = object.send(a_sort_property)
-              # handle nil and difficult to compare types gracefully
-              if sort_type[i] == Integer
-                value = value.to_i
-              elsif sort_type[i] == Float
-                value = value.to_f
-              elsif sort_type[i] == String
-                value = value.to_s
+          original_array = array = model_binding.evaluate_property
+          array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
+          # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
+          if sort_block
+            sorted_array = array.sort(&sort_block)
+          elsif sort_by_block
+            sorted_array = array.sort_by(&sort_by_block)
+          else
+            sorted_array = array.sort_by do |object|
+              sort_property.each_with_index.map do |a_sort_property, i|
+                value = object.send(a_sort_property)
+                # handle nil and difficult to compare types gracefully
+                if sort_type[i] == Integer
+                  value = value.to_i
+                elsif sort_type[i] == Float
+                  value = value.to_f
+                elsif sort_type[i] == String
+                  value = value.to_s
+                end
+                value
               end
-              value
             end
           end
+          sorted_array = sorted_array.reverse if sort_direction == :descending
+          if model_binding.binding_options.symbolize_keys[:read_only_sort]
+            table_items_binding.call(sorted_array, internal_sort: true) unless internal_sort
+          else
+            model_binding.call(sorted_array)
+          end
+          sorted_array
         end
-        sorted_array = sorted_array.reverse if sort_direction == :descending
-        if model_binding.binding_options.symbolize_keys[:read_only_sort]
-          table_items_binding.call(sorted_array, internal_sort: true) unless internal_sort
-        else
-          model_binding.call(sorted_array)
+      end
+      
+      def no_sort=(value)
+        table_column_proxies.each do |table_column_proxy|
+          table_column_proxy.no_sort = value
         end
-        sorted_array
       end
       
       def editor=(args)

data/lib/glimmer/swt/widget_proxy.rb

@@ -167,6 +167,7 @@ module Glimmer
             parent = swt_widget.parent
             @parent_proxy = parent&.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
           end
+          shell_proxy # populates @shell_proxy attribute
           if @swt_widget&.get_data('proxy').nil?
             @swt_widget.set_data('proxy', self)
             DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
@@ -201,10 +202,12 @@ module Glimmer
       end
       
       def shell_proxy
-        if @swt_widget.respond_to?(:shell)
-          @swt_widget.shell.get_data('proxy')
+        if @swt_widget.respond_to?(:shell) && !@swt_widget.is_disposed
+          @shell_proxy = @swt_widget.shell.get_data('proxy')
+        elsif @parent_proxy&.shell_proxy
+          @shell_proxy = @parent_proxy&.shell_proxy
         else
-          @parent_proxy&.shell_proxy
+          @shell_proxy
         end
       end
       

data/samples/elaborate/meta_sample/tutorials.yml

@@ -31,3 +31,4 @@ Hello, Custom Shell!: c8Eb8GWM_XQ
 Hello, Custom Shape!: H3J8ecp30Ak
 Battleship: b00OWeLZOt8
 Klondike Solitaire: qOzgiz9X3sI
+Tetris: oQbBCXACOLY

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -28,11 +28,11 @@ class Tetris
   
       options :parent_shell, :game
       
-      after_body {
+      after_body do
         @game_over_observer = observe(game, :game_over) do |game_over|
           close if !game_over
         end
-      }
+      end
       
       body {
         dialog(parent_shell) {

data/samples/hello/hello_refined_table.rb

@@ -112,6 +112,7 @@ class HelloRefinedTable
   
   BaseballSeason = Struct.new(:year) do
     attr_accessor :selected_game
+    attr_writer :games
   
     def games
       if @games.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.4.5
+  version: 4.24.4.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-17 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement