zephyr 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/zephyr/failed_request.rb

@@ -0,0 +1,38 @@
+class Zephyr
+  # Raised when a request fails due to either a timeout or when the expected
+  # response code does not match the actual response code.
+  class FailedRequest < StandardError
+    attr_reader :method, :uri, :expected_code, :timeout, :response
+
+    # The following options are required:
+    #
+    # method        - The HTTP method used for the request.
+    # uri           - The uri of the request.
+    # expected_code - The expected response code for the request.
+    # timeout       - The timeout (in milliseconds) for the request.
+    # response      - The response.
+    def initialize(options)
+      @method        = options[:method].to_s.upcase
+      @uri           = options[:uri]
+      @expected_code = options[:expected_code]
+      @timeout       = options[:timeout]
+      @response      = options[:response]
+
+      super "#{@method} #{@uri} - #{error_message}"
+    end
+
+    # Returns whether the request timed out.
+    def timed_out?
+      @response.timed_out? || @response.code == 0
+    end
+
+    private
+      def error_message
+        if timed_out?
+          "Response exceeded #{@timeout}ms."
+        else
+          "Expected #{@expected_code} from the server but received #{@response.code}."
+        end
+      end
+  end
+end

data/lib/zephyr.rb

@@ -43,6 +43,8 @@ end
 
 # A simple front-end for doing HTTP requests quickly and simply.
 class Zephyr
+  autoload :FailedRequest, "zephyr/failed_request"
+
   def initialize(root_uri = '')
     @root_uri = URI.parse(root_uri.to_s).freeze
   end
@@ -300,9 +302,12 @@ class Zephyr
       end
       result
     else
-      response_body  = response.timed_out? || response.code == 0 ? "Exceeded #{timeout}ms" : response.body
-      failed_request = FailedRequest.new(method, expect, response.code, response_headers.to_hash, response_body, response.timed_out?)
-      Zephyr.logger.error "[zephyr:#{$$}:#{Time.now.to_f}]: #{ failed_request }"
+      failed_request = FailedRequest.new(:method        => method,
+                                         :uri           => uri(path_components),
+                                         :expected_code => expect,
+                                         :timeout       => timeout,
+                                         :response      => response)
+      Zephyr.logger.error "[zephyr:#{$$}:#{Time.now.to_f}]: #{failed_request}"
       raise failed_request
     end
   end
@@ -356,17 +361,3 @@ class Headers
     add_field(key, value) if key && value
   end
 end
-
-class FailedRequest < StandardError
-  attr_reader :method
-  attr_reader :expected
-  attr_reader :code
-  attr_reader :headers
-  attr_reader :body
-  attr_reader :timed_out
-
-  def initialize(method, expected_code, received_code, headers, body, timed_out)
-    @method, @expected, @code, @headers, @body, @timed_out = method, expected_code, received_code, headers, body, timed_out
-    super "Expected #{@expected.inspect} from the server but received #{@code}. #{@body}"
-  end
-end

data/zephyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "zephyr"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
-  s.date = "2012-02-17"
+  s.date = "2012-03-16"
   s.description = "Simple HTTP client using Typheous, derived from the Riak client"
   s.email = "matt.knopp@gmail.com"
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/zephyr.rb",
+    "lib/zephyr/failed_request.rb",
     "test/helper.rb",
     "test/test_zephyr.rb",
     "zephyr.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zephyr
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70113484381080 !ruby/object:Gem::Requirement
+  requirement: &70159647046820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70113484381080
+  version_requirements: *70159647046820
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70113484380360 !ruby/object:Gem::Requirement
+  requirement: &70159647045860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113484380360
+  version_requirements: *70159647045860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70113484379780 !ruby/object:Gem::Requirement
+  requirement: &70159646995840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70113484379780
+  version_requirements: *70159646995840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70113484379100 !ruby/object:Gem::Requirement
+  requirement: &70159646993360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70113484379100
+  version_requirements: *70159646993360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70113484378520 !ruby/object:Gem::Requirement
+  requirement: &70159646992740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70113484378520
+  version_requirements: *70159646992740
 description: Simple HTTP client using Typheous, derived from the Riak client
 email: matt.knopp@gmail.com
 executables: []
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - VERSION
 - lib/zephyr.rb
+- lib/zephyr/failed_request.rb
 - test/helper.rb
 - test/test_zephyr.rb
 - zephyr.gemspec
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 13337105164833368
+      hash: 2863491660694697364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: