shoes-swt 4.0.0.pre6 → 4.0.0.pre7

data/spec/shoes/swt/integration_spec.rb

@@ -13,7 +13,7 @@ describe Shoes::App do
     app = nil
     begin
       expect do
-        app = Shoes.app do para 'me no fail' end
+        app = Shoes.app { para 'me no fail' }
         app.quit
       end.not_to raise_error
     ensure

data/spec/shoes/swt/key_listener_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 describe Shoes::Swt::Keypress do
   let(:app) { double('app', add_key_listener: nil, remove_key_listener: nil) }
   let(:dsl) { double('dsl') }
-  let(:block) { proc { |key| key} }
-  let(:key_listener) {Shoes::Swt::Keypress.new(dsl, app, &block)}
+  let(:block) { proc { |key| key } }
+  let(:key_listener) { Shoes::Swt::Keypress.new(dsl, app, &block) }
 
   describe '.get_swt_constant' do
     it 'gets the swt constant' do
@@ -39,7 +39,7 @@ describe Shoes::Swt::Keypress do
   SHIFT = ::Swt::SWT::SHIFT
   COMMAND = ::Swt::SWT::COMMAND
 
-  subject {key_listener}
+  subject { key_listener }
 
   def test_character_press(character, state_modifier = 0, result_char = character)
     expect(block).to receive(:call).with(result_char)
@@ -275,75 +275,76 @@ describe Shoes::Swt::Keypress do
 
   describe 'Mac command key' do
     it 'fixes crash of shift option command #584' do
-      event = double 'key event', stateMask: 196608,
-                                  keyCode: 4194304,
+      event = double 'key event', stateMask: 196_608,
+                                  keyCode: 4_194_304,
                                   character: "don't care atm"
-      expect {subject.handle_key_event(event)}.not_to raise_error
+      expect { subject.handle_key_event(event) }.not_to raise_error
     end
   end
 
   describe '#ignore_event?' do
-    let(:character) {'a'}
-    let(:event) {double 'key event',
-                        widget: widget,
-                        stateMask: 0,
-                        keyCode:  keyCode,
-                        character: character.ord }
-    let(:shell) {Java::OrgEclipseSwtWidgets::Shell.new}
-    let(:style) {0}
-    let(:keyCode) {character.downcase.ord}
-
-    subject {key_listener.ignore_event? event}
+    let(:character) { 'a' }
+
+    let(:event) do
+      double 'key event', widget: widget, stateMask: 0, keyCode:  keyCode,
+                          character: character.ord
+    end
+
+    let(:shell) { Java::OrgEclipseSwtWidgets::Shell.new }
+    let(:style) { 0 }
+    let(:keyCode) { character.downcase.ord }
+
+    subject { key_listener.ignore_event? event }
 
     shared_examples_for 'ignores space and enter' do
       describe 'with a space' do
-        let(:character) {' '}
-        it {is_expected.to be_truthy}
+        let(:character) { ' ' }
+        it { is_expected.to be_truthy }
       end
 
       describe 'with enter' do
-        let(:keyCode) {::Swt::SWT::CR}
-        it {is_expected.to be_truthy}
+        let(:keyCode) { ::Swt::SWT::CR }
+        it { is_expected.to be_truthy }
       end
     end
 
     shared_examples_for 'accepts normal characters' do
       describe 'with a normal character' do
-        let(:character) {'a'}
-        it {is_expected.to be_falsey}
+        let(:character) { 'a' }
+        it { is_expected.to be_falsey }
       end
     end
 
     context 'on a Shell' do
-      let(:widget) {shell}
-      it {is_expected.to be_falsey}
+      let(:widget) { shell }
+      it { is_expected.to be_falsey }
 
       describe 'even with enter' do
-        let(:keyCode) {::Swt::SWT::CR}
-        it {is_expected.to be_falsey}
+        let(:keyCode) { ::Swt::SWT::CR }
+        it { is_expected.to be_falsey }
       end
     end
 
     context 'on a Text' do
-      let(:widget) {Java::OrgEclipseSwtWidgets::Text.new(shell, style)}
-      it {is_expected.to be_truthy}
+      let(:widget) { Java::OrgEclipseSwtWidgets::Text.new(shell, style) }
+      it { is_expected.to be_truthy }
     end
 
     context 'on a button' do
