glimmer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1cfa3ffb6be614db3b3e6509edf06c483067889a384c0ffbe94cfb27eea3c73
-  data.tar.gz: 4e30d971345d5df61a8ffcd7d736cc71cf2e7992dfe75fba39763ecba1bcbc6d
+  metadata.gz: 6b229c575994db66837bce7ab4d21eea4dc48c01f6875269942cc6c1d325cf04
+  data.tar.gz: 87759b07eda23d64c7321f55dc3ab4a339b15e0cd59fb3b93eaee079c730caad
 SHA512:
-  metadata.gz: be20760fda63f6b5458fd00ddcdd1f008057a3b376ad11dbaaa9ee488c0ec72cf67d9322b9f6673d23ff8c49679dc636ef98b17db0a8092fdabf41010f400074
-  data.tar.gz: 221280c0420afd17a8f843b2691b445ee2da99240d7b916e4f3af52eec1772458aa846393db9dbc6c44ba8ee1874b53ad517a946ffb05a39653fd669cd771163
+  metadata.gz: a968e1d522df3c64bdf9366c5a551fe17f160004a1270697b9583fae58e5c86204773d97f95db92a88f1820b1c3cc3bec1a985c5f1e6a35e48c9b325ac62ca51
+  data.tar.gz: 5f70f66d16b9c1b6daef6b737d9612f96bd722622d25c95c3ba022f620905c7ade6edb7a040ab4ea35bbcf9023e8f6ba7dda519c4c0439d6d311f4c9305bafc9

data/README.markdown

@@ -102,14 +102,14 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.3.2
+jgem install glimmer -v 0.3.3
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.3.2'
+gem 'glimmer', '~> 0.3.3'
 ```
 
 And, then run:
@@ -152,13 +152,108 @@ Other widget examples:
 - `table_column`: wrapper for `org.eclipse.swt.widgets.TableColumn`
 - `tree`: wrapper for `org.eclipse.swt.widgets.Tree`
 
+### Widget Styles
+
+SWT widgets receive `SWT` styles in their constructor as per this guide:
+
+https://wiki.eclipse.org/SWT_Widget_Style_Bits
+
+Glimmer DSL facilitates that by passing symbols representing `SWT` constants as widget method arguments (i.e. inside widget `()` parentheses. See example below) in lower case version (e.g. `SWT::MULTI` becomes `:multi`).
+
+These styles customize widget look, feel, and behavior.
+
+Example:
+```ruby
+list(:multi) { # SWT styles go inside ()
+  # ...
+}
+```
+
+Passing `:multi` to `list` widget enables list element multi-selection.
+
+```ruby
+composite(:border) { # SWT styles go inside ()
+  # ...
+}
+```
+
+Passing `:border` to `composite` widget ensures it has a border.
+
+When you need to pass in **multiple SWT styles**, simply separate by commas.
+
+Example:
+```ruby
+text(:center, :border) { # Multiple SWT styles separated by comma
+  # ...
+}
+```
+
+Glimmer ships with SWT style **smart defaults** so you wouldn't have to set them yourself most of the time (albeit you can always override them):
+
+- `text(:border)`
+- `table(:border)`
+- `spinner(:border)`
+- `list(:border, :v_scroll)`
+- `button(:push)`
+
+You may check out all available `SWT` styles here:
+
+https://help.eclipse.org/2019-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/SWT.html
+
 ### Widget Properties
 
-Widget properties (e.g. `text`) may be set with methods matching their names in lower snakecase.
+Widget properties such as value, enablement, and layout details are set within the widget block using methods matching SWT widget property names in lower snakecase. You may refer to SWT widget guide for details on available widget properties:
 
-Widget property examples:
-- `text` to set text value of a `label`
-- `gridData` to set grid data of a `composite`
+https://help.eclipse.org/2019-12/topic/org.eclipse.platform.doc.isv/guide/swt_widgets_controls.htm?cp=2_0_7_0_0
+
+
+Code examples:
+
+```ruby
+label {
+  text "Hello World!" # SWT properties go inside {} block
+}
+```
+
+In the above example, the `label` widget `text` property was set to "Hello World!".
+
+```ruby
+button {
+  enabled bind(@tic_tac_toe_board.box(row, column), :empty)
+}
+```
+
+In the above example, the `text` widget `enabled` property was data-bound to `#empty` method on `@tic_tac_toe_board.box(row, column)` (learn more about data-binding below)
+
+### Color
+
+Color makes up a subset of widget properties. SWT accepts color objects created with RGB (Red Green Blue) or RGBA (Red Green Blue Alpha). Glimmer supports constructing color objects using the `rgb` and `rgba` DSL methods.
+
+Example:
+
+```ruby
+label {
+  background rgb(144, 240, 244)
+  foreground rgba(38, 92, 232, 255)
+}
+```
+
+SWT also supports all standard colors available as constants under the `SWT` namespace (e.g. `SWT::COLOR_BLUE`)
+
+Glimmer accepts these constants as Ruby symbols prefixed by `color_`.
+
+Example:
+
+```ruby
+label {
+  background :color_white
+  foreground :color_black
+}
+```
+
+You may check out all available standard colors in `SWT` over here:
+
+https://help.eclipse.org/2019-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/SWT.html
 
 ### Data-Binding
 
@@ -184,9 +279,9 @@ The fifth example demonstrates nested indexed computed value data binding whereb
 
 You may learn more about Glimmer's syntax by reading the Eclipse Zone Tutorial mentioned in resources and opening up the samples under the `samples` folder.
 
-### Observer/Observable
+### Observer
 
-Glimmer comes with the two classes `Observer`/`Observable`, which are used internally for data-binding, but can also be used externally for custom use of the Observer Pattern.
+Glimmer comes with `Observer` module, which is used internally for data-binding, but can also be used externally for custom use of the Observer Pattern.
 
 In summary, the class that needs to observe an object, must include Observer and implement `#update(changed_value)` method. The class to be observed doesn't need to do anything. It will automatically be enhanced by Glimmer for observation.
 
@@ -239,6 +334,9 @@ Here is a list of SWT widgets:
 
 https://help.eclipse.org/2019-12/topic/org.eclipse.platform.doc.isv/guide/swt_widgets_controls.htm?cp=2_0_7_0_0
 
+Here is a list of SWT style bits:
+
+https://wiki.eclipse.org/SWT_Widget_Style_Bits
 
 ## Girb (Glimmer irb)
 
@@ -299,15 +397,20 @@ jruby -J-XstartOnFirstThread -J-classpath "path_to/swt.jar" -r glimmer -S applic
 
 These features have been suggested. You might see them in a future version of Glimmer. You are welcome to contribute more feature suggestions.
 
-- Auto-include SWT packages when including Glimmer
 - Glimmer Application: provide a standard structure for building a Glimmer app
 - Glimmer Component: Glimmer already supports components by externalizing to objects, but it would be good if there is a module to include so Glimmer would automatically register
 a new component and extend the DSL with it
-- **Nested indexed property data binding**: a complementary feature to nested property data binding that binds to a collection element by index (e.g. `bind(user, 'addresses[1].street')`)
-- **bind_collection**: an iterator that enables spawning widgets based on a variable collection (e.g. `bind_collection('user.addresses') { |address| address_widget {...} }` spawns 3 `AddressWidget`s if `user.addresses` is set with 3 addresses; and replaces with 2 `AddressWidget`s if `user.addresses` is reset with 2 addresses only). Needs further thought on naming and functionality.
+- Glimmer Wizard: provide a standard structure for building a Glimmer wizard (multi-step/multi-screen process)
+- bind_collection: an iterator that enables spawning widgets based on a variable collection (e.g. `bind_collection('user.addresses') { |address| address_widget {...} }` spawns 3 `AddressWidget`s if `user.addresses` is set with 3 addresses; and replaces with 2 `AddressWidget`s if `user.addresses` is reset with 2 addresses only). Needs further thought on naming and functionality.
 - Automatic relayout of "glimmer components" when disposing one or as an option
 - Consider using Ruby Refinements for Glimmer
-
+- Add 'font' to Glimmer DSL to build font objects easily
+- Add grid layout support to Glimmer DSL to layout grid components easily
+- Add rerendering support to Glimmer to rerender any widget easily
+- Avoid disposing display when disposing a shell to allow recycling
+- Provide a display builder method to use independently of shell
+- Supported a single computed data binding as a string (not array)
+- Disallow use of SWT::CONSTANTs with ORing since it's not intuitive at all
 
 ## Contributors
 

data/lib/command_handlers.rb

