shamrock 0.0.2 → 0.0.3

data/.rspec

@@ -0,0 +1,3 @@
+--order random
+--color
+--format doc

data/lib/shamrock/http.rb

@@ -0,0 +1,20 @@
+require 'net/http'
+
+module Shamrock
+  class Http
+
+    attr_reader :uri
+
+    def initialize(url)
+      @uri = URI.parse(url)
+    end
+
+    def ready?
+      Net::HTTP.get_response(uri)
+      true
+
+    rescue SystemCallError, SocketError
+      false
+    end
+  end
+end

data/lib/shamrock/monitor.rb

@@ -1,4 +1,3 @@
-require 'net/http'
 require 'timeout'
 
 module Shamrock
@@ -7,13 +6,15 @@ module Shamrock
     DEFAULT_TIMEOUT = 10
     RE_CHECK_WAIT   = 0.1
 
-    def initialize(url)
-      @uri = URI.parse(url)
+    attr_reader :http
+
+    def initialize(http)
+      @http = http
     end
 
     def wait_until_ready
       Timeout::timeout(DEFAULT_TIMEOUT) do
-        until ready? do
+        until http.ready? do
           sleep RE_CHECK_WAIT
         end
       end
@@ -21,15 +22,5 @@ module Shamrock
     rescue Timeout::Error => error
       abort "Server never started!"
     end
-
-    def ready?
-      begin
-        response = Net::HTTP.get_response(@uri)
-        response.is_a?(Net::HTTPSuccess)
-      rescue SystemCallError => error
-        false
-      end
-    end
-
   end
 end

data/lib/shamrock/service.rb

@@ -1,5 +1,6 @@
 module Shamrock
   class Service
+
     attr_reader :port, :url
 
     def initialize(rack_app,
@@ -10,7 +11,7 @@ module Shamrock
       @handler  = handler
       @port     = Port.new
       @url      = "http://localhost:#{port.number}"
-      @monitor  = monitor.new(url)
+      @monitor  = monitor.new(Shamrock::Http.new(url))
     end
 
     def start

data/lib/shamrock/version.rb

@@ -1,3 +1,3 @@
 module Shamrock
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/shamrock.rb

@@ -4,3 +4,4 @@ require 'shamrock/version'
 require 'shamrock/port'
 require 'shamrock/service'
 require 'shamrock/monitor'
+require 'shamrock/http'

data/spec/shamrock/http_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Shamrock::Http do
+  describe "#ready?" do
+    it "should be ready if the HTTP response is successful" do
+      Net::HTTP.stub!(:get_response).and_return(Net::HTTPSuccess.new(nil, nil, nil))
+      Shamrock::Http.new('http://example.com').should be_ready
+    end
+
+    it "should be ready if the HTTP response if the resource has been moved" do
+      Net::HTTP.stub!(:get_response).and_return(Net::HTTPMovedPermanently.new(nil, nil, nil))
+      Shamrock::Http.new('http://example.com').should be_ready
+    end
+
+    it "should not be ready if the HTTP request raises a SocketError" do
+      Net::HTTP.stub!(:get_response).and_raise(SocketError)
+      Shamrock::Http.new('http://example.com').should_not be_ready
+    end
+
+    it "should not be ready if the HTTP request raises a Errno::ECONNREFUSED" do
+      Net::HTTP.stub!(:get_response).and_raise(Errno::ECONNREFUSED)
+      Shamrock::Http.new('http://example.com').should_not be_ready
+    end
+  end
+end

data/spec/shamrock/monitor_spec.rb

@@ -3,8 +3,18 @@ require 'spec_helper'
 describe Shamrock::Monitor do
   describe "#wait_until_ready" do
     it "should check to see if the given url is available" do
-      monitor = Shamrock::Monitor.new('http://example.com')
-      monitor.should_receive(:ready?).and_return(true)
+      http = mock('http')
+      http.should_receive(:ready?).and_return(true)
+
+      monitor = Shamrock::Monitor.new(http)
+      monitor.wait_until_ready
+    end
+
+    it "should check the http connection a second time if it is not ready at first" do
+      http = mock('http')
+      http.should_receive(:ready?).and_return(false, true)
+
+      monitor = Shamrock::Monitor.new(http)
       monitor.wait_until_ready
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shamrock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -84,16 +84,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/shamrock.rb
+- lib/shamrock/http.rb
 - lib/shamrock/monitor.rb
 - lib/shamrock/port.rb
 - lib/shamrock/service.rb
 - lib/shamrock/version.rb
 - shamrock.gemspec
+- spec/shamrock/http_spec.rb
 - spec/shamrock/monitor_spec.rb
 - spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb
@@ -123,6 +126,7 @@ signing_key:
 specification_version: 3
 summary: Facilitates setting up stub services in your application
 test_files:
+- spec/shamrock/http_spec.rb
 - spec/shamrock/monitor_spec.rb
 - spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb