glimmer-dsl-swt 4.17.10.3 → 4.17.10.8

data/VERSION

@@ -1 +1 @@
-4.17.10.3
+4.17.10.8

data/glimmer-dsl-swt.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.10.3 ruby lib
+# stub: glimmer-dsl-swt 4.17.10.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.10.3"
+  s.version = "4.17.10.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-11-24"
-  s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
+  s.date = "2020-12-17"
+  s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
   s.extra_rdoc_files = [
@@ -131,6 +131,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/tic_tac_toe/cell.rb",
     "samples/elaborate/user_profile.rb",
     "samples/hello/hello_browser.rb",
+    "samples/hello/hello_button.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
@@ -144,6 +145,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_expand_bar.rb",
     "samples/hello/hello_file_dialog.rb",
     "samples/hello/hello_group.rb",
+    "samples/hello/hello_link.rb",
     "samples/hello/hello_list_multi_selection.rb",
     "samples/hello/hello_list_single_selection.rb",
     "samples/hello/hello_menu_bar.rb",
@@ -172,17 +174,17 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.4"])
-    s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
-    s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
-    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
+    s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
+    s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
+    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
     s.add_runtime_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
     s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
     s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.25.0", "< 4.0.0"])
+    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.26.0", "< 4.0.0"])
     s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
@@ -191,17 +193,17 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.4"])
-    s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
-    s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
-    s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.6"])
+    s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
+    s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
+    s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
     s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
     s.add_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
     s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
     s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_dependency(%q<rouge>.freeze, [">= 3.25.0", "< 4.0.0"])
+    s.add_dependency(%q<rouge>.freeze, [">= 3.26.0", "< 4.0.0"])
     s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -38,16 +38,16 @@ module Glimmer
         @model_binding = model_binding
         @table.swt_widget.data = @model_binding
         @column_properties = column_properties
+        @table.on_widget_disposed do |dispose_event|
+          unregister_all_observables
+        end
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties
         else # assume custom widget
           @table.body_root.column_properties = @column_properties
         end
-        call(@model_binding.evaluate_property)
         @table_observer_registration = observe(model_binding)
-        @table.on_widget_disposed do |dispose_event|
-          unregister_all_observables
-        end
+        call
       end
 
       def call(new_model_collection=nil)
@@ -65,7 +65,7 @@ module Glimmer
       end
       
       def populate_table(model_collection, parent, column_properties)
-        selected_table_item_models = parent.swt_widget.getSelection.map(&:getData)
+        selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
         parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
@@ -74,11 +74,10 @@ module Glimmer
           for index in 0..(column_properties.size-1)
             table_item.setText(index, model.send(column_properties[index]).to_s)
           end
-          table_item.setData(model)
+          table_item.set_data(model)
         end
-        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.getData) }
-        selected_table_items = [parent.swt_widget.getItems.first].to_java(TableItem) if selected_table_items.empty? && !parent.swt_widget.getItems.empty?
-        parent.swt_widget.setSelection(selected_table_items) unless selected_table_items.empty?
+        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
+        parent.swt_widget.setSelection(selected_table_items)
         parent.sort!
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -69,7 +69,7 @@ module Glimmer
         old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
         old_tree_items.each do |tree_item|
           tree_item.getData('observer_registrations').each(&:unregister)
-        end        
+        end
         parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
@@ -85,9 +85,9 @@ module Glimmer
           array + [observe(model_tree_node, key_value_pair.last)]
         end
         
-        tree_item.setData('observer_registrations', observer_registrations)
-        tree_item.setData(model_tree_node)
-        tree_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
+        tree_item.set_data('observer_registrations', observer_registrations)
+        tree_item.set_data(model_tree_node)
+        tree_item.text = (model_tree_node && model_tree_node.send(tree_properties[:text])).to_s
         [model_tree_node && model_tree_node.send(tree_properties[:children])].flatten.to_a.compact.each do |child|
           populate_tree_node(child, tree_item, tree_properties)
         end

data/lib/glimmer/swt/menu_proxy.rb

@@ -66,7 +66,6 @@ module Glimmer
         else
           @swt_widget = swt_widget_class.new(parent.swt_widget)
         end
-        DEFAULT_INITIALIZERS['menu']&.call(swt_widget)
 
         if styles.include?(:bar)
           parent.swt_widget.setMenuBar(swt_widget)

data/lib/glimmer/swt/table_proxy.rb

@@ -245,7 +245,7 @@ module Glimmer
         end
       end
       
-      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable, :initial_sort_property
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable
       attr_accessor :column_properties
       alias editable? editable
       
@@ -353,19 +353,6 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
-      def editor=(args)
-        @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
@@ -395,6 +382,19 @@ module Glimmer
         model_binding.call(sorted_array)
       end
       
+      def editor=(args)
+        @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
+            
       # Performs a search for table items matching block condition
       # If no condition block is passed, returns all table items
       # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed

data/lib/glimmer/swt/widget_proxy.rb

