shoes-swt 4.0.0.pre3 → 4.0.0.pre4

data/lib/shoes/swt/tooling/leak_hunter.rb

@@ -27,7 +27,7 @@ Hometown.undisposed_report_at_exit
 
 # Register an internal keystroke for closing the app, making sure to clear
 # out the contents first (to avoid false positives for still-exiting elements.
-Shoes::InternalApp.add_global_keypress(:'control_alt_q') do
+Shoes::InternalApp.add_global_keypress(:control_alt_q) do
   clear
   quit
 end

data/lib/shoes/swt/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre3"
+    VERSION = "4.0.0.pre4"
   end
 end

data/shoes-swt.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Team Shoes"]
   s.email       = ["shoes@librelist.com"]
   s.homepage    = "https://github.com/shoes/shoes4"
-  s.summary     = %q{A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.}
-  s.description = %q{A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple.}
+  s.summary     = 'A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.'
+  s.description = 'A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby. Shoes makes building for Mac, Windows, and Linux super simple.'
   s.license     = 'MIT'
 
   s.files         = `git ls-files`.split($/)

data/spec/shoes/cli_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Shoes::CLI do
-  subject {Shoes::CLI.new}
+  subject {Shoes::CLI.new("swt")}
 
   before :each do
     allow(subject.packager).to receive :run

data/spec/shoes/swt/app_spec.rb

@@ -2,11 +2,12 @@ require "shoes/swt/spec_helper"
 
 describe Shoes::Swt::App do
   let(:opts) { {:background => Shoes::COLORS[:salmon], :resizable => true} }
-  let(:app) { double('app', :opts => opts,
-                            :width => width,
-                            :height => 0,
-                            :app_title => 'double') }
-  let(:dsl) { app }
+  let(:app)  { double('app') }
+  let(:dsl)  { double('dsl', :app => app,
+                             :opts => opts,
+                             :width => width,
+                             :height => 0,
+                             :app_title => 'double') }
 
   let(:opts_unresizable) { {:background => Shoes::COLORS[:salmon],
                             :resizable => false} }
@@ -16,7 +17,7 @@ describe Shoes::Swt::App do
                                         :app_title => 'double') }
   let(:width) {0}
 
-  subject { Shoes::Swt::App.new(app) }
+  subject { Shoes::Swt::App.new(dsl) }
 
   it { is_expected.to respond_to :clipboard }
   it { is_expected.to respond_to :clipboard= }
@@ -43,6 +44,14 @@ describe Shoes::Swt::App do
       expect(Shoes::Swt.apps.length).to eq(old_apps_length + 1)
       expect(Shoes::Swt.apps.include?(subject)).to be_truthy
     end
+
+    it "unregisters" do
+      old_apps_length = Shoes::Swt.apps.length
+      expect(Shoes).to receive(:unregister)
+
+      subject.send(:unregister_app).call()
+      expect(Shoes::Swt.apps.length).to eq(old_apps_length)
+    end
   end
 
   context "when running on a mac" do

data/spec/shoes/swt/color_spec.rb

@@ -1,7 +1,8 @@
 require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Color do
-  subject(:color) { Shoes::Swt::Color.create(Shoes::COLORS[:salmon]) }
+  subject(:color)  { Shoes::Swt::Color.create(Shoes::COLORS[:salmon]) }
+  let(:applied_to) { double("applied to") }
 
   it_behaves_like "an swt pattern"
 
@@ -33,19 +34,20 @@ describe Shoes::Swt::Color do
     it "sets background" do
       allow(gc).to receive(:set_alpha)
       expect(gc).to receive(:set_background).with(color.real)
-      color.apply_as_fill(gc)
+      color.apply_as_fill(gc, applied_to)
     end
 
     it "sets alpha" do
       allow(gc).to receive(:set_background)
       expect(gc).to receive(:set_alpha)
-      color.apply_as_fill(gc, 10, 20, 100, 200)
+      color.apply_as_fill(gc, applied_to)
     end
   end
 end
 
 describe Shoes::Swt::NullColor do
-  subject(:color) { Shoes::Swt::Color.create(nil) }
+  subject(:color)  { Shoes::Swt::Color.create(nil) }
+  let(:applied_to) { double("applied to") }
 
   it { is_expected.to be_instance_of(Shoes::Swt::NullColor) }
   its(:real) { is_expected.to be_nil }
@@ -56,12 +58,11 @@ describe Shoes::Swt::NullColor do
     let(:gc) { double("graphics context") }
 
     it "sends no messages in #apply_as_fill" do
-      color.apply_as_fill(gc)
+      color.apply_as_fill(gc, applied_to)
     end
 
     it "sends no messages in #apply_as_stroke" do
-      color.apply_as_stroke(gc)
+      color.apply_as_stroke(gc, applied_to)
     end
   end
 end
-

data/spec/shoes/swt/common/painter_spec.rb

@@ -1,10 +1,12 @@
 require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::Common::Painter do
-  let(:object) {double 'object', dsl: dsl}
-  let(:dsl) {double 'dsl', visible?: true, positioned?: true}
+  let(:object) {double 'object', dsl: dsl, transform: transform,
+                       apply_fill: nil, apply_stroke: nil}
+  let(:dsl) {double 'dsl', visible?: true, positioned?: true, style: Hash.new}
   let(:event) {double 'paint event', gc: graphics_context}
   let(:graphics_context) { double 'graphics_context',
+                                  dispose: nil,
                                   set_antialias: nil, set_line_cap: nil,
                                   set_transform: nil, setTransform: nil }
   let(:transform) { double 'transform', disposed?: false }
@@ -32,13 +34,31 @@ describe Shoes::Swt::Common::Painter do
       subject.paint_control event
     end
 
+    it 'rotates' do
+      allow(dsl).to receive(:needs_rotate?) { true }
+      allow(dsl).to receive(:rotate) { 10 }
+      allow(dsl).to receive(:element_left)   { 0 }
+      allow(dsl).to receive(:element_width)  { 0 }
+      allow(dsl).to receive(:element_top)    { 0 }
+      allow(dsl).to receive(:element_height) { 0 }
+
+      expect_transform_for_rotate
+
+      subject.paint_control event
+    end
+
+    it "doesn't rotate if doesn't need it" do
+      allow(dsl).to receive(:needs_rotate?) { false }
+
+      expect(transform).not_to receive(:translate)
+      expect(transform).not_to receive(:rotate)
+      subject.paint_control event
+    end
   end
 
   context "set_rotate" do
     it "disposes of transform" do
-      expect(transform).to receive(:dispose)
-      expect(transform).to receive(:translate).at_least(:once)
-      expect(transform).to receive(:rotate).at_least(:once)
+      expect_transform_for_rotate
 
       subject.set_rotate graphics_context, 0, 0, 0 do
         #no-op
@@ -46,4 +66,9 @@ describe Shoes::Swt::Common::Painter do
     end
   end
 
+  def expect_transform_for_rotate
+    expect(transform).to receive(:dispose)
+    expect(transform).to receive(:translate).at_least(:once)
+    expect(transform).to receive(:rotate).at_least(:once)
+  end
 end

data/spec/shoes/swt/disposed_protection_spec.rb

@@ -46,4 +46,3 @@ describe Shoes::Swt::DisposedProtection do
     end
   end
 end
-

data/spec/shoes/swt/font_spec.rb

@@ -29,5 +29,5 @@ describe Shoes::Swt::Font do
       subject.add_font font_path
     end
   end
-  
-end
+
+end

data/spec/shoes/swt/gradient_spec.rb

@@ -3,6 +3,9 @@ require 'shoes/swt/spec_helper'
 describe Shoes::Swt::Gradient do
   let(:color1) { Shoes::Color.create(Shoes::COLORS[:honeydew]) }
   let(:color2) { Shoes::Color.create(Shoes::COLORS[:salmon]) }
+  let(:applied_to) { double("applied to",
+                            element_left: 0, element_top: 0, angle: 0,
+                            element_width: 10, element_height: 10) }
   let(:dsl) { Shoes::Gradient.new(color1, color2) }
   let(:gc) { double("gc", set_background_pattern: nil) }
 
@@ -13,7 +16,7 @@ describe Shoes::Swt::Gradient do
   describe "#dispose" do
     it "lets subresources do" do
       # Prime the object's lazy colors
-      subject.apply_as_fill(gc, 10, 20, 100, 200)
+      subject.apply_as_fill(gc, applied_to)
 
       expect(subject.color1).to receive(:dispose)
       expect(subject.color2).to receive(:dispose)
@@ -25,7 +28,7 @@ describe Shoes::Swt::Gradient do
   describe "#apply_as_fill" do
     it "sets background" do
       expect(gc).to receive(:set_background_pattern)
-      subject.apply_as_fill(gc, 10, 20, 100, 200)
+      subject.apply_as_fill(gc, applied_to)
     end
   end
 end

data/spec/shoes/swt/image_pattern_spec.rb

@@ -2,6 +2,7 @@ require 'shoes/swt/spec_helper'
 
 describe Shoes::Swt::ImagePattern do
   let(:dsl)         { Shoes::ImagePattern.new("some/path/to") }
+  let(:applied_to)  { double("applied to") }
   let(:swt_image)   { double("swt image") }
   let(:swt_pattern) { double("swt pattern") }
 
@@ -24,12 +25,21 @@ describe Shoes::Swt::ImagePattern do
     end
   end
 
+  describe "#apply_as_stroke" do
+    let(:gc) { double("gc") }
+
+    it "sets foreground" do
+      expect(gc).to receive(:set_foreground_pattern)
+      subject.apply_as_stroke(gc, applied_to)
+    end
+  end
+
   describe "#apply_as_fill" do
     let(:gc) { double("gc") }
 
     it "sets background" do
       expect(gc).to receive(:set_background_pattern)
-      subject.apply_as_fill(gc, 10, 20, 100, 200)
+      subject.apply_as_fill(gc, applied_to)
     end
   end
 end

data/spec/shoes/swt/list_box_spec.rb

@@ -8,9 +8,10 @@ describe Shoes::Swt::ListBox do
                         items: items, opts: {},
                         element_width: 200, element_height: 20).as_null_object }
   let(:block)  { ->(){} }
-  let(:real)   { double('real', text: "", :items= => true,
+  let(:real)   { double('real', text: "",
+                        :items= => true, :text= => true,
                         set_size: true, add_selection_listener: true,
-                        disposed?: false ) }
+                        disposed?: false) }
 
   subject { Shoes::Swt::ListBox.new dsl, parent, &block }
 
@@ -26,10 +27,16 @@ describe Shoes::Swt::ListBox do
   end
 
   it "should call 'items' when updating values" do
-    subject # creation already calls update_items once
     allow(dsl).to receive(:items).and_return ["hello"]
     subject.update_items
-    expect(real).to have_received(:items=).with(["hello"])
+    # creation already calls update_items once
+    expect(real).to have_received(:items=).with(["hello"]).twice
+  end
+
+  it "should set real text if initialized with choose option" do
+    allow(dsl).to receive(:style) { { choose: "Apple" } }
+    subject
+    expect(real).to have_received(:text=).with("Apple")
   end
 
   it "should respond to choose" do
@@ -41,11 +48,24 @@ describe Shoes::Swt::ListBox do
     subject.choose "Bacon"
   end
 
+  it "should notify dsl of changes when choosing" do
+    allow(real).to receive(:text=)
+    expect(dsl).to receive(:call_change_listeners)
+    subject.choose "Bacon"
+  end
+
   it 'sets the items on real upon initialization' do
     subject
     expect(real).to have_received(:items=).with(items)
   end
 
+  it 'converts array to string' do
+    allow(dsl).to receive(:items).and_return [1,2,3]
+    subject.update_items
+    # creation already calls update_items once
+    expect(real).to have_received(:items=).with(%w(1 2 3)).twice
+  end
+
   describe "when the backend notifies us that the selection has changed" do
     it "should call the change listeners" do
       expect(dsl).to receive(:call_change_listeners)

data/spec/shoes/swt/mouse_move_listener_spec.rb

@@ -12,7 +12,7 @@ describe Shoes::Swt::MouseMoveListener do
   let(:x) {10}
   let(:y) {42}
   let(:block) {double 'Block', call: nil}
-  let(:mouse_event) {double'mouse event', x: x, y: y}
+  let(:mouse_event) {double 'mouse event', x: x, y: y}
 
   subject {Shoes::Swt::MouseMoveListener.new(app)}
   before :each do

data/spec/shoes/swt/oval_spec.rb

@@ -48,4 +48,3 @@ describe Shoes::Swt::Oval do
     end
   end
 end
-

data/spec/shoes/swt/progress_spec.rb

@@ -5,7 +5,8 @@ describe Shoes::Swt::Progress do
 
   let(:text) { "TEXT" }
   let(:dsl) { double('dsl', app: shoes_app).as_null_object }
-  let(:real) { double('real', disposed?: false, :disposed? => false).as_null_object }
+  let(:real) { double('real', disposed?: real_disposed).as_null_object }
+  let(:real_disposed) {false}
 
   subject { Shoes::Swt::Progress.new dsl, parent }
 
@@ -32,9 +33,7 @@ describe Shoes::Swt::Progress do
   end
 
   context "with disposed real element" do
-    before :each do
-      allow(real).to receive(:disposed?) { true }
-    end
+    let(:real_disposed) {true}
 
     it "shouldn't set selection" do
       expect(real).not_to receive(:selection=)

data/spec/shoes/swt/radio_group_spec.rb

@@ -15,7 +15,7 @@ describe Shoes::Swt::RadioGroup do
 
   describe "#add" do
     it "monitors selection" do
-      expect(real).to receive(:add_selection_listener) 
+      expect(real).to receive(:add_selection_listener)
       subject.add(radio)
     end
 
@@ -57,12 +57,12 @@ describe Shoes::Swt::RadioGroup do
       subject.add(radio)
       subject.add(radio_selected)
     end
-    after :each do 
-      subject.select_only_one_radio_in_group(radio_selected) 
+    after :each do
+      subject.select_only_one_radio_in_group(radio_selected)
     end
 
     it "turns on the selected radio" do
-      expect(real_selected).to receive(:set_selection).with(true) 
+      expect(real_selected).to receive(:set_selection).with(true)
     end
 
     it "turns off the non-selected radios" do

data/spec/shoes/swt/radio_spec.rb

@@ -33,7 +33,7 @@ describe Shoes::Swt::Radio do
     let(:radio_group) { double("radio_group").as_null_object }
     let(:group_lookup) { double('group_lookup', :[] => radio_group).as_null_object }
     before :each do
-      allow(Shoes::Swt::RadioGroup).to receive(:group_lookup) { group_lookup }  
+      allow(Shoes::Swt::RadioGroup).to receive(:group_lookup) { group_lookup }
     end
 
     it "changes the group" do

data/spec/shoes/swt/shape_spec.rb

@@ -3,7 +3,8 @@ require 'shoes/swt/spec_helper'
 describe Shoes::Swt::Shape do
   include_context "swt app"
 
-  let(:dsl) { instance_double("Shoes::Shape", hidden: false, style: {}).as_null_object }
+  let(:dsl) { instance_double("Shoes::Shape", hidden: false,
+                              needs_rotate?: false,style: {}).as_null_object }
   subject { Shoes::Swt::Shape.new dsl, swt_app }
 
   shared_examples_for "Swt::Shape" do
@@ -20,6 +21,7 @@ describe Shoes::Swt::Shape do
   it_behaves_like "Swt::Shape"
   it_behaves_like "paintable"
   it_behaves_like "removable"
+  it_behaves_like 'clickable backend'
 
   it "properly disposes" do
     expect(subject.transform).to receive(:dispose)
@@ -43,6 +45,11 @@ describe Shoes::Swt::Shape do
       expect(element).to receive(:line_to).with(20, 30)
       subject.line_to 20, 30
     end
+
+    it "delegates #arc_to" do
+      expect(element).to receive(:add_arc).with(25, 45, 50, 20, 0.0, -90.0)
+      subject.arc_to 50, 55, 50, 20, 0, Shoes::PI/2
+    end
   end
 
   describe "moving" do

data/spec/shoes/swt/shared_examples/paintable.rb

@@ -4,4 +4,3 @@ shared_examples_for "paintable" do
     subject
   end
 end
-

data/spec/shoes/swt/shared_examples/pattern.rb

@@ -4,10 +4,6 @@ shared_examples_for "an swt pattern" do
 
   describe "#apply_as_stroke" do
     let(:gc) { double("graphics context") }
-    let(:left) { 0 }
-    let(:top) { 0 }
-    let(:width) { 10 }
-    let(:height) { 10 }
 
     it "sets foreground" do
       if subject.is_a? Shoes::Swt::Color
@@ -16,7 +12,7 @@ shared_examples_for "an swt pattern" do
       else
         expect(gc).to receive(:set_foreground_pattern)
       end
-      subject.apply_as_stroke(gc, left, top, width, height)
+      subject.apply_as_stroke(gc, applied_to)
     end
 
     it "sets alpha" do
@@ -26,7 +22,7 @@ shared_examples_for "an swt pattern" do
       else
         expect(gc).to receive(:set_foreground_pattern)
       end
-      subject.apply_as_stroke(gc, left, top, width, height)
+      subject.apply_as_stroke(gc, applied_to)
     end
   end
 end