shoes-swt 4.0.0.pre6 → 4.0.0.pre7

data/spec/shoes/swt/oval_painter_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Shoes::Swt::OvalPainter do
+  include_context "swt app"
+  include_context "painter context"
+
+  subject { Shoes::Swt::OvalPainter.new(shape) }
+
+  let(:left) { 100 }
+  let(:top) { 200 }
+  let(:width) { 300 }
+  let(:height) { 400 }
+  let(:dsl) { ::Shoes::Oval.new shoes_app, parent, left, top, width, height }
+  let(:shape) { Shoes::Swt::Oval.new(dsl, swt_app) }
+
+  before :each do
+    shape.absolute_left = left
+    shape.absolute_top  = top
+  end
+
+  it_behaves_like "fill painter"
+  it_behaves_like "stroke painter"
+
+  it "creates oval clipping area" do
+    double_path = double("path")
+    allow(::Swt::Path).to receive(:new) { double_path }
+    expect(double_path).to receive(:add_arc).with(left, top, width, height, 0, 360)
+    subject.clipping
+  end
+
+  it "fills" do
+    expect(gc).to receive(:fill_oval)
+    subject.paint_control(event)
+  end
+
+  specify "draws oval" do
+    expect(gc).to receive(:draw_oval).with(left + sw / 2, top + sw / 2, width - sw, height - sw)
+    subject.paint_control(event)
+  end
+end

data/spec/shoes/swt/oval_spec.rb

@@ -7,44 +7,13 @@ describe Shoes::Swt::Oval do
   let(:top) { 200 }
   let(:width) { 300 }
   let(:height) { 400 }
-  let(:dsl) {::Shoes::Oval.new shoes_app, parent, left, top, width, height}
+  let(:dsl) { ::Shoes::Oval.new shoes_app, parent, left, top, width, height }
 
-  subject {
+  subject do
     Shoes::Swt::Oval.new(dsl, swt_app)
-  }
+  end
 
   it_behaves_like "paintable"
   it_behaves_like "updating visibility"
   it_behaves_like 'clickable backend'
-
-  describe "painter" do
-    include_context "painter context"
-
-    before :each do
-      shape.absolute_left = left
-      shape.absolute_top  = top
-    end
-    let(:shape) { Shoes::Swt::Oval.new(dsl, swt_app) }
-    subject { Shoes::Swt::Oval::Painter.new(shape) }
-
-    it_behaves_like "fill painter"
-    it_behaves_like "stroke painter"
-
-    it "creates oval clipping area" do
-      double_path = double("path")
-      allow(::Swt::Path).to receive(:new) { double_path }
-      expect(double_path).to receive(:add_arc).with(left, top, width, height, 0, 360)
-      subject.clipping
-    end
-
-    it "fills" do
-      expect(gc).to receive(:fill_oval)
-      subject.paint_control(event)
-    end
-
-    specify "draws oval" do
-      expect(gc).to receive(:draw_oval).with(left+sw/2, top+sw/2, width-sw, height-sw)
-      subject.paint_control(event)
-    end
-  end
 end

data/spec/shoes/swt/progress_spec.rb

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

data/spec/shoes/swt/radio_group_spec.rb

@@ -21,7 +21,7 @@ describe Shoes::Swt::RadioGroup do
 
     describe 'after adding a button' do
       before :each do
-         subject.add radio
+        subject.add radio
       end
 
       it "only one button is added" do

data/spec/shoes/swt/radio_spec.rb

@@ -4,10 +4,13 @@ describe Shoes::Swt::Radio do
   include_context "swt app"
 
   let(:text) { "TEXT" }
-  let(:dsl) { double('dsl', :app => shoes_app,
-                            :width= => true, :width => 100,
-                            :height= => true, :height => 200,
-                            :group => nil, :blk => block).as_null_object }
+
+  let(:dsl) do
+    double('dsl', :app => shoes_app, :width= => true, :width => 100,
+                  :height= => true, :height => 200, :group => nil,
+                  :blk => block).as_null_object
+  end
+
   let(:block) { proc {} }
   let(:real) { double('real').as_null_object }
 

data/spec/shoes/swt/rect_painter_spec.rb

@@ -6,15 +6,20 @@ describe Shoes::Swt::RectPainter do
   let(:corners) { 0 }
   let(:app) { double('app', real: container, add_paint_listener: true, dsl: dsl) }
   let(:container) { double('container', disposed?: false) }
