glimmer 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b229c575994db66837bce7ab4d21eea4dc48c01f6875269942cc6c1d325cf04
-  data.tar.gz: 87759b07eda23d64c7321f55dc3ab4a339b15e0cd59fb3b93eaee079c730caad
+  metadata.gz: 4a13439b3524a4100c7ca2a6eb8b191a9706e3f4591423fa28a30fbda690e21d
+  data.tar.gz: 13c287b39adc40c4eaefde63ab196a5771b442032a8c3ccd697cb84384ecbe77
 SHA512:
-  metadata.gz: a968e1d522df3c64bdf9366c5a551fe17f160004a1270697b9583fae58e5c86204773d97f95db92a88f1820b1c3cc3bec1a985c5f1e6a35e48c9b325ac62ca51
-  data.tar.gz: 5f70f66d16b9c1b6daef6b737d9612f96bd722622d25c95c3ba022f620905c7ade6edb7a040ab4ea35bbcf9023e8f6ba7dda519c4c0439d6d311f4c9305bafc9
+  metadata.gz: 561b9b04686935229929e33dfd3af7461fadd52e2d4902be8556e42c27df3bbbb1a37323bfa74d4978d34906f7154480ccae73aad6f6c01da33f49280d6f0807
+  data.tar.gz: '08e8364b81fdd8189ed9469d6d06b0b41e2f2629329355824e96be6b7ed4ea276d31783297ca1f537c6059ce0db78d971407eb34df06351290dce5c633f5917b'

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.3
+jgem install glimmer -v 0.3.4
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.3.3'
+gem 'glimmer', '~> 0.3.4'
 ```
 
 And, then run:
@@ -338,6 +338,23 @@ Here is a list of SWT style bits:
 
 https://wiki.eclipse.org/SWT_Widget_Style_Bits
 
+## SWT Packages
+
+Glimmer automatically imports all SWT Java packages upon adding `include Glimmer` to a class or module.
+
+Still, if you'd like to import manually elsewhere, you may add the following lines to your code:
+
+```ruby
+include_package 'org.eclipse.swt'
+include_package 'org.eclipse.swt.widgets'
+include_package 'org.eclipse.swt.layout'
+include_package 'org.eclipse.swt.graphics'
+```
+
+This allows you to call Java SWT classes from Ruby without indicating the package explicitly.
+
+For example, `org.eclipse.swt.graphics.Color` becomes `Color`
+
 ## Girb (Glimmer irb)
 
 With Glimmer installed, you may run want to run `girb` instead of standard `irb` to have SWT preloaded and the Glimmer library required and included for quick Glimmer coding/testing.

data/lib/command_handlers/color_command_handler.rb

@@ -4,13 +4,21 @@ require_relative 'models/r_color'
 class ColorCommandHandler
   include CommandHandler
 
+  include_package 'org.eclipse.swt.widgets'
+
   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)
+      (3..5).include?(args.count)
   end
 
   def do_handle(parent, command_symbol, *args, &block)
-    RColor.new(parent.widget.display, *args).color
+    if args.first.is_a?(Display)
+      display = args.delete_at(0)
+    elsif parent.is_a?(RWidget)
+      display = parent.widget.display
+    else
+      display = nil
+    end
+    RColor.new(display, *args)
   end
 end

data/lib/command_handlers/models/r_color.rb

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

data/lib/command_handlers/models/r_widget.rb

@@ -30,6 +30,12 @@ class RWidget
     "group" => Proc.new {|group| group.setLayout(GridLayout.new) },
   }
 
+  @@property_type_converters = {
+    :text => Proc.new { |value| value.to_s },
+    :items => Proc.new { |value| value.to_java :string},
+    :visible => Proc.new { |value| !!value},
+  }
+
   #styles is a comma separate list of symbols representing SWT styles in lower case
   def initialize(underscored_widget_name, parent, styles, &contents)
     @widget = underscored_widget_name.swt_widget.new(parent, style(underscored_widget_name, styles))
@@ -41,11 +47,24 @@ class RWidget
   end
 
   def set_attribute(attribute_name, *args)
+    apply_property_type_converters(attribute_name, args)    
+    @widget.send(attribute_setter(attribute_name), *args)
+  end
+
+  def apply_property_type_converters(attribute_name, args)
+    if args.count == 1
+      value = args.first
+      converter = @@property_type_converters[attribute_name.to_sym]
+      args[0] = converter.call(value) if converter
+    end
     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)
+    elsif args.count == 1 && args.first.is_a?(RColor)
+      r_color = args.first
+      r_color.display = widget.display if r_color.display.nil? || r_color.display != widget.display
+      args[0] = r_color.color
     end
-    @widget.send(attribute_setter(attribute_name), *args)
   end
 
   def self.widget_exists?(underscored_widget_name)

data/lib/command_handlers/models/widget_binding.rb

@@ -7,11 +7,6 @@ class WidgetBinding
   include Observer
 
   attr_reader :widget, :property
-  @@property_type_converters = {
-    :text => Proc.new { |value| value.to_s },
-    :items => Proc.new { |value| value.to_java :string},
-    :visible => Proc.new { |value| !!value},
-  }
   def initialize(model, property, translator = nil)
     @widget = model
     @property = property
@@ -24,9 +19,7 @@ class WidgetBinding
   end
   def update(value)
     converted_value = translated_value = @translator.call(value)
-    converter = @@property_type_converters[@property.to_sym]
-    converted_value = converter.call(translated_value) if converter
-    @widget.widget.send("set#{@property.camelcase(:upper)}", converted_value) unless evaluate_property == converted_value
+    @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
   end
   def evaluate_property
     @widget.widget.send(@property)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - AndyMaleh