glimmer-dsl-swt 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f75e570d4a595c012b464d8dffa7149200385d8053dc39640d5be59d8f4980c
-  data.tar.gz: 1fbd61272f851ffa8aa1f6dbcf0afa57e898147c3982f69a180018a2d5d0e6c3
+  metadata.gz: f8cb96b5eda19eb65af0d9fa5b8f79050a341f5f148e78c13a27b18c07cef083
+  data.tar.gz: 6e925dab92f1ea52557c2f9078a1c7b0b0068225644da25ce81677e6d4b9fca4
 SHA512:
-  metadata.gz: 3c78fc793f87813acaf59b2732a362fc37da683c79b2610dc7d9d74c37ddd56ee1ac5d33209ee509d2cc1a3c62a0fb5db56b8275d88a93b6c4d7e8c5906511b0
-  data.tar.gz: 90941e2906ecc6c87e6685f8c8ff62fda790a43c3af519761011cefa56466336e5705e8deb49e25eeef60020a7cf6ab65c19c7c3f1c1a0f325158053bcf778c4
+  metadata.gz: f23a464b36497e60e0379b90a1f17f630d84c0ff01359a89a9dd8cfe008306bbbd779c1b456c3ff17cdbaae331b795b1241597d57b653e063c3aa8af7f463ce7
+  data.tar.gz: 02a87c762461b89acac3385dfb2ab4ea0089e6b3b4320f60e843758e5b28df2036cb4524e8b0851b792576401857de3e77e9981bf92ee98205ddfadf425cbf8a

data/README.md

@@ -1,4 +1,4 @@
-# [<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.8 (JRuby 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)

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

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

@@ -19,14 +19,12 @@ namespace :glimmer do
     end
     
     task :glimmer_gems do
-      glimmer_gem_lib_files = Dir.glob(File.join(Gem.dir, 'gems', '*')).to_a.select do |gem_path| 
-        !!File.basename(gem_path).match(/glimmer-cw|glimmer-cs|glimmer-dsl/)
-      end.map do |gem_path|
-        Dir.glob(File.join(gem_path, 'lib/*.rb')).detect {|lib| gem_path.include?(File.basename(lib, '.rb')) }
-      end.uniq do |gem_lib_file|
-        File.basename(gem_lib_file)
-      end
-      glimmer_gem_lib_files.each {|file| require file.sub(/\.rb$/, '')}    
+      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.'

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
@@ -303,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]
@@ -314,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
@@ -354,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

@@ -74,8 +74,17 @@ module Glimmer
       }
       
       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)
@@ -97,8 +106,13 @@ module Glimmer
       
       # 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
@@ -109,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
@@ -348,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
 
@@ -475,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - AndyMaleh