shoes-core 4.0.0.pre6 → 4.0.0.pre7

data/spec/shoes/download_spec.rb

@@ -5,15 +5,15 @@ describe Shoes::Download do
 
   let(:name) { "http://www.google.com/logos/nasa50th.gif" }
   let(:response_body) { "NASA 50th logo" }
-  let(:response_status) {["200", "OK"]}
-  let(:response_headers) { { "content-length" => "42" }}
+  let(:response_status) { ["200", "OK"] }
+  let(:response_headers) { { "content-length" => "42" } }
   let(:opts) { {save: "nasa50th.gif"} }
 
   subject(:download) { Shoes::Download.new app, parent, name, opts, &input_block }
 
-  let(:percent) {download.percent}
-  let(:length) {download.length}
-  let(:content_length) {download.content_length}
+  let(:percent) { download.percent }
+  let(:length) { download.length }
+  let(:content_length) { download.content_length }
 
   before do
     expect(app.current_slot).to receive(:create_bound_block).at_least(1) { |blk| blk ? blk : nil }
@@ -64,9 +64,9 @@ describe Shoes::Download do
   end
 
   context 'with a progress proc' do
-    let(:progress_proc) {Proc.new {}}
+    let(:progress_proc) { proc {} }
     let(:opts) { {save: "nasa50th.gif", progress: progress_proc} }
-    subject(:download) {Shoes::Download.new app, parent, name, opts}
+    subject(:download) { Shoes::Download.new app, parent, name, opts }
 
     before :each do
       allow(download.gui).to receive :eval_block
@@ -76,9 +76,9 @@ 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(progress_proc, download).
-                                  exactly(3).times
+        expect(download.gui).to have_received(:eval_block)
+          .with(progress_proc, download)
+          .exactly(3).times
       end
     end
 
@@ -86,9 +86,9 @@ describe Shoes::Download do
       let(:response_headers) { Hash.new }
 
       it 'does not call on progress, but called from content length and finish' do
-        expect(download.gui).to have_received(:eval_block).
-          with(progress_proc, download).
-          twice
+        expect(download.gui).to have_received(:eval_block)
+          .with(progress_proc, download)
+          .twice
       end
 
       it 'can call percent just fine thanks' do
@@ -98,8 +98,8 @@ describe Shoes::Download do
   end
 
   describe 'after it is finished' do
-    let(:result) {download}
-    let(:response) {download.response}
+    let(:result) { download }
+    let(:response) { download.response }
 
     before :each do
       allow(download.gui).to receive(:eval_block)
@@ -136,7 +136,7 @@ describe Shoes::Download do
     end
 
     context 'with a finish proc' do
-      let(:finish_proc) { Proc.new {} }
+      let(:finish_proc) { proc {} }
       let(:opts) { {save: "nasa50th.gif", finish: finish_proc} }
       subject(:download) { Shoes::Download.new app, parent, name, opts }
 
@@ -181,7 +181,7 @@ describe Shoes::Download do
     end
 
     describe 'with custom error blocks' do
-      let(:error_proc) { Proc.new { } }
+      let(:error_proc) { proc {} }
       let(:opts) { {save: "nasa50th.gif", error: error_proc} }
 
       it 'gets called' do

data/spec/shoes/flow_spec.rb

@@ -65,7 +65,7 @@ describe Shoes::Flow do
       it_behaves_like 'positioning in the same line'
 
       describe 'exact fit' do
-        let(:input_opts) {{width: element.width + element2.width}}
+        let(:input_opts) { {width: element.width + element2.width} }
         it_behaves_like 'positioning in the same line'
       end
     end
@@ -99,7 +99,7 @@ describe Shoes::Flow do
     end
 
     describe 'with margins and two elements not fitting next to each other' do
-      let(:input_opts) {{ width: element.width + 10, margin: 27 }}
+      let(:input_opts) { { width: element.width + 10, margin: 27 } }
       it_behaves_like 'taking care of margin'
     end
   end

data/spec/shoes/framework_learning_spec.rb

@@ -18,9 +18,11 @@ module TextPlugin
   end
 end
 
-  class Learning::App
+module Learning
+  class App
     include TextPlugin::App
   end
+end
 
 describe "A Shoes Framework" do
   it "should include Framework Plugins" do

data/spec/shoes/helpers/fake_absolute_element.rb

