shoes-core 4.0.0.pre6 → 4.0.0.pre7

data/spec/shoes/shared_examples/common_methods.rb

@@ -27,8 +27,8 @@ end
 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))
-    expect(centered_object.top).to eq(top-(height/2))
+    expect(centered_object.left).to eq(left - (width / 2))
+    expect(centered_object.top).to eq(top - (height / 2))
     expect(centered_object.width).to eq(width)
     expect(centered_object.height).to eq(height)
   end

data/spec/shoes/shared_examples/dsl.rb

@@ -8,7 +8,7 @@
 shared_examples "DSL container" do
   let(:dsl) { app }
 
-  %w[
+  %w(
     animate
     arc
     background
@@ -36,7 +36,7 @@ shared_examples "DSL container" do
     strokewidth
     style
     video
-  ].each do |method|
+  ).each do |method|
     include_examples "#{method} DSL method"
   end
 

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

@@ -1,5 +1,5 @@
 shared_examples_for "flow DSL method" do
-  let(:flow) {dsl.flow}
+  let(:flow) { dsl.flow }
 
   it "creates a Shoes::Flow" do
     expect(flow).to be_an_instance_of(Shoes::Flow)

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

@@ -13,7 +13,7 @@ shared_examples_for "pattern DSL method" do
     let(:pattern) { dsl.pattern honeydew..salmon }
 
     it "returns a gradient" do
-      expect(pattern).to eq(dsl.gradient honeydew..salmon)
+      expect(pattern).to eq(dsl.gradient(honeydew..salmon))
     end
   end
 
@@ -28,7 +28,7 @@ shared_examples_for "pattern DSL method" do
     let(:pattern) { dsl.pattern honeydew.hex..salmon.hex }
 
     it "returns a gradient" do
-      expect(pattern).to eq(dsl.gradient honeydew..salmon)
+      expect(pattern).to eq(dsl.gradient(honeydew..salmon))
     end
   end
 end

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

@@ -18,11 +18,11 @@ shared_examples_for "rgb DSL method" do
 
   describe "named color method" do
     it "produces correct color" do
-      expect(dsl.cornflowerblue).to eq(Shoes::Color.new red, green, blue)
+      expect(dsl.cornflowerblue).to eq(Shoes::Color.new(red, green, blue))
     end
 
     it "accepts alpha arg" do
-      expect(dsl.cornflowerblue(alpha)).to eq(Shoes::Color.new red, green, blue, alpha)
+      expect(dsl.cornflowerblue(alpha)).to eq(Shoes::Color.new(red, green, blue, alpha))
     end
   end
 end

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

@@ -1,13 +1,13 @@
 shared_examples_for "shape DSL method" do
-  let(:shape) {
-    dsl.shape {
+  let(:shape) do
+    dsl.shape do
       move_to 400, 300
       line_to 400, 200
       line_to 100, 100
       line_to 400, 300
       curve_to 100, 100, 20, 200, 120, 240
-    }
-  }
+    end
+  end
 
   it "creates a Shoes::Shape" do
     expect(shape).to be_an_instance_of(Shoes::Shape)
@@ -33,21 +33,25 @@ shared_examples_for "shape DSL method" do
     end
 
     it "can accept a left and top" do
-      left, top = 10, 20
+      left = 10
+      top = 20
       shape = dsl.shape left, top
       expect(shape.left).to eq(left)
       expect(shape.top).to eq(top)
     end
 
     it "accepts left and top in styles" do
-      left, top = 10, 20
+      left = 10
+      top = 20
       shape = dsl.shape left: left, top: top
       expect(shape.left).to eq(left)
       expect(shape.top).to eq(top)
     end
 
     it "can accept a left, top, and some styles" do
-      left, top, white = 10, 20, Shoes::COLORS.fetch(:white)
+      left = 10
+      top = 20
+      white = Shoes::COLORS.fetch(:white)
       shape = dsl.shape left, top, stroke: white
       expect(shape.left).to eq(left)
       expect(shape.top).to eq(top)

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

@@ -8,33 +8,33 @@ shared_examples_for "star DSL method" do
   end
 
   describe 'instantiation' do
