shoes-core 4.0.0.pre4 → 4.0.0.pre5

data/spec/shoes/arc_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::Arc do
   include_context "dsl app"
@@ -21,6 +21,7 @@ describe Shoes::Arc do
     it_behaves_like "object with dimensions"
     it_behaves_like "left, top as center", :start_angle, :end_angle
     it_behaves_like "object with parent"
+    it_behaves_like "object with hover"
 
     #it_styles_with :art_styles, :center, :dimensions, :radius
 

data/spec/shoes/background_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::Background do
   include_context "dsl app"
@@ -9,7 +9,7 @@ describe Shoes::Background do
   let(:height) { 200 }
 
   let(:blue)  { Shoes::COLORS[:blue] }
-  let(:input_opts){ {left: left, top: top, width: width, height: height, color: blue} }
+  let(:input_opts) { {left: left, top: top, width: width, height: height, color: blue} }
   subject(:background) { Shoes::Background.new(app, parent, blue, input_opts) }
 
   before do

data/spec/shoes/border_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 shared_examples_for "basic border" do
   it "retains app" do
@@ -13,7 +13,7 @@ end
 describe Shoes::Border do
   include_context "dsl app"
   let(:parent) { Shoes::FakeElement.new nil, left, top, width, height}
-  let(:opts){ {left: left, top: top, width: width, height: height} }
+  let(:opts) { {left: left, top: top, width: width, height: height} }
 
   let(:left) { 10 }
   let(:top) { 20 }

data/spec/shoes/builtin_methods_spec.rb

@@ -1,9 +1,10 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::BuiltinMethods do
   let(:input_blk) { Proc.new {} }
   let(:app) { Shoes::App.new({}, &input_blk) }
   let(:logger) { double("logger") }
+  let(:dialog) { double('dialog') }
 
   before :each do
     Shoes::LOG.clear
@@ -22,63 +23,33 @@ describe Shoes::BuiltinMethods do
     end
   end
 
-  describe "info" do
-    before :each do
-      allow(logger).to receive(:info)
-      app.info("test")
-    end
-
-    it "sets Shoes::LOG" do
-      expect(Shoes::LOG).to eq([["info", "test"]])
-    end
-
-    it "sends message to logger" do
-      expect(logger).to have_received(:info)
-    end
-  end
-
-  describe "debug" do
-    before :each do
-      allow(logger).to receive(:debug)
-      app.debug("test")
-    end
-
-    it "sets Shoes::LOG" do
-      expect(Shoes::LOG).to eq([["debug", "test"]])
-    end
-
-    it "sends message to logger" do
-      expect(logger).to have_received(:debug)
-    end
-  end
-
-  describe "warn" do
-    before :each do
-      allow(logger).to receive(:warn)
-      app.warn("test")
-    end
+  %w(info debug warn error).each do |level|
+    describe "##{level}" do
+      before :each do
+        allow(logger).to receive(level)
+        app.public_send(level, "test")
+      end
 
-    it "sets Shoes::LOG" do
-      expect(Shoes::LOG).to eq([["warn", "test"]])
-    end
+      it 'sets Shoes::LOG' do
+        expect(Shoes::LOG).to eq([[level, 'test']])
+      end
 
-    it "sends message to logger" do
-      expect(logger).to have_received(:warn)
+      it 'sends message to logger' do
+        expect(logger).to have_received(level)
+      end
     end
   end
 
-  describe "error" do
-    before :each do
-      allow(logger).to receive(:error)
-      app.error("test")
-    end
-
-    it "sets Shoes::LOG" do
-      expect(Shoes::LOG).to eq([["error", "test"]])
-    end
+  %w(open_file save_file open_folder save_folder).each do |chooser_action|
+    describe "#ask_#{chooser_action}" do
+      before do
+        allow(Shoes::Dialog).to receive(:new).and_return(dialog)
+        expect(dialog).to receive(:dialog_chooser).and_return(dialog)
+      end
 
-    it "sends message to logger" do
-      expect(logger).to have_received(:error)
+      it 'creates a new chooser dialog' do
+        expect(app.public_send("ask_#{chooser_action}")).to eq(dialog)
+      end
     end
   end
 
@@ -86,9 +57,9 @@ describe Shoes::BuiltinMethods do
   # elsewhere
   describe 'are builtin methods are also available from Shoes' do
     builtin_methods = [:alert, :ask, :ask_color, :ask_open_file, :ask_save_file,
-                     :ask_open_folder, :ask_save_folder, :confirm, :color,
-                     :debug, :error, :font, :gradient, :gray, :rgb, :info,
-                     :pattern, :warn]
+                       :ask_open_folder, :ask_save_folder, :confirm, :color,
+                       :debug, :error, :font, :gradient, :gray, :rgb, :info,
+                       :pattern, :warn]
 
     builtin_methods.each do |method|
       it "responds to #{method}" do
@@ -96,7 +67,6 @@ describe Shoes::BuiltinMethods do
       end
     end
 
-
     describe 'does not get to the nitty gritty helper_methods' do
       helper_methods = [:image_file?, :image_pattern]
 
@@ -107,4 +77,46 @@ describe Shoes::BuiltinMethods do
       end
     end
   end
+
+  %w(alert confirm).each do |type|
+    describe '##{alert}' do
+     let(:message) { double('message') }
+
+      before do
+        allow(Shoes::Dialog).to receive(:new).and_return(dialog)
+        expect(dialog).to receive(type).with(message).and_return(dialog)
+      end
+
+      it 'creates a new dialog' do
+        expect(app.public_send(type, message)).to eq(dialog)
+      end
+    end
+  end
+
+  describe '#ask' do
+    let(:message) { double('message') }
+    let(:args) { double('args') }
+
+    before do
+      allow(Shoes::Dialog).to receive(:new).and_return(dialog)
+      expect(dialog).to receive(:ask).with(message, args).and_return(dialog)
+    end
+
+    it 'creates a new dialog' do
+      expect(app.ask(message, args)).to eq(dialog)
+    end
+  end
+
+  describe '#ask_color' do
+    let(:title) { double('title') }
+
+    before do
+      allow(Shoes::Dialog).to receive(:new).and_return(dialog)
+      expect(dialog).to receive(:ask_color).with(title).and_return(dialog)
+    end
+
+    it 'creates a new dialog' do
+      expect(app.ask_color(title)).to eq(dialog)
+    end
+  end
 end

data/spec/shoes/button_spec.rb

@@ -1,9 +1,9 @@
-require "shoes/spec_helper"
+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) { {left: left, top: top, width: width,
+                      height: height, margin: margin, state: "disabled"} }
 
   let(:left)   { 13 }
   let(:top)    { 44 }

data/spec/shoes/check_spec.rb

@@ -1,8 +1,9 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::Check do
   include_context "dsl app"
 
+  let(:input_opts) { { width: 22, height: 22 } }
   subject { Shoes::Check.new(app, parent, input_opts, input_block) }
 
   it_behaves_like "checkable"
@@ -17,7 +18,7 @@ describe Shoes::Check do
     let(:top) { 20 }
     let(:width) { 100 }
     let(:height) { 200 }
-    let(:input_opts){ {left: left, top: top, width: width, height: height} }
+    let(:input_opts) { {left: left, top: top, width: width, height: height} }
     subject { Shoes::Check.new(app, parent, input_opts) }
 
     it_behaves_like "object with dimensions"

data/spec/shoes/color_spec.rb

@@ -1,4 +1,4 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 
 describe Shoes::Color do
   describe ".create" do
@@ -277,6 +277,12 @@ describe "Shoes built-in colors" do
   its(:papayawhip) { should eq(Shoes::Color.new(255, 239, 213)) }
   its(:aquamarine) { should eq(Shoes::Color.new(127, 255, 212)) }
   its(:tomato) { should eq(Shoes::Color.new(255, 99, 71)) }
+
+  # define colors spec here since this has the other custom colors?
+  it 'can use define_shoes_color to create built-in colors' do
+    Shoes::DSL.define_shoes_color(:test_color, 0, 1, 2)
+    expect(subject.test_color).to eq Shoes::Color.new(0, 1, 2)
+  end
 end
 
 describe "Shoes built in gray" do
@@ -413,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/remove_spec.rb

@@ -1,7 +1,6 @@
 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}}

data/spec/shoes/common/rotate_spec.rb

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

data/spec/shoes/common/style_spec.rb

@@ -8,8 +8,9 @@ describe Shoes::Common::Style do
     include Shoes::Common::Visibility
     include Shoes::DimensionsDelegations
     include Shoes::Common::Style
+    include Shoes::Common::Hover
 
-    attr_reader :dimensions
+    attr_reader :app, :dimensions
     style_with :key, :left, :click, :strokewidth, :fill
 
     STYLES = {fill: Shoes::COLORS[:blue]}
@@ -39,7 +40,7 @@ describe Shoes::Common::Style do
 
   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 } }
+                         margin: [0,0,0,0], margin_left: 0, margin_top: 0, margin_right: 0, margin_bottom: 0 } }
 
   describe 'reading and writing through #style(hash)' do
     let(:input_proc) { Proc.new {} }
@@ -178,7 +179,15 @@ describe Shoes::Common::Style do
         expect(subject).to respond_to "#{style}="
       end
     end
-
   end
 
+  describe 'sets hover and leave from styles' do
+    let(:hover_blk) { Proc.new {} }
+    let(:leave_blk) { Proc.new {} }
+
+    subject { StyleTester.new(app, hover: hover_blk, leave: leave_blk) }
+
+    its(:hover_blk) { should eq(hover_blk) }
+    its(:leave_blk) { should eq(leave_blk) }
+  end
 end

data/spec/shoes/configuration_spec.rb

@@ -18,18 +18,33 @@ describe Shoes::Configuration do
 
     let(:dsl_object) { Shoes::Shape.new app, parent }
 
-    describe "#backend_with_app_for" do
+    describe "#backend_for" do
       it "passes app.gui to backend" do
         expect(Shoes.configuration.backend::Shape).to receive(:new).with(an_instance_of(Shoes::Shape), app.gui).and_call_original
         dsl_object
       end
 
       it "returns shape backend object" do
-        expect(Shoes.configuration.backend_with_app_for(dsl_object)).to be_instance_of(Shoes.configuration.backend::Shape)
+        expect(Shoes.backend_for(dsl_object)).to be_instance_of(Shoes.configuration.backend::Shape)
       end
 
       it "raises ArgumentError for a non-Shoes object" do
-        expect { Shoes.configuration.backend_with_app_for(1..100) }.to raise_error(ArgumentError)
+        expect { Shoes.backend_for(1..100) }.to raise_error(ArgumentError)
+      end
+    end
+
+    describe '#backend_class' do
+      it 'returns the backend class for a dsl object' do
+        expect(Shoes.configuration.backend_class(dsl_object)).to eq(Shoes.configuration.backend::Shape)
+      end
+
+      it 'returns the backend class if fed with a class' do
+        expect(Shoes.configuration.backend_class(Shoes::Shape)).to eq(Shoes.configuration
+                                                .backend::Shape)
+      end
+
+      it 'raises an error when fed with a non existant class' do
+        expect { Shoes.configuration.backend_class(Array) }.to raise_error(ArgumentError)
       end
     end
   end

data/spec/shoes/constants_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require "pathname"
 
 describe "Shoes constants" do

data/spec/shoes/dialog_spec.rb

@@ -1,11 +1,10 @@
-require 'shoes/spec_helper'
+require 'spec_helper'
 # NOTE: This spec is sadly circumventing the integration specs since we couldn't
 # figure out how to get rid of the alert - it stopped the running tests
 
 main_object = self
 
 describe Shoes::Dialog do
