shoes-core 4.0.0.pre6 → 4.0.0.pre7

data/lib/shoes/widget.rb

@@ -60,8 +60,8 @@ class Shoes
 
     def self.dsl_method_name(klass)
       klass.to_s[/(^|::)(\w+)$/, 2]
-        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-        .gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+           .gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
     end
   end
 end

data/lib/shoes/window.rb

@@ -0,0 +1,6 @@
+class Shoes
+  # This class serves as a placeholder for referring to the overall window of
+  # a Shoes app, such as attaching a slot to the top.
+  class Window
+  end
+end

data/spec/shoes/app_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Shoes::App do
-  let(:input_blk) { Proc.new {} }
+  let(:input_blk) { proc {} }
   let(:opts) { Hash.new }
   subject(:app) { Shoes::App.new(opts, &input_blk) }
 
@@ -20,7 +20,7 @@ describe Shoes::App do
   end
 
   describe "initialize" do
-    let(:input_blk) { Proc.new {} }
+    let(:input_blk) { proc {} }
 
     it "initializes style hash", :qt do
       style = Shoes::App.new.style
@@ -82,8 +82,8 @@ describe Shoes::App do
       it 'initializes a flow with the right parameters' do
         expect(Shoes::Flow).to receive(:new).with(anything, anything,
                                                   width:  opts[:width],
-                                                  height: opts[:height]).
-                                                  and_call_original
+                                                  height: opts[:height])
+          .and_call_original
         subject
       end
     end
@@ -117,7 +117,7 @@ describe Shoes::App do
     default_styles = Shoes::Common::Style::DEFAULT_STYLES
 
     default_styles.each do |key, value|
-      describe "#{key}" do
+      describe key.to_s do
         it "defaults to #{value}" do
           expect(subject.style[key]).to eq(value)
         end
@@ -200,13 +200,13 @@ describe Shoes::App do
   describe 'Execution context' do
     it 'starts with self as the execution context' do
       my_self = nil
-      app = Shoes.app do my_self = self end
+      app = Shoes.app { my_self = self }
       expect(my_self).to eq app
     end
   end
 
   describe '#append' do
-    let(:input_blk) {Proc.new do append do para 'Hi' end end}
+    let(:input_blk) { proc { append { para 'Hi' } } }
 
     it 'understands append' do
       expect(subject).to respond_to :append
@@ -260,11 +260,11 @@ describe Shoes::App do
 
   describe '#clear' do
     let(:input_blk) do
-      Proc.new do
+      proc do
         para 'Hello'
       end
     end
-    let(:internal_app) {subject.instance_variable_get(:@__app__)}
+    let(:internal_app) { subject.instance_variable_get(:@__app__) }
 
     it 'has initial contents' do
       expect(subject.contents).to_not be_empty
@@ -352,9 +352,9 @@ describe Shoes::App do
       Shoes::App.subscribe_to_dsl_methods(self)
     end
 
-    let(:subscribed_instance) {TestSubscribeClass.new subject}
+    let(:subscribed_instance) { TestSubscribeClass.new subject }
 
-    AUTO_SUBSCRIBED_CLASSES = [Shoes::App, Shoes::URL, Shoes::Widget]
+    AUTO_SUBSCRIBED_CLASSES = [Shoes::App, Shoes::URL, Shoes::Widget].freeze
     SUBSCRIBED_CLASSES      = AUTO_SUBSCRIBED_CLASSES + [TestSubscribeClass]
 
     describe '.subscribe_to_dsl_methods' do
@@ -389,22 +389,22 @@ describe Shoes::App do
     end
 
     describe 'DELEGATE_METHODS' do
-      subject {Shoes::App::DELEGATE_METHODS}
+      subject { Shoes::App::DELEGATE_METHODS }
 
       describe 'does not include general ruby object methods' do
-        it {is_expected.not_to include :new, :initialize}
+        it { is_expected.not_to include :new, :initialize }
       end
 
       describe 'it has access to Shoes app and DSL methods' do
-        it {is_expected.to include :para, :rect, :stack, :flow, :image, :location}
+        it { is_expected.to include :para, :rect, :stack, :flow, :image, :location }
       end
 
       describe 'it does not have access to private methods' do
-        it {is_expected.not_to include :pop_style, :style_normalizer, :create}
+        it { is_expected.not_to include :pop_style, :style_normalizer, :create }
       end
 
       describe 'there are blacklisted methods that wreck havoc' do
-        it {is_expected.not_to include :parent, :app}
+        it { is_expected.not_to include :parent, :app }
       end
     end
   end

data/spec/shoes/arc_spec.rb

@@ -23,7 +23,7 @@ describe Shoes::Arc 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
 
     it "is a Shoes::Arc" do
       expect(arc.class).to be(Shoes::Arc)

data/spec/shoes/arrow_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Shoes::Arrow do
+  include_context "dsl app"
+
+  let(:parent) { app }
+  let(:left) { 44 }
+  let(:top) { 66 }
+  let(:width) { 111 }
+  let(:height) { 111 }
+  subject(:arrow) { Shoes::Arrow.new(app, parent, left, top, width) }
+
+  describe '#style' do
+    it 'restyles handed in fill colors (even the weird ones)' do
+      subject.style fill: 'fff'
+      expect(subject.style[:fill]).to eq Shoes::Color.new 255, 255, 255
+    end
+  end
+
+  it_behaves_like "object with style" do
+    let(:subject_without_style) { Shoes::Arrow.new(app, parent, left, top, width) }
+    let(:subject_with_style) { Shoes::Arrow.new(app, parent, left, top, width, arg_styles) }
+  end
+  it_behaves_like "object with dimensions"
+  it_behaves_like "movable object"
+  it_behaves_like 'object with parent'
+  it_behaves_like "object with hover"
+end

data/spec/shoes/background_spec.rb

@@ -8,7 +8,7 @@ describe Shoes::Background do
   let(:width) { 100 }
   let(:height) { 200 }
 
-  let(:blue)  { Shoes::COLORS[:blue] }
+  let(:blue) { Shoes::COLORS[:blue] }
   let(:input_opts) { {left: left, top: top, width: width, height: height, color: blue} }
   subject(:background) { Shoes::Background.new(app, parent, blue, input_opts) }
 
@@ -43,5 +43,5 @@ describe Shoes::Background do
     it_behaves_like "object with negative dimensions"
   end
 
-  it {is_expected.not_to be_takes_up_space}
+  it { is_expected.not_to be_takes_up_space }
 end

data/spec/shoes/border_spec.rb

@@ -12,7 +12,7 @@ end
 
 describe Shoes::Border do
   include_context "dsl app"
-  let(:parent) { Shoes::FakeElement.new nil, left, top, width, height}
+  let(:parent) { Shoes::FakeElement.new nil, left, top, width, height }
   let(:opts) { {left: left, top: top, width: width, height: height} }
 
   let(:left) { 10 }
@@ -20,7 +20,7 @@ describe Shoes::Border do
   let(:width) { 100 }
   let(:height) { 200 }
 
-  let(:blue)  { Shoes::COLORS[:blue] }
+  let(:blue) { Shoes::COLORS[:blue] }
 
   subject { Shoes::Border.new(app, parent, blue, opts) }
 
@@ -42,5 +42,5 @@ describe Shoes::Border do
     it_behaves_like "object with negative dimensions"
   end
 
-  it {is_expected.not_to be_takes_up_space}
+  it { is_expected.not_to be_takes_up_space }
 end

data/spec/shoes/builtin_methods_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Shoes::BuiltinMethods do
-  let(:input_blk) { Proc.new {} }
+  let(:input_blk) { proc {} }
   let(:app) { Shoes::App.new({}, &input_blk) }
   let(:logger) { double("logger") }
   let(:dialog) { double('dialog') }
@@ -80,7 +80,7 @@ describe Shoes::BuiltinMethods do
 
   %w(alert confirm).each do |type|
     describe '##{alert}' do
-     let(:message) { double('message') }
+      let(:message) { double('message') }
 
       before do
         allow(Shoes::Dialog).to receive(:new).and_return(dialog)

data/spec/shoes/button_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 describe Shoes::Button do
   include_context "dsl app"
-  let(:input_opts) { {left: left, top: top, width: width,
-                      height: height, margin: margin, state: "disabled"} }
+
+  let(:input_opts) do
+    { left: left, top: top, width: width, height: height, margin: margin, state: "disabled" }
+  end
 
   let(:left)   { 13 }
   let(:top)    { 44 }

data/spec/shoes/color_spec.rb

@@ -30,22 +30,22 @@ describe Shoes::Color do
   end
 
   context "with wrong number of arguments" do
-    subject { lambda { Shoes::Color.new(10, 10) } }
+    subject { -> { Shoes::Color.new(10, 10) } }
     it_behaves_like "color with bad arguments"
   end
 
   context "with too many hex chars" do
-    subject { lambda { Shoes::Color.new("a1b2c3d") } }
+    subject { -> { Shoes::Color.new("a1b2c3d") } }
     it_behaves_like "color with bad arguments"
   end
 
   context "with too few hex chars" do
-    subject { lambda { Shoes::Color.new("a1") } }
+    subject { -> { Shoes::Color.new("a1") } }
     it_behaves_like "color with bad arguments"
   end
 
   context "with invalid hex chars" do
-    subject { lambda { Shoes::Color.new("#g01234") } }
+    subject { -> { Shoes::Color.new("#g01234") } }
     it_behaves_like "color with bad arguments"
   end
 
@@ -212,8 +212,8 @@ describe Shoes::Color do
 
     describe "comparable" do
       let(:color1) { Shoes::Color.new(255, 69, 0) }
-      let(:red) {Shoes::Color.new 255, 0, 0}
-      let(:green) {Shoes::Color.new 0, 255, 0}
+      let(:red) { Shoes::Color.new 255, 0, 0 }
+      let(:green) { Shoes::Color.new 0, 255, 0 }
 
       it "is equal when values are equal" do
         color2 = Shoes::Color.new(255, 69, 0)
@@ -241,11 +241,11 @@ describe Shoes::Color do
       # shoes 3 compatibility behavior
       describe 'different colors' do
         it 'takes the total of rgb values to compare, less is less' do
-          expect(create_rgb 100, 200, 0).to be < create_rgb(50, 100, 151)
+          expect(create_rgb(100, 200, 0)).to be < create_rgb(50, 100, 151)
         end
 
         it 'takes the total of rgb values to compare, more is more' do
-          expect(create_rgb 0, 200, 200).to be > create_rgb(150, 150, 99)
+          expect(create_rgb(0, 200, 200)).to be > create_rgb(150, 150, 99)
         end
       end
 
@@ -397,7 +397,7 @@ describe Shoes::Color::DSLHelpers do
     include Shoes::Color::DSLHelpers
   end
 
-  subject {ColorDSLHelperTest.new}
+  subject { ColorDSLHelperTest.new }
 
   describe '#pattern' do
     it 'creates an image pattern when fed a string for which a file exists' do
@@ -408,7 +408,7 @@ describe Shoes::Color::DSLHelpers do
     end
 
     it 'raises an argument error for bad input like a single number' do
-      expect {subject.pattern(1)}.to raise_error(ArgumentError)
+      expect { subject.pattern(1) }.to raise_error(ArgumentError)
     end
 
     it 'creates a gradient given 2 arguments' do
@@ -419,11 +419,11 @@ describe Shoes::Color::DSLHelpers do
 
   describe '#gradient' do
     it 'raises an argument error for no arguments supplied' do
-      expect {subject.gradient}.to raise_error ArgumentError
+      expect { subject.gradient }.to raise_error ArgumentError
     end
 
     it 'raises an argument error for too many (> 2) args supplied' do
-      expect {subject.gradient 1, 2, 3}.to raise_error ArgumentError
+      expect { subject.gradient 1, 2, 3 }.to raise_error ArgumentError
     end
   end
 end

data/spec/shoes/common/attachable_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Shoes::Common::Attachable do
+  include_context "dsl app"
+
+  subject do
+    Class.new do
+      include Shoes::Common::Attachable
+
+      attr_reader :style
+
+      def initialize(app, attached_to)
+        @app   = app
+        @style = { attach: attached_to }
+      end
+    end
+  end
+
+  let(:slot) { double('slot') }
+
+  it "isn't attached" do
+    expect(subject.new(app, nil).attached_to).to eq(nil)
+  end
+
+  it "attaches" do
+    expect(subject.new(app, slot).attached_to).to eq(slot)
+  end
+
+  it "attaches to Shoes::Window" do
+    expect(subject.new(app, Shoes::Window).attached_to).to eq(app.top_slot)
+  end
+end

data/spec/shoes/common/inspect_spec.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 
 describe "Shoes::Common::Inspect" do
-  let(:test_class) {
-    Class.new {
+  let(:test_class) do
+    Class.new do
       include Shoes::Common::Inspect
       def self.name
         "Shoes::InspectableObject"
       end
-    }
-  }
+    end
+  end
 
   describe "when included" do
     include InspectHelpers

data/spec/shoes/common/remove_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Shoes::Common::Remove do
-  let(:parent) {double 'parent', add_child: true, remove_child: true}
-  let(:gui) {double 'gui', remove: true}
-  let(:test_class) {Class.new {include Shoes::Common::Remove}}
+  let(:parent) { double 'parent', add_child: true, remove_child: true }
+  let(:gui) { double 'gui', remove: true }
+  let(:test_class) { Class.new { include Shoes::Common::Remove } }
 
-  subject {test_class.new}
+  subject { test_class.new }
 
   before :each do
     allow(subject).to receive_messages parent: parent, gui: gui
@@ -27,7 +27,7 @@ describe Shoes::Common::Remove do
     describe 'if the gui does not respond to clear' do
       # need to stub clear and respond_to because we get a non stubbed method
       # otherwise on our spies when verifying...
-      let(:gui) {double 'no clear gui', clear: true, respond_to?: false}
+      let(:gui) { double 'no clear gui', clear: true, respond_to?: false }
 
       it 'does not call clear on the gui' do
         expect(gui).not_to have_received(:clear)

data/spec/shoes/common/rotate_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Shoes::Common::Rotate do
   let(:test_class) { Class.new { include Shoes::Common::Rotate } }
 
-  subject {test_class.new}
+  subject { test_class.new }
 
   describe '#needs_rotate?' do
     it 'defaults to falsey value' do

data/spec/shoes/common/style_normalizer_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 describe Shoes::Common::StyleNormalizer do
-  subject {Shoes::Common::StyleNormalizer.new}
+  subject { Shoes::Common::StyleNormalizer.new }
 
   it 'does not modify a simple hash' do
     input = {left: 100, width: 233}
-    expect(subject.normalize input).to eq input
+    expect(subject.normalize(input)).to eq input
   end
 
   it 'turns hexcodes for fill into colors' do
     input = {fill: 'ffffff'}
     expected = {fill: Shoes::Color.new(255, 255, 255)}
-    expect(subject.normalize input).to eq expected
+    expect(subject.normalize(input)).to eq expected
   end
 
   it 'turns hexcodes for stroke into colors' do
     input = {stroke: 'ffffff'}
     expected = {stroke: Shoes::Color.new(255, 255, 255)}
-    expect(subject.normalize input).to eq expected
+    expect(subject.normalize(input)).to eq expected
   end
 
   it 'does not modify the original hash' do

data/spec/shoes/common/style_spec.rb

@@ -13,10 +13,10 @@ describe Shoes::Common::Style do
     attr_reader :app, :dimensions
     style_with :key, :left, :click, :strokewidth, :fill
 
-    STYLES = {fill: Shoes::COLORS[:blue]}
+    STYLES = { fill: Shoes::COLORS[:blue] }.freeze
 
     def initialize(app, styles = {})
-      @app = app #needed for style init
+      @app = app # needed for style init
       @dimensions = Shoes::Dimensions.new(@app, left: 15)
 
       # Would normally be done by Common::Initialization
@@ -36,14 +36,18 @@ describe Shoes::Common::Style do
     end
   end
 
-  subject {StyleTester.new(app)}
+  subject { StyleTester.new(app) }
 
   its(:style) { should eq(initial_style) }
-  let(:initial_style) { {key: 'value', left: 15, click: nil, strokewidth: 1, fill: blue,
-                         margin: [0,0,0,0], margin_left: 0, margin_top: 0, margin_right: 0, margin_bottom: 0 } }
+  let(:initial_style) do
+    {
+      key: 'value', left: 15, click: nil, strokewidth: 1, fill: blue, margin: [0, 0, 0, 0],
+      margin_left: 0, margin_top: 0, margin_right: 0, margin_bottom: 0
+    }
+  end
 
   describe 'reading and writing through #style(hash)' do
-    let(:input_proc) { Proc.new {} }
+    let(:input_proc) { proc {} }
     let(:changed_style) { {key: 'changed value'} }
 
     before :each do
@@ -138,7 +142,7 @@ describe Shoes::Common::Style do
   end
 
   describe "style priorities" do
-    subject {StyleTester.new(app, key: 'pumpkin')}
+    subject { StyleTester.new(app, key: 'pumpkin') }
     let(:green) { Shoes::COLORS[:green] }
 
     it 'uses arguments-styles over element-styles' do
@@ -150,7 +154,7 @@ describe Shoes::Common::Style do
     end
 
     describe "with app level styles applied" do
-      let(:app) { Shoes::App.new}
+      let(:app) { Shoes::App.new }
 
       it "should override class level defaults with app level styles provided those app styles are supported by the class" do
         app.style(fill: green)
@@ -164,7 +168,7 @@ describe Shoes::Common::Style do
       end
     end
 
-    #related priority specs are tested individually in spec/shared_examples/style
+    # related priority specs are tested individually in spec/shared_examples/style
   end
 
   describe 'StyleWith' do
@@ -182,8 +186,8 @@ describe Shoes::Common::Style do
   end
 
   describe 'sets hover and leave from styles' do
-    let(:hover_blk) { Proc.new {} }
-    let(:leave_blk) { Proc.new {} }
+    let(:hover_blk) { proc {} }
+    let(:leave_blk) { proc {} }
 
     subject { StyleTester.new(app, hover: hover_blk, leave: leave_blk) }