glimmer-dsl-swt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70cb97f3e5f058b49cb24ddbe87281e9db925f6708e03d9d520545878608a3e7
-  data.tar.gz: 73ad3cf16e2a30f4227135ce0eed679a40d3ca222780b1f9b998535274eed720
+  metadata.gz: 1b818d6b949f1a1c4388ecad2f9d6f425afbdf0c772a99031c2ea1cf1276dc1c
+  data.tar.gz: 7f9f78326e9a083b170f9606bfb7337963bda57c4648e7f585c435747f77e94a
 SHA512:
-  metadata.gz: 0f0842bb53f0f8703970924e6f21374d1e64c955fd7a7135b4c864d7158221285a5ef9c89b7e01508d1393a5130388d79659672ad0fa4e1c35b4363bb772c47a
-  data.tar.gz: 65c239a07dd7a216873fbe6f56842c5b2e15ea9d6aa3a77ac301b3e064f2c6521afcb07731ba0a5df20fe7ea877f25716581386621ac987c00a73c77da0988a3
+  metadata.gz: e56deeff2d43d47a8e875ed1e32ba54f6cca9398053afdd5351257a2b0da3326384412635cf0c41529e8d961abab5de32d69cc5b6e23e67f1ebec23bb372b174
+  data.tar.gz: 49dc96a0dc0921bac9b0cd048d9e33d1436dffa09b4bcb48704f162a30209c52209b3ca03318c89e7277835e682821ec89fb4f32f9c26218fb8ed1812a340dcb

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.0 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.3.0 (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)
@@ -10,7 +10,7 @@
 
 You may find full setup/usage instructions at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
 
-Other Glimmer DSL gems:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.2.11.1
+jruby-9.2.12.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/ext/glimmer.rb

@@ -3,11 +3,18 @@ require 'glimmer/swt/packages'
 module Glimmer
   class << self
     def included(klass)
+      if Object.const_defined?(:ActiveSupport) && ActiveSupport.const_defined?(:Dependencies)
+        begin
+          ActiveSupport::Dependencies.unhook!
+        rescue => e
+          # noop TODO support logging unimportant details below debug level
+        end
+      end
       if Config.import_swt_packages
         klass.include(SWT::Packages)
         klass.extend(SWT::Packages)
-        klass.extend(Glimmer)
       end
+      klass.extend(Glimmer)
     end
   end
 end

data/lib/ext/glimmer/config.rb

@@ -1,16 +1,24 @@
 module Glimmer
   module Config
+    DEFAULT_IMPORT_SWT_PACKAGES = [
+      'org.eclipse.swt',
+      'org.eclipse.swt.widgets',
+      'org.eclipse.swt.layout',
+      'org.eclipse.swt.graphics',
+      'org.eclipse.swt.browser',
+      'org.eclipse.swt.custom',
+      'org.eclipse.swt.dnd',  
+    ]
+  
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
       def import_swt_packages=(value)
-        @@import_swt_packages = !!value
+        @@import_swt_packages = value
       end
   
       # Returns whether Glimmer will import SWT packages into including class
       def import_swt_packages
-        unless defined? @@import_swt_packages
-          @@import_swt_packages = true
-        end
+        @@import_swt_packages = DEFAULT_IMPORT_SWT_PACKAGES if !defined?(@@import_swt_packages) || (defined?(@@import_swt_packages) && @@import_swt_packages == true)
         @@import_swt_packages
       end
     end

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
@@ -22,14 +23,14 @@ module Glimmer
           @table.body_root.column_properties = @column_properties
         end
         call(@model_binding.evaluate_property)
-        model = model_binding.base_model
-        observe(model, model_binding.property_name_expression)
+        observe(model_binding)
         @table.on_widget_disposed do |dispose_event|
           unregister_all_observables
         end
       end
 
       def call(new_model_collection=nil)
+        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
         if new_model_collection and new_model_collection.is_a?(Array)
           observe(new_model_collection, @column_properties)
           @model_collection = new_model_collection

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/combo_selection_data_binding_expression.rb

@@ -35,6 +35,10 @@ module Glimmer
           parent.on_widget_selected do
             model_binding.call(widget_binding.evaluate_property)
           end
+          
+          parent.on_modify_text do
+            model_binding.call(widget_binding.evaluate_property)
+          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/package.rb

@@ -7,6 +7,12 @@ module Glimmer
     class << self
       attr_accessor :javapackager_extra_args
       
+      def clean
+        require 'fileutils'
+        FileUtils.rm_rf('dist')
+        FileUtils.rm_rf('packages')
+      end
+      
       def config
         project_name = File.basename(File.expand_path('.'))
         if !File.exists?('config/warble.rb')
@@ -15,7 +21,7 @@ module Glimmer
           system('warble config')
           new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
             if line.include?('config.dirs =')
-              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos)')
+              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos vendor)')
             end
             if line.include?('config.includes =')
               line = line.sub('# ', '').sub(/=[^=\n]+$/, "= FileList['LICENSE.txt', 'VERSION']")

data/lib/glimmer/rake_task.rb

@@ -4,6 +4,11 @@ require_relative 'package'
 
 namespace :glimmer do
   namespace :package do
+    desc 'Clean by removing "dist" and "packages" directories'
+    task :clean do
+      Glimmer::Package.clean
+    end
+
     desc 'Generate JAR config file'
     task :config do
       Glimmer::Package.config

