glimmer-dsl-swt 0.6.4 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c0437f480a9bfc7064ec9cf10bc196a3bbb644d8fe20832c02eda79565435a
-  data.tar.gz: 418e810fad2c7f12280b78848931c743d619a8cc28f04f7a438092de9fed12e7
+  metadata.gz: f8cb96b5eda19eb65af0d9fa5b8f79050a341f5f148e78c13a27b18c07cef083
+  data.tar.gz: 6e925dab92f1ea52557c2f9078a1c7b0b0068225644da25ce81677e6d4b9fca4
 SHA512:
-  metadata.gz: dadb4107a2480af548a5e1f79f60b44a798e0ae2aa130e14dae4e1878d7211418c53ab88be39cb8adcfe42a1fc3846b46e06f5e90dccb984299896eef90f15a9
-  data.tar.gz: f902727a93b33a3aa0f013484b44f648fc2f991766f612ebb4e093c932389032417f8fe038de17609f7a28e3324d158419a1e502d07cd822b104658a7b4fb33c
+  metadata.gz: f23a464b36497e60e0379b90a1f17f630d84c0ff01359a89a9dd8cfe008306bbbd779c1b456c3ff17cdbaae331b795b1241597d57b653e063c3aa8af7f463ce7
+  data.tar.gz: 02a87c762461b89acac3385dfb2ab4ea0089e6b3b4320f60e843758e5b28df2036cb4524e8b0851b792576401857de3e77e9981bf92ee98205ddfadf425cbf8a

data/README.md

@@ -1,11 +1,11 @@
-# [<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 0.6.4 (Desktop GUI)
+# [<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 0.6.9 (JRuby 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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/aaf1cba142dd351f84bd/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-swt/maintainability)
 [![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](https://www.eclipse.org/swt/) enables desktop development with [Glimmer](https://github.com/AndyObtiva/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) in [JRuby](https://www.jruby.org/).
 
 [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.
 
@@ -15,6 +15,7 @@ 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)
+- [glimmer-dsl-tk](https://github.com/AndyObtiva/glimmer-dsl-tk): Glimmer DSL for Tk (MRI Ruby Desktop GUI)
 
 ## Example
 

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.9

data/lib/ext/glimmer/config.rb

@@ -1,3 +1,5 @@
+require 'glimmer/config'
+
 module Glimmer
   module Config
     DEFAULT_IMPORT_SWT_PACKAGES = [
@@ -9,6 +11,11 @@ module Glimmer
       'org.eclipse.swt.custom',
       'org.eclipse.swt.dnd',  
     ]
+    
+    # This may be configured with extra sample directories from custom widget/shell gems
+    # following the convention of a `samples/subdirectory` where subdirectory is the 
+    # custom widget/shell name or something representative of a group of samples (e.g. c_date_time).
+    SAMPLE_DIRECTORIES = []
   
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
@@ -48,6 +55,10 @@ module Glimmer
       
       def logging_appender_options
         @@logging_appender_options = {async: true, auto_flushing: 500, write_size: 500, flush_period: 60, immediate_at: [:error, :fatal], layout: logging_layout} unless defined? @@logging_appender_options
+        # TODO make this a glimmer command option
+        if ENV['GLIMMER_LOGGER_ASYNC'].to_s.downcase == 'false'
+          @@logging_appender_options.merge!(async: false, auto_flushing: 1, immediate_at: [:debug, :info, :warn, :error, :fatal])
+        end
         @@logging_appender_options
       end
       
@@ -90,12 +101,16 @@ module Glimmer
           end
           logger.appenders = appenders
         end
+        
       end
+      
     end
+    
   end
+  
 end
 
-Glimmer::Config.reset_logger!
+Glimmer::Config.reset_logger! unless ENV['GLIMMER_LOGGER_ENABLED'].to_s.downcase == 'false'
 if ENV['GLIMMER_LOGGER_LEVEL']
   # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
   Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1)
@@ -106,6 +121,7 @@ if ENV['GLIMMER_LOGGER_LEVEL']
     puts e.message
   end
 end
+
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
   result = false

data/lib/glimmer-dsl-swt.rb

@@ -2,15 +2,11 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
 require 'java'
-if ENV['BUNDLER_REQUIRE'].to_s.downcase == 'true'
-  require 'bundler'
-  Bundler.require
-else
-  require 'glimmer'
-  require 'logging'
-  require 'nested_inherited_jruby_include_package'
-  require 'super_module'
-end
+require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
+require 'glimmer'
+require 'logging'
+require 'nested_inherited_jruby_include_package'
+require 'super_module'
 
 # Internal requires
 require 'ext/glimmer/config'

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -30,7 +30,10 @@ module Glimmer
       end
 
       def call(new_model_collection=nil)
-        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)        
+        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+        table_cells = @table.swt_widget.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
+        model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
+        return if table_cells == model_cells
         if new_model_collection and new_model_collection.is_a?(Array)
           @table_items_observer_registration&.unobserve
           @table_items_observer_registration = observe(new_model_collection, @column_properties)

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

@@ -20,7 +20,13 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::DisplayProxy.instance.swt_display.send(exec_operation, &block)
+          Glimmer::SWT::DisplayProxy.instance.swt_display.send(exec_operation) do |*args|
+            begin
+              block.call(*args)
+            rescue => e
+              Glimmer::Config.logger.error e.full_message
+            end
+          end
         end
       end
     end

data/lib/glimmer/launcher.rb

@@ -1,39 +1,30 @@
 require 'fileutils'
-
-require_relative 'rake_task'
+require 'os'
 
 module Glimmer
   class Launcher
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
-    TEXT_USAGE_PREFIX = <<~MULTI_LINE_STRING
+    TEXT_USAGE = <<~MULTI_LINE_STRING
       Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
       Usage: glimmer [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
-      Runs Glimmer applications/tasks.
-    
-      Either a single task or one or more applications may be specified.
-    
-      When a task is specified, it runs via rake. Some tasks take arguments in square brackets.
-    
-      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
-    MULTI_LINE_STRING
-
-    TEXT_USAGE_SUFFIX = <<~MULTI_LINE_STRING
+      Runs Glimmer applications and tasks.    
     
       When applications are specified, they are run using JRuby, 
       automatically preloading the glimmer Ruby gem and SWT jar dependency.
     
-      Optionally, extra Glimmer options, JRuby options and environment variables may be passed in.
+      Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
     
       Glimmer options:
       - "--quiet"           : Does not announce file path of Glimmer application being launched
       - "--debug"           : Displays extra debugging information, passes "--debug" to JRuby, and enables debug logging
       - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is none)
     
-      Example: glimmer samples/hello_world.rb
+      Tasks are run via rake. Some tasks take arguments in square brackets.
     
-      This runs the Glimmer application samples/hello_world.rb
+      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
+      
     MULTI_LINE_STRING
 
     GLIMMER_LIB_LOCAL = File.expand_path(File.join('lib', 'glimmer-dsl-swt.rb'))
@@ -108,6 +99,7 @@ module Glimmer
         if the_glimmer_lib == GLIMMER_LIB_LOCAL
           devmode_require = '-r puts_debuggerer '
         end
+        require_relative 'rake_task'
         rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
          
         # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
@@ -180,14 +172,36 @@ module Glimmer
     end
 
     def display_usage
-      rakefile_dir = File.exist?('Rakefile') ? '.' : File.dirname(__FILE__)
-      FileUtils.cd(rakefile_dir) do
-        rake_tasks = `rake -T`.gsub('rake glimmer:', 'glimmer ').split("\n").select {|l| l.start_with?('glimmer ')}
-        puts TEXT_USAGE_PREFIX
-        puts rake_tasks.join("\n")
-        puts TEXT_USAGE_SUFFIX
+      puts TEXT_USAGE
+      display_tasks
+    end
+    
+    def display_tasks
+      if OS.windows?
+        tasks = Rake.application.tasks
+        task_lines = tasks.reject do |task|
+          task.comment.nil?
+        end.map do |task|
+          max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
+          task_name = task.name_with_args.sub('glimmer:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+          bound = TTY::Screen.width - 6
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
+        end
+        puts task_lines.to_a
+      else
+        require 'rake-tui'
+        require 'tty-screen'
+        require_relative 'rake_task'
+        Rake::TUI.run(branding_header: nil, prompt_question: 'Select a Glimmer task to run:') do |task, tasks|
+          max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
+          task_name = task.name_with_args.sub('glimmer:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+          bound = TTY::Screen.width - 6
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
+        end    
       end
-    end    
+    end
 
     def extract_application_paths(options)
       options.select do |option|

data/lib/glimmer/rake_task.rb

@@ -2,102 +2,91 @@ require 'rake'
 
 require_relative 'package'
 
+ENV['GLIMMER_LOGGER_ENABLED'] = 'false'
+require_relative '../ext/glimmer/config.rb'
+
+Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/hello', __FILE__)
+Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/elaborate', __FILE__)
+
 namespace :glimmer do
   namespace :sample do
+    task :requires do
+      require 'text-table'
+      require 'facets/string/titlecase'
+      require 'facets/string/underscore'
+      
+      require_relative 'launcher'        
+    end
+    
+    task :glimmer_gems do
+      glimmer_cw_gems = Gem.find_latest_files('glimmer-cw-*')
+      glimmer_cs_gems = Gem.find_latest_files('glimmer-cs-*')
+      glimmer_dsl_gems = Gem.find_latest_files('glimmer-dsl-*')
+      glimmer_gem_lib_files = glimmer_cw_gems + glimmer_cs_gems + glimmer_dsl_gems
+      glimmer_gem_lib_files = glimmer_gem_lib_files.map {|file| file.sub(/\.rb$/, '')}.uniq.reject {|file| file.include?('glimmer-cs-gladiator')}
+      glimmer_gem_lib_files.each {|file| require file}    
+    end
+  
     desc 'Runs a Glimmer internal sample [included in gem]. If no name is supplied, it runs all samples.'
-    task :run, [:name] => :requires do |t, args|
+    task :run, [:name] => [:requires, :glimmer_gems] do |t, args|
       name = args[:name]
       name = name.underscore.downcase unless name.nil?
-      samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).sort
+      samples = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).sort
       samples = samples.select {|path| path.include?("#{name}.rb")} unless name.nil?      
       Rake::Task['glimmer:sample:code'].invoke(name) if samples.size == 1
       Glimmer::Launcher.new(samples << '--quiet=false').launch
     end
     
-    namespace :run do    
-      task :hello do
-        samples = Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)).sort
-        Glimmer::Launcher.new(samples << '--quiet=false').launch        
-      end    
-      
-      task :elaborate do
-        samples = Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__)).sort
-        Glimmer::Launcher.new(samples << '--quiet=false').launch        
-      end    
-    end
-  
     desc 'Lists Glimmer internal samples [included in gem]. Filters by query if specified (query is optional)'
-    task :list, [:query] do |t, args|
-      Rake::Task['glimmer:sample:list:hello'].invoke(args[:query])
-      Rake::Task['glimmer:sample:list:elaborate'].invoke(args[:query])
-    end
-    
-    namespace :list do
-      task :hello, [:query] => :requires do |t, args|
-        array_of_arrays = Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)).map do |path| 
+    task :list, [:query] => [:requires, :glimmer_gems] do |t, args|
+      Glimmer::Config::SAMPLE_DIRECTORIES.each do |dir|
+        sample_group_name = File.basename(dir)
+        human_sample_group_name = sample_group_name.underscore.titlecase
+        array_of_arrays = Dir.glob(File.join(dir, '*.rb')).map do |path| 
           File.basename(path, '.rb')
         end.select do |path| 
           args[:query].nil? || path.include?(args[:query])
         end.map do |path| 
           [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
         end.sort
-        puts 
-        puts "  Glimmer Hello Samples (run all via: #{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run:hello):"
-        puts Text::Table.new(
-          :head => %w[Name Description Run],
-          :rows => array_of_arrays,
-          :horizontal_padding    => 1,
-          :vertical_boundary     => ' ',
-          :horizontal_boundary   => ' ',
-          :boundary_intersection => ' '
-        )        
+        if array_of_arrays.empty?
+          puts "No Glimmer #{human_sample_group_name} Samples match the query."
+        else
+          puts 
+          puts "  Glimmer #{human_sample_group_name} Samples:"
+          puts Text::Table.new(
+            :head => %w[Name Description Run],
+            :rows => array_of_arrays,
+            :horizontal_padding    => 1,
+            :vertical_boundary     => ' ',
+            :horizontal_boundary   => ' ',
+            :boundary_intersection => ' '
+          )        
+        end
       end
-      
-      task :elaborate, [:query] => :requires do |t, args|
-        array_of_arrays = Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__)).map do |path| 
-          File.basename(path, '.rb')
-        end.select do |path| 
-          args[:query].nil? || path.include?(args[:query])
-        end.map do |path| 
-          [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
-        end.sort
-        puts 
-        puts "  Glimmer Elaborate Samples (run all via: #{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run:elaborate):"
-        puts Text::Table.new(
-          :head => %w[Name Description Run],
-          :rows => array_of_arrays,
-          :horizontal_padding    => 1,
-          :vertical_boundary     => ' ',
-          :horizontal_boundary   => ' ',
-          :boundary_intersection => ' '
-        )        
-      end      
     end
-  
+    
     desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
-    task :code, [:name] => :requires do |t, args|
-      samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).sort
+    task :code, [:name] => [:requires, :glimmer_gems] do |t, args|
+      require 'tty-markdown' unless OS.windows?
+      samples = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).sort
       sample = samples.detect {|path| path.include?("#{args[:name].to_s.underscore.downcase}.rb")}
       sample_additional_files = Dir.glob(File.join(sample.sub('.rb', ''), '**', '*.rb'))
-      ([sample] + sample_additional_files).each do |file|
-        puts
-        puts "# #{file}"
-        puts
-        puts File.read(file)
-        puts
-        puts '# # #'
-        puts
-      end
+      code = ([sample] + sample_additional_files).map do |file|
+        <<~RUBY
+        
+        # #{file}
+        
+        #{File.read(file)}
+        
+        # # #
+        
+        RUBY
+      end.join("\n")
+      code = TTY::Markdown.parse("```ruby\n#{code}\n```") unless OS.windows?
+      puts code
     end
     
-    task :requires do
-      require 'text-table'
-      require 'facets/string/titlecase'
-      require 'facets/string/underscore'
-      
-      require_relative 'launcher'        
-    end
-  
   end
 
   namespace :package do
@@ -137,7 +126,6 @@ namespace :glimmer do
     Rake::Task['glimmer:package:native'].execute(args)
   end
 
-
   desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
     require_relative 'scaffold'

data/lib/glimmer/scaffold.rb

@@ -4,6 +4,8 @@ require 'facets'
 
 # TODO refactor to nest under RakeTask namespace
 
+MAIN_OBJECT = self
+
 class Scaffold
   class << self
     include FileUtils
@@ -179,6 +181,13 @@ class Scaffold
     def custom_shell_gem(custom_shell_name, namespace)
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
       gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
+      begin
+        custom_shell_keyword = dsl_widget_name(custom_shell_name)
+        MAIN_OBJECT.method(custom_shell_keyword)
+        return puts("CustomShell keyword `#{custom_shell_keyword}` is unavailable (occupied by a built-in Ruby method)! Please pick a different name.")
+      rescue NameError
+        # No Op (keyword is not taken by a built in Ruby method)
+      end
       if namespace
         gem_name += "-#{compact_name(namespace)}"
         gem_summary += " (#{human_name(namespace)})"
@@ -350,12 +359,19 @@ class Scaffold
     end
 
     def gem_bin_file(gem_name, custom_shell_name, namespace)
+      # TODO change this so that it does not mix Glimmer unto the main object
       <<~MULTI_LINE_STRING
         require_relative '../lib/#{gem_name}'
         
-        include Glimmer
+        class #{class_name(custom_shell_name)}App
+          include Glimmer
+        
+          def open
+            #{dsl_widget_name(custom_shell_name)}.open
+          end
+        end
         
-        #{dsl_widget_name(custom_shell_name)}.open
+        #{class_name(custom_shell_name)}App.new.open
       MULTI_LINE_STRING
     end
 
@@ -394,7 +410,7 @@ class Scaffold
             " -name '#{human_name(custom_shell_name)}'" +
             " -title '#{human_name(custom_shell_name)}'" +
             " -Bmac.CFBundleName='#{human_name(custom_shell_name)}'" +
-            " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name)}'" 
+            " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name).capitalize}'" 
             # " -BlicenseType=" +
             # " -Bmac.category=" +
             # " -Bmac.signing-key-developer-id-app="

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,7 +1,6 @@
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/display_proxy'
-require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT

data/lib/glimmer/swt/style_constantizable.rb

@@ -18,6 +18,7 @@ module Glimmer
         end
  
         def constant_value_none
+          # TODO instead of raising error try a convention instead like CLASSNAME::NONE by default
           raise 'Not implemented! Mixer must implement!'
         end
         

data/lib/glimmer/swt/table_proxy.rb