@@ -1,9 +1,10 @@
 class Shoes
   class FakeAbsoluteElement
+    include Common::Attachable
     include Common::Inspect
-    include Common::Visibility
     include Common::Positioning
     include Common::Remove
+    include Common::Visibility
 
     include Shoes::DimensionsDelegations
 
@@ -11,7 +12,7 @@ class Shoes
       @dimensions = AbsoluteDimensions.new 0, 0, 100, 100
     end
 
-    def add_child(element)
+    def add_child(_element)
       true
     end
 

data/spec/shoes/helpers/fake_element.rb

@@ -1,11 +1,12 @@
 class Shoes
   class FakeElement < Dimensions
+    include Common::Attachable
     include Common::Inspect
-    include Common::Visibility
     include Common::Positioning
     include Common::Remove
+    include Common::Visibility
 
-    def add_child(element)
+    def add_child(_element)
       true
     end
 

data/spec/shoes/input_box_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Shoes::InputBox do
   include_context "dsl app"
-  let(:input_opts) {{left: left, top: top, width: width, height: height}}
+  let(:input_opts) { {left: left, top: top, width: width, height: height} }
   let(:left) { 10 }
   let(:top) { 20 }
   let(:width) { 100 }
@@ -39,7 +39,7 @@ describe Shoes::InputBox do
   end
 
   describe 'non string text' do
-    let(:text) {42}
+    let(:text) { 42 }
 
     it 'is converted to a string (convenience + error in backend)' do
       expect(subject.text).to eq '42'

data/spec/shoes/internal_app_spec.rb

@@ -66,7 +66,7 @@ describe Shoes::InternalApp do
   end
 
   describe '#inspect' do
-    let(:input_opts) {{title: 'Dupa'}}
+    let(:input_opts) { {title: 'Dupa'} }
 
     it 'shows the title in inspect' do
       expect(subject.inspect).to include 'Dupa'
@@ -75,12 +75,12 @@ describe Shoes::InternalApp do
 
   describe '#clear' do
     context 'when called after the initial input block' do
-      let(:input_block) {
-        Proc.new do
+      let(:input_block) do
+        proc do
           para "CONTENT"
           para "JUST FOR TESTING"
         end
-      }
+      end
 
       before :each do
         expect(subject.contents.size).to eq(2)
@@ -93,22 +93,22 @@ describe Shoes::InternalApp do
     end
 
     context 'when called in the initial input_block' do
-      let(:input_block) {
-        Proc.new do
+      let(:input_block) do
+        proc do
           para 'Hello there'
           clear do
             para 'see you'
           end
         end
-      }
+      end
 
       it 'does not raise an error' do
-        expect {subject}.not_to raise_error
+        expect { subject }.not_to raise_error
       end
 
       context 'when called inside a slot' do
-        let(:input_block) {
-          Proc.new do
+        let(:input_block) do
+          proc do
             button 'I am here'
             stack do
               button 'Hi there'
@@ -116,7 +116,7 @@ describe Shoes::InternalApp do
               clear
             end
           end
-        }
+        end
 
         it 'does not delete the slot, or an element outside the slot' do
           expect(subject.contents.size).to eq 2
@@ -125,12 +125,12 @@ describe Shoes::InternalApp do
     end
 
     context 'when called before a button in an initial input block' do
-      let(:input_block) {
-        Proc.new do
+      let(:input_block) do
+        proc do
           clear
           button 'My Button'
         end
-      }
+      end
 
       it 'allows a button to be created' do
         expect(subject.contents.size).to eq(1)

data/spec/shoes/link_spec.rb

@@ -4,24 +4,30 @@ describe Shoes::Link do
   let(:gui) { double("gui").as_null_object }
   let(:user_facing_app) { double("user facing app") }
   let(:element_styles) { Hash.new }
-  let(:app) { double("app", gui: gui, style: {}, element_styles: element_styles,
-                     warn: true, add_mouse_hover_control: nil) }
+
+  let(:app) do
+    double("app", gui: gui, style: {}, element_styles: element_styles,
+                  warn: true, add_mouse_hover_control: nil)
+  end
+
   let(:parent) { double("parent") }
   let(:internal_app) { double("internal app", app: app, gui: gui, style: {}, element_styles: {}) }
   let(:texts) { ["text", "goes", "first"] }