-      let(:widget) {Java::OrgEclipseSwtWidgets::Button.new(shell, style)}
+      let(:widget) { Java::OrgEclipseSwtWidgets::Button.new(shell, style) }
 
       it_behaves_like 'ignores space and enter'
       it_behaves_like 'accepts normal characters'
     end
 
     context 'on a Combo' do
-      let(:widget) {Java::OrgEclipseSwtWidgets::Combo.new(shell, style)}
+      let(:widget) { Java::OrgEclipseSwtWidgets::Combo.new(shell, style) }
 
       it_behaves_like 'ignores space and enter'
 
       describe 'with up' do
-        let(:keyCode) {::Swt::SWT::ARROW_UP}
-        it {is_expected.to be_truthy}
+        let(:keyCode) { ::Swt::SWT::ARROW_UP }
+        it { is_expected.to be_truthy }
       end
 
       it_behaves_like 'accepts normal characters'

data/spec/shoes/swt/line_painter_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Shoes::Swt::LinePainter do
+  include_context "swt app"
+  include_context "painter context"
+
+  let(:dsl) { Shoes::Line.new shoes_app, parent, point_a, point_b }
+  let(:point_a) { Shoes::Point.new(10, 100) }
+  let(:point_b) { Shoes::Point.new(300, 10) }
+
+  let(:shape) { Shoes::Swt::Line.new(dsl, swt_app) }
+  subject { Shoes::Swt::LinePainter.new(shape) }
+
+  before(:each) do
+    dsl.absolute_left = point_a.x
+    dsl.absolute_top  = point_a.y
+    allow(dsl).to receive_messages(positioned?: true)
+  end
+
+  it_behaves_like "stroke painter"
+
+  specify "draws line" do
+    expect(gc).to receive(:draw_line).with(10, 100, 300, 10)
+    subject.paint_control(event)
+  end
+end

data/spec/shoes/swt/line_spec.rb

@@ -3,14 +3,11 @@ require 'spec_helper'
 describe Shoes::Swt::Line do
   include_context "swt app"
 
-  let(:container) { double('container', disposed?: false).as_null_object }
   let(:dsl) { Shoes::Line.new shoes_app, parent, point_a, point_b }
   let(:point_a) { Shoes::Point.new(10, 100) }
   let(:point_b) { Shoes::Point.new(300, 10) }
 
-  subject {
-    Shoes::Swt::Line.new(dsl, swt_app)
-  }
+  subject { Shoes::Swt::Line.new(dsl, swt_app) }
 
   context "#initialize" do
     it { is_expected.to be_instance_of(Shoes::Swt::Line) }
@@ -21,25 +18,5 @@ describe Shoes::Swt::Line do
   it_behaves_like "updating visibility"
   it_behaves_like "clickable backend"
 
-  it {is_expected.to respond_to :remove}
-
-  describe "painter" do
-    include_context "painter context"
-
-    let(:shape) { Shoes::Swt::Line.new(dsl, swt_app) }
-    subject { Shoes::Swt::Line::Painter.new(shape) }
-
-    before(:each) do
-      dsl.absolute_left = point_a.x
-      dsl.absolute_top  = point_a.y
-      allow(dsl).to receive_messages(positioned?: true)
-    end
-
-    it_behaves_like "stroke painter"
-
-    specify "draws line" do
-      expect(gc).to receive(:draw_line).with(10, 100, 300, 10)
-      subject.paint_control(event)
-    end
-  end
+  it { is_expected.to respond_to :remove }
 end

data/spec/shoes/swt/link_segment_spec.rb

@@ -5,13 +5,15 @@ describe Shoes::Swt::LinkSegment do
   let(:line_width)    { 20 }
   let(:line_height)   { 14 }
   let(:layout)        { double('swt layout', width: line_width, line_count: 10) }
-  let(:text_segment)  { double('text segment', layout: layout,
-                                               element_left: 0, element_top: 0) }
+
+  let(:text_segment)  do
+    double('text segment', layout: layout, element_left: 0, element_top: 0)
+  end
 
   subject { Shoes::Swt::LinkSegment.new(text_segment, range) }
 
   before(:each) do
-    10.times {|i| stub_line_bounds(i)}
+    10.times { |i| stub_line_bounds(i) }
   end
 
   # ....................
@@ -37,18 +39,18 @@ describe Shoes::Swt::LinkSegment do
     stub_start_and_end_locations([0, 0], [5, line_height])
 
     expect_bounded_box(0, 0,           line_width, line_height)