-  let(:dsl) { double("dsl object", hidden: false, rotate: 0,
-                                   element_left: left, element_top: top,
-                                   element_width: width, element_height: height,
-                                   curve: corners).as_null_object }
+
+  let(:dsl) do
+    double("dsl object", hidden: false, rotate: 0,
+                         translate_left: 0, translate_top: 0,
+                         element_left: left, element_top: top,
+                         element_width: width, element_height: height,
+                         curve: corners, style: {}, strokewidth: 1).as_null_object
+  end
+
   let(:left) { 55 }
   let(:top) { 77 }
   let(:width) { 222 }
   let(:height) { 111 }
-  let(:shape) { Shoes::Swt::Rect.new dsl, app}
+  let(:shape) { Shoes::Swt::Rect.new dsl, app }
   subject { Shoes::Swt::RectPainter.new shape }
 
   it_behaves_like "fill painter"
@@ -24,12 +29,12 @@ describe Shoes::Swt::RectPainter do
     let(:corners) { 0 }
 
     it "fills rect" do
-      expect(gc).to receive(:fill_round_rectangle).with(left, top, width, height, corners*2, corners*2)
+      expect(gc).to receive(:fill_round_rectangle).with(left, top, width, height, corners * 2, corners * 2)
       subject.paint_control(event)
     end
 
     it "draws rect" do
-      expect(gc).to receive(:draw_round_rectangle).with(left+sw/2, top+sw/2, width-sw, height-sw, corners*2, corners*2)
+      expect(gc).to receive(:draw_round_rectangle).with(left + sw / 2, top + sw / 2, width - sw, height - sw, corners * 2, corners * 2)
       subject.paint_control(event)
     end
   end
@@ -38,7 +43,7 @@ describe Shoes::Swt::RectPainter do
     let(:corners) { 13 }
 
     it "draws rect with rounded corners" do
-      expect(gc).to receive(:draw_round_rectangle).with(left+sw/2, top+sw/2, width-sw, height-sw, corners*2, corners*2)
+      expect(gc).to receive(:draw_round_rectangle).with(left + sw / 2, top + sw / 2, width - sw, height - sw, corners * 2, corners * 2)
       subject.paint_control(event)
     end
   end

data/spec/shoes/swt/rect_spec.rb

@@ -7,11 +7,9 @@ describe Shoes::Swt::Rect do
   let(:top) { 77 }
   let(:width) { 222 }
   let(:height) { 111 }
-  let(:dsl) {::Shoes::Rect.new shoes_app, parent, left, top, width, height}
+  let(:dsl) { ::Shoes::Rect.new shoes_app, parent, left, top, width, height }
 
-  subject {
-    Shoes::Swt::Rect.new dsl, swt_app
-  }
+  subject { Shoes::Swt::Rect.new dsl, swt_app }
 
   it_behaves_like "paintable"
   it_behaves_like "updating visibility"

data/spec/shoes/swt/shape_painter_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Shoes::Swt::ShapePainter do
+  include_context "swt app"
+  include_context "painter context"
+
+  let(:dsl) do
+    double("Shoes::Shape", hidden: false, needs_rotate?: false, style: {}).as_null_object
+  end
+
+  let(:shape) { Shoes::Swt::Shape.new(dsl, swt_app) }
+  subject { Shoes::Swt::ShapePainter.new(shape) }
+
+  it_behaves_like "stroke painter"
+  it_behaves_like "fill painter"
+  it_behaves_like "movable painter"
+
+  it "fills path" do
+    expect(gc).to receive(:fill_path)
+    subject.paint_control(event)
+  end
+
+  it "draws path" do
+    expect(gc).to receive(:draw_path)
+    subject.paint_control(event)
+  end
+end

data/spec/shoes/swt/shape_spec.rb

@@ -3,8 +3,12 @@ require 'spec_helper'
 describe Shoes::Swt::Shape do
   include_context "swt app"
 
-  let(:dsl) { instance_double("Shoes::Shape", hidden: false,
-                                              needs_rotate?: false,style: {}).as_null_object }
+  let(:dsl) do
+    double("Shoes::Shape", hidden: false, needs_rotate?: false,
+                           translate_left: 0, translate_top: 0,
+                           style: {}).as_null_object
+  end
+
   subject { Shoes::Swt::Shape.new dsl, swt_app }
 
   shared_examples_for "Swt::Shape" do
