glimmer-dsl-swt 0.1.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b54809644b379821d606ce742901ec5ce91197bfccb33ee15893d9b809ef766
-  data.tar.gz: f322c7d1c9f2a7aa9b97709739978317c727a0988dec41c397db205c544c3c7b
+  metadata.gz: fee38949564fb2b0f3874a1bad1229cfb813439f0dca2e08b8d293b8c61fecb9
+  data.tar.gz: eb0e920dba273a6a343aeeb34cc664c33b7238b151df0e8cd5a4679aaee85b29
 SHA512:
-  metadata.gz: 54539c2fa3414d637fa6e29578e88c592f09d292c7027308ced2a8ddd84f11ed6d36ec769ec9e8c06113c3fed16c08cba4774f92b5d167e8f16867788fd7106d
-  data.tar.gz: 8f3f36715b553078f72f0fd66f635437344ba0151a1ba2665852cee9fb81658afb265d66493d0b61d42083f1ebb3c963368fc43c6f74133e4b9bf73d79fb8395
+  metadata.gz: c5ca29f9d303aa9320acb7f97492c8caf9d7e1135597ba646a3e5b238ec6e47408da2e4ea87f74c50ae283cd313def6d35c93e622040123dfb438c12d9330f8c
+  data.tar.gz: cd22b1bf5093d4a3a1c9caea73d152678395e7aa0110bdcfbe1df2ee923ca85d601c8529120a17acadabe75af979fc3791477ec00dde075b59a1f13565f5cf2a

data/README.md

@@ -1,9 +1,12 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=105 /> Glimmer DSL for SWT 0.1.2 (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.3 (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)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for SWT enables desktop development with Glimmer.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) enables desktop development with [Glimmer](https://github.com/AndyObtiva/glimmer).
+
+[Glimmer](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the GUI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models test-first afterwards.
 
 You may find full setup/usage instructions at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
 
@@ -12,6 +15,23 @@ Other Glimmer DSL gems:
 - [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)
 
+## Example
+
+```ruby
+include Glimmer
+   
+shell {
+  text 'Glimmer'
+  label {
+    text 'Hello, World!'
+  }
+}.open
+```
+
+![Glimmer DSL for SWT Hello World](https://github.com/AndyObtiva/glimmer/blob/master/images/glimmer-hello-world.png)
+
+Learn more at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
+
 ## Help
 
 ### Issues

data/RUBY_VERSION

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

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.3

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-dsl-swt.rb

@@ -2,9 +2,14 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
 require 'java'
-require 'nested_inherited_jruby_include_package'
-require 'super_module'
-require 'glimmer'
+if ENV['BUNDLER_REQUIRE'].to_s.downcase == 'true'
+  require 'bundler'
+  Bundler.require
+else
+  require 'nested_inherited_jruby_include_package'
+  require 'super_module'
+  require 'glimmer'
+end
 
 # Internal requires
 require 'ext/glimmer/config'

data/lib/glimmer/data_binding/list_selection_binding.rb

@@ -1,4 +1,3 @@
-require 'glimmer'
 require 'glimmer/data_binding/observable'
 require 'glimmer/data_binding/observer'
 

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -22,23 +22,24 @@ 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
         end
-        populate_table(@model_collection, @table, @column_properties)
+        populate_table(@model_collection, @table, @column_properties)        
       end
-
+      
       def populate_table(model_collection, parent, column_properties)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:getData)
+        parent.finish_edit!
         parent.swt_widget.removeAll
         model_collection.each do |model|
           table_item = TableItem.new(parent.swt_widget, SWT::SWTProxy[:none])

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

@@ -0,0 +1,25 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/swt/dnd_proxy'
+
+# TODO consider turning static keywords like bind into methods
+
+module Glimmer
+  module DSL
+    module SWT
+      # Responsible for returning DND constant values
+      #
+      # Named DndExpression (not DNDExpression) so that the DSL engine
+      # discovers quickly by convention
+      class DndExpression < StaticExpression
+        def can_interpret?(parent, keyword, *args, &block)
+          block.nil? &&
+            args.size > 0
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::DNDProxy[*args]
+        end
+      end
+    end
+  end
+end

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

@@ -14,10 +14,6 @@ module Glimmer
 
         include_package 'org.eclipse.swt.widgets'
 
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'message_box'
-        end
-
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
           parent = args.shift if potential_parent.is_a?(Shell) || (potential_parent.respond_to?(:swt_widget) && potential_parent.swt_widget.is_a?(Shell))

data/lib/glimmer/package.rb

@@ -1,10 +1,18 @@
 require 'os'
 
+# TODO refactor to nest under RakeTask namespace
+
 module Glimmer
   module Package
     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')
@@ -13,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
@@ -59,4 +64,26 @@ namespace :glimmer do
       Scaffold.custom_widget_gem(args[:custom_widget_name], args[:namespace])
     end
   end
+  
+  namespace :list do
+    task :list_require do
+      require_relative 'rake_task/list'
+    end
+  
+    desc 'List Glimmer custom widget gems available at rubygems.org (query is optional)'
+    task :custom_widget_gems, [:query] => :list_require do |t, args|
+      Glimmer::RakeTask::List.custom_widget_gems(args[:query])
+    end
+    
+    desc 'List Glimmer custom shell gems available at rubygems.org (query is optional)'
+    task :custom_shell_gems, [:query] => :list_require do |t, args|
+      Glimmer::RakeTask::List.custom_shell_gems(args[:query])
+    end
+    
+    desc 'List Glimmer DSL gems available at rubygems.org (query is optional)'
+    task :dsl_gems, [:query] => :list_require do |t, args|
+      Glimmer::RakeTask::List.dsl_gems(args[:query])
+    end
+    
+  end
 end

data/lib/glimmer/rake_task/list.rb

@@ -0,0 +1,73 @@
+require 'facets'
+require 'text-table'
+
+module Glimmer
+  module RakeTask
+    # Lists Glimmer related gems to use in rake_task.rb
+    class List
+      class << self
+        REGEX_GEM_LINE = /^([^\(]+) \(([^\)]+)\)$/
+        
+        def custom_widget_gems(query=nil)
+          list_gems('glimmer-cw-', query) do |result|
+            puts
+            puts "  Glimmer Custom Widget Gems#{" matching [#{query}]" if query} at rubygems.org:"
+            puts result
+          end
+        end
+
+        def custom_shell_gems(query=nil)
+          list_gems('glimmer-cs-', query) do |result|
+            puts
+            puts "  Glimmer Custom Shell Gems#{" matching [#{query}]" if query} at rubygems.org:"
+            puts result
+          end
+        end
+
+        def dsl_gems(query=nil)
+          list_gems('glimmer-dsl-', query) do |result|
+            puts
+            puts "  Glimmer DSL Gems#{" matching [#{query}]" if query} at rubygems.org:"
+            puts result
+          end
+        end
+        
+        def list_gems(gem_prefix, query=nil, &printer)
+          lines = `gem search -d #{gem_prefix}`.split("\n")
+          gems = lines.slice_before {|l| l.match(REGEX_GEM_LINE) }.to_a
+          gems = gems.map do |gem|
+            {            
+              name: gem[0].match(REGEX_GEM_LINE)[1],
+              version: gem[0].match(REGEX_GEM_LINE)[2],
+              author: gem[1].strip,
+              description: gem[4..-1].map(&:strip).join(' ')
+            }
+          end.select do |gem|
+            query.nil? || "#{gem[:name]} #{gem[:author]} #{gem[:description]}".downcase.include?(query.to_s.downcase)
+          end
+          printer.call(tablify(gem_prefix, gems))
+        end
+        
+        def tablify(gem_prefix, gems)
+          array_of_arrays = gems.map do |gem|
+            [
+              gem[:name].sub(gem_prefix, '').underscore.titlecase,
+              gem[:name],
+              gem[:version],
+              gem[:author].sub('Author: ', ''),
+              gem[:description],
+            ]
+          end
+          Text::Table.new(
+            :head => %w[Name Gem Version Author Description],
+            :rows => array_of_arrays,
+            :horizontal_padding    => 1,
+            :vertical_boundary     => ' ',
+            :horizontal_boundary   => ' ',
+            :boundary_intersection => ' '
+          )
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/scaffold.rb

@@ -2,6 +2,8 @@ require 'fileutils'
 require 'os'
 require 'facets'
 
+# TODO refactor to nest under RakeTask namespace
+
 class Scaffold
   class << self
     include FileUtils
@@ -56,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
       
@@ -177,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
@@ -216,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

data/lib/glimmer/swt/dnd_proxy.rb

@@ -0,0 +1,34 @@
+require 'glimmer/swt/style_constantizable'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.dnd.DND
+    #
+    # Follows the Proxy Design Pattern
+    class DNDProxy            
+      include StyleConstantizable      
+
+      class << self
+        JAVA_IMPORT = 'org.eclipse.swt.dnd.DND'
+        
+        java_import JAVA_IMPORT
+        
+        def constant_java_import 
+          JAVA_IMPORT
+        end
+
+        def constant_source_class
+          DND
+        end
+
+        def constant_value_none
+          DND::DROP_NONE
+        end
+        
+        def extra_styles
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/packages.rb

@@ -1,13 +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'
+      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/style_constantizable.rb

@@ -0,0 +1,120 @@
+require 'glimmer/error'
+
+module Glimmer
+  module SWT
+    # Mixin for all proxy classes that manage style constants (e.g. SWT, DND, etc...)
+    module StyleConstantizable
+      include SuperModule
+      
+      class << self
+        REGEX_SYMBOL_NEGATIVITY = /^([^!]+)(!)?$/
+      
+        def constant_java_import
+          raise 'Not implemented! Mixer must implement!'
+        end
+ 
+        def constant_source_class
+          raise 'Not implemented! Mixer must implement!'
+        end
+ 
+        def constant_value_none
+          raise 'Not implemented! Mixer must implement!'
+        end
+        
+        # hash of extra styles (i.e. new style combinations)
+        def extra_styles
+          raise 'Not implemented! Mixer must implement!'
+        end
+                
+        def error_message_invalid_style
+          " is an invalid #{constant_source_class.name.split(':').last} style! Please choose a style from #{constant_java_import} class constants." # TODO parameterize
+        end
+
+        # Gets constants (e.g. SWT::CONSTANT) where constant is
+        # passed in as a lower case symbol
+        def [](*symbols)
+          symbols = symbols.first if symbols.size == 1 && symbols.first.is_a?(Array)
+          result = symbols.compact.map do |symbol|
+            constant(symbol).tap do |constant_value|
+              raise Glimmer::Error, symbol.to_s + error_message_invalid_style unless constant_value.is_a?(Integer)
+            end
+          end.reduce do |output, constant_value|
+            if constant_value < 0
+              output & constant_value
+            else
+              output | constant_value
+            end
+          end
+          result.nil? ? constant_value_none : result
+        end
+
+        # Returns style integer value for passed in symbol or allows
+        # passed in object to pass through (e.g. Integer). This makes is convenient
+        # to use symbols or actual style integers in Glimmer
+        # Does not raise error for invalid values. Just lets them pass as is.
+        # (look into [] operator if you want an error raised on invalid values)
+        def constant(symbol)
+          return symbol unless symbol.is_a?(Symbol) || symbol.is_a?(String)
+          symbol_string, negative = extract_symbol_string_negativity(symbol)
+          swt_constant_symbol = symbol_string.downcase == symbol_string ? symbol_string.upcase.to_sym : symbol_string.to_sym
+          bit_value = constant_source_class.const_get(swt_constant_symbol)
+          negative ? ~bit_value : bit_value
+        rescue => e
+          begin
+#             Glimmer::Config.logger&.debug(e.full_message)
+            alternative_swt_constant_symbol = constant_source_class.constants.find {|c| c.to_s.upcase == swt_constant_symbol.to_s.upcase}
+            bit_value = constant_source_class.const_get(alternative_swt_constant_symbol)
+            negative ? ~bit_value : bit_value
+          rescue => e
+#             Glimmer::Config.logger&.debug(e.full_message)
+            bit_value = extra_styles[swt_constant_symbol]
+            if bit_value
+              negative ? ~bit_value : bit_value
+            else
+              symbol
+            end
+          end
+        end
+
+        def extract_symbol_string_negativity(symbol)
+          if symbol.is_a?(Symbol) || symbol.is_a?(String)
+            symbol_negativity_match = symbol.to_s.match(REGEX_SYMBOL_NEGATIVITY)
+            symbol = symbol_negativity_match[1]
+            negative = !!symbol_negativity_match[2]
+            [symbol, negative]
+          else
+            negative = symbol < 0
+            [symbol, negative]
+          end
+         end
+
+        def negative?(symbol)
+          extract_symbol_string_negativity(symbol)[1]
+        end
+
+        def has_constant?(symbol)
+          return false unless symbol.is_a?(Symbol) || symbol.is_a?(String)
+          constant(symbol).is_a?(Integer)
+        end
+
+        def constantify_args(args)
+          args.map {|arg| constant(arg)}
+        end
+
+        # Deconstructs a style integer into symbols
+        # Useful for debugging
+        def deconstruct(integer)
+          constant_source_class.constants.reduce([]) do |found, c|
+            constant_value = constant_source_class.const_get(c) rescue -1
+            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
+            is_found ? found += [c] : found
+          end
+        end
+
+        def include?(swt_constant, *symbols)
+          swt_constant & self[symbols] == self[symbols]
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,106 +1,38 @@
-require 'glimmer/error'
+require 'glimmer/swt/style_constantizable'
 
 module Glimmer
-  module SWT # TODO Consider making this the class below to ease calling it
+  module SWT
     # Proxy for org.eclipse.swt.SWT
     #
     # Follows the Proxy Design Pattern
-    class SWTProxy
-      class << self
-        java_import 'org.eclipse.swt.SWT'
-
-        ERROR_INVALID_STYLE = " is an invalid SWT style! Please choose a style from org.eclipse.swt.SWT class constants."
-        REGEX_SYMBOL_NEGATIVITY = /^([^!]+)(!)?$/
-
-        # Gets SWT constants as if calling SWT::CONSTANT where constant is
-        # passed in as a lower case symbol
-        def [](*symbols)
-          symbols = symbols.first if symbols.size == 1 && symbols.first.is_a?(Array)
-          result = symbols.compact.map do |symbol|
-            constant(symbol).tap do |constant_value|
-              raise Error, symbol.to_s + ERROR_INVALID_STYLE unless constant_value.is_a?(Integer)
-            end
-          end.reduce do |output, constant_value|
-            if constant_value < 0
-              output & constant_value
-            else
-              output | constant_value
-            end
-          end
-          result.nil? ? SWT::NONE : result
-        end
-
-        # Returns SWT style integer value for passed in symbol or allows
-        # passed in object to pass through (e.g. Integer). This makes is convenient
-        # to use symbols or actual SWT style integers in Glimmer
-        # Does not raise error for invalid values. Just lets them pass as is.
-        # (look into [] operator if you want an error raised on invalid values)
-        def constant(symbol)
-          return symbol unless symbol.is_a?(Symbol) || symbol.is_a?(String)
-          symbol_string, negative = extract_symbol_string_negativity(symbol)
-          swt_constant_symbol = symbol_string.downcase == symbol_string ? symbol_string.upcase.to_sym : symbol_string.to_sym
-          bit_value = SWT.const_get(swt_constant_symbol)
-          negative ? ~bit_value : bit_value
-        rescue => e
-          begin
-#             Glimmer::Config.logger&.debug(e.full_message)
-            alternative_swt_constant_symbol = SWT.constants.find {|c| c.to_s.upcase == swt_constant_symbol.to_s.upcase}
-            bit_value = SWT.const_get(alternative_swt_constant_symbol)
-            negative ? ~bit_value : bit_value
-          rescue => e
-#             Glimmer::Config.logger&.debug(e.full_message)
-            bit_value = Glimmer::SWT::SWTProxy::EXTRA_STYLES[swt_constant_symbol]
-            if bit_value
-              negative ? ~bit_value : bit_value
-            else
-              symbol
-            end
-          end
-        end
+    class SWTProxy            
+      include StyleConstantizable      
 
-        def extract_symbol_string_negativity(symbol)
-          if symbol.is_a?(Symbol) || symbol.is_a?(String)
-            symbol_negativity_match = symbol.to_s.match(REGEX_SYMBOL_NEGATIVITY)
-            symbol = symbol_negativity_match[1]
-            negative = !!symbol_negativity_match[2]
-            [symbol, negative]
-          else
-            negative = symbol < 0
-            [symbol, negative]
-          end
-         end
-
-        def negative?(symbol)
-          extract_symbol_string_negativity(symbol)[1]
-        end
-
-        def has_constant?(symbol)
-          return false unless symbol.is_a?(Symbol) || symbol.is_a?(String)
-          constant(symbol).is_a?(Integer)
+      class << self
+        JAVA_IMPORT = 'org.eclipse.swt.SWT'
+        
+        java_import JAVA_IMPORT
+        
+        def constant_java_import 
+          JAVA_IMPORT
         end
 
-        def constantify_args(args)
-          args.map {|arg| constant(arg)}
+        def constant_source_class
+          SWT
         end
 
-        # Deconstructs a style integer into symbols
-        # Useful for debugging
-        def deconstruct(integer)
-          SWT.constants.reduce([]) do |found, c|
-            constant_value = SWT.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
-            is_found ? found += [c] : found
-          end
+        def constant_value_none
+          SWT::NONE
         end
-
-        def include?(swt_constant, *symbols)
-          swt_constant & self[symbols] == self[symbols]
+        
+        def extra_styles
+          EXTRA_STYLES
         end
       end
-
+      
       EXTRA_STYLES = {
         NO_RESIZE: self[:shell_trim, :resize!, :max!]
-      }
+      }            
     end
   end
 end

data/lib/glimmer/swt/table_proxy.rb

@@ -68,6 +68,21 @@ module Glimmer
         })
       end
       
+      # Indicates if table is in edit mode, thus displaying a text widget for a table item cell
+      def edit_mode?
+        !!@edit_mode
+      end
+      
+      def cancel_edit!
+        @cancel_edit&.call if @edit_mode
+      end
+
+      def finish_edit!
+        @finish_edit&.call if @edit_mode
+      end
+
+      # Indicates if table is editing a table item because the user hit ENTER or focused out after making a change in edit mode to a table item cell.
+      # It is set to false once change is saved to model
       def edit_in_progress?
         !!@edit_in_progress
       end
@@ -78,24 +93,32 @@ module Glimmer
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
         return if table_item.nil?
+        @cancel_edit&.call if @edit_mode
+        @edit_mode = true
         content {
           @table_editor_text_proxy = text {
             focus true
             text table_item.getText(column_index)
             action_taken = false
-            cancel = lambda {
-              @table_editor_text_proxy.swt_widget.dispose
+            @cancel_edit = lambda do
+              @cancel_in_progress = true
+              @table_editor_text_proxy&.swt_widget&.dispose
               @table_editor_text_proxy = nil
               after_cancel&.call
               @edit_in_progress = false
-            }
-            action = lambda { |event|
-              if !action_taken && !@edit_in_progress
+              @cancel_in_progress = false
+              @cancel_edit = nil
+              @edit_mode = false
+            end
+            @finish_edit = lambda do |event=nil|
+              if table_item.isDisposed
+                @cancel_edit.call
+              elsif !action_taken && !@edit_in_progress && !@cancel_in_progress
                 action_taken = true
                 @edit_in_progress = true
                 new_text = @table_editor_text_proxy.swt_widget.getText
                 if new_text == table_item.getText(column_index)
-                  cancel.call
+                  @cancel_edit.call
                 else
                   before_write&.call
                   table_item.setText(column_index, new_text)
@@ -103,19 +126,19 @@ module Glimmer
                   model.send("#{column_properties[column_index]}=", new_text) # makes table update itself, so must search for selected table item again
                   edited_table_item = search { |ti| ti.getData == model }.first
                   swt_widget.showItem(edited_table_item)
-                  @table_editor_text_proxy.swt_widget.dispose
+                  @table_editor_text_proxy&.swt_widget&.dispose
                   @table_editor_text_proxy = nil
                   after_write&.call(edited_table_item)
                   @edit_in_progress = false
                 end
               end
-            }
-            on_focus_lost(&action)
+            end
+            on_focus_lost(&@finish_edit)
             on_key_pressed { |key_event|
               if key_event.keyCode == swt(:cr)
-                action.call(key_event)
+                @finish_edit.call(key_event)
               elsif key_event.keyCode == swt(:esc)
-                cancel.call
+                @cancel_edit.call
               end
             }
           }

data/lib/glimmer/swt/widget_proxy.rb

@@ -2,6 +2,7 @@ require 'glimmer/swt/widget_listener_proxy'
 require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/dnd_proxy'
 require 'glimmer/data_binding/observable_widget'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
@@ -30,6 +31,8 @@ module Glimmer
         "list"        => [:border, :v_scroll],
         "button"      => [:push],
         "menu_item"   => [:push],
+        "drag_source" => [:drop_copy],
+        "drop_target" => [:drop_copy],
       }
 
       DEFAULT_INITIALIZERS = {
@@ -48,7 +51,7 @@ module Glimmer
         end,
       }
 
-      attr_reader :swt_widget
+      attr_reader :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
 
       # Initializes a new SWT Widget
       #
@@ -72,7 +75,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
 
@@ -81,7 +95,7 @@ module Glimmer
         if widget_custom_attribute
           @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
         else
-          @swt_widget.respond_to?(attribute_setter(attribute_name), args)
+          @swt_widget.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
         end
       end
 
@@ -89,9 +103,11 @@ module Glimmer
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-        else
+        elsif @swt_widget.respond_to?(attribute_setter(attribute_name), args)
           apply_property_type_converters(attribute_name, args)
           @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
+        else
+          send(ruby_attribute_setter(attribute_name), args)
         end
       end
 
@@ -129,6 +145,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|
@@ -251,7 +284,12 @@ module Glimmer
       end
 
       def has_style?(style)
-        (@swt_widget.style & SWTProxy[style]) == SWTProxy[style]
+        begin
+          comparison = SWTProxy[style]
+        rescue
+          comparison = DNDProxy[style]
+        end
+        (@swt_widget.style & comparison) == comparison
       end
 
       def dispose
@@ -268,15 +306,28 @@ 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)
         # TODO consider implementing if remove_observer is needed (consumers can remove listener via SWT API)
       end
 
+      def ensure_drag_source_proxy(style=[])
+        @drag_source_proxy ||= self.class.new('drag_source', self, style).tap do |proxy|
+          proxy.set_attribute(:transfer, :text)
+        end
+      end
+      
+      def ensure_drop_target_proxy(style=[])
+        @drop_target_proxy ||= self.class.new('drop_target', self, style).tap do |proxy|
+          proxy.set_attribute(:transfer, :text)
+          proxy.on_drag_enter { |event|
+            event.detail = DNDProxy[:drop_copy]
+          }          
+        end
+      end
+      
       # TODO eliminate duplication in the following methods perhaps by relying on exceptions
 
       def can_handle_observation_request?(observation_request)
@@ -286,9 +337,31 @@ module Glimmer
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
-          can_add_listener?(event)
-        else
-          false
+          can_add_listener?(event) || can_handle_drag_observation_request?(observation_request) || can_handle_drop_observation_request?(observation_request)
+        end
+      end
+      
+      def can_handle_drag_observation_request?(observation_request)
+        return false unless swt_widget.is_a?(Control)
+        potential_drag_source = @drag_source_proxy.nil?
+        ensure_drag_source_proxy
+        @drag_source_proxy.can_handle_observation_request?(observation_request).tap do |result|
+          if potential_drag_source && !result
+            @drag_source_proxy.swt_widget.dispose
+            @drag_source_proxy = nil
+          end
+        end
+      end
+
+      def can_handle_drop_observation_request?(observation_request)
+        return false unless swt_widget.is_a?(Control)
+        potential_drop_target = @drop_target_proxy.nil?
+        ensure_drop_target_proxy
+        @drop_target_proxy.can_handle_observation_request?(observation_request).tap do |result|
+          if potential_drop_target && !result
+            @drop_target_proxy.swt_widget.dispose
+            @drop_target_proxy = nil
+          end
         end
       end
 
@@ -298,7 +371,14 @@ module Glimmer
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
-          add_listener(event, &block)
+          if can_add_listener?(event)
+            event = observation_request.sub(/^on_/, '')
+            add_listener(event, &block)
+          elsif can_handle_drag_observation_request?(observation_request)
+            @drag_source_proxy&.handle_observation_request(observation_request, &block)
+          elsif can_handle_drop_observation_request?(observation_request)
+            @drop_target_proxy&.handle_observation_request(observation_request, &block)
+          end
         end
       end
 
@@ -310,12 +390,24 @@ module Glimmer
 
       def style(underscored_widget_name, styles)
         styles = [styles].flatten.compact
-        styles.empty? ? default_style(underscored_widget_name) : SWTProxy[*styles]
+        if styles.empty?
+          default_style(underscored_widget_name) 
+        else         
+          begin
+            SWTProxy[*styles]
+          rescue
+            DNDProxy[*styles]
+          end
+        end
       end
 
       def default_style(underscored_widget_name)
         styles = DEFAULT_STYLES[underscored_widget_name] || [:none]
-        SWTProxy[styles]
+        SWTProxy[styles] rescue DNDProxy[styles]
+      end
+
+      def ruby_attribute_setter(attribute_name)
+        "#{attribute_name}="
       end
 
       def attribute_setter(attribute_name)
@@ -339,7 +431,7 @@ module Glimmer
       def add_listener(underscored_listener_name, &block)
         widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }        
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
@@ -416,6 +508,38 @@ module Glimmer
         }
       end
 