-    expect_bounded_box(0, line_height, 5,          2*line_height)
+    expect_bounded_box(0, line_height, 5,          2 * line_height)
   end
 
   # .....xxxxxxxxxxxxxxx
   # xxxxxxxxxxxxxxxxxxxx
   # xxxxx...............
   it "sets bounds wrapping over three lines" do
-    stub_start_and_end_locations([5, 0], [5, 2*line_height])
+    stub_start_and_end_locations([5, 0], [5, 2 * line_height])
 
     expect_bounded_box(5, 0,             line_width, line_height)
-    expect_bounded_box(0, line_height,   line_width, 2*line_height)
-    expect_bounded_box(0, 2*line_height, 5,          3*line_height)
+    expect_bounded_box(0, line_height,   line_width, 2 * line_height)
+    expect_bounded_box(0, 2 * line_height, 5,          3 * line_height)
   end
 
   # ....................
@@ -56,17 +58,17 @@ describe Shoes::Swt::LinkSegment do
   it "sets bounds with single line beginning further down" do
     stub_start_and_end_locations([5, line_height], [15, line_height])
 
-    expect_bounded_box(5, line_height, 15, 2*line_height)
+    expect_bounded_box(5, line_height, 15, 2 * line_height)
   end
 
   # ....................
   # ...............xxxxx
   # xxxxx...............
   it "sets bounds with two lines beginning further down" do
-    stub_start_and_end_locations([15, line_height], [5, 2*line_height])
+    stub_start_and_end_locations([15, line_height], [5, 2 * line_height])
 
-    expect_bounded_box(15, line_height,   15, 2*line_height)
-    expect_bounded_box(0,  2*line_height, 5,  3*line_height)
+    expect_bounded_box(15, line_height, 15, 2 * line_height)
+    expect_bounded_box(0,  2 * line_height, 5,  3 * line_height)
   end
 
   # ....................
@@ -74,26 +76,26 @@ describe Shoes::Swt::LinkSegment do
   # xxxxxxxxxxxxxxxxxxxx
   # xxxxx...............
   it "sets bounds with three lines beginning further down" do
-    stub_start_and_end_locations([15, line_height], [5, 3*line_height])
+    stub_start_and_end_locations([15, line_height], [5, 3 * line_height])
 
-    expect_bounded_box(15, line_height,   15,         2*line_height)
-    expect_bounded_box(0,  2*line_height, line_width, 3*line_height)
-    expect_bounded_box(0,  3*line_height, 5,          4*line_height)
+    expect_bounded_box(15, line_height, 15, 2 * line_height)
+    expect_bounded_box(0,  2 * line_height, line_width, 3 * line_height)
+    expect_bounded_box(0,  3 * line_height, 5,          4 * line_height)
   end
 
   def expect_bounded_box(left, top, right, bottom)
     expect_in_bounds([left, top],    [right, top],
-                     [left, bottom], [right,bottom])
+                     [left, bottom], [right, bottom])
   end
 
   def expect_in_bounds(*points)
-    points.each do |(x,y)|
+    points.each do |(x, y)|
       expect(subject.in_bounds?(x, y)).to be_truthy, "with #{x}, #{y}"
     end
   end
 
   def expect_not_in_bounds(*points)
-    points.each do |(x,y)|
+    points.each do |(x, y)|
       expect(subject.in_bounds?(x, y)).to be_falsey, "with #{x}, #{y}"
     end
   end

data/spec/shoes/swt/link_spec.rb

@@ -7,18 +7,21 @@ describe Shoes::Swt::Link do
 
   subject { Shoes::Swt::Link.new(dsl, swt_app) }
 
-  its(:dsl) {is_expected.to eq dsl}
+  its(:dsl) { is_expected.to eq dsl }
 
   it_behaves_like "clickable backend"
 
   context "creating link segments" do
-    let(:bounds)       { double("bounds", x: 0, y: 0, height: 0) }
-    let(:inner_layout) { double("inner layout",
-                                get_line_bounds: bounds, line_count: 1) }
-    let(:layout)       { double("layout",
-                                get_location: double("position", x: 0, y: 0),
-                                element_left: 0, element_top: 0,
-                                layout: inner_layout) }
+    let(:bounds) { double("bounds", x: 0, y: 0, height: 0) }
+
+    let(:inner_layout) do
+      double("inner layout", get_line_bounds: bounds, line_count: 1)
+    end
+
+    let(:layout) do
+      double("layout", get_location: double("position", x: 0, y: 0),
+                       element_left: 0, element_top: 0, layout: inner_layout)
+    end
 
     it "clears existing" do
       subject.link_segments << double("segment")