-    let(:left) {10}
-    let(:top) {20}
-    let(:points) {15}
-    let(:outer) {27}
-    let(:inner) {33}
-    let(:clickable) { proc { } }
+    let(:left) { 10 }
+    let(:top) { 20 }
+    let(:points) { 15 }
+    let(:outer) { 27 }
+    let(:inner) { 33 }
+    let(:clickable) { proc {} }
 
     DEFAULT_POINTS = 10
     DEFAULT_OUTER = 100.0
     DEFAULT_INNER = 50.0
 
     describe '2 arguments' do
-      subject {dsl.star left, top}
-      its(:left) {should eq left}
-      its(:top) {should eq top}
-      its(:points) {should eq DEFAULT_POINTS}
-      its(:outer) {should eq DEFAULT_OUTER}
-      its(:inner) {should eq DEFAULT_INNER}
+      subject { dsl.star left, top }
+      its(:left) { should eq left }
+      its(:top) { should eq top }
+      its(:points) { should eq DEFAULT_POINTS }
+      its(:outer) { should eq DEFAULT_OUTER }
+      its(:inner) { should eq DEFAULT_INNER }
     end
 
     describe '2 arguments with hash' do
       subject { dsl.star left, top, click: clickable }
-      its(:left)   {should eq left}
-      its(:top)    {should eq top}
-      its(:points) {should eq DEFAULT_POINTS}
-      its(:outer)  {should eq DEFAULT_OUTER}
-      its(:inner)  {should eq DEFAULT_INNER}
+      its(:left)   { should eq left }
+      its(:top)    { should eq top }
+      its(:points) { should eq DEFAULT_POINTS }
+      its(:outer)  { should eq DEFAULT_OUTER }
+      its(:inner)  { should eq DEFAULT_INNER }
 
       it "gets the click" do
         expect(subject.style[:click]).to eq(clickable)
@@ -43,11 +43,11 @@ shared_examples_for "star DSL method" do
 
     describe '3 arguments with hash' do
       subject { dsl.star left, top, points, click: clickable }
-      its(:left)   {should eq left}
-      its(:top)    {should eq top}
-      its(:points) {should eq points}
-      its(:outer)  {should eq DEFAULT_OUTER}
-      its(:inner)  {should eq DEFAULT_INNER}
+      its(:left)   { should eq left }
+      its(:top)    { should eq top }
+      its(:points) { should eq points }
+      its(:outer)  { should eq DEFAULT_OUTER }
+      its(:inner)  { should eq DEFAULT_INNER }
 
       it "gets the click" do
         expect(subject.style[:click]).to eq(clickable)
@@ -55,21 +55,21 @@ shared_examples_for "star DSL method" do
     end
 
     describe '4 arguments' do
-      subject {dsl.star left, top, points, outer}
-      its(:left) {should eq left}
-      its(:top) {should eq top}
-      its(:points) {should eq points}
-      its(:outer) {should eq outer}
-      its(:inner) {should eq DEFAULT_INNER}
+      subject { dsl.star left, top, points, outer }
+      its(:left) { should eq left }
+      its(:top) { should eq top }
+      its(:points) { should eq points }
+      its(:outer) { should eq outer }
+      its(:inner) { should eq DEFAULT_INNER }
     end
 
     describe '4 arguments with hash' do
       subject { dsl.star left, top, points, outer, click: clickable }
-      its(:left)   {should eq left}
-      its(:top)    {should eq top}
-      its(:points) {should eq points}
-      its(:outer)  {should eq outer}
-      its(:inner)  {should eq DEFAULT_INNER}
+      its(:left)   { should eq left }
+      its(:top)    { should eq top }
+      its(:points) { should eq points }
+      its(:outer)  { should eq outer }
+      its(:inner)  { should eq DEFAULT_INNER }
 
       it "gets the click" do
         expect(subject.style[:click]).to eq(clickable)
@@ -77,21 +77,21 @@ shared_examples_for "star DSL method" do
     end
 
     describe '5 arguments' do
-      subject {dsl.star left, top, points, outer, inner}
-      its(:left) {should eq left}
-      its(:top) {should eq top}
-      its(:points) {should eq points}
-      its(:outer) {should eq outer}
-      its(:inner) {should eq inner}
+      subject { dsl.star left, top, points, outer, inner }
+      its(:left) { should eq left }
+      its(:top) { should eq top }
+      its(:points) { should eq points }
+      its(:outer) { should eq outer }
+      its(:inner) { should eq inner }
     end
 
     describe '5 arguments with hash' do
       subject { dsl.star left, top, points, outer, inner, click: clickable }