+  let(:text_block) { double 'text block', visible?: true, hidden?: false }
 
-  subject {
+  subject do
     link = Shoes::Link.new(app, texts, color: :blue)
     link.parent = parent
+    link.text_block = text_block
     link
-  }
+  end
 
   before do
     allow(user_facing_app).to receive(:style) do |clazz, styles|
       element_styles[clazz] = styles
     end
 
-    allow(parent).to receive(:eval_hover_block) do |blk|
+    allow(subject).to receive(:eval_hover_block) do |blk|
       blk.call(subject) if blk
     end
   end
@@ -45,8 +51,9 @@ describe Shoes::Link do
     end
 
     context "overriding styles" do
-      subject { Shoes::Link.new(app, texts,
-                                underline: false, bg: Shoes::COLORS[:green]) }
+      subject do
+        Shoes::Link.new(app, texts, underline: false, bg: Shoes::COLORS[:green])
+      end
 
       it "should include defaults" do
         expect(subject.style).to include(stroke: Shoes::COLORS[:blue])
@@ -63,7 +70,7 @@ describe Shoes::Link do
 
     context "with a block" do
       let(:callable) { double("callable") }
-      subject { Shoes::Link.new(internal_app, texts, {}, Proc.new { callable.call }) }
+      subject { Shoes::Link.new(internal_app, texts, {}, proc { callable.call }) }
 
       it "sets up for the click" do
         expect(callable).to receive(:call)
@@ -82,7 +89,7 @@ describe Shoes::Link do
 
     context "with click option as Proc" do
       let(:callable) { double("callable", call: nil) }
-      subject { Shoes::Link.new(internal_app, texts, click: Proc.new { callable.call }) }
+      subject { Shoes::Link.new(internal_app, texts, click: proc { callable.call }) }
 
       it "calls the block" do
         expect(callable).to receive(:call)
@@ -106,13 +113,7 @@ describe Shoes::Link do
   end
 
   describe 'visibility' do
-    let(:text_block) {double 'text block', visible?: true, hidden?: false}
-
     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?
@@ -126,19 +127,17 @@ describe Shoes::Link do
 
     describe 'without a containing text block' do
       it 'does not crash on #visibie?' do
-        expect {subject.visible?}.not_to raise_error
+        expect { subject.visible? }.not_to raise_error
       end
 
       it 'does not crash on #hidden?' do
-        expect {subject.hidden?}.not_to raise_error
+        expect { subject.hidden? }.not_to raise_error
       end
     end
   end
 
   # #979
   describe 'containing text block' do
-    let(:text_block) {double 'text block'}
-
     before :each do
       subject.parent = text_block
     end

data/spec/shoes/list_box_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Shoes::ListBox do
   include_context "dsl app"
-  let(:input_opts)  { { items: items, left: left, top: top, width: width,
-                        height: height } }
+  let(:input_opts) do
+    { items: items, left: left, top: top, width: width, height: height }
+  end
 
-  let(:items) {["Wine", "Vodka", "Water"]}
+  let(:items) { ["Wine", "Vodka", "Water"] }
 
   let(:left) { 10 }
   let(:top) { 20 }
@@ -49,7 +50,7 @@ describe Shoes::ListBox do
 
     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!"}
+      list_box.items.map! { "replaced!" }
     end
   end
 
@@ -59,8 +60,8 @@ describe Shoes::ListBox do
     end
 
     def expect_gui_choose_with(string)
-      expect_any_instance_of(Shoes.configuration.backend::ListBox).
-      to receive(:choose).with string
+      expect_any_instance_of(Shoes.configuration.backend::ListBox)
+        .to receive(:choose).with string
     end
 
     it "should call @gui.choose when we choose something" do
@@ -75,8 +76,8 @@ describe Shoes::ListBox do
   end
 
   it "should delegate #text to the backend" do
-    expect_any_instance_of(Shoes.configuration.backend::ListBox).
-        to receive(:text).and_return("Sneakers & Sandals")
+    expect_any_instance_of(Shoes.configuration.backend::ListBox)
+      .to receive(:text).and_return("Sneakers & Sandals")
     expect(list_box.text).to eq("Sneakers & Sandals")
   end
 

data/spec/shoes/oval_spec.rb

@@ -20,6 +20,6 @@ describe Shoes::Oval do
     it_behaves_like "object with parent"
     it_behaves_like "object with hover"
 
-    #it_styles_with :art_styles, :center, :dimensions, :radius
+    # it_styles_with :art_styles, :center, :dimensions, :radius
   end
 end

data/spec/shoes/point_spec.rb

@@ -19,9 +19,9 @@ describe Shoes::Point do
 
   describe "equality" do
     it "requires x and y to be equal" do
-      expect(subject).to eq(Shoes::Point.new 40, 50)
-      expect(subject).not_to eq(Shoes::Point.new 41, 50)
-      expect(subject).not_to eq(Shoes::Point.new 40, 51)
+      expect(subject).to eq(Shoes::Point.new(40, 50))
+      expect(subject).not_to eq(Shoes::Point.new(41, 50))
+      expect(subject).not_to eq(Shoes::Point.new(40, 51))
     end
 
     it "works with other (x,y) objects" do

data/spec/shoes/renamed_delegate_spec.rb

@@ -35,8 +35,8 @@ describe RenamedDelegate do
                                 ToDelegate.public_instance_methods(false),
                                 'key' => 'shoes', 'something' => 'awesome'
 
-  let(:delegate) {double('delegate').as_null_object}
-  subject {TestClass.new delegate}
+  let(:delegate) { double('delegate').as_null_object }
+  subject { TestClass.new delegate }
 
   def test_renaming(new_name, old_name)
     subject.public_send new_name

data/spec/shoes/shape_spec.rb

@@ -5,22 +5,22 @@ describe Shoes::Shape do
 
   let(:left) { 0 }
   let(:top) { 0 }
-  let(:style) { {left: left, top: top} }
-  let(:draw)  { Proc.new { } }
+  let(:style) { {translate_left: 0, translate_top: 0, left: left, top: top} }
+  let(:draw)  { proc {} }
 
   subject { Shoes::Shape.new app, parent, style, draw }
 
   it_behaves_like "object with style" do
     let(:subject_without_style) { Shoes::Shape.new(app, parent) }
-    let(:subject_with_style) { Shoes::Shape.new(app, parent,  arg_styles) }
+    let(:subject_with_style) { Shoes::Shape.new(app, parent, arg_styles) }
   end
 
   it_behaves_like "movable object"
   it_behaves_like "clickable object"
 
   describe "octagon" do
-    let(:draw) {
-      Proc.new {
+    let(:draw) do
+      proc do
         xs = [200, 300, 370, 370, 300, 200, 130, 130]
         ys = [100, 100, 170, 270, 340, 340, 270, 170]
         move_to xs.first, ys.first
@@ -28,8 +28,8 @@ describe Shoes::Shape do
           line_to(x, y)
         end
         line_to xs.first, ys.first
-      }
-    }
+      end
+    end
 
     its(:left) { should eq(0) }
     its(:top) { should eq(0) }
@@ -66,12 +66,12 @@ describe Shoes::Shape do
   end
 
   describe "curve" do
-    let(:draw) {
-      Proc.new {
+    let(:draw) do
+      proc do
         move_to 10, 10
         curve_to 20, 30, 100, 200, 50, 50
-      }
-    }
+      end
+    end
 
     its(:left_bound)   { should eq(10) }
     its(:top_bound)    { should eq(10) }
@@ -84,17 +84,17 @@ describe Shoes::Shape do
   end
 
   describe "arc" do
-    let(:draw) {
-      Proc.new {
+    let(:draw) do
+      proc do
         arc_to 10, 10, 100, 100, Shoes::PI, Shoes::TWO_PI
-      }
-    }
+      end
+    end
 
     it_behaves_like "movable object"
   end
 
   describe "in_bounds?" do
-    let(:draw) { Proc.new { line_to 100, 100 } }
+    let(:draw) { proc { line_to 100, 100 } }
 
     it "is in bounds" do
       expect(subject.in_bounds?(10, 10)).to be true
@@ -106,13 +106,13 @@ describe Shoes::Shape do
   end
 
   describe "accesses app" do
-    let(:draw) {
-      Proc.new {
+    let(:draw) do
+      proc do
         background Shoes::COLORS[:red]
         stroke Shoes::COLORS[:blue]
         rect 10, 10, 100, 100
-      }
-    }
+      end
+    end
 
     it_behaves_like "movable object"
   end