data/spec/shoes/swt/list_box_spec.rb

@@ -3,15 +3,19 @@ require 'spec_helper'
 describe Shoes::Swt::ListBox do
   include_context "swt app"
 
-  let(:items)  { ["Pie", "Apple", "Sand"] }
-  let(:dsl)    { double('dsl', app: shoes_app,
-                               items: items, opts: {},
-                               element_width: 200, element_height: 20).as_null_object }
-  let(:block)  { ->() {} }
-  let(:real)   { double('real', text: "",
-                                :items= => true, :text= => true,
-                                set_size: true, add_selection_listener: true,
-                                disposed?: false) }
+  let(:items) { ["Pie", "Apple", "Sand"] }
+
+  let(:dsl) do
+    double('dsl', app: shoes_app, items: items, opts: {}, element_width: 200,
+                  element_height: 20).as_null_object
+  end
+
+  let(:block) { ->() {} }
+
+  let(:real) do
+    double('real', text: "", :items= => true, :text= => true, set_size: true,
+                   add_selection_listener: true, disposed?: false)
+  end
 
   subject { Shoes::Swt::ListBox.new dsl, swt_app, &block }
 
@@ -59,7 +63,7 @@ describe Shoes::Swt::ListBox do
   end
 
   it 'converts array to string' do
-    allow(dsl).to receive(:items).and_return [1,2,3]
+    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
@@ -69,7 +73,7 @@ describe Shoes::Swt::ListBox do
     it "should call the change listeners" do
       expect(dsl).to receive(:call_change_listeners)
       expect(real).to receive(:add_selection_listener) do |&blk|
-        blk.call()
+        blk.call
       end
       subject
     end

data/spec/shoes/swt/mouse_move_listener_spec.rb

@@ -1,20 +1,27 @@
 require 'spec_helper'
 
 describe Shoes::Swt::MouseMoveListener do
-  let(:app) {double 'SWT App', dsl: dsl_app, shell: shell,
-                               clickable_elements: clickable_elements}
-  let(:clickable_elements) {[]}
-  let(:mouse_hover_controls) {[]}
-  let(:mouse_motion) {[]}
-  let(:shell) {double 'Shell', setCursor: nil}
-  let(:dsl_app) {double('DSL App', mouse_hover_controls: mouse_hover_controls,
-                                   mouse_motion: mouse_motion).as_null_object}
-  let(:x) {10}
-  let(:y) {42}
-  let(:block) {double 'Block', call: nil}
-  let(:mouse_event) {double 'mouse event', x: x, y: y}
-
-  subject {Shoes::Swt::MouseMoveListener.new(app)}
+  let(:app) do
+    double 'SWT App', dsl: dsl_app, shell: shell,
+                      clickable_elements: clickable_elements
+  end
+
+  let(:clickable_elements) { [] }
+  let(:mouse_hover_controls) { [] }
+  let(:mouse_motion) { [] }
+  let(:shell) { double 'Shell', setCursor: nil }
+
+  let(:dsl_app) do
+    double('DSL App', mouse_hover_controls: mouse_hover_controls,
+                      mouse_motion: mouse_motion).as_null_object
+  end
+
+  let(:x) { 10 }
+  let(:y) { 42 }
+  let(:block) { double 'Block', call: nil }
+  let(:mouse_event) { double 'mouse event', x: x, y: y }
+
+  subject { Shoes::Swt::MouseMoveListener.new(app) }
   before :each do
     subject.mouse_move(mouse_event)
   end
@@ -26,7 +33,7 @@ describe Shoes::Swt::MouseMoveListener do
   end
 
   describe 'mouse motion' do
-    let(:mouse_motion) {[block]}
+    let(:mouse_motion) { [block] }
 
     it 'calls the block with the position' do
       expect(block).to have_received(:call).with(x, y)
@@ -34,18 +41,18 @@ describe Shoes::Swt::MouseMoveListener do
   end
 
   describe 'shape control' do
-    let(:hand_cursor) {Shoes::Swt::Shoes.display.getSystemCursor(::Swt::SWT::CURSOR_HAND)}
-    let(:arrow_cursor) {Shoes::Swt::Shoes.display.getSystemCursor(::Swt::SWT::CURSOR_ARROW)}
+    let(:hand_cursor) { Shoes::Swt::Shoes.display.getSystemCursor(::Swt::SWT::CURSOR_HAND) }
+    let(:arrow_cursor) { Shoes::Swt::Shoes.display.getSystemCursor(::Swt::SWT::CURSOR_ARROW) }
 
     context 'over a clickable element' do
