http_monkey 0.0.3 → 0.0.4

data/Readme.md

@@ -1,4 +1,4 @@
-# HTTP Monkey [![Build Status](https://secure.travis-ci.org/rogerleite/http_monkey.png?branch=master)](https://travis-ci.org/rogerleite/http_monkey)
+# HTTP Monkey [![Mini logo](https://raw.github.com/rogerleite/http_monkey/gh-pages/images/m1_pb.png)] [![Build Status](https://secure.travis-ci.org/rogerleite/http_monkey.png?branch=master)](https://travis-ci.org/rogerleite/http_monkey)
 
 A fluent interface to do HTTP calls, free of fat dependencies and at same time, powered by middlewares rack.
 * Light and powerful interface

data/lib/http_monkey/client.rb

@@ -29,17 +29,20 @@ module HttpMonkey
     end
 
     def http_request(method, request)
+      client = self
       env = Client::EnvironmentBuilder.new(self, method, request).to_env
-      code, headers, body = @conf.middlewares.execute(Middlewares::HttpRequest, env)
-      body.close if body.respond_to?(:close)  # close when is a Rack::BodyProxy
-      response = Client::Response.new(code, headers, body)
 
-      if (behaviour = @conf.behaviours.find(response.code))
-        behaviour.call(self, request, response)
-      else
-        unknown_behaviour = @conf.behaviours.unknown_behaviour
-        unknown_behaviour.call(self, request, response) if unknown_behaviour.respond_to?(:call)
+      begin
+        code, headers, body = @conf.middlewares.execute(Middlewares::HttpRequest, env)
+        body.close if body.respond_to?(:close)  # close when is a Rack::BodyProxy
+      rescue => error
+        raise unless @conf.behaviours.error_behaviour
+        return @conf.behaviours.error_behaviour.call(client, request, error)
       end
+
+      response = Client::Response.new(code, headers, body)
+      behaviour = @conf.behaviours.find(response.code)
+      behaviour.call(client, request, response)
     end
 
   end

data/lib/http_monkey/configuration/behaviours.rb

@@ -2,7 +2,7 @@ module HttpMonkey
 
   class Configuration::Behaviours
 
-    attr_reader :unknown_behaviour
+    attr_reader :unknown_behaviour, :error_behaviour
 
     def initialize
       self.clear!
@@ -18,6 +18,7 @@ module HttpMonkey
       @behaviours = {}
       @behaviours_range = {}
       @unknown_behaviour = nil
+      @error_behaviour = nil
       nil
     end
 
@@ -34,6 +35,15 @@ module HttpMonkey
       @unknown_behaviour = block
     end
 
+    def on_error(&block)
+      @error_behaviour = block
+    end
+
+    # Public: Look for behaviours defined by *code*.
+    #
+    # code - Integer. Generally response.code
+    #
+    # Returns Proc defined by *code* or unknown_behaviour proc.
     def find(code)
       behaviour = @behaviours[code]
       if behaviour.nil?
@@ -41,7 +51,7 @@ module HttpMonkey
           range.include?(code)
         end
       end
-      behaviour
+      behaviour || self.unknown_behaviour
     end
 
   end

data/lib/http_monkey/version.rb

@@ -1,3 +1,3 @@
 module HttpMonkey
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/http_monkey/client_test.rb

@@ -33,4 +33,35 @@ describe HttpMonkey::Client do
     end
   end
 
+  describe "request error" do
+    before do
+      subject.configure do
+        middlewares do
+          self.expects(:execute).raises("request timeout")
+        end
+      end
+    end
+
+    let(:fake_request) do
+      HTTPI::Request.new("http://fake.com")
+    end
+
+    it "raise error by default" do
+      lambda {
+        subject.http_request(:get, fake_request)
+      }.must_raise(RuntimeError)
+    end
+    it "can intercept error" do
+      subject.configure do
+        behaviours.on_error do |client, request, error|
+          [client, request, error]
+        end
+      end
+      client, request, error = subject.http_request(:get, fake_request)
+      client.must_equal(subject)
+      request.must_equal(fake_request)
+      error.message.must_equal("request timeout")
+    end
+  end
+
 end

data/test/http_monkey/configuration/behaviours_test.rb

@@ -4,7 +4,15 @@ describe HttpMonkey::Configuration::Behaviours do
 
   subject { HttpMonkey::Configuration::Behaviours.new }
 
+  it "#on_unknown" do
+    subject.on_unknown { "ok" }
+    subject.unknown_behaviour.call.must_equal("ok")
+  end
+
   describe "#on" do
+    before do
+      subject.on_unknown # clears unknown_behaviour
+    end
     it "support Integer code" do
       subject.on(1) { "test int" }
 
@@ -25,10 +33,15 @@ describe HttpMonkey::Configuration::Behaviours do
       subject.find(3).call.must_equal("test array")
       subject.find(1).must_be_nil
     end
+    it "support unknown_behaviour" do
+      subject.on_unknown { "unknown" }
+      subject.find(666).call.must_equal("unknown")
+    end
   end
 
-  it "#on_unknown" do
-    subject.on_unknown { "ok" }
-    subject.unknown_behaviour.call.must_equal("ok")
+  it "#on_error" do
+    subject.on_error { "on error" }
+    subject.error_behaviour.call.must_equal("on error")
   end
+
 end

data/test/test_helper.rb

@@ -3,13 +3,14 @@ require "http_monkey"
 require "minitest/autorun"
 require "minitest/reporters"
 
-require "mocha"
+require "mocha/setup"
 
 require "support/fake_environment"
 require "support/captain_hook"
 
 MiniTest::Unit.runner = MiniTest::SuiteRunner.new
-MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
+MiniTest::Unit.runner.reporters << MiniTest::Reporters::DefaultReporter.new
+#MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
 MiniTest::Unit.runner.reporters << HttpMonkey::Support::CaptainHook.new
 
 require "minion_server"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_monkey
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70197101569580 !ruby/object:Gem::Requirement
+  requirement: &70246023653420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197101569580
+  version_requirements: *70246023653420
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70197101569080 !ruby/object:Gem::Requirement
+  requirement: &70246023652900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70197101569080
+  version_requirements: *70246023652900
 - !ruby/object:Gem::Dependency
   name: http_objects
-  requirement: &70197101568560 !ruby/object:Gem::Requirement
+  requirement: &70246023652400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70197101568560
+  version_requirements: *70246023652400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197101568160 !ruby/object:Gem::Requirement
+  requirement: &70246023652000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197101568160
+  version_requirements: *70246023652000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70197101567600 !ruby/object:Gem::Requirement
+  requirement: &70246023651380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70197101567600
+  version_requirements: *70246023651380
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
-  requirement: &70197101567040 !ruby/object:Gem::Requirement
+  requirement: &70246023650560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70197101567040
+  version_requirements: *70246023650560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70197101566640 !ruby/object:Gem::Requirement
+  requirement: &70246023650160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197101566640
+  version_requirements: *70246023650160
 - !ruby/object:Gem::Dependency
   name: minion_server
-  requirement: &70197101566140 !ruby/object:Gem::Requirement
+  requirement: &70246023649660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197101566140
+  version_requirements: *70246023649660
 description: A fluent interface to do HTTP calls, free of fat dependencies and at
   same time, powered by middlewares rack.
 email: