shoes-swt 4.0.0.pre6 → 4.0.0.pre7

data/spec/shoes/swt/star_painter_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Shoes::Swt::StarPainter do
+  include_context "swt app"
+  include_context "painter context"
+
+  let(:left) { 55 }
+  let(:top) { 77 }
+  let(:points) { 7 }
+  let(:outer) { 100 }
+  let(:inner) { 20 }
+  let(:corners) { 0 }
+
+  let(:dsl) do
+    double("dsl object", hidden: false, points: points, outer: outer,
+                         inner: inner, element_width: outer * 2.0,
+                         element_height: outer * 2.0, element_left: left,
+                         element_top: top).as_null_object
+  end
+
+  let(:shape) { Shoes::Swt::Star.new dsl, swt_app }
+  subject { Shoes::Swt::StarPainter.new shape }
+
+  it_behaves_like "fill painter"
+  it_behaves_like "stroke painter"
+
+  it "fills star" do
+    expect(gc).to receive(:fillPolygon)
+    subject.paint_control(event)
+  end
+
+  it "draws star" do
+    expect(gc).to receive(:drawPolygon)
+    subject.paint_control(event)
+  end
+end

data/spec/shoes/swt/star_spec.rb

@@ -19,29 +19,4 @@ describe Shoes::Swt::Star do
   it_behaves_like "paintable"
   it_behaves_like "updating visibility"
   it_behaves_like 'clickable backend'
-
-  describe "painter" do
-    include_context "painter context"
-
-    let(:corners) { 0 }
-    let(:dsl) { double("dsl object", hidden: false, points: points, outer: outer,
-                                     inner: inner, element_width: outer * 2.0,
-                                     element_height: outer * 2.0, element_left: left,
-                                     element_top: top).as_null_object }
-    let(:shape) { Shoes::Swt::Star.new dsl, swt_app }
-    subject { Shoes::Swt::Star::Painter.new shape }
-
-    it_behaves_like "fill painter"
-    it_behaves_like "stroke painter"
-
-    it "fills star" do
-      expect(gc).to receive(:fillPolygon)
-      subject.paint_control(event)
-    end
-
-    it "draws star" do
-      expect(gc).to receive(:drawPolygon)
-      subject.paint_control(event)
-    end
-  end
 end

data/spec/shoes/swt/text_block/centered_text_segment_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Shoes::Swt::TextBlock::CenteredTextSegment do
   let(:width) { 200 }
-  let(:dsl)   { double("dsl", text: "boo", font: "", size: 16, style:{}) }
+  let(:dsl)   { double("dsl", text: "boo", font: "", size: 16, style: {}) }
 
-  subject { Shoes::Swt::TextBlock::CenteredTextSegment.new(dsl, width)}
+  subject { Shoes::Swt::TextBlock::CenteredTextSegment.new(dsl, width) }
 
   it "takes all the width it can get" do
     expect(subject.width).to eq(width)

data/spec/shoes/swt/text_block/cursor_painter_spec.rb

@@ -4,13 +4,13 @@ describe Shoes::Swt::TextBlock::CursorPainter do
   include_context "swt app"
 
   let(:dsl) { double("dsl", app: shoes_app, textcursor: textcursor, textcursor?: true) }
-  let(:textcursor) { double("textcursor", left:0, top: 0, height: 10) }
-  let(:segment_collection) { double('segment collection',
-                                    cursor_height: 12,
-                                    relative_text_position: 0)}
+  let(:textcursor) { double("textcursor", left: 0, top: 0, height: 10) }
 
-  subject { Shoes::Swt::TextBlock::CursorPainter.new(dsl,
-                                                     segment_collection) }
+  let(:segment_collection) do
+    double('segment collection', cursor_height: 12, relative_text_position: 0)
+  end
+
+  subject { Shoes::Swt::TextBlock::CursorPainter.new(dsl, segment_collection) }
 
   describe "missing cursor" do
     before(:each) do
@@ -21,7 +21,7 @@ describe Shoes::Swt::TextBlock::CursorPainter do
     end
 
     it "shouldn't do anything without text cursor" do
-      allow(dsl).to receive(:textcursor?) { nil}
+      allow(dsl).to receive(:textcursor?) { nil }
       subject.draw
       expect(dsl).to_not have_received(:textcursor=)
     end
@@ -37,9 +37,11 @@ describe Shoes::Swt::TextBlock::CursorPainter do
     let(:left) { 10 }
     let(:top)  { 20 }
     let(:position) { double(x: 5, y: 5) }
-    let(:first_segment) { double("first segment", text: "first",
-                                                  get_location: position, height: 10,
-                                                  element_left: left, element_top: top) }
+
+    let(:first_segment) do
+      double("first segment", text: "first", get_location: position, height: 10,
+                              element_left: left, element_top: top)
+    end
 
     before(:each) do
       allow(textcursor).to receive(:move)
@@ -47,9 +49,11 @@ describe Shoes::Swt::TextBlock::CursorPainter do
     end
 
     context "with two segments" do
-      let(:second_segment) { double("second segment", text: "second",
-                                                      get_location: position,
-                                                      element_left: left, element_top: top + 100) }
+      let(:second_segment) do
+        double("second segment", text: "second", get_location: position,
+                                 element_left: left, element_top: top + 100)
+      end
+
       before(:each) do
         allow(dsl).to receive(:text).and_return(first_segment.text + second_segment.text)
       end

data/spec/shoes/swt/text_block/fitter_spec.rb

@@ -1,18 +1,23 @@
 require 'spec_helper'
 
 describe Shoes::Swt::TextBlock::Fitter do
-  let(:dsl) { double('dsl', parent: parent_dsl, text: "Text goes here",
-                            desired_width: 85, centered?:    false,
-                            absolute_left: 25, absolute_top: 75,
-                            element_left:  26, element_top:  76,
-                            margin_left:   1,  margin_top:   1) }
+  let(:dsl) do
+    double('dsl', parent: parent_dsl, text: "Text goes here",
+                  desired_width: 85,  centered?:    false,
+                  absolute_left: 25,  absolute_top: 75,
+                  element_left:  26,  element_top:  76,
+                  margin_left:   1,   margin_top:   1)
+  end
 
-  let(:parent_dsl) { double('parent_dsl', parent: grandparent_dsl,
-                                          absolute_top: 0, absolute_left: 0, absolute_right: 100,
-                                          width: parent_width, height: 200) }
+  let(:parent_dsl) do
+    double('parent_dsl', parent: grandparent_dsl,
+                         absolute_top: 0, absolute_left: 0, absolute_right: 100,
+                         width: parent_width, height: 200)
+  end
 
-  let(:grandparent_dsl) { double('grandparent_dsl', parent: app,
-                                                    width: grandparent_width) }
+  let(:grandparent_dsl) do
+    double('grandparent_dsl', parent: app, width: grandparent_width)
+  end
 
   let(:app) { double('app', width: app_width) }
 
@@ -60,14 +65,14 @@ describe Shoes::Swt::TextBlock::Fitter do
       end
 
       it "bumps out until it fits" do
-        when_positioned_at(x:1010, y: 5, next_line_start: 5)
+        when_positioned_at(x: 1010, y: 5, next_line_start: 5)
         allow(dsl).to receive(:desired_width).with(app_width) { 990 }
 
         expect(subject.available_space).to eq([990, :unbounded])
       end
 
       it "just gives up if it still won't fit" do
-        when_positioned_at(x:1010, y: 5, next_line_start: 5)
+        when_positioned_at(x: 1010, y: 5, next_line_start: 5)
         expect(subject.available_space).to eq([0, 0])
       end
     end
@@ -76,14 +81,14 @@ describe Shoes::Swt::TextBlock::Fitter do
   describe "finding what didn't fit" do
     it "splits when one line past requested height" do
       segment = double('segment', line_offsets: [0, 5, 10], text: "Text Split")
-      allow(segment).to receive(:get_line_bounds) { double('line_bounds', height: 25)}
+      allow(segment).to receive(:get_line_bounds) { double('line_bounds', height: 25) }
 
       expect(subject.split_text(segment, 24)).to eq(["Text ", "Split"])
     end
 
     it "should be able to split text when too small" do
       segment = double('segment', line_offsets: [0, 10], text: "Text Split")
-      allow(segment).to receive(:get_line_bounds).with(0) { double('line_bounds', height: 21)}
+      allow(segment).to receive(:get_line_bounds).with(0) { double('line_bounds', height: 21) }
       allow(segment).to receive(:get_line_bounds).with(1) { raise "Boom" }
 
       expect(subject.split_text(segment, 33)).to eq(["Text Split", ""])
@@ -91,10 +96,12 @@ describe Shoes::Swt::TextBlock::Fitter do
   end
 
   describe "fit it in" do
-    let(:bounds) { double('bounds', width: 100, height: 50)}
-    let(:segment) { double('segment',
-                           text: "something something", :text= => nil,
-                           line_count: 1, line_offsets:[], bounds: bounds) }
+    let(:bounds) { double('bounds', width: 100, height: 50) }
+
+    let(:segment) do
+      double('segment', text: "something something", :text= => nil,
+                        line_count: 1, line_offsets: [], bounds: bounds)
+    end
 
     before(:each) do
       layout = double('swt_layout', :spacing => 4, :spacing= => nil)

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

@@ -8,10 +8,13 @@ describe Shoes::Swt::TextBlock::Painter do
   let(:gui)    { double("gui", dispose: nil, segments: segment_collection) }
   let(:segment_collection) { double("segment collection", empty?: false) }
 
-  let(:event)  { double("event", gc: graphics_context).as_null_object }
-  let(:graphics_context) { double("graphics context", set_antialias: nil,
-                                  set_line_cap: nil, set_transform: nil,
-                                  clipping: nil, set_clipping: nil) }
+  let(:event) { double("event", gc: graphics_context).as_null_object }
+
+  let(:graphics_context) do
+    double("graphics context", set_antialias: nil, set_line_cap: nil,
+                               set_transform: nil, clipping: nil,
+                               set_clipping: nil)
+  end
 
   subject { Shoes::Swt::TextBlock::Painter.new(dsl) }
 

data/spec/shoes/swt/text_block/text_font_factory_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Shoes::Swt::TextFontFactory do
-  let(:font_details) {
+  let(:font_details) do
     {
       name: "Helvetica",
       size: 16,
       styles: [::Swt::SWT::BOLD]
     }
-  }
+  end
 
-  subject { Shoes::Swt::TextFontFactory.new() }
+  subject { Shoes::Swt::TextFontFactory.new }
 
   it "creates a font" do
     font = subject.create_font(font_details)

data/spec/shoes/swt/text_block/text_segment_collection_spec.rb

@@ -5,11 +5,14 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
 
   let(:first_segment) { create_segment("first", "first") }
   let(:second_segment) { create_segment("second", "rest") }
-  let(:dsl) { double("dsl", font: "", size: 16, style:{},
-                            text_styles: {(0..-1) => ["whatever"]}) }
+
+  let(:dsl) do
+    double("dsl", font: "", size: 16, style: {},
+                  text_styles: {(0..-1) => ["whatever"]})
+  end
 
   let(:gc) { double("gc") }
-  let(:default_text_styles) {
+  let(:default_text_styles) do
     {
       fg: :fg,
       bg: :bg,
@@ -21,12 +24,14 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
         styles: [::Swt::SWT::NORMAL]
       }
     }
-  }
+  end
 
   describe "with one segment" do
-    subject { Shoes::Swt::TextBlock::TextSegmentCollection.new(dsl,
-                                                               [first_segment],
-                                                               default_text_styles) }
+    subject do
+      Shoes::Swt::TextBlock::TextSegmentCollection.new(dsl,
+                                                       [first_segment],
+                                                       default_text_styles)
+    end
 
     before do
       allow(dsl).to receive(:text) { first_segment.text }
@@ -42,7 +47,7 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
     end
 
     it "applies segment styling" do
-      styles = [[0..1, [double("segment", style:{stroke: :blue})]]]
+      styles = [[0..1, [double("segment", style: {stroke: :blue})]]]
       subject.style_segment_ranges(styles)
 
       expected_style = style_with(stroke: :blue, fg: :blue)
@@ -129,9 +134,11 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
   end
 
   describe "with two segments" do
-    subject { Shoes::Swt::TextBlock::TextSegmentCollection.new(dsl,
-                                                               [first_segment, second_segment],
-                                                               default_text_styles) }
+    subject do
+      Shoes::Swt::TextBlock::TextSegmentCollection.new(dsl,
+                                                       [first_segment, second_segment],
+                                                       default_text_styles)
+    end
 
     before do
       allow(dsl).to receive(:text) { first_segment.text + second_segment.text }
@@ -154,11 +161,11 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
     it "spans both segments" do
       result = subject.segment_ranges(2..7)
       expect(result).to eql([[first_segment, 2..5],
-                             [second_segment,  0..2]])
+                             [second_segment, 0..2]])
     end
 
     it "applies segment styling in first segment" do
-      styles = [[0..2, [double("segment", style:{stroke: :blue})]]]
+      styles = [[0..2, [double("segment", style: {stroke: :blue})]]]
       subject.style_segment_ranges(styles)
 
       expected_style = style_with(stroke: :blue, fg: :blue)
@@ -167,7 +174,7 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
     end
 
     it "applies segment styling in second segment" do
-      styles = [[5..7, [double("segment", style:{stroke: :blue})]]]
+      styles = [[5..7, [double("segment", style: {stroke: :blue})]]]
       subject.style_segment_ranges(styles)
 
       expected_style = style_with(stroke: :blue, fg: :blue)
@@ -176,7 +183,7 @@ describe Shoes::Swt::TextBlock::TextSegmentCollection do
     end
 
     it "applies segment styling in both segments" do
-      styles = [[2..7, [double("segment", style:{stroke: :blue})]]]
+      styles = [[2..7, [double("segment", style: {stroke: :blue})]]]
       subject.style_segment_ranges(styles)
 
       expected_style = style_with(stroke: :blue, fg: :blue)

data/spec/shoes/swt/text_block/text_segment_spec.rb

@@ -1,11 +1,14 @@
 require 'spec_helper'
 
 describe Shoes::Swt::TextBlock::TextSegment do
-  let(:layout) { double("layout", text: "the text",
-                                  :alignment= => nil, :justify= => nil, :spacing= => nil,
-                                  :text= => nil, :width= => nil,
-                                  disposed?: false, dispose: nil,
-                                  set_style: nil, bounds: bounds) }
+  let(:layout) do
+    double("layout", text: "the text",
+                     :alignment= => nil, :justify= => nil, :spacing= => nil,
+                     :text= => nil, :width= => nil,
+                     disposed?: false, dispose: nil,
+                     set_style: nil, bounds: bounds)
+  end
+
   let(:bounds) { Java::OrgEclipseSwtGraphics::Rectangle.new(0, 0, 0, 0) }
   let(:element_left) { 0 }
   let(:element_top)  { 0 }
@@ -19,7 +22,7 @@ describe Shoes::Swt::TextBlock::TextSegment do
   let(:font)   { double("font") }
   let(:style)  { double("style") }
 
