shoes-swt 4.0.0.pre3 → 4.0.0.pre4

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

@@ -78,12 +78,12 @@ describe Shoes::Swt::TextBlock::TextSegment do
   end
 
   describe "shrinking on initialization" do
-    it "should not shrink when enough containing width" do
-      expect(subject.layout).to_not have_received(:width=)
+    it "happens when too long for container" do
+      bounds.width = segment_width + 10
+      expect(subject.layout).to have_received(:width=).with(segment_width)
     end
 
-    it "shrinks when too long for container" do
-      bounds.width = segment_width + 10
+    it "happens even when enough containing width" do
       expect(subject.layout).to have_received(:width=).with(segment_width)
     end
   end

data/spec/shoes/swt/text_block_spec.rb

@@ -59,35 +59,41 @@ describe Shoes::Swt::TextBlock do
       end
 
       it "positions single line of text" do
-        expect(dsl).to receive(:absolute_right=).with(layout_width + 50)
-        expect(dsl).to receive(:absolute_bottom=).with(layout_height)
+        expect(dsl).to receive(:absolute_right=).with(layout_width + 50 - 1)
+        expect(dsl).to receive(:absolute_bottom=).with(layout_height - 1)
 
         when_aligns_and_positions
 
-        expect(current_position.y).to eq(layout_height - line_height)
+        expect(current_position.y).to eq(layout_height - line_height + 1)
       end
 
       it "positions single line with margin" do
         allow(dsl).to receive_messages(margin_left: margin, margin_right: margin,
                  margin_top: margin, margin_bottom: margin)
 
-        expect(dsl).to receive(:absolute_right=).with(layout_width + 50 + margin)
-        expect(dsl).to receive(:absolute_bottom=).with(layout_height + 2 * margin)
+        expect(dsl).to receive(:absolute_right=).with(layout_width + 50 + margin - 1)
+        expect(dsl).to receive(:absolute_bottom=).with(layout_height + 2 * margin - 1)
 
         when_aligns_and_positions
 
-        expect(current_position.y).to eq(layout_height - line_height)
+        expect(current_position.y).to eq(layout_height - line_height + 1)
       end
 
       it "pushes to next line if ends in newline" do
         allow(dsl).to receive(:text) { "text\n" }
 
         expect(dsl).to receive(:absolute_right=).with(50)
-        expect(dsl).to receive(:absolute_bottom=).with(layout_height)
+        expect(dsl).to receive(:absolute_right=).with(149)
+        expect(dsl).to receive(:absolute_bottom=).with(layout_height - 1)
 
         when_aligns_and_positions
 
-        expect(current_position.y).to eq(layout_height)
+        expect(current_position.y).to eq(layout_height + 1)
+      end
+
+      it "is aligns and positions safely without segments" do
+        allow(fitter).to receive(:fit_it_in).and_return([])
+        when_aligns_and_positions
       end
 
       it "disposes of prior segments" do
@@ -124,6 +130,13 @@ describe Shoes::Swt::TextBlock do
           subject.remove
         end
       end
+
+      context "when doesn't fit" do
+        it "bails out early" do
+          allow(fitter).to receive(:fit_it_in).and_return([])
+          subject.contents_alignment(current_position)
+        end
+      end
     end
 
     describe "with two segments" do
@@ -140,24 +153,24 @@ describe Shoes::Swt::TextBlock do
       end
 
       it "positions in two segments" do
-        expect(dsl).to receive(:absolute_right=).with(layout_width)
-        expect(dsl).to receive(:absolute_bottom=).with(layout_height)
+        expect(dsl).to receive(:absolute_right=).with(layout_width - 1)
+        expect(dsl).to receive(:absolute_bottom=).with(layout_height - 1)
 
         when_aligns_and_positions
 
-        expect(current_position.y).to eq(layout_height - line_height)
+        expect(current_position.y).to eq(layout_height - line_height + 1)
       end
 
       it "positions in two segments with margins" do
         allow(dsl).to receive_messages(margin_left: margin, margin_right: margin,
                  margin_top: margin, margin_bottom: margin)
 
-        expect(dsl).to receive(:absolute_right=).with(layout_width + margin)
-        expect(dsl).to receive(:absolute_bottom=).with(layout_height + 2 * margin)
+        expect(dsl).to receive(:absolute_right=).with(layout_width + margin - 1)
+        expect(dsl).to receive(:absolute_bottom=).with(layout_height + 2 * margin - 1)
 
         when_aligns_and_positions
 
-        expect(current_position.y).to eq(layout_height - line_height)
+        expect(current_position.y).to eq(layout_height - line_height + 1)
       end
     end
   end
@@ -183,7 +196,7 @@ describe Shoes::Swt::TextBlock do
   def create_segment(name="segment", width=layout_width,
                     height=layout_height, line_height=line_height)
     bounds = double("bounds", width: width, height: height)
-    double(name, disposed?: false,
+    double(name, disposed?: false, style_from: nil,
            width: width, height: height,
            last_line_width: width, last_line_height: line_height,
            bounds: bounds)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre3
+  version: 4.0.0.pre4
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre3
+        version: 4.0.0.pre4
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre3
+        version: 4.0.0.pre4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre3
+        version: 4.0.0.pre4
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre3
+        version: 4.0.0.pre4
 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.
 email:
 - shoes@librelist.com
@@ -198,6 +198,7 @@ files:
 - spec/shoes/swt/shared_examples/swt_app_context.rb
 - spec/shoes/swt/shared_examples/visibility.rb
 - spec/shoes/swt/shell_control_listener_spec.rb
+- spec/shoes/swt/shoes_layout_spec.rb
 - spec/shoes/swt/slot_spec.rb
 - spec/shoes/swt/spec_helper.rb
 - spec/shoes/swt/star_spec.rb
@@ -282,6 +283,7 @@ test_files:
 - spec/shoes/swt/shared_examples/swt_app_context.rb
 - spec/shoes/swt/shared_examples/visibility.rb
 - spec/shoes/swt/shell_control_listener_spec.rb
+- spec/shoes/swt/shoes_layout_spec.rb
 - spec/shoes/swt/slot_spec.rb
 - spec/shoes/swt/spec_helper.rb
 - spec/shoes/swt/star_spec.rb