glimmer-dsl-swt 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee38949564fb2b0f3874a1bad1229cfb813439f0dca2e08b8d293b8c61fecb9
-  data.tar.gz: eb0e920dba273a6a343aeeb34cc664c33b7238b151df0e8cd5a4679aaee85b29
+  metadata.gz: e33ae73c95946ba7fce0d3dc221cee2ca817968a03bbfe678ff9e0ecfbaf5a65
+  data.tar.gz: c95f41b789e3dee67c94dbf79d6e8367d5ad7a1fb94749e784a8c3b13ef8a4aa
 SHA512:
-  metadata.gz: c5ca29f9d303aa9320acb7f97492c8caf9d7e1135597ba646a3e5b238ec6e47408da2e4ea87f74c50ae283cd313def6d35c93e622040123dfb438c12d9330f8c
-  data.tar.gz: cd22b1bf5093d4a3a1c9caea73d152678395e7aa0110bdcfbe1df2ee923ca85d601c8529120a17acadabe75af979fc3791477ec00dde075b59a1f13565f5cf2a
+  metadata.gz: c4784a352196f496c4fce136da828352c9c92c2f7092e917f9c47a403bd91964566a2d493680b35f13d240a87dd37830153f3a37ea050ea0d84aa8b02071cfdc
+  data.tar.gz: 9080d1bdc15f375db58fa8719d5c6fb8d2017313fe52ea7e2ad7b4dd042f47daa8bf87edecffa819c6e1596839af619f989335839fa757dd2e645ce6c6e13fdb

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.2.3 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.2.4 (Desktop GUI)
 [![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)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -15,6 +15,7 @@ module Glimmer
       def initialize(parent, model_binding, column_properties)
         @table = parent
         @model_binding = model_binding
+        @table.swt_widget.data = @model_binding
         @column_properties = column_properties
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties

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

@@ -0,0 +1,20 @@
+require 'glimmer/dsl/expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      class BlockPropertyExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          block_given? and
+            args.size == 0 and
+            parent.respond_to?("#{keyword}_block=")
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send("#{keyword}_block=", block)
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -25,6 +25,7 @@ module Glimmer
           table_items_data_binding
           data_binding
           property
+          block_property
           widget
           custom_widget
         ]

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

@@ -31,5 +31,7 @@ module Glimmer
 end
 
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/scrolled_composite_proxy'
 require 'glimmer/swt/tree_proxy'
 require 'glimmer/swt/table_proxy'
+require 'glimmer/swt/table_column_proxy'

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -0,0 +1,21 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy
+      def initialize(underscored_widget_name, parent, args)
+        unless args.first.is_a?(Numeric)
+          args.unshift(:h_scroll)
+          args.unshift(:v_scroll)
+        end
+        super
+        swt_widget.expand_horizontal = true
+        swt_widget.expand_vertical = true
+      end
+      
+      def post_initialize_child(child)
+        swt_widget.content = child.swt_widget        
+      end
+    end
+  end
+end

data/lib/glimmer/swt/swt_proxy.rb

@@ -31,7 +31,8 @@ module Glimmer
       end
       
       EXTRA_STYLES = {
-        NO_RESIZE: self[:shell_trim, :resize!, :max!]
+        NO_RESIZE: self[:shell_trim, :resize!, :max!],
+        NO_SORT: -7,
       }            
     end
   end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -0,0 +1,24 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TableColumnProxy < Glimmer::SWT::WidgetProxy    
+      attr_reader :no_sort, :sort_property
+      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)
+        end unless no_sort?
+      end
+      
+      def sort_property=(args)
+        @sort_property = args.to_a.first
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/table_proxy.rb

@@ -33,7 +33,7 @@ module Glimmer
         end   
       end
       
-      attr_reader :table_editor, :table_editor_text_proxy
+      attr_reader :table_editor, :table_editor_text_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -43,7 +43,70 @@ module Glimmer
         @table_editor.grabHorizontal = true
         @table_editor.minimumHeight = 20
       end
-    
+
+      def model_binding
+        swt_widget.data
+      end      
+      
+      def sort_by_column(table_column_proxy)
+        index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget)
+        new_sort_property = table_column_proxy.sort_property || column_properties[index]
+        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending
+        @sort_property = new_sort_property
+        if table_column_proxy.sort_by_block
+          @sort_by_block = table_column_proxy.sort_by_block
+        elsif table_column_proxy.sort_block
+          @sort_block = table_column_proxy.sort_block
+        else
+          detect_sort_type        
+        end
+        sort
+      end
+      
+      def detect_sort_type
+        @sort_type = String
+        array = model_binding.evaluate_property
+        values = array.map { |object| object.send(sort_property) }
+        value_classes = values.map(&:class).uniq
+        if value_classes.size == 1
+          @sort_type = value_classes.first
+        elsif value_classes.include?(Integer)
+          @sort_type = Integer
+        elsif value_classes.include?(Float)
+          @sort_type = Float
+        end
+      end
+      
+      def sort
+        return unless sort_property && (sort_type || sort_block || sort_by_block)
+        array = model_binding.evaluate_property
+        # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
+        if sort_block
+          sorted_array = array.sort do |object1, object2|
+            value1 = object1.send(sort_property)
+            value2 = object2.send(sort_property)
+            sort_block.call(value1, value2)
+          end
+        else
+          sorted_array = array.sort_by do |object|
+            value = object.send(sort_property)
+            # handle nil and difficult to compare types gracefully
+            if sort_by_block
+              value = sort_by_block.call(value)
+            elsif sort_type == Integer
+              value = value.to_i
+            elsif sort_type == Float
+              value = value.to_f
+            elsif sort_type == String
+              value = value.to_s
+            end
+            value
+          end
+        end
+        sorted_array = sorted_array.reverse if sort_direction == :descending
+        model_binding.call(sorted_array)
+      end
+      
       # Performs a search for table items matching block condition
       # If no condition block is passed, returns all table items
       # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed

data/lib/glimmer/swt/widget_proxy.rb

@@ -61,6 +61,12 @@ module Glimmer
         swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
         @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
+        parent.post_initialize_child(self)
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        # No Op by default
       end
 
       def extract_args(underscored_widget_name, args)
@@ -266,11 +272,11 @@ module Glimmer
         end
         swt_widget_class
       rescue NameError => e
-        Glimmer::Config.logger&.debug e.message
+        Glimmer::Config.logger&.debug e.full_message
         # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       rescue => e
-        Glimmer::Config.logger&.debug e.message
+        Glimmer::Config.logger&.debug e.full_message
         # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       end

data/lib/glimmer/ui/custom_widget.rb

@@ -137,6 +137,11 @@ module Glimmer
         execute_hooks('after_body')
         @swt_widget = @body_root.swt_widget
       end
+      
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        body_root.post_initialize_child(child)
+      end      
 
       def can_handle_observation_request?(observation_request)
         result = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +285,7 @@ files:
 - lib/glimmer/data_binding/widget_binding.rb
 - lib/glimmer/dsl/swt/async_exec_expression.rb
 - lib/glimmer/dsl/swt/bind_expression.rb
+- lib/glimmer/dsl/swt/block_property_expression.rb
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
@@ -328,10 +329,12 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
+- lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/table_column_proxy.rb
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb