glimmer-dsl-swt 0.6.1 → 0.6.6

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
@@ -73,7 +75,8 @@ class Scaffold
       
       # Glimmer
       dist
-      packages      
+      packages
+      vendor/jars
     MULTI_LINE_STRING
 
     GEMFILE = <<~MULTI_LINE_STRING
@@ -109,7 +112,6 @@ class Scaffold
     MULTI_LINE_STRING
 
     def app(app_name)
-      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 = file_name(app_name)
       gem_summary = human_name(app_name)
       system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
@@ -127,17 +129,22 @@ class Scaffold
       mkdir 'app/models'
       mkdir 'app/views'
       custom_shell('AppView', current_dir_name, :app)
-      if OS::Underlying.windows?
-        mkdir_p 'package/windows'
-        icon_file = "package/windows/#{human_name(app_name)}.ico"
-        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      elsif OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(app_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      end
+        
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(app_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(app_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+    
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(app_name)}.png"
+      cp File.expand_path('../../../icons/scaffold_app.png', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+    
       mkdir 'bin'
       write "bin/#{file_name(app_name)}", app_bin_file(app_name)
       write 'spec/spec_helper.rb', spec_helper_file
@@ -147,9 +154,12 @@ class Scaffold
         system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
       else
         system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-        system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app" if OS.mac?
+        if OS.mac?
+          system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
+        else
+          system "glimmer bin/#{file_name(app_name)}"
+        end
       end
-      # TODO generate rspec test suite
     end
 
     def custom_shell(custom_shell_name, namespace, shell_type = nil)
@@ -169,13 +179,20 @@ 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"
+      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)})"
       else
+        return puts('Namespace is required! Usage: glimmer scaffold:gem:customshell[name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
         namespace = 'glimmer'
       end
       system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
@@ -194,24 +211,33 @@ class Scaffold
       write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name)
       FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
       write 'spec/spec_helper.rb', spec_helper_file
-      if OS::Underlying.windows?
-        mkdir_p 'package/windows'
-        icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
-        cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      elsif OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      end
+
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+        
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(custom_shell_name)}.png"
+      cp File.expand_path('../../../icons/scaffold_app.png', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
       if OS.windows?
         system "bundle"
         system "glimmer package[image]"
         system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
       else
         system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-        system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+        if OS.mac?
+          system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+        else
+          system "bin/#{file_name(custom_shell_name)}"
+        end        
       end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
@@ -333,18 +359,25 @@ 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
 
     def gem_bin_command_file(gem_name)
       <<~MULTI_LINE_STRING
-        #!/usr/bin/env ruby
+        #!/usr/bin/env jruby
         
         require 'glimmer/launcher'
         
@@ -489,7 +522,7 @@ class Scaffold
           menu {
             text '&File'
             menu_item {
-              text 'Preferences...'
+              text '&Preferences...'
               on_widget_selected {
                 display_preferences_dialog
               }

data/lib/glimmer/swt/display_proxy.rb

@@ -35,16 +35,26 @@ module Glimmer
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
+      end      
 
       def method_missing(method, *args, &block)
-        swt_display.send(method, *args, &block)
+        if can_handle_observation_request?(method)
+          handle_observation_request(method, &block)
+        else
+          swt_display.send(method, *args, &block)
+        end
       rescue => e
         Glimmer::Config.logger.debug {"Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"}
         super
       end
       
       def respond_to?(method, *args, &block)
-        super || swt_display.respond_to?(method, *args, &block)
+        super || 
+          can_handle_observation_request?(method) ||        
+          swt_display.respond_to?(method, *args, &block)
       end
 
       def can_handle_observation_request?(observation_request)
@@ -61,6 +71,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)

data/lib/glimmer/swt/image_proxy.rb

@@ -8,7 +8,7 @@ module Glimmer
     class ImageProxy
       include_package 'org.eclipse.swt.graphics'
       
-      attr_reader :jar_file_path, :image_data
+      attr_reader :file_path, :jar_file_path, :image_data, :swt_image
 
       # Initializes a proxy for an SWT Image object
       #
@@ -17,31 +17,24 @@ module Glimmer
       # and returns an image object.
       def initialize(*args)
         @args = args
-        @jar_file_path = @args.first if @args.first.is_a?(String) && @args.size == 1
-        
-      end
-
-      def swt_image
-        unless @swt_image
-          if @jar_file_path
-            file_path = @jar_file_path
-            if file_path.start_with?('uri:classloader')
-              file_path = file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
-              object = java.lang.Object.new
-              file_input_stream = object.java_class.resource_as_stream(file_path)
-              buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
-            end
-            @image_data = ImageData.new(buffered_file_input_stream || file_path)
-            @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
-          else
-            @swt_image = Image.new(*@args)
+        @file_path = @args.first if @args.first.is_a?(String) && @args.size == 1        
+        if @file_path
+          if @file_path.start_with?('uri:classloader')
+            @jar_file_path = @file_path
+            @file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
+            object = java.lang.Object.new
+            file_input_stream = object.java_class.resource_as_stream(file_path)
+            buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
           end
-        end
-        @swt_image
+          @image_data = ImageData.new(buffered_file_input_stream || @file_path)
+          @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+        else
+          @swt_image = Image.new(*@args)
+          @image_data = @swt_image.image_data
+        end        
       end
-      
+
       def scale_to(width, height)
-        return @swt_image if image_data.nil?
         scaled_image_data = image_data.scaledTo(width, height)
         device = swt_image.device
         swt_image.dispose

data/lib/glimmer/swt/layout_proxy.rb

@@ -45,6 +45,8 @@ module Glimmer
         @widget_proxy = widget_proxy
         args = SWTProxy.constantify_args(args)
         @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
+        @swt_layout.marginWidth = 15 if @swt_layout.respond_to?(:marginWidth)
+        @swt_layout.marginHeight = 15 if @swt_layout.respond_to?(:marginHeight)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
       end
 

data/lib/glimmer/swt/message_box_proxy.rb

@@ -14,16 +14,22 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
-        parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
-        @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget if parent.nil?
-        @swt_widget = MessageBox.new(parent, style)
+        if parent.nil?
+          @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
+        end
+        @swt_widget = MessageBox.new(parent, style)        
       end
       
       def open
-        @swt_widget.open
-        @temporary_parent&.dispose
+        @swt_widget.open.tap do |result|
+          @temporary_parent&.dispose
+        end
       end
       
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
+      end            
+      
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
       def attribute_setter(attribute_name)
@@ -44,6 +50,18 @@ module Glimmer
 
       def get_attribute(attribute_name)
         @swt_widget.send(attribute_getter(attribute_name))
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || 
+          swt_widget.respond_to?(method, *args, &block)
       end      
     end
   end

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -1,21 +1,16 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_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
-      
+    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy    
       def post_initialize_child(child)
         swt_widget.content = child.swt_widget        
       end
+      
+      def post_add_content
+        swt_widget.set_min_size(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]))
+      end      
     end
   end
 end

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

@@ -85,7 +85,55 @@ module Glimmer
                 }
                 table_editor_widget_proxy
               end,
-            }
+            },
+            checkbox: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                checkbox(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            },
+            radio: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                radio(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            }            
           }      
         end
       end
@@ -161,9 +209,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)
@@ -276,7 +334,7 @@ module Glimmer
           new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
           if table_item.isDisposed
             @cancel_edit.call
-          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+          elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
             action_taken = true
             @edit_in_progress = true
             if new_value == model.send(model_editing_property)