+      def drag_source_style=(style)
+        ensure_drag_source_proxy(style)
+      end
+
+      def drop_target_style=(style)
+        ensure_drop_target_proxy(style)
+      end
+
+      def drag_source_transfer=(args)
+        args = args.first if !args.empty? && args.first.is_a?(ArrayJavaProxy)
+        ensure_drag_source_proxy
+        @drag_source_proxy.set_attribute(:transfer, args)
+      end
+
+      def drop_target_transfer=(args)
+        args = args.first if !args.empty? && args.first.is_a?(ArrayJavaProxy)
+        ensure_drop_target_proxy
+        @drop_target_proxy.set_attribute(:transfer, args)
+      end
+
+      def drag_source_effect=(args)
+        args = args.first if args.is_a?(Array)
+        ensure_drag_source_proxy
+        @drag_source_proxy.set_attribute(:drag_source_effect, args)
+      end
+
+      def drop_target_effect=(args)
+        args = args.first if args.is_a?(Array)
+        ensure_drop_target_proxy
+        @drop_target_proxy.set_attribute(:drop_target_effect, args)
+      end
+
       def apply_property_type_converters(attribute_name, args)
         if args.count == 1
           value = args.first
@@ -478,6 +602,25 @@ module Glimmer
               value.to_s
             end
           end,
+          :transfer => lambda do |value|
+            value = value.first if value.is_a?(Array) && value.size == 1 && value.first.is_a?(Array)
+            transfer_object_extrapolator = lambda do |transfer_name|
+              transfer_type = "#{transfer_name.to_s.camelcase(:upper)}Transfer".to_sym
+              transfer_type_alternative = "#{transfer_name.to_s.upcase}Transfer".to_sym
+              transfer_class = org.eclipse.swt.dnd.const_get(transfer_type) rescue org.eclipse.swt.dnd.const_get(transfer_type_alternative)
+              transfer_class.getInstance
+            end
+            result = value
+            if value.is_a?(Symbol) || value.is_a?(String)
+              result = [transfer_object_extrapolator.call(value)]
+            elsif value.is_a?(Array)
+              result = value.map do |transfer_name|
+                transfer_object_extrapolator.call(transfer_name)
+              end
+            end
+            result = result.to_java(Transfer) unless result.is_a?(ArrayJavaProxy)
+            result
+          end,
           :visible => lambda do |value|
             !!value
           end,

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.4
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,7 +65,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: text-table
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -194,7 +214,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-description: Glimmer DSL for SWT (Desktop GUI)
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.23
+  name: coveralls
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.23
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  name: simplecov
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  name: simplecov-lcov
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+description: Glimmer DSL for SWT (Desktop GUI) - JRuby on SWT
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -230,6 +292,7 @@ files:
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
 - lib/glimmer/dsl/swt/display_expression.rb
+- lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
@@ -254,9 +317,11 @@ files:
 - lib/glimmer/launcher.rb
 - lib/glimmer/package.rb
 - lib/glimmer/rake_task.rb
+- lib/glimmer/rake_task/list.rb
 - lib/glimmer/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
+- lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
 - lib/glimmer/swt/layout_proxy.rb
@@ -264,6 +329,7 @@ files:
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.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_proxy.rb