-      its(:left)   {should eq left}
-      its(:top)    {should eq top}
-      its(:points) {should eq points}
-      its(:outer)  {should eq outer}
-      its(:inner)  {should eq inner}
+      its(:left)   { should eq left }
+      its(:top)    { should eq top }
+      its(:points) { should eq points }
+      its(:outer)  { should eq outer }
+      its(:inner)  { should eq inner }
 
       it "gets the click" do
         expect(subject.style[:click]).to eq(clickable)

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

@@ -35,23 +35,26 @@ shared_examples_for "text element DSL methods" do
   end
 
   describe 'span' do
+    let(:link_array) { [dsl.link('foo'), dsl.link('foo')] }
+
     it 'should parse the color' do
       span = dsl.span 'Hello', stroke: '#ccc'
       expect(span.style[:stroke]).to eq Shoes::Color.new 204, 204, 204
     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(*link_array) }.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(*link_array, 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
+      array = [link, link]
+      expect { dsl.span(*array) }.not_to raise_error
     end
   end
 

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

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

data/spec/shoes/shared_examples/dsl_app_context.rb

@@ -1,10 +1,11 @@
 shared_context "dsl app" do
-  let(:input_block) { Proc.new {} }
+  let(:input_block) { proc {} }
   let(:input_opts) { Hash.new }
   let(:user_facing_app) { Shoes::App.new input_opts, &input_block }
   let(:app) { user_facing_app.instance_variable_get(:@__app__) }
-  let(:parent) { Shoes::Flow.new app, app,
-                                 width: Shoes::InternalApp::DEFAULT_OPTIONS[:width],
-                                 height: Shoes::InternalApp::DEFAULT_OPTIONS[:height]
-  }
+  let(:parent) do
+    Shoes::Flow.new app, app,
+                    width: Shoes::InternalApp::DEFAULT_OPTIONS[:width],
+                    height: Shoes::InternalApp::DEFAULT_OPTIONS[:height]
+  end
 end

data/spec/shoes/shared_examples/hover.rb

@@ -6,12 +6,12 @@ shared_examples "object with hover" do
 
   it "registers hover" do
     expect(subject).to receive(:add_mouse_hover_control)
-    subject.hover { }
+    subject.hover {}
   end
 
   it "registers with leave" do
     expect(subject).to receive(:add_mouse_hover_control)
-    subject.leave { }
+    subject.leave {}
   end
 
   it "marks itself as hovered" do

data/spec/shoes/shared_examples/shared_element_method.rb

@@ -24,7 +24,7 @@ shared_examples_for "object with stroke" do
 
   # Be sure the subject does *not* have the stroke set previously
   specify "defaults to black" do
-    expect(subject.stroke).to eq(Shoes::COLORS.fetch :black)
+    expect(subject.stroke).to eq(Shoes::COLORS.fetch(:black))
   end
 
   describe "strokewidth" do
@@ -55,6 +55,6 @@ shared_examples_for "object with fill" do
 
   # Be sure the subject does *not* have the stroke set previously
   specify "defaults to black" do
-    expect(subject.fill).to eq(Shoes::COLORS.fetch :black)
+    expect(subject.fill).to eq(Shoes::COLORS.fetch(:black))
   end
 end

data/spec/shoes/shared_examples/slot.rb

@@ -2,7 +2,7 @@ shared_examples_for "Slot" do
   it "should be able to append" do
     expect(subject.contents).to be_empty
     our_subject = subject
-    app.execute_block Proc.new { our_subject.append {para "foo"} }
+    app.execute_block proc { our_subject.append { para "foo" } }
     expect(subject.contents.size).to eq(1)
   end
 
@@ -21,8 +21,8 @@ shared_examples_for "Slot" do
 end
 
 shared_context 'one slot child' do
-  let(:ele_opts) {Hash.new}
-  let(:element) {Shoes::FakeElement.new(nil, {height: 100,width: 50}.merge(ele_opts))}
+  let(:ele_opts) { Hash.new }
+  let(:element) { Shoes::FakeElement.new(nil, {height: 100, width: 50}.merge(ele_opts)) }
 
   before :each do
     subject.add_child element
@@ -31,7 +31,7 @@ end
 
 shared_context 'two slot children' do
   include_context 'one slot child'
-  let(:element2) {Shoes::FakeElement.new nil, height: 200, width: 70}
+  let(:element2) { Shoes::FakeElement.new nil, height: 200, width: 70 }
 
   before :each do
     subject.add_child element2
@@ -39,7 +39,7 @@ shared_context 'two slot children' do
 end
 
 shared_context 'hidden child' do
-  let(:hidden_element) {Shoes::FakeElement.new nil, height: 200, width: 70}
+  let(:hidden_element) { Shoes::FakeElement.new nil, height: 200, width: 70 }
 
   before :each do
     subject.add_child hidden_element
@@ -50,7 +50,7 @@ end
 
 shared_context 'three slot children' do
   include_context 'two slot children'
-  let(:element3) {Shoes::FakeElement.new(nil, height: 50, width: 20)}
+  let(:element3) { Shoes::FakeElement.new(nil, height: 50, width: 20) }
 
   before :each do
     subject.add_child element3
@@ -64,33 +64,33 @@ shared_context 'contents_alignment' do
 end
 
 shared_context 'element one with top and left' do
-  let(:ele_top) {22}
-  let(:ele_left) {47}
-  let(:ele_opts) {{left: ele_left, top: ele_top}}
+  let(:ele_top) { 22 }
+  let(:ele_left) { 47 }
+  let(:ele_opts) { {left: ele_left, top: ele_top} }
 end
 
 shared_context 'slot with set height and width' do
-  let(:input_opts) {{width: 250, height: 300}}
+  let(:input_opts) { {width: 250, height: 300} }
 end
 
 shared_context 'slot with a top margin' do
-  let(:margin_top) {70}
-  let(:input_opts) {{margin_top: margin_top}}
+  let(:margin_top) { 70 }
+  let(:input_opts) { {margin_top: margin_top} }
 end
 
 shared_context 'slot with a left margin' do
-  let(:margin_left) {30}
-  let(:input_opts) {{margin_left: margin_left}}
+  let(:margin_left) { 30 }
+  let(:input_opts) { {margin_left: margin_left} }
 end
 
 shared_context 'element one with bottom and right' do
-  let(:ele_bottom) {24}
-  let(:ele_right) {49}
-  let(:ele_opts) {{right: ele_right, bottom: ele_bottom}}
+  let(:ele_bottom) { 24 }
+  let(:ele_right) { 49 }
+  let(:ele_opts) { {right: ele_right, bottom: ele_bottom} }
 end
 
 shared_examples_for 'positioning through :_position' do
-  let(:element) {Shoes::FakeElement.new nil, height: 100, width: 50}
+  let(:element) { Shoes::FakeElement.new nil, height: 100, width: 50 }
 
   def add_child_and_align
     subject.add_child element
@@ -124,10 +124,21 @@ shared_examples_for 'positioning through :_position' do
 
   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
+    allow(subject).to receive(:puts) # Quiet, you
     add_child_and_align
   end
 
+  describe 'attached' do
+    let(:attached_to) { double('attached slot', absolute_left: 101, absolute_top: 101) }
+    let(:element) { Shoes::FakeElement.new nil }
+
+    it "gets positioned where it's attached" do
+      element.style[:attach] = attached_to
+      expect(element).to receive(:_position).with(101, 101).at_least(1)
+      add_child_and_align
+    end
+  end
+
   describe 'absolute dimensions' do
     let(:element) { Shoes::FakeAbsoluteElement.new }
 
@@ -256,7 +267,7 @@ shared_examples_for 'growing although relatively positioned elements' do
   include_context 'contents_alignment'
 
   describe 'positioned at the very beginning' do
-    let(:ele_opts) {{top: 0}}
+    let(:ele_opts) { {top: 0} }
 
     it 'grows the slot height' do
       expect(subject.height).to eq element.height
@@ -264,7 +275,7 @@ shared_examples_for 'growing although relatively positioned elements' do
   end
 
   describe 'positioned with a good offset' do
-    let(:ele_opts) {{top: 70}}
+    let(:ele_opts) { {top: 70} }
 
     it 'grows the height even further' do
       expect(subject.height).to eq element.height + 70