-      let(:clickable_elements) {[double('element', visible?: true, in_bounds?: true)]}
+      let(:clickable_elements) { [double('element', visible?: true, in_bounds?: true)] }
       it 'should set the curser hand' do
         expect(shell).to have_received(:setCursor).with(hand_cursor)
       end
     end
 
     context 'not over a clickable element' do
-      let(:clickable_elements) {[double('element', visible?: true, in_bounds?: false)]}
+      let(:clickable_elements) { [double('element', visible?: true, in_bounds?: false)] }
       it 'should set the curser hand' do
         expect(shell).to have_received(:setCursor).with(arrow_cursor)
       end
@@ -53,9 +60,12 @@ describe Shoes::Swt::MouseMoveListener do
   end
 
   describe 'hover control' do
-    let(:element) {double 'element', in_bounds?: in_bounds?, hovered?: hovered?,
-                                     visible?: true, mouse_left: nil, mouse_hovered: nil}
-    let(:mouse_hover_controls) {[element]}
+    let(:element) do
+      double 'element', in_bounds?: in_bounds?, hovered?: hovered?,
+                        visible?: true, mouse_left: nil, mouse_hovered: nil
+    end
+
+    let(:mouse_hover_controls) { [element] }
 
     shared_examples_for 'does not do anything' do
       it 'calls no hover related methods whatsoever' do
@@ -65,22 +75,22 @@ describe Shoes::Swt::MouseMoveListener do
     end
 
     context 'in bounds and hovered' do
-      let(:in_bounds?) {true}
-      let(:hovered?) {true}
+      let(:in_bounds?) { true }
+      let(:hovered?) { true }
 
       it_behaves_like 'does not do anything'
     end
 
     context 'out of bounds and not hovered' do
-      let(:in_bounds?) {false}
-      let(:hovered?) {false}
+      let(:in_bounds?) { false }
+      let(:hovered?) { false }
 
       it_behaves_like 'does not do anything'
     end
 
     context 'in bounds and not hovered' do
-      let(:in_bounds?) {true}
-      let(:hovered?) {false}
+      let(:in_bounds?) { true }
+      let(:hovered?) { false }
 
       it 'calls the hovered method' do
         expect(element).to have_received :mouse_hovered
@@ -88,8 +98,8 @@ describe Shoes::Swt::MouseMoveListener do
     end
 
     context 'out of bounds and hovered' do
-      let(:in_bounds?) {false}
-      let(:hovered?) {true}
+      let(:in_bounds?) { false }
+      let(:hovered?) { true }
 
       it 'calls the mouse_left method' do
         expect(element).to have_received :mouse_left
@@ -97,21 +107,27 @@ describe Shoes::Swt::MouseMoveListener do
     end
 
     describe 'in bounds, not hovered but hidden' do
-      let(:in_bounds?) {true}
-      let(:hovered?)   {false}
-      let(:element) {double 'element', in_bounds?: in_bounds?, hovered?: hovered?,
-                                       visible?: false, mouse_left: nil, mouse_hovered: nil}
+      let(:in_bounds?) { true }
+      let(:hovered?)   { false }
+
+      let(:element) do
+        double 'element', in_bounds?: in_bounds?, hovered?: hovered?,
+                          visible?: false, mouse_left: nil, mouse_hovered: nil
+      end
 
       it_behaves_like 'does not do anything'
     end
 
     describe 'with 2 elements' do
-      let(:in_bounds?) {false}
-      let(:hovered?) {true}
+      let(:in_bounds?) { false }
+      let(:hovered?) { true }
+
+      let(:element2) do
+        double 'element 2', in_bounds?: true, hovered?: false, visible?: true,
+                            mouse_left: nil, mouse_hovered: nil
+      end
 
-      let(:element2) {double 'element 2', in_bounds?: true, hovered?: false,
-                                          visible?: true, mouse_left: nil, mouse_hovered: nil}
-      let(:mouse_hover_controls) {[element, element2]}
+      let(:mouse_hover_controls) { [element, element2] }
 
       it 'calls leave for element 1 before calling hover for element 2' do
         expect(element).to receive(:mouse_left).ordered