@@ -36,7 +36,8 @@ module Glimmer
       class << self
         def editors
           @editors ||= {
-            text: {
+            # ensure editor can work with string keys not just symbols (leave one string in for testing)
+            'text' => {
               widget_value_property: :text,
               editor_gui: lambda do |args, model, property, table_proxy|
                 table_proxy.table_editor.minimumHeight = 20
@@ -209,9 +210,19 @@ module Glimmer
         @editor = args
       end 
       
+      def cells_for(model)
+        column_properties.map {|property| model.send(property)}
+      end
+      
+      def cells
+        column_count = @table.column_properties.size
+        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+      end
+      
       def sort
         return unless sort_property && (sort_type || sort_block || sort_by_block)
         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)
@@ -293,6 +304,7 @@ module Glimmer
       end
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+        require 'facets/hash/symbolize_keys'
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -304,10 +316,10 @@ module Glimmer
         editor_config = editor_config.to_a
         editor_widget_options = editor_config.last.is_a?(Hash) ? editor_config.last : {}
         editor_widget_arg_last_index = editor_config.last.is_a?(Hash) ? -2 : -1
-        editor_widget = editor_config[0] || :text
+        editor_widget = (editor_config[0] || :text).to_sym
         editor_widget_args = editor_config[1..editor_widget_arg_last_index]
         model_editing_property = editor_widget_options[:property] || property
-        widget_value_property = TableProxy::editors[editor_widget][:widget_value_property]
+        widget_value_property = TableProxy::editors.symbolize_keys[editor_widget][:widget_value_property]
         
         @cancel_edit = lambda do |event=nil|
           @cancel_in_progress = true
@@ -344,7 +356,7 @@ module Glimmer
         end
 
         content { 
-          @table_editor_widget_proxy = TableProxy::editors[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
+          @table_editor_widget_proxy = TableProxy::editors.symbolize_keys[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
         }
         @table_editor.setEditor(@table_editor_widget_proxy.swt_widget, table_item, column_index)
       rescue => e

data/lib/glimmer/swt/widget_proxy.rb

@@ -25,6 +25,7 @@ module Glimmer
         "arrow"               => [:arrow],
         "button"              => [:push],
         "checkbox"            => [:check],
+        "check"               => [:check],
         "drag_source"         => [:drop_copy],
         "drop_target"         => [:drop_copy],
         "list"                => [:border, :v_scroll],
@@ -41,21 +42,17 @@ module Glimmer
 
       DEFAULT_INITIALIZERS = {
         "composite" => lambda do |composite|
-          layout = GridLayout.new
-          layout.marginWidth = 15
-          layout.marginHeight = 15
-          composite.layout = layout
+          if composite.get_layout.nil?
+            layout = GridLayout.new
+            layout.marginWidth = 15
+            layout.marginHeight = 15
+            composite.layout = layout
+          end
         end,
         "scrolled_composite" => lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
           scrolled_composite.expand_vertical = true
         end,
-        "shell" => lambda do |shell|
-          layout = FillLayout.new
-          layout.marginWidth = 15
-          layout.marginHeight = 15
-          shell.layout = layout
-        end,
         "table" => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
@@ -64,17 +61,35 @@ module Glimmer
           table_column.setWidth(80)
         end,
         "group" => lambda do |group|
-          group.setLayout(GridLayout.new)
+          group.layout = GridLayout.new if group.get_layout.nil?
         end,
       }
       
+      KEYWORD_ALIASES = {
+        'radio'          => 'button',
+        'checkbox'       => 'button',
+        'check'          => 'button',
+        'toggle'         => 'button',
+        'arrow'          => 'button',
+      }
+      
       class << self
-        def create(keyword, parent, args)
-          widget_proxy_class(keyword).new(keyword, parent, args)
+        # Instantiates the right WidgetProxy subclass for passed in keyword
+        # Args are: keyword, parent, swt_widget_args (including styles)
+        def create(*init_args, swt_widget: nil)
+          return swt_widget.get_data('proxy') if swt_widget&.get_data('proxy')
+          keyword, parent, args = init_args
+          selected_widget_proxy_class = widget_proxy_class(keyword || underscored_widget_name(swt_widget))
+          if init_args.empty?
+            selected_widget_proxy_class.new(swt_widget: swt_widget)
+          else
+            selected_widget_proxy_class.new(*init_args)            
+          end
         end
         
         def widget_proxy_class(keyword)
           begin
+            keyword = KEYWORD_ALIASES[keyword] if KEYWORD_ALIASES[keyword]
             class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
             Glimmer::SWT.const_get(class_name)
           rescue
@@ -88,11 +103,16 @@ module Glimmer
       end
 
       attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
-
+      
       # Initializes a new SWT Widget
       #
+      # It is preferred to use `::create` method instead since it instantiates the 
+      # right subclass per widget keyword
+      #
+      # keyword, parent, swt_widget_args (including styles)
+      #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
-      def initialize(*init_args, swt_widget: nil)      
+      def initialize(*init_args, swt_widget: nil)
         if swt_widget.nil?
           underscored_widget_name, parent, args = init_args
           @parent_proxy = parent
@@ -103,11 +123,14 @@ module Glimmer
           @swt_widget = swt_widget
           underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
           parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
-          @parent_proxy = parent_proxy_class.new(swt_widget: swt_widget.parent)
+          parent = swt_widget.parent
+          @parent_proxy = parent.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
+        end
+        if @swt_widget&.get_data('proxy').nil?
+          @swt_widget.set_data('proxy', self)          
+          DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
+          @parent_proxy.post_initialize_child(self)
         end
-        @swt_widget.set_data('proxy', self)          
-        DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
-        @parent_proxy.post_initialize_child(self)
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -315,7 +338,7 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
-        underscored_widget_name = 'button' if %w[radio checkbox toggle arrow].include?(underscored_widget_name)
+        underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
@@ -342,11 +365,7 @@ module Glimmer
       end
 
       def has_style?(style)
-        begin
-          comparison = SWTProxy[style]
-        rescue
-          comparison = DNDProxy[style]
-        end
+        comparison = interpret_style(style)
         (@swt_widget.style & comparison) == comparison
       end
 
@@ -457,6 +476,7 @@ module Glimmer
       rescue => e
         Glimmer::Config.logger.debug {"Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
         super
+        # TODO consider get_attribute too
       end
       
       def respond_to?(method, *args, &block)
@@ -468,21 +488,17 @@ module Glimmer
       private
 
       def style(underscored_widget_name, styles)
-        styles = [styles].flatten.compact
-        if styles.empty?
-          default_style(underscored_widget_name) 
-        else         
-          begin
-            SWTProxy[*styles]
-          rescue
-            DNDProxy[*styles]
-          end
-        end
+        styles = [styles].flatten.compact        
+        styles = default_style(underscored_widget_name) if styles.empty?
+        interpret_style(*styles)
+      end
+      
+      def interpret_style(*styles)
+        SWTProxy[*styles] rescue DNDProxy[*styles]
       end
 
       def default_style(underscored_widget_name)
-        styles = DEFAULT_STYLES[underscored_widget_name] || [:none]
-        SWTProxy[styles] rescue DNDProxy[styles]
+        DEFAULT_STYLES[underscored_widget_name] || [:none]
       end
 
       def ruby_attribute_setter(attribute_name)

data/samples/elaborate/user_profile.rb

@@ -0,0 +1,55 @@
+include Glimmer
+
+shell {
+  text "User Profile"
+
+  composite {
+    grid_layout 2, false
+
+    group {
+      text "Name"
+      grid_layout 2, false
+      layout_data :fill, :fill, true, true
+      label {text "First"}; text {text "Bullet"}
+      label {text "Last"}; text {text "Tooth"}  
+    }
+
+    group {
+      layout_data :fill, :fill, true, true
+      text "Gender"
+      radio {text "Male"; selection true}
+      radio {text "Female"}  
+    }
+
+    group {
+      layout_data :fill, :fill, true, true
+      text "Role"
+      check {text "Student"; selection true}
+      check {text "Employee"; selection true}  
+    }
+
+    group {
+      text "Experience"
+      row_layout
+      layout_data :fill, :fill, true, true
+      spinner {selection 5}; label {text "years"}
+    }
+
+    button {
+      text "save"
+      layout_data :right, :center, true, true
+      on_widget_selected { 
+        message_box {
+          text 'Profile Saved!'
+          message 'User profile has been saved!'
+        }.open 
+      }
+    }
+
+    button {
+      text "close"
+      layout_data :left, :center, true, true
+      on_widget_selected { exit(0) }
+    }
+  }
+}.open

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.9
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,7 +65,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  name: rake-tui
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -200,6 +214,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  name: tty-markdown
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -290,7 +324,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for SWT (Desktop GUI) - JRuby on SWT
+description: Glimmer DSL for SWT (JRuby Desktop GUI)
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -392,6 +426,7 @@ files:
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb
+- samples/elaborate/user_profile.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_combo.rb
 - samples/hello/hello_computed.rb