@@ -1,17 +1,18 @@
-require File.dirname(__FILE__) + "/command_handler_chain_factory"
-require File.dirname(__FILE__) + "/command_handlers/shell_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_listener_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/bind_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/tab_item_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/combo_selection_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/list_selection_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/tree_items_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/tree_properties_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/table_items_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/table_column_properties_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_method_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_command_handler"
+require_relative "command_handler_chain_factory"
+require_relative "command_handlers/color_command_handler"
+require_relative "command_handlers/shell_command_handler"
+require_relative "command_handlers/widget_listener_command_handler"
+require_relative "command_handlers/bind_command_handler"
+require_relative "command_handlers/tab_item_command_handler"
+require_relative "command_handlers/combo_selection_data_binding_command_handler"
+require_relative "command_handlers/list_selection_data_binding_command_handler"
+require_relative "command_handlers/tree_items_data_binding_command_handler"
+require_relative "command_handlers/tree_properties_data_binding_command_handler"
+require_relative "command_handlers/table_items_data_binding_command_handler"
+require_relative "command_handlers/table_column_properties_data_binding_command_handler"
+require_relative "command_handlers/data_binding_command_handler"
+require_relative "command_handlers/widget_method_command_handler"
+require_relative "command_handlers/widget_command_handler"
 
 # edit to add more command handlers and extend Glimmer
 CommandHandlerChainFactory.def_dsl(:swt,
@@ -26,6 +27,7 @@ CommandHandlerChainFactory.def_dsl(:swt,
   TableItemsDataBindingCommandHandler.new,
   TableColumnPropertiesDataBindingCommandHandler.new,
   DataBindingCommandHandler.new,
+  ColorCommandHandler.new,
   WidgetMethodCommandHandler.new,
   WidgetCommandHandler.new
 )

data/lib/command_handlers/color_command_handler.rb

@@ -0,0 +1,16 @@
+require_relative '../command_handler'
+require_relative 'models/r_color'
+
+class ColorCommandHandler
+  include CommandHandler
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+      ['rgba', 'rgb'].include?(command_symbol.to_s) and
+      (3..4).include?(args.count)
+  end
+
+  def do_handle(parent, command_symbol, *args, &block)
+    RColor.new(parent.widget.display, *args).color
+  end
+end

data/lib/command_handlers/models/r_color.rb

@@ -0,0 +1,18 @@
+class RColor
+  attr_reader :display
+  attr_reader :color
+
+  include_package 'org.eclipse.swt.graphics'
+
+  class << self
+    def for(display, standard_color)
+      standard_color_swt_constant = org.eclipse.swt.SWT.const_get(standard_color.to_s.upcase.to_sym)
+      display.getSystemColor(standard_color_swt_constant)
+    end
+  end
+
+  def initialize(display, red, green, blue, alpha = nil)
+    @display = display
+    @color = Color.new(@display, *[red, green, blue, alpha].compact)
+  end
+end

data/lib/command_handlers/models/r_widget.rb

@@ -1,5 +1,6 @@
 require_relative "r_widget_listener"
 require_relative "r_runnable"
+require_relative "r_color"
 
 class RWidget
   include_package 'org.eclipse.swt'
@@ -40,6 +41,10 @@ class RWidget
   end
 
   def set_attribute(attribute_name, *args)
+    if args.count == 1 && args.first.is_a?(Symbol) && args.first.to_s.start_with?('color_')
+      standard_color = args.first
+      args[0] = RColor.for(widget.getDisplay, standard_color)
+    end
     @widget.send(attribute_setter(attribute_name), *args)
   end
 

data/lib/command_handlers/models/widget_binding.rb

@@ -10,7 +10,7 @@ class WidgetBinding
   @@property_type_converters = {
     :text => Proc.new { |value| value.to_s },
     :items => Proc.new { |value| value.to_java :string},
-    :visible => Proc.new { |value| !!value}
+    :visible => Proc.new { |value| !!value},
   }
   def initialize(model, property, translator = nil)
     @widget = model

data/lib/command_handlers/shell_command_handler.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + "/models/r_shell"
 
 class ShellCommandHandler
   include CommandHandler
-  
+
   def can_handle?(parent, command_symbol, *args, &block)
     command_symbol.to_s == "shell"
   end
-  
-  def do_handle(parent, command_symbol, *args, &block) 
+
+  def do_handle(parent, command_symbol, *args, &block)
     RShell.send(:new, *args)
   end
-  
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - lib/command_handler_chain_link.rb
 - lib/command_handlers.rb
 - lib/command_handlers/bind_command_handler.rb
+- lib/command_handlers/color_command_handler.rb
 - lib/command_handlers/combo_selection_data_binding_command_handler.rb
 - lib/command_handlers/data_binding_command_handler.rb
 - lib/command_handlers/list_selection_data_binding_command_handler.rb
@@ -166,6 +167,7 @@ files:
 - lib/command_handlers/models/observable_array.rb
 - lib/command_handlers/models/observable_model.rb
 - lib/command_handlers/models/observer.rb
+- lib/command_handlers/models/r_color.rb
 - lib/command_handlers/models/r_runnable.rb
 - lib/command_handlers/models/r_shell.rb
 - lib/command_handlers/models/r_tab_item_composite.rb