data/lib/glimmer/scaffold.rb

@@ -58,7 +58,7 @@ class Scaffold
       
       # for a library or gem, you might want to ignore these files since the code is
       # intended to run in multiple environments; otherwise, check them in:
-      Gemfile.lock
+      # Gemfile.lock
       # .ruby-version
       # .ruby-gemset
       
@@ -179,6 +179,7 @@ class Scaffold
     end
 
     def custom_shell_gem(custom_shell_name, namespace)
+      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
       gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
       if namespace
@@ -218,6 +219,7 @@ class Scaffold
     end
 
     def custom_widget_gem(custom_widget_name, namespace)
+      return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
       gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
       if namespace
@@ -483,12 +485,10 @@ class Scaffold
         custom_shell_file_content += <<-MULTI_LINE_STRING
 
     def display_about_dialog
-      message_box = MessageBox.new(swt_widget)
-      message_box.setText("About")
-      message = "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\n\n"
-      message += LICENSE
-      message_box.setMessage(message)
-      message_box.open
+      message_box(body_root) {
+        text 'About'
+        message "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\\n\\n\#{LICENSE}"
+      }.open
     end
     
     def display_preferences_dialog

data/lib/glimmer/swt/packages.rb

@@ -1,14 +1,16 @@
+require 'ext/glimmer/config'
+
 module Glimmer
   module SWT
     # This contains Java imports of SWT Java packages
     module Packages
-      include_package 'org.eclipse.swt'
-      include_package 'org.eclipse.swt.widgets'
-      include_package 'org.eclipse.swt.layout'
-      include_package 'org.eclipse.swt.graphics'
-      include_package 'org.eclipse.swt.browser'
-      include_package 'org.eclipse.swt.custom'
-      include_package 'org.eclipse.swt.dnd'
+      class << self
+        def included(klass)
+          Glimmer::Config.import_swt_packages.to_a.each do |package|
+            include_package(package) if package.is_a?(String)
+          end
+        end    
+      end
     end
   end
 end

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 unless args.empty?
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/table_proxy.rb

@@ -1,4 +1,4 @@
-require 'glimmer/swt/widget_proxy'
+  require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
@@ -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, :additional_sort_properties
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -43,7 +43,91 @@ 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]]
+        if new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
+          selected_additional_sort_properties = additional_sort_properties.clone
+          if selected_additional_sort_properties.include?(new_sort_property.first)
+            selected_additional_sort_properties.delete(new_sort_property.first)
+            new_sort_property += selected_additional_sort_properties
+          else
+            new_sort_property += additional_sort_properties
+          end
+        end
+        
+        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending        
+        swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+        
+        @sort_property = new_sort_property
+        swt_widget.sort_column = table_column_proxy.swt_widget
+        
+        @sort_by_block = nil
+        @sort_block = nil
+        @sort_type = nil
+        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 = sort_property.size.times.map { String }
+        array = model_binding.evaluate_property
+        sort_property.each_with_index do |a_sort_property, i|
+          values = array.map { |object| object.send(a_sort_property) }
+          value_classes = values.map(&:class).uniq
+          if value_classes.size == 1
+            @sort_type[i] = value_classes.first
+          elsif value_classes.include?(Integer)
+            @sort_type[i] = Integer
+          elsif value_classes.include?(Float)
+            @sort_type[i] = Float
+          end
+        end
+      end
+      
+      def additional_sort_properties=(args)
+        @additional_sort_properties = args unless args.empty?
+      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(&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
+          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)
@@ -75,7 +81,18 @@ module Glimmer
         if @arg_extractor_mapping[underscored_widget_name]
           @arg_extractor_mapping[underscored_widget_name].call(args)
         else
-          [args, []]
+          extra_options = []
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            extra_options = args[style_arg_last_index+1..-1]
+            args = args[style_arg_start_index..style_arg_last_index]
+          elsif args.first.is_a?(Integer)
+            extra_options = args[1..-1]
+            args = args[0..0]
+          end
+          [args, extra_options]
         end
       end
 
@@ -134,6 +151,23 @@ module Glimmer
                 observer.call(false)
               }
             end,
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              } if can_handle_observation_request?(:on_widget_selected)
+            end,
+            :text => lambda do |observer|
+              on_modify_text { |modify_event|
+                observer.call(@swt_widget.getText)
+              } if can_handle_observation_request?(:on_modify_text)
+            end,
+          },
+          Java::OrgEclipseSwtWidgets::Combo => {
+            :text => lambda do |observer|
+              on_modify_text { |modify_event|
+                observer.call(@swt_widget.getText)
+              }
+            end,
           },
           Java::OrgEclipseSwtWidgets::Text => {
             :text => lambda do |observer|
@@ -238,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
@@ -278,9 +312,7 @@ module Glimmer
       def add_observer(observer, property_name)
         property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
         widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.to_a.each do |widget_listener_installer|
-          widget_listener_installer.call(observer)
-        end
+        widget_listener_installers.to_a.first&.call(observer)
       end
 
       def remove_observer(observer, property_name)

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,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -256,7 +256,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for SWT (Desktop GUI)
+description: Glimmer DSL for SWT (Desktop GUI) - JRuby on SWT
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -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