-
   before :each do
     @dialog = Shoes::Dialog.new
   end
@@ -167,5 +166,4 @@ describe Shoes::Dialog do
       expect(@app).to respond_to :ask_color
     end
   end
-
 end

data/spec/shoes/dimension_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Shoes::Dimension do
-
   subject {Shoes::Dimension.new parent_dimension}
   let(:start) {10}
   let(:extent) {21}
@@ -218,7 +217,6 @@ describe Shoes::Dimension do
   end
 
   describe '#margins' do
-
     let(:margin_start) {11}
     let(:margin_end) {17}
 
@@ -358,12 +356,9 @@ describe Shoes::Dimension do
     before :each do
       parent.start        = parent_start
       parent.extent       = parent_extent
-      parent.margin_start = margin
-      parent.margin_end   = margin
     end
 
     describe 'it takes some parent values if no values are set' do
-      its(:start)  {should eq parent_start}
       its(:extent) {should eq parent_extent}
 
       its(:margin_start) {should eq 0}
@@ -372,22 +367,28 @@ describe Shoes::Dimension do
       context 'with parent absolute_start set' do
         before :each do
           parent.absolute_start = 11
-
-          # This would be set by positioning code
-          subject.absolute_start = parent.absolute_start + margin
         end
 
-        its(:absolute_start) {should eq parent.absolute_start + margin}
-        its(:element_start)  {should eq parent.absolute_start + margin}
+        its(:absolute_start) {should eq parent.element_start}
+        its(:element_start)  {should eq parent.element_start}
         its(:element_end)    {should eq parent.element_end}
       end
+
+      context 'but it takes the parent margins into account' do
+        before :each do
+          parent.margin_start = margin
+          parent.margin_end   = margin
+        end
+
+        its(:extent) {is_expected.to eq 17}
+      end
     end
 
     describe 'otherwise it takes its own values' do
       before :each do
         subject.start = start
         subject.extent = extent
-        subject.absolute_start = 17
+        parent.absolute_start = 17
       end
 
       its(:start) {should eq start}
@@ -396,36 +397,44 @@ describe Shoes::Dimension do
 
       it 'can still handle special values like a negative extent' do
         subject.extent = -10
-        expect(subject.extent).to eq(parent_extent - 2 * margin - 10)
+        expect(subject.extent).to eq(parent.element_extent - 10)
       end
 
       it 'can also still handle special values like relative values' do
         subject.extent = 0.8
         expect(subject.extent).to be_within(ONE_PIXEL).of(0.8 * parent.element_extent)
       end
+
+      it 'takes the margins of parent into account' do
+        parent.margin_start = 10
+        expect(subject.absolute_start).to eq 27
+      end
     end
 
     describe 'it obeys parent bounds' do
       let(:parent_dimension) { double 'parent_dimension',
-                                  element_start:  10,
-                                  element_end:    20,
-                                  absolute_start: 10,
-                                  absolute_end:   20,
-                                  extent:         10,
-                                  element_extent: 10 }
+                                      element_start:  10,
+                                      element_end:    20,
+                                      absolute_start: 10,
+                                      absolute_end:   20,
+                                      extent:         10,
+                                      element_extent: 10 }
 
       subject {Shoes::ParentDimension.new parent_dimension}
 
-      it "can't extend beyond parent" do
-        subject.absolute_start = 15
-        expect(subject.extent).to eq(6)
+      it "gets the parent element_extent" do
+        expect(subject.extent).to eq(10)
       end
 
-      it "can't start before parent" do
-        subject.absolute_start = 5
+      it "can't extend beyond the parent" do
+        subject.extent = 25
         expect(subject.extent).to eq(10)
       end
+
+      it 'can get smaller than the parent' do
+        subject.extent = 5
+        expect(subject.extent).to eq(5)
+      end
     end
   end
-
 end