glimmer-dsl-swt 4.24.4.6 → 4.24.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35a647a3770c1d5d57e5f7f8a26ad1f607e1c77719797643238f11e99ba9a55
-  data.tar.gz: dbf9f410d0c1008ad62e590811168ea8b0ec2e119dfc275a2feed6454cf5f1ff
+  metadata.gz: 0fe762c944e91cd87d49690912e9bfe3513335ff8ac80d5248a485b597bc82fb
+  data.tar.gz: 0fc8caa7604fbc524020ab9b7c91f7cf5e1aa44055c116607a9103ef407b4b2e
 SHA512:
-  metadata.gz: a49ad225fa01ee4725a3103766ec7f7a4ecfea439df3d66ca3fc77448345766f4e60072691f903579d27d7a6999172581aadfcea5445c5ea973ef56894b40388
-  data.tar.gz: c4dc1ae979fccb36b594a368c7f49e48722782589fa65b432d2e04d0306cbf8b878b0e98418d49b9f14955dc5266e9bc1bf7eaee510d9b72d9ab63ac9785100a
+  metadata.gz: e1e058691460ad791753d7040268e0ede146a075a32eb85b7c9b5bb12cc87316dfa90965b27f274741ac7c4c7c9fd7d03a5196dcffc5c5156918251c2cf41196
+  data.tar.gz: 3ed723eb74b7b225d7a082732cfbb0c50350221ab532576f6da14000cad1c8149bb0a5becd6db78f33b318b1e09ab8e12ff0bae9069578ce379428ff98250661

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 4.24.4.8
+
+- Optimize `refined_table` sorting to avoid re-running upon navigating pages
+- Fix issue with `refined_table` sorting breaking page remembering behavior upon entering a filter query
+
+## 4.24.4.7
+
+- Optimize performance of `refined_table` in filtering (it now caches results and replays them) and pagination (it now remembers last query page and avoids refiltering when paginating on the same query value)
+- Improve `combo` `selection` data-binding by auto-converting `_options` values to `String` before setting as `Item`s on `combo` (e.g. in case `Integer` values were set like years)
+
 ## 4.24.4.6
 
 - Support `refined_table` sorting (now clicking on headers sorts the entire `model_array` collection, not just the visible rows)

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.6
+# [<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.8
 ## 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.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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.4.8 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.6
+jgem install glimmer-dsl-swt -v 4.24.4.8
 ```
 
 `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.6'
+gem 'glimmer-dsl-swt', '~> 4.24.4.8'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.6
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.8
       
 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.6
+4.24.4.8

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -4309,7 +4309,7 @@ Here is an explanation of the example above:
 
 ##### Refined Table
 
-**(ALPHA FEATURE)**
+**(BETA FEATURE)**
 
 `refined_table` is a custom widget that can handle very large amounts of data by applying pagination and filtering.
 
@@ -4320,7 +4320,9 @@ Options:
 - `page` (default: `1` if table is filled and `0` otherwise): specifies initial page
 - `query` (default: `''`): specifies filter query term (empty shows all results)
 
-Note that currently `refined_table` does not support sorting by clicking columns yet.
+When click columns (headers) in a `refined_table`, it sorts the entire `model_array`, not just the visible rows.
+
+Also, upon filtering with a query term, moving in pages, and then unfiltering (backspacing)/refiltering, it remembers the last query term's page and results (through caching) and goes back to them, thus ensuring better performance.
 
 Example taken from [Hello, Refined Table!](/docs/reference/GLIMMER_SAMPLES.md#hello-refined-table):
 

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

@@ -39,6 +39,7 @@ module Glimmer
         
         before_body do
           self.query ||= ''
+          @last_query = self.query
           self.model_array ||= []
           self.filtered_model_array = []
           self.refined_model_array = []
@@ -52,6 +53,7 @@ module Glimmer
                 model_binding = new_widget_binding.model_binding
                 configure_sorting
                 observe(self, :model_array) do
+                  clear_query_cache
                   filter_and_paginate
                 end
                 @table_proxy.content {
@@ -200,11 +202,23 @@ module Glimmer
         end
         
         def filter
-          self.filtered_model_array = model_array.select do |model|
-            @table_proxy.cells_for(model).any? do |cell_text|
-              cell_text.to_s.downcase.include?(query.to_s.downcase)
+          new_query = query.to_s.strip
+          new_filtered_model_array = query_to_filtered_model_array_hash[new_query]
+          if new_filtered_model_array.nil?
+            if new_query.empty?
+              query_to_filtered_model_array_hash[new_query] = new_filtered_model_array = model_array.dup
+            else
+              new_filtered_model_array = model_array.select do |model|
+                @table_proxy.cells_for(model).any? do |cell_text|
+                  cell_text.to_s.downcase.include?(new_query.downcase)
+                end
+              end
+              query_to_filtered_model_array_hash[new_query] = new_filtered_model_array
             end
           end
+          self.filtered_model_array = new_filtered_model_array
+          restore_query_page
+          @last_query = new_query
         end
         
         def paginate
@@ -212,10 +226,40 @@ module Glimmer
           self.refined_model_array = filtered_model_array[(page - 1) * per_page, per_page]
         end
         
+        def restore_query_page
+          new_query = query.to_s.strip
+          last_query = @last_query.to_s.strip
+          if last_query != new_query
+            query_to_page_hash[last_query] = page
+          else
+            query_to_page_hash[new_query] = page
+          end
+          if last_query != new_query && last_query.include?(new_query)
+            new_page = query_to_page_hash[new_query]
+            self.page = corrected_page(new_page) if new_page
+          end
+        end
+        
+        def clear_query_cache
+          @query_to_filtered_model_array_hash = {}
+          @query_to_page_hash = {}
+        end
+        
+        def query_to_filtered_model_array_hash
+          @query_to_filtered_model_array_hash ||= {}
+        end
+        
+        def query_to_page_hash
+          @query_to_page_hash ||= {}
+        end
+        
         private
         
         def configure_sorting
           @table_proxy.sort_strategy = lambda do
+            new_sort = @table_proxy.sort_block || @table_proxy.sort_by_block || @table_proxy.sort_property
+            new_sort_direction = @table_proxy.sort_direction
+            return if new_sort == @last_sort && new_sort_direction == @last_sort_direction
             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
@@ -241,6 +285,8 @@ module Glimmer
             end
             sorted_array = sorted_array.reverse if @table_proxy.sort_direction == :descending
             self.model_array = sorted_array
+            @last_sort = new_sort
+            @last_sort_direction = new_sort_direction
           end
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1146,7 +1146,7 @@ module Glimmer
             end.to_java(Image)
           end,
           items: lambda do |value|
-            value.to_java :string
+            value.map(&:to_s).to_java :string
           end,
           maximized_control: lambda do |value|
             value = (value.respond_to?(:swt_widget) ? value.swt_widget : value) if swt_widget.is_a?(SashForm)

data/samples/elaborate/meta_sample/tutorials.yml

@@ -32,3 +32,4 @@ Hello, Custom Shape!: H3J8ecp30Ak
 Battleship: b00OWeLZOt8
 Klondike Solitaire: qOzgiz9X3sI
 Tetris: oQbBCXACOLY
+Hello, Refined Table!: PEfCZiUa1qo

metadata

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