@@ -69,7 +69,7 @@ module Glimmer
       }
 
       DEFAULT_INITIALIZERS = {
-        'composite' => lambda do |composite|
+        composite: lambda do |composite|
           if composite.get_layout.nil?
             layout = GridLayout.new
             layout.marginWidth = 15
@@ -77,18 +77,18 @@ module Glimmer
             composite.layout = layout
           end
         end,
-        'scrolled_composite' => lambda do |scrolled_composite|
+        scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
           scrolled_composite.expand_vertical = true
         end,
-        'table' => lambda do |table|
+        table: lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        'table_column' => lambda do |table_column|
+        table_column: lambda do |table_column|
           table_column.setWidth(80)
         end,
-        'group' => lambda do |group|
+        group: lambda do |group|
           group.layout = GridLayout.new if group.get_layout.nil?
         end,
       }
@@ -160,7 +160,7 @@ module Glimmer
         end
         if @swt_widget&.get_data('proxy').nil?
           @swt_widget.set_data('proxy', self)
-          DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
+          DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
       end
@@ -212,6 +212,7 @@ module Glimmer
       end
 
       def set_attribute(attribute_name, *args)
+        # TODO Think about widget subclasses overriding set_attribute to add more attributes vs adding as Ruby attributes directly
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
@@ -857,6 +858,7 @@ module Glimmer
             !!value
           end,
           :foreground => color_converter,
+          :link_foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)
               font_properties = value

data/samples/elaborate/login.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -19,7 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#Presents login screen data
 class LoginPresenter
 
   attr_accessor :user_name
@@ -35,7 +34,6 @@ class LoginPresenter
   def status=(status)
     @status = status
 
-    #TODO add feature to bind dependent properties to master property (2017-07-25 nested data binding)
     notify_observers("logged_in")
     notify_observers("logged_out")
   end
@@ -65,7 +63,6 @@ class LoginPresenter
 
 end
 
-#Login screen
 class Login
   include Glimmer
 
@@ -77,10 +74,10 @@ class Login
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
-        @user_name_text = text {                     # goes in column 2
+        @user_name_text = text {   # goes in column 2
           text bind(presenter, :user_name)
           enabled bind(presenter, :logged_out)
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
         }
@@ -89,7 +86,7 @@ class Login
         @password_text = text(:password, :border) {
           text bind(presenter, :password)
           enabled bind(presenter, :logged_out)
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             presenter.login if event.keyCode == swt(:cr)
           }
         }
@@ -101,21 +98,21 @@ class Login
           text "Login"
           enabled bind(presenter, :logged_out)
           on_widget_selected { presenter.login }
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             presenter.login if event.keyCode == swt(:cr)
-          }          
+          }
         }
 
         button {
           text "Logout"
           enabled bind(presenter, :logged_in)
           on_widget_selected { presenter.logout }
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             if event.keyCode == swt(:cr)
               presenter.logout
               @user_name_text.set_focus
             end
-          }          
+          }
         }
       }
     }

data/samples/elaborate/meta_sample.rb

@@ -1,4 +1,8 @@
+require 'fileutils'
+
 class Sample
+  include Glimmer::DataBinding::ObservableModel
+  
   attr_accessor :sample_directory, :file, :selected
   
   def initialize(file, sample_directory: )
@@ -19,12 +23,33 @@ class Sample
     @name
   end
   
-  def content
-    @content = File.read(file)
+  def code
+    reset_code! if @code.nil?
+    @code
   end
-    
-  def launch
-    load file
+  
+  def reset_code!
+    @code = File.read(file)
+    notify_observers('code')
+  end
+  
+  def launch(modified_code)
+    modified_file = File.join(File.dirname(file), ".#{File.basename(file)}")
+    begin
+      File.write(modified_file, modified_code)
+      begin
+        load(modified_file)
+      rescue StandardError, SyntaxError => launch_error
+        message_box {
+          text 'Error Launching'
+          message launch_error.full_message
+        }.open
+      end
+    rescue
+      load(file) # load original file if failed to write changes
+    ensure
+      FileUtils.rm_rf(modified_file)
+    end
   end
 end
 
@@ -111,15 +136,17 @@ end
 class MetaSampleApplication
   include Glimmer
   
+  def initialize
+    selected_sample_directory = SampleDirectory.sample_directories.first
+    selected_sample = selected_sample_directory.samples.first
+    selected_sample_directory.selected_sample_name = selected_sample.name
+  end
+  
   def launch
     shell {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       
-      on_swt_show {
-        SampleDirectory.selected_sample = SampleDirectory.all_samples.first
-      }
-      
       sash_form {
         composite {
           grid_layout 1, false
@@ -144,22 +171,31 @@ class MetaSampleApplication
             }
           }
           
-          button {
+          composite {
+            fill_layout
             layout_data(:fill, :center, true, false) {
               height_hint 120
             }
-            text 'Launch Sample'
-            font height: 30
-            on_widget_selected {
-              SampleDirectory.selected_sample.launch
+            
+            button {
+              text 'Launch'
+              font height: 30
+              on_widget_selected {
+                SampleDirectory.selected_sample.launch(@code_text.text)
+              }
+            }
+            button {
+              text 'Reset'
+              font height: 30
+              on_widget_selected {
+                SampleDirectory.selected_sample.reset_code!
+              }
             }
           }
         }
             
-        code_text {
-          text bind(SampleDirectory, 'selected_sample.content')
-          editable false
-          caret nil
+        @code_text = code_text {
+          text bind(SampleDirectory, 'selected_sample.code', read_only: true)
         }
         
         weights 4, 9