shoes-core 4.0.0.pre3 → 4.0.0.pre4

data/spec/shoes/download_spec.rb

@@ -15,10 +15,8 @@ describe Shoes::Download do
   let(:length) {download.length}
   let(:content_length) {download.content_length}
 
-  let(:bound_block) { Proc.new {} }
-
   before do
-    expect(app.current_slot).to receive(:create_bound_block).at_least(1) { |blk| blk ? bound_block : nil }
+    expect(app.current_slot).to receive(:create_bound_block).at_least(1) { |blk| blk ? blk : nil }
 
     stub_request(:get, name)
       .to_return(:status => response_status, :body => response_body, :headers => response_headers)
@@ -79,7 +77,7 @@ describe Shoes::Download do
     context 'with content length' do
       it 'calls the progress proc from start, download and finish' do
         expect(download.gui).to have_received(:eval_block).
-                                  with(bound_block, download).
+                                  with(progress_proc, download).
                                   exactly(3).times
       end
     end
@@ -89,9 +87,13 @@ describe Shoes::Download do
 
       it 'does not call on progress, but called from content length and finish' do
         expect(download.gui).to have_received(:eval_block).
-          with(bound_block, download).
+          with(progress_proc, download).
           twice
       end
+
+      it 'can call percent just fine thanks' do
+        expect(download.percent).to eq(0)
+      end
     end
   end
 
@@ -107,7 +109,7 @@ describe Shoes::Download do
 
     context 'with a block' do
       it 'calls the block with a result' do
-        expect(download.gui).to have_received(:eval_block).with(bound_block, result)
+        expect(download.gui).to have_received(:eval_block).with(input_block, result)
       end
 
       describe 'response object' do
@@ -134,13 +136,52 @@ describe Shoes::Download do
     end
 
     context 'with a finish proc' do
-      let(:opts) { {save: "nasa50th.gif", finish: input_block} }
+      let(:finish_proc) { Proc.new {} }
+      let(:opts) { {save: "nasa50th.gif", finish: finish_proc} }
       subject(:download) { Shoes::Download.new app, parent, name, opts }
 
       it 'calls the finish proc' do
-        expect(download.gui).to have_received(:eval_block).with(bound_block, subject)
+        expect(download.gui).to have_received(:eval_block).with(finish_proc, subject)
       end
     end
 
   end
+
+  describe 'when things go wrong' do
+    it 'reports back to the parent thread' do
+      error = StandardError.new("Nope")
+
+      expect(download.gui).to receive(:eval_block).with(anything, error)
+      allow(download).to receive(:open).and_raise(error)
+
+      download.start
+      download.join_thread
+    end
+
+    it 'does not die on socket errors, but logs them' do
+      error = SocketError.new('Badumz')
+
+      expect(download.gui).not_to receive(:eval_block)
+      expect(Shoes.logger).to receive(:error).with error
+      allow(download).to receive(:open).and_raise(error)
+
+      download.start
+      download.join_thread
+    end
+
+    describe 'with custom error blocks' do
+      let(:error_proc) { Proc.new { } }
+      let(:opts) { {save: "nasa50th.gif", error: error_proc} }
+
+      it 'gets called' do
+        error = StandardError.new("Nope")
+
+        expect(download.gui).to receive(:eval_block).with(error_proc, error)
+        allow(download).to receive(:open).and_raise(error)
+
+        download.start
+        download.join_thread
+      end
+    end
+  end
 end

data/spec/shoes/flow_spec.rb

@@ -37,7 +37,7 @@ describe Shoes::Flow do
     expect(flow).to receive(:clear) do |&blk|
       expect(blk).to eq(input_block)
     end
-    flow.clear &input_block
+    flow.clear(&input_block)
   end
 
   describe "positioning" do

data/spec/shoes/helpers/fake_element.rb

@@ -12,6 +12,13 @@ class Shoes
     def adjust_current_position(*_)
     end
 
+    # Fake this out instead of using Common::Style to avoid things like touching
+    # app level styles, etc. that we don't need for testing purposes
+    def style
+      @style ||= {}
+      @style
+    end
+
     attr_accessor :parent, :gui
   end
 end

data/spec/shoes/helpers/sample17_helper.rb

@@ -10,16 +10,16 @@
 #   end
 #
 class Sample17Helper
-  
+
   def initialize(app)
     # This gives us the Shoes::App
     @app = app.app
   end
-  
+
   def create_para
     @app.para("Testing, test, test. ", strong_breadsticks, em, code, bg, sub)
   end
-  
+
   def breadsticks
     "Breadsticks. "
   end

data/spec/shoes/integration_spec.rb

@@ -17,4 +17,4 @@ describe 'Integration specs' do
       end.not_to raise_error
     end
   end
-end
+end

data/spec/shoes/internal_app_spec.rb

@@ -65,6 +65,14 @@ describe Shoes::InternalApp do
     end
   end
 
+  describe '#inspect' do
+    let(:input_opts) {{title: 'Dupa'}}
+
+    it 'shows the title in inspect' do
+      expect(subject.inspect).to include 'Dupa'
+    end
+  end
+
   describe '#clear' do
     context 'when called after the initial input block' do
       let(:input_block) {

data/spec/shoes/line_spec.rb

@@ -19,7 +19,7 @@ describe Shoes::Line do
     it_behaves_like 'object with parent'
   end
 
-  context "line with point a at leftmost, topmost" do
+  describe "line with point a at leftmost, topmost" do
     subject { Shoes::Line.new(app, app, Shoes::Point.new(10, 15), Shoes::Point.new(100, 60), input_opts) }
     its(:left)   { should eq(10) }
     its(:top)    { should eq(15) }
@@ -29,7 +29,7 @@ describe Shoes::Line do
     its(:height) { should eq(45) }
   end
 
-  context "specified right-to-left, top-to-bottom" do
+  describe "specified right-to-left, top-to-bottom" do
     subject { Shoes::Line.new(app, app, Shoes::Point.new(100, 60), Shoes::Point.new(10, 15), input_opts) }
     its(:left)   { should eq(100) }
     its(:top)    { should eq(60) }
@@ -39,7 +39,7 @@ describe Shoes::Line do
     its(:height) { should eq(-45) }
   end
 
-  context "setting dimensions" do
+  describe "setting dimensions" do
     subject { Shoes::Line.new(app, app, Shoes::Point.new(100, 100), Shoes::Point.new(200, 200), input_opts) }
 
     it "moves point a with left and top" do
@@ -84,4 +84,36 @@ describe Shoes::Line do
       expect(subject.point_b).to eq(Shoes::Point.new(20, 20))
     end
   end
+
+  describe "#in_bounds?" do
+    subject(:line) { Shoes::Line.new(app, app, Shoes::Point.new(100, 100), Shoes::Point.new(50, 50), input_opts) }
+
+    it "returns true if a point is in the end of the line" do
+      expect(subject.in_bounds?(100, 100)).to be true
+    end
+
+    it "returns true if a point is in the end of the line" do
+      expect(subject.in_bounds?(50, 50)).to be true
+    end
+
+    it "returns true if a point is in the middle of the line" do
+      expect(subject.in_bounds?(75, 75)).to be true
+    end
+
+    it "returns false if a point is not in the line" do
+      expect(subject.in_bounds?(201, 200)).to be false
+    end
+
+    it "takes into account :strokewidth style" do
+      line = Shoes::Line.new(app, app, Shoes::Point.new(50, 50), Shoes::Point.new(70, 50), input_opts)
+      line.style(strokewidth: 20)
+      expect(line.in_bounds?(50, 52)).to be true
+      expect(line.in_bounds?(50, 48)).to be true
+      expect(line.in_bounds?(50, 60)).to be true
+      expect(line.in_bounds?(50, 40)).to be true
+      expect(line.in_bounds?(49, 50)).to be false
+      expect(line.in_bounds?(50, 61)).to be false
+      expect(line.in_bounds?(70, 50)).to be true
+    end
+  end
 end

data/spec/shoes/link_spec.rb

@@ -2,11 +2,11 @@ require 'shoes/spec_helper'
 
 describe Shoes::Link do
   let(:gui) { double("gui").as_null_object }
-  let(:app) { double("app", gui: gui, style: {}, element_styles: {}) }
+  let(:app) { double("app", gui: gui, style: {}, element_styles: {}, warn: true) }
   let(:internal_app) { double("internal app", app: app, gui: gui, style: {}, element_styles: {}) }
   let(:texts) { ["text", "goes", "first"] }
 
-  subject { Shoes::Link.new(app, texts, {color: :blue}) }
+  subject { Shoes::Link.new(app, texts, color: :blue) }
 
   context "initialize" do
     it "should set up text" do
@@ -88,23 +88,35 @@ describe Shoes::Link do
   describe 'visibility' do
     let(:text_block) {double 'text block', visible?: true, hidden?: false}
 
-    before :each do
-      subject.text_block = text_block
-    end
+    describe 'with a containing text block' do
+      before :each do
+        subject.text_block = text_block
+      end
+
+      it 'forwards #visible? calls' do
+        subject.visible?
+        expect(text_block).to have_received :visible?
+      end
 
-    it 'forwards visible? calls' do
-      subject.visible?
-      expect(text_block).to have_received :visible?
+      it 'forwards #hidden? calls' do
+        subject.hidden?
+        expect(text_block).to have_received :hidden?
+      end
     end
 
-    it 'forwards hidden? calls' do
-      subject.hidden?
-      expect(text_block).to have_received :hidden?
+    describe 'without a containing text block' do
+      it 'does not crash on #visibie?' do
+        expect {subject.visible?}.not_to raise_error
+      end
+
+      it 'does not crash on #hidden?' do
+        expect {subject.hidden?}.not_to raise_error
+      end
     end
   end
 
   # #979
-  describe 'parent' do
+  describe 'containing text block' do
     let(:text_block) {double 'text block'}
 
     before :each do

data/spec/shoes/list_box_spec.rb

@@ -41,6 +41,18 @@ describe Shoes::ListBox do
     expect(list_box.items).to eq(["Pie", "Apple", "Pig"])
   end
 
+  describe 'Updating gui' do
+    it "updates the gui when array methods like size are called" do
+      expect(list_box.gui).to receive(:update_items)
+      list_box.items.size
+    end
+
+    it "updates the gui when self-modifying array methods like map! are called" do
+      expect(list_box.gui).to receive(:update_items)
+      list_box.items.map!{"replaced!"}
+    end
+  end
+
   describe 'Choosing' do
     it "allows us to choose an option" do
       expect(list_box).to respond_to(:choose)
@@ -56,8 +68,8 @@ describe Shoes::ListBox do
       list_box.choose "Wine"
     end
 
-    it 'should call @gui.choose when the choose option is passed' do
-      expect_gui_choose_with 'Wine'
+    it 'should not call @gui.choose when the choose option is passed' do
+      expect_any_instance_of(Shoes.configuration.backend::ListBox).to_not receive(:choose)
       Shoes::ListBox.new app, parent, input_opts.merge(choose: 'Wine')
     end
   end

data/spec/shoes/point_spec.rb

@@ -29,6 +29,34 @@ describe Shoes::Point do
     end
   end
 
+  describe "#+" do
+    it "performs element-wise addition with other point" do
+      expect(subject + Shoes::Point.new(40, 50)).to eq(Shoes::Point.new(80, 100))
+    end
+
+    it "performs element-wise addition with an array" do
+      expect(subject + [40, 50]).to eq(Shoes::Point.new(80, 100))
+    end
+
+    it "doesn't perform addition when dimensions don't match" do
+      expect { subject + [40, 50, 60] }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "#-" do
+    it "performs element-wise subtraction with other point" do
+      expect(subject - Shoes::Point.new(40, 50)).to eq(Shoes::Point.new(0, 0))
+    end
+
+    it "performs element-wise subtraction with an array" do
+      expect(subject - [40, 50]).to eq(Shoes::Point.new(0, 0))
+    end
+
+    it "doesn't perform subtraction when dimensions don't match" do
+      expect { subject - [40, 50, 60] }.to raise_error(ArgumentError)
+    end
+  end
+
   describe "#to" do
     it "positive" do
       expect(subject.to(24, 166)).to eq(Shoes::Point.new(64, 216))

data/spec/shoes/renamed_delegate_spec.rb

@@ -34,7 +34,7 @@ describe RenamedDelegate do
 
   TestClass.renamed_delegate_to :delegate,
                                 ToDelegate.public_instance_methods(false),
-                                {'key' => 'shoes', 'something' => 'awesome'}
+                                'key' => 'shoes', 'something' => 'awesome'
 
   let(:delegate) {double('delegate').as_null_object}
   subject {TestClass.new delegate}
@@ -67,4 +67,4 @@ describe RenamedDelegate do
   it 'does not define a method for methods without renamings' do
     expect(subject).not_to respond_to :abcd
   end
-end
+end

data/spec/shoes/shape_spec.rb

@@ -16,6 +16,7 @@ describe Shoes::Shape do
   end
 
   it_behaves_like "movable object"
+  it_behaves_like "clickable object"
 
   describe "octagon" do
     let(:draw) {
@@ -44,7 +45,7 @@ describe Shoes::Shape do
     describe "when created without left and top values" do
       let(:left) { nil }
       let(:top) { nil }
-      
+
       its(:left) { should eq(nil) }
       its(:top) { should eq(nil) }
     end
@@ -85,13 +86,25 @@ describe Shoes::Shape do
   describe "arc" do
     let(:draw) {
       Proc.new {
-        arc 10, 10, 100, 100, Shoes::PI, Shoes::TWO_PI
+        arc_to 10, 10, 100, 100, Shoes::PI, Shoes::TWO_PI
       }
     }
 
     it_behaves_like "movable object"
   end
 
+  describe "in_bounds?" do
+    let(:draw) { Proc.new { line_to 100, 100 } }
+
+    it "is in bounds" do
+      expect(subject.in_bounds?(10, 10)).to be true
+    end
+
+    it "is out of bounds" do
+      expect(subject.in_bounds?(101, 101)).to be false
+    end
+  end
+
   describe "accesses app" do
     let(:draw) {
       Proc.new {

data/spec/shoes/shared_examples/changeable.rb

@@ -9,7 +9,7 @@ shared_examples "an element that can respond to change" do
   describe "when setting up a callback with #change" do
     it "should notify the callback of change events" do
       called = false
-      subject.change do |element|
+      subject.change do
         called = true
       end
       subject.call_change_listeners

data/spec/shoes/shared_examples/common_methods.rb

@@ -24,7 +24,7 @@ shared_examples_for "movable object" do
   end
 end
 
-shared_examples_for "left, top as center" do | *params |
+shared_examples_for "left, top as center" do |*params|
   let(:centered_object) { described_class.new(app, parent, left, top, width, height, *params, :center => true) }
   it "should now be located somewhere" do
     expect(centered_object.left).to eq(left-(width/2))

data/spec/shoes/shared_examples/dsl/style.rb

@@ -3,7 +3,7 @@ shared_examples_for "style DSL method" do
     let(:stroke) { Shoes::COLORS[:chartreuse] }
     let(:size)   { 42 }
     let(:fill)   { Shoes::COLORS[:peru] }
-    let(:font )  { "SOME FONT" }
+    let(:font)  { "SOME FONT" }
     let(:style)  { {:stroke => stroke, :size => size, :fill => fill, :font => font} }
 
     %w(Banner Title Subtitle Tagline Caption Para Inscription).each do |text_block|

data/spec/shoes/shared_examples/dsl/text_elements.rb

@@ -41,17 +41,17 @@ shared_examples_for "text element DSL methods" do
     end
 
     it 'should handle a splatted array of links' do
-      expect{dsl.span *[dsl.link('foo'), dsl.link('foo')]}.not_to raise_error
+      expect{dsl.span(*[dsl.link('foo'), dsl.link('foo')])}.not_to raise_error
     end
 
     it 'should handle a splatted array of links and parse the color' do
-      span = dsl.span *[dsl.link('foo'), dsl.link('foo')], stroke: '#ccc'
+      span = dsl.span(*[dsl.link('foo'), dsl.link('foo')], stroke: '#ccc')
       expect(span.style[:stroke]).to eq Shoes::Color.new 204, 204, 204
     end
 
     it 'should handle a splatted array of links with a block' do
       link = dsl.link('foo') { "Bar" }
-      expect{dsl.span *[link, link]}.not_to raise_error
+      expect{dsl.span(*[link, link])}.not_to raise_error
     end
   end
 

data/spec/shoes/shared_examples/dsl/video.rb

@@ -2,4 +2,4 @@ shared_examples_for 'video DSL method' do
   it 'throws a Shoes::NotImplementedError' do
     expect{dsl.video}.to raise_error Shoes::NotImplementedError
   end
-end
+end

data/spec/shoes/shared_examples/dsl_app_context.rb

@@ -5,4 +5,3 @@ shared_context "dsl app" do
   let(:app) { user_facing_app.instance_variable_get(:@__app__) }
   let(:parent) { Shoes::Flow.new app, app }
 end
-

data/spec/shoes/shared_examples/parent.rb

@@ -3,4 +3,4 @@ shared_examples_for 'object with parent' do
   it 'has a getter for the parent' do
     expect(subject.parent).to eq parent
   end
-end
+end

data/spec/shoes/shared_examples/slot.rb

@@ -108,6 +108,12 @@ shared_examples_for 'positioning through :_position' do
     expect(element).not_to receive(:_position)
     subject.contents_alignment
   end
+
+  it 'is resilient to exceptions during positioning' do
+    allow(element).to receive(:contents_alignment).and_raise("O_o")
+    allow(subject).to receive(:puts)  # Quiet, you
+    add_child_and_align
+  end
 end
 
 shared_examples_for 'element one positioned with top and left' do
@@ -127,11 +133,11 @@ shared_examples_for 'element one positioned with bottom and right' do
   include_context 'slot with set height and width'
 
   it 'positions the element from its right' do
-    expect(element.absolute_right).to eq (subject.absolute_right - ele_right - 1)
+    expect(element.absolute_right).to eq(subject.absolute_right - ele_right - 1)
   end
 
   it 'positions the element from its bottom' do
-    expect(element.absolute_bottom).to eq (subject.absolute_bottom - ele_bottom - 1)
+    expect(element.absolute_bottom).to eq(subject.absolute_bottom - ele_bottom - 1)
   end
 end
 
@@ -169,11 +175,11 @@ shared_examples_for 'arranges elements underneath each other' do
   end
 
   it 'has a stack height according to its contents' do
-    expect(subject.height).to eq (element.height + element2.height)
+    expect(subject.height).to eq(element.height + element2.height)
   end
 
   it 'has an absolute_bottom of top + height' do
-    expect(subject.absolute_bottom).to eq (subject.absolute_top + subject.height - 1)
+    expect(subject.absolute_bottom).to eq(subject.absolute_top + subject.height - 1)
   end
 
   describe 'element one with top and left' do
@@ -196,7 +202,7 @@ shared_examples_for 'set height and contents alignment' do
   include_context 'two slot children'
 
   it 'contents_alignment returns the height of the content' do
-    expect(subject.contents_alignment).to eq (element.height + element2.height)
+    expect(subject.contents_alignment).to eq(element.height + element2.height)
   end
 
   it 'still has the same height though' do

data/spec/shoes/shared_examples/state.rb

@@ -8,7 +8,7 @@ shared_examples_for "object with state" do
   it "should enable" do
     expect(subject.gui).to receive(:enabled).with(true)
     subject.state = nil
-    expect(subject.state).to eq(nil) 
+    expect(subject.state).to eq(nil)
   end
 
   it "should disable" do
@@ -16,4 +16,4 @@ shared_examples_for "object with state" do
     subject.state = "disabled"
     expect(subject.state).to eq("disabled")
   end
-end
+end

data/spec/shoes/shared_examples/style.rb

@@ -9,7 +9,7 @@ shared_examples_for "object with style" do
   end
 
   describe 'using app-level styles' do
-    
+
     it 'initially uses app defaults' do
       app.style.each do |key, value|
         expect(subject.style[key]).to eq(value) if uses_app_default? key

data/spec/shoes/spec_helper.rb

@@ -9,7 +9,7 @@ def unpack_styles(styles)
   supported_styles = []
   styles.each do |style|
     if Shoes::Common::Style::STYLE_GROUPS[style]
-      Shoes::Common::Style::STYLE_GROUPS[style].each{|style| supported_styles << style}
+      Shoes::Common::Style::STYLE_GROUPS[style].each{|s| supported_styles << s}
     else
       supported_styles << style
     end

data/spec/shoes/text_block_spec.rb

@@ -6,7 +6,7 @@ describe Shoes::TextBlock do
 
   let(:text_link) { Shoes::Link.new(app, ['Hello']) }
   let(:text) { [text_link, ", world!"] }
-  subject(:text_block) { Shoes::TextBlock.new(app, parent, text, {app: app}) }
+  subject(:text_block) { Shoes::TextBlock.new(app, parent, text, app: app) }
 
   it_behaves_like "object with style" do
     let(:subject_without_style) { Shoes::TextBlock.new(app, parent, text) }
@@ -72,6 +72,17 @@ describe Shoes::TextBlock do
       text_block.replace "Later Gator"
       expect(text_block.text_styles).to be_empty
     end
+
+    it "updates styles from options hash" do
+      text_block.replace "Later Gator", stroke: Shoes::COLORS[:aquamarine]
+      expect(text_block.stroke).to eq(Shoes::COLORS[:aquamarine])
+    end
+
+    it "updates font from options hash" do
+      text_block.replace "Later Gator", font: 'Monospace 18px'
+      expect(text_block.font).to eq('Monospace')
+      expect(text_block.size).to eq(18)
+    end
   end
 
   describe "#contents" do
@@ -138,7 +149,7 @@ describe Shoes::TextBlock do
 
   describe "stroke" do
     it "should accept a hex code" do
-      s = Shoes::TextBlock.new(app, parent, ["Hello, world!"], { stroke: "#fda", app: app })
+      s = Shoes::TextBlock.new(app, parent, ["Hello, world!"], stroke: "#fda", app: app)
       color = s.style[:stroke]
       expect(color.red).to eql 255
       expect(color.green).to eql 221
@@ -174,10 +185,16 @@ describe Shoes::TextBlock do
         subject.absolute_left = 20
         expect(subject.desired_width(1000)).to eql(980)
       end
+
+      it "factors margins into desired width" do
+        subject.absolute_left = 0
+        subject.margin = 10
+        expect(subject.desired_width(1000)).to eql(980)
+      end
     end
 
     context "when explicitly set" do
-      subject(:text_block) { Shoes::TextBlock.new(app, parent, ["text"], { width: 120 }) }
+      subject(:text_block) { Shoes::TextBlock.new(app, parent, ["text"], width: 120) }
 
       it "gets returned" do
         expect(subject.width).to eql 120