-  let(:style_hash) {
+  let(:style_hash) do
     {
       bg: double("bg"),
       fg: double("fg"),
@@ -29,9 +32,9 @@ describe Shoes::Swt::TextBlock::TextSegment do
         styles: nil
       }
     }
-  }
+  end
 
-  let(:dsl) { double("dsl", font: "", size: 16, style:{}) }
+  let(:dsl) { double("dsl", font: "", size: 16, style: {}) }
 
   before(:each) do
     allow(::Swt::TextLayout).to receive(:new)            { layout }
@@ -61,9 +64,9 @@ describe Shoes::Swt::TextBlock::TextSegment do
   context "setting style" do
     it "on full range" do
       subject.set_style(style_hash)
-      expect(layout).to have_received(:set_style).
-                          with(style, 0, layout.text.length - 1).
-                          at_least(1).times
+      expect(layout).to have_received(:set_style)
+        .with(style, 0, layout.text.length - 1)
+        .at_least(1).times
     end
 
     it "with a range" do
@@ -94,7 +97,7 @@ describe Shoes::Swt::TextBlock::TextSegment do
     end
 
     it "checks boundaries" do
-      expect(subject.in_bounds?(1,1)).to be_truthy
+      expect(subject.in_bounds?(1, 1)).to be_truthy
     end
 
     describe "offsets left" do

data/spec/shoes/swt/text_block_spec.rb

@@ -6,10 +6,12 @@ describe Shoes::Swt::TextBlock do
   let(:height) { 100 }
   let(:width)  { 200 }
   let(:margin) { 10 }
-  let(:dsl) { double("dsl", app: shoes_app, text: "text",
-                            margin_left: 0, margin_right: 0,
-                            margin_top: 0, margin_bottom: 0,
-                            pass_coordinates?: nil).as_null_object }
+
+  let(:dsl) do
+    double("dsl", app: shoes_app, text: "text", margin_left: 0, margin_right: 0,
+                  margin_top: 0, margin_bottom: 0, pass_coordinates?: nil)
+      .as_null_object
+  end
 
   subject { Shoes::Swt::TextBlock.new(dsl, swt_app) }
 
@@ -17,18 +19,18 @@ describe Shoes::Swt::TextBlock do
   it_behaves_like "updating visibility"
   it_behaves_like "clickable backend"
 
-  # reported nil, caused trouble in simple-downloader.rb
+  # reported nil, caused trouble in simple_downloader.rb
   it 'initially responds with empty segments' do
     expect(subject.segments).to be_empty
   end
 
   describe "bounds checking" do
     it "delegates to segment" do
-      segment = double()
+      segment = double
       subject.segments = [segment]
       expect(segment).to receive(:in_bounds?)
 
-      subject.in_bounds?(1,1)
+      subject.in_bounds?(1, 1)
     end
   end
 
@@ -44,7 +46,7 @@ describe Shoes::Swt::TextBlock do
     let(:segment) { create_segment }
     let(:second_segment) { create_segment }
 
-    let(:current_position) { Shoes::Slot::CurrentPosition.new(0, 0) }
+    let(:current_position) { Shoes::Slot::Position.new(0, 0) }
 
     before(:each) do
       allow(::Shoes::Swt::TextBlock::Fitter).to receive(:new) { fitter }
@@ -178,7 +180,7 @@ describe Shoes::Swt::TextBlock do
   end
 
   context "links" do
-    let(:link)     { Shoes::Link.new(shoes_app, ["link"])  }
+    let(:link) { Shoes::Link.new(shoes_app, ["link"]) }
 
     before(:each) do
       allow(dsl).to receive(:links) { [link] }
@@ -196,7 +198,7 @@ describe Shoes::Swt::TextBlock do
   end
 
   def create_segment(name = "segment", width = layout_width,
-                    height = layout_height, last_line_height = line_height)
+                     height = layout_height, last_line_height = line_height)
     bounds = double("bounds", width: width, height: height)
     double(name, disposed?: false, style_from: nil,
                  width: width, height: height,