glimmer-dsl-swt 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa25c1d494d14eac00319e494d3b2f12c9a6b344c084b02a1dde9f60c2f44a5
-  data.tar.gz: 648c050a1a25a284e972beb5c129047ef6cbf8fabb1a80981408d900afed0c25
+  metadata.gz: 2efe946d6209511675a9b2e91c76b71a69fa52ece7ea821229783c1ddf52c2da
+  data.tar.gz: 3df579040ae3a9183388d1b6d3bca864a911679973e33ff7faae8a421384f64a
 SHA512:
-  metadata.gz: dc9dedb03e9251f0a88e5530a642c062899be1651b26d2314258925375b871a3e5736141a1ee5b8dfacde1bc7a1d606d4ce00ac8affc8bf160b06f4aa7141306
-  data.tar.gz: 00416f75c6c00dc163501209a20839cd23fb51921a5335f8ffff7009bf013cca11ccb54389a55367c0ccbb1b0f1bb1641c61141d376a5c5792584567bd1d7937
+  metadata.gz: b3a057aabf006662881fa9adf157722831a4c6a2e397353a71b6c7d52fbc360bca96f095a5b5d4077bb271dd5b3eae9505cf8cd489bc801230179a8bf0d51aa8
+  data.tar.gz: ebe5556abe7c1dfe1446f2a42c0f71a799a47153b545f9cc463240d13a85bddf4c9e83eaab96e0b4f498de4753c48a8761306517714c19385a1d89c4e6f054d8

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.5 (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.6 (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.5
+0.6.6

data/lib/ext/glimmer/config.rb

@@ -48,6 +48,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,9 +94,13 @@ module Glimmer
           end
           logger.appenders = appenders
         end
+        
       end
+      
     end
+    
   end
+  
 end
 
 Glimmer::Config.reset_logger!

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

@@ -84,18 +84,23 @@ namespace :glimmer do
   
     desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
     task :code, [:name] => :requires do |t, args|
+      require 'tty-markdown' unless OS.windows?
       samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).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

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
 

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

@@ -209,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)

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],
@@ -315,7 +316,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 = 'button' if %w[radio checkbox check toggle arrow].include?(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)
@@ -457,6 +458,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)

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.5
+  version: 0.6.6
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-14 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,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -214,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:
@@ -304,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
@@ -406,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