@@ -48,7 +52,7 @@ describe Shoes::Swt::Shape do
 
     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
+      subject.arc_to 50, 55, 50, 20, 0, Shoes::PI / 2
     end
   end
 
@@ -66,25 +70,4 @@ describe Shoes::Swt::Shape do
       subject.update_position
     end
   end
-
-  describe "painter" do
-    include_context "painter context"
-
-    let(:shape) { Shoes::Swt::Shape.new(dsl, swt_app) }
-    subject { Shoes::Swt::Shape::Painter.new(shape) }
-
-    it_behaves_like "stroke painter"
-    it_behaves_like "fill painter"
-    it_behaves_like "movable painter"
-
-    it "fills path" do
-      expect(gc).to receive(:fill_path)
-      subject.paint_control(event)
-    end
-
-    it "draws path" do
-      expect(gc).to receive(:draw_path)
-      subject.paint_control(event)
-    end
-  end
 end

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

@@ -1,12 +1,12 @@
 shared_examples 'clickable backend' do
   describe 'interaction with the swt app object' do
     it 'adds a listener for the MouseDown event when click is called' do
-      subject.click Proc.new {}
+      subject.click proc {}
       expect(click_listener).to have_received(:add_click_listener).at_least(1)
     end
 
     it 'adds a listener for the MouseUp event when release is called' do
-      subject.release Proc.new {}
+      subject.release proc {}
       expect(click_listener).to have_received(:add_release_listener).at_least(1)
     end
   end

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

@@ -3,14 +3,17 @@
 #   - swt_app:   use for instantiating a Shoes::Swt object
 #   - shoes_app: use for instantiating a Shoes DSL object
 shared_context "swt app" do
-  let(:swt_app_real) { double('swt app real', disposed?: false,
-                                              set_visible: true) }
+  let(:swt_app_real) do
+    double('swt app real', disposed?: false, set_visible: true)
+  end
 
   let(:clickable_element) { double("clickable_element", delete: nil) }
-  let(:click_listener)    { double("click listener",
-                                   add_click_listener: nil,
-                                   add_release_listener: nil,
-                                   remove_listeners_for: nil) }
+
+  let(:click_listener) do
+    double("click listener", add_click_listener: nil, add_release_listener: nil,
+                             remove_listeners_for: nil)
+  end
+
   let(:swt_app) do
     swt_double = double('swt app', real: swt_app_real, disposed?: false,
                                    add_paint_listener: true, remove_paint_listener: true,
@@ -23,10 +26,16 @@ shared_context "swt app" do
   end
 
   let(:shoes_app) { double('shoes app', gui: swt_app, rotate: 0, style: {}, element_styles: {}) }
-  let(:parent) { double('parent', app: swt_app, add_child: true, real: true,
-                        absolute_left: 0, absolute_top: 0,
-                        width: 200, height: 100, fixed_height?: true) }
-  let(:parent_dsl) {double("parent dsl", add_child: true, contents: [],
-                                         gui: parent, x_dimension: double.as_null_object,
-                                         y_dimension: double.as_null_object)}
+
+  let(:parent) do
+    double('parent', app: swt_app, add_child: true, real: true,
+                     absolute_left: 0, absolute_top: 0,
+                     width: 200, height: 100, fixed_height?: true)
+  end
+
+  let(:parent_dsl) do
+    double("parent dsl", add_child: true, contents: [], gui: parent,
+                         x_dimension: double.as_null_object,
+                         y_dimension: double.as_null_object)
+  end
 end

data/spec/shoes/swt/shell_control_listener_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe Shoes::Swt::ShellControlListener do
-  let(:app) {double 'SWT App', dsl: dsl_app, shell: shell, real: real}
-  let(:shell) {double('Shell').as_null_object}
-  let(:resize_callbacks) {[]}
-  let(:dsl_app) {double('DSL App', resize_callbacks: resize_callbacks).as_null_object}
-  let(:block) {double 'Block', call: nil}
-  let(:resize_event) {double 'resize_event', widget: shell}
-  let(:real) {double('Swt Real').as_null_object}
+  let(:app) { double 'SWT App', dsl: dsl_app, shell: shell, real: real }
+  let(:shell) { double('Shell').as_null_object }
+  let(:resize_callbacks) { [] }
+  let(:dsl_app) { double('DSL App', resize_callbacks: resize_callbacks).as_null_object }
+  let(:block) { double 'Block', call: nil }
+  let(:resize_event) { double 'resize_event', widget: shell }
+  let(:real) { double('Swt Real').as_null_object }
 
-  subject {Shoes::Swt::ShellControlListener.new(app)}
+  subject { Shoes::Swt::ShellControlListener.new(app) }
   before :each do
     subject.controlResized(resize_event)
   end
 
   describe 'resize' do
-    let(:resize_callbacks) {[block]}
+    let(:resize_callbacks) { [block] }
     it 'calls the resize block' do
       expect(block).to have_received(:call)
     end

data/spec/shoes/swt/shoes_layout_spec.rb

@@ -7,22 +7,27 @@ describe Shoes::Swt::ShoesLayout do
     result
   end
 
-  let(:gui_app)      { double('gui_app', dsl: dsl, real: real, shell: shell) }
-  let(:real)         { double('real', set_size: nil,
-                                      location: location, :location= => nil) }
-  let(:size)         { double('size', height: 0, width: 0) }
-  let(:location)     { double('location', :y= => nil) }
-  let(:dsl)          { double('dsl', top_slot: top_slot,
-                                     height: 100, width: 100) }
-  let(:top_slot)     { double('top_slot', contents_alignment: 0,
-                                          :width= => nil, :height= => nil) }
-  let(:shell)        { double('shell', vertical_bar: vertical_bar) }
-  let(:vertical_bar) { double('vertical_bar', :increment= => nil,
-                                              :visible= => nil, :maximum= => nil,
-                                              :thumb= => nil, thumb: 0) }
+  let(:gui_app)   { double('gui_app', dsl: dsl, real: real, shell: shell) }
+  let(:size)      { double('size', height: 0, width: 0) }
+  let(:location)  { double('location', :y= => nil) }
+  let(:dsl)       { double('dsl', top_slot: top_slot, height: 100, width: 100) }
+  let(:shell)     { double('shell', vertical_bar: vertical_bar) }
 
   let(:scroll_height) { dsl.height * 2 }
 
+  let(:real) do
+    double('real', set_size: nil, location: location, :location= => nil)
+  end
+
+  let(:top_slot) do
+    double('top_slot', contents_alignment: 0, :width= => nil, :height= => nil)
+  end
+
+  let(:vertical_bar) do
+    double('vertical_bar', :increment= => nil, :visible= => nil,
+                           :maximum= => nil, :thumb= => nil, thumb: 0)
+  end
+
   before do
     allow(real).to receive(:compute_trim) do |_, _, width, height|
       double('size', width: width, height: height)

data/spec/shoes/swt/slot_spec.rb

@@ -2,11 +2,15 @@ require 'spec_helper'
 
 describe Shoes::Swt::Slot do
   include_context "swt app"
-  let(:dsl) {instance_double Shoes::Slot, hidden?: true,
-                                          visible?: false, contents: [content] }
-  let(:content) {double 'content', show: true, hide: true}
 
-  subject {Shoes::Swt::Slot.new dsl, swt_app}
+  let(:dsl) do
+    instance_double Shoes::Slot, hidden?: true, visible?: false,
+                                 contents: [content]
+  end
+
+  let(:content) { double 'content', show: true, hide: true }
+
+  subject { Shoes::Swt::Slot.new dsl, swt_app }
 
   describe '#update_visibility' do
     it 'does not set visibility on the parent #904' do
@@ -27,4 +31,11 @@ describe Shoes::Swt::Slot do
       expect(content).to have_received(:hide).once
     end
   end
+
+  describe '#remove' do
+    it 'cleans up click listeners' do
+      expect(swt_app.click_listener).to receive(:remove_listeners_for).with(dsl)
+      subject.remove
+    end
+  end
 end

data/spec/shoes/swt/spec_helper.rb

@@ -29,7 +29,7 @@ end
 # as we do not create real apps most of the time there are no redraws and we
 # we don't really want that during test execution either way as it adds stuff to
 # methods that might break
-def with_redraws(&blk)
+def with_redraws
   allow(Shoes::Swt::RedrawingAspect).to receive(:new).and_call_original
   aspect = Shoes::Swt::RedrawingAspect.new swt_app, double
   begin