hugs 2.1.0 → 2.2.0

data/Gemfile

@@ -5,7 +5,7 @@ gem "nokogiri", "~> 1.4.4"
 gem "net-http-persistent", "~> 1.4.1"
 gem "multipart-post", "~> 1.0.1"
 
-group :development do
+group :development, :test do
   gem "rake"
   gem "jeweler", "~> 1.5.1"
   gem "minitest", "~> 2.0.0"

data/Gemfile.lock

@@ -4,11 +4,11 @@ GEM
     addressable (2.2.2)
     crack (0.1.8)
     git (1.2.5)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    minitest (2.0.0)
+    minitest (2.0.2)
     multipart-post (1.0.1)
     net-http-persistent (1.4.1)
     nokogiri (1.4.4)

data/README.md

@@ -10,7 +10,8 @@ Opted to write this gem for four reasons:
 * Wanted a [fast](http://blog.segment7.net/articles/2010/05/07/net-http-is-not-slow),
   thread-safe, and persistent client.
 * [Excon](https://github.com/geemus/excon) does most everything right, but is not
-  compatible with [VCR](https://github.com/myronmarston/vcr).
+  compatible with [VCR](https://github.com/myronmarston/vcr) (more specifically
+  [webmock](https://github.com/bblimke/webmock) and [fakeweb](https://github.com/chrisk/fakeweb)).
 * Wanted to learn how to handle this pattern.
 
 The XML usage of this gem will probably change.  In the next couple of weeks Hugs
@@ -19,7 +20,7 @@ will be implemented against an XML OCCI API.
 ## Assumptions
 
 * The webservice returns JSON or XML.
-* You want to objectify the returned JSON.
+* To objectify the returned JSON or hand back a Nokogiri::XML::Document.
 
 ## Usage
 
@@ -33,4 +34,10 @@ See the 'Examples' section in the [wiki](http://github.com/retr0h/hugs/wiki/).
 
 ## Testing
 
+Tests can run offline thanks to [webmock](https://github.com/bblimke/webmock).
+
     $ bundle exec rake
+
+or
+
+    $ rake

data/Rakefile

@@ -18,7 +18,7 @@ end
 require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
   test.libs   << "lib" << "test"
-  test.pattern = "test/**/test_*.rb"
+  test.pattern = "test/**/*_test.rb"
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/hugs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hugs}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2011-01-04}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,16 +25,20 @@ Gem::Specification.new do |s|
     "VERSION",
     "hugs.gemspec",
     "lib/hugs.rb",
-    "test/support.rb",
-    "test/test_hugs.rb"
+    "lib/hugs/client.rb",
+    "lib/hugs/errors.rb",
+    "test/lib/hugs/client_test.rb",
+    "test/lib/hugs/errors_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/retr0h/hugs}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Hugs net-http-persistent with convenient get, delete, post, and put methods.}
   s.test_files = [
-    "test/support.rb",
-    "test/test_hugs.rb"
+    "test/lib/hugs/client_test.rb",
+    "test/lib/hugs/errors_test.rb",
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/hugs.rb

@@ -1,133 +1 @@
-%w(net/http/persistent net/http/post/multipart yajl nokogiri).each { |r| require r }
-
-class Hugs
-  Headers = {
-    :json => "application/json",
-    :xml  => "application/xml",
-  }.freeze
-
-  Classes = [
-    Net::HTTP::Get,
-    Net::HTTP::Delete,
-    Net::HTTP::Post,
-    Net::HTTP::Put,
-  ].freeze
-
-  ##
-  # Required options:
-  #   +host+: A String with the host to connect.
-  # Optional:
-  #   +user+: A String containing the username for use in HTTP Basic auth.
-  #   +password+: A String containing the password for use in HTTP Basic auth.
-  #   +port+: An Integer containing the port to connect.
-  #   +scheme+: A String containing the HTTP scheme.
-
-  def initialize options
-    @user     = options[:user]
-    @password = options[:password]
-    @host     = options[:host]
-    @port     = options[:port]   || 80
-    @scheme   = options[:scheme] || "https"
-    @type     = options[:type]   || :json
-  end
-
-  ##
-  # Perform an HTTP get, delete, post, or put.
-  # +path+: A String with the path to the HTTP resource.
-  # +params+: A Hash with the following keys:
-  #   - +:query+: Query String in the format "foo=bar"
-  #   - +:body+: A sub Hash to be JSON encoded, and  posted in
-  #     the message body.
-
-  Classes.each do |clazz|
-    verb = clazz.to_s.split("::")[-1].tr 'A-Z', 'a-z'
-
-    define_method verb do |*args|
-      path   = args[0]
-      params = args[1] || {}
-
-      response      = response_for(clazz, path, params)
-      response.body = parse response.body
-      response
-    end
-  end
-
-  ##
-  # :method: get
-
-  ##
-  # :method: delete
-
-  ##
-  # :method: post
-
-  ##
-  # :method: put
-
-private
-  ##
-  # Worker method to be called by #get, #delete, #post, #put.
-  # Method arguments have been documented in the callers.
-
-  def response_for request, path, params
-    query  = params[:query]  && params.delete(:query)
-    body   = params[:body]   && params.delete(:body)
-    upload = params[:upload] && params.delete(:upload)
-
-    @http ||= Net::HTTP::Persistent.new
-    @url  ||= URI.parse "#{@scheme}://#{@host}:#{@port}"
-
-    if upload && request.class === Net::HTTP::Post
-      parts        = upload[:parts] || {}
-      parts[:file] = UploadIO.new(parts[:file], upload[:content_type]) if parts[:file]
-
-      request = Net::HTTP::Post::Multipart.new path_with_query(path, query), parts
-    else
-      request      = request.new path_with_query path, query
-      request.body = encode(body) if body
-
-      common_headers request
-    end
-
-    request.basic_auth(@user, @password) if requires_authentication?
-    @http.request(@url, request)
-  end
-
-  def path_with_query path, query
-    [path, query].compact.join "?"
-  end
-
-  def common_headers request
-    case request
-      when Net::HTTP::Get, Net::HTTP::Delete
-        request.add_field "Accept", Headers[@type]
-      when Net::HTTP::Post, Net::HTTP::Put
-        request.add_field "Accept", Headers[@type]
-        request.add_field "Content-Type", Headers[@type]
-    end
-  end
-
-  def parse data
-    if is_json?
-      Yajl::Parser.parse data
-    elsif is_xml?
-      Nokogiri::XML.parse data
-    end
-  end
-
-  def encode body
-    is_json? ? (Yajl::Encoder.encode body) : body
-  end
-
-  def requires_authentication?
-    @user && @password
-  end
-
-  def is_xml?
-    @type == :xml
-  end
-
-  def is_json?
-    @type == :json
-  end
-end
+require "hugs/client"

data/lib/hugs/client.rb

@@ -0,0 +1,152 @@
+%w(hugs/errors net/http/persistent net/http/post/multipart yajl nokogiri).each { |r| require r }
+
+module Hugs
+  class Client
+    attr_accessor :headers
+    attr_accessor :raise_4xx, :raise_5xx
+    attr_writer   :raise_4xx, :raise_5xx
+
+    Headers = {
+      :json => "application/json",
+      :xml  => "application/xml",
+    }.freeze
+
+    Classes = [
+      Net::HTTP::Get,
+      Net::HTTP::Delete,
+      Net::HTTP::Post,
+      Net::HTTP::Put,
+    ].freeze
+
+    ##
+    # Required options:
+    #   +host+: A String with the host to connect.
+    # Optional:
+    #   +user+: A String containing the username for use in HTTP Basic auth.
+    #   +password+: A String containing the password for use in HTTP Basic auth.
+    #   +port+: An Integer containing the port to connect.
+    #   +scheme+: A String containing the HTTP scheme.
+
+    def initialize options
+      @user     = options[:user]
+      @password = options[:password]
+      @host     = options[:host]
+      @port     = options[:port]    || 80
+      @scheme   = options[:scheme]  || "http"
+      @type     = options[:type]    || :json
+      @headers  = options[:headers] || {}
+    end
+
+    ##
+    # Perform an HTTP get, delete, post, or put.
+    # +path+: A String with the path to the HTTP resource.
+    # +params+: A Hash with the following keys:
+    #   - +:query+: Query String in the format "foo=bar"
+    #   - +:body+: A sub Hash to be JSON encoded, and  posted in
+    #     the message body.
+
+    Classes.each do |clazz|
+      verb = clazz.to_s.split("::").last.downcase
+
+      define_method verb do |*args|
+        path   = args[0]
+        params = args[1] || {}
+
+        response_for clazz, path, params
+      end
+    end
+
+    ##
+    # :method: get
+
+    ##
+    # :method: delete
+
+    ##
+    # :method: post
+
+    ##
+    # :method: put
+
+  private
+    ##
+    # Worker method to be called by #get, #delete, #post, #put.
+    # Method arguments have been documented in the callers.
+
+    def response_for request, path, params
+      query  = params[:query]  && params.delete(:query)
+      body   = params[:body]   && params.delete(:body)
+      upload = params[:upload] && params.delete(:upload)
+
+      @http ||= Net::HTTP::Persistent.new
+      @url  ||= URI.parse "#{@scheme}://#{@host}:#{@port}"
+
+      full_path = path_with_query path, query
+
+      if upload && request.class === Net::HTTP::Post
+        parts        = upload[:parts] || {}
+        parts[:file] = UploadIO.new(parts[:file], upload[:content_type]) if parts[:file]
+
+        request = Net::HTTP::Post::Multipart.new full_path, parts
+      else
+        request      = request.new full_path
+        request.body = encode body
+
+        add_headers request
+      end
+
+      request.basic_auth(@user, @password) if requires_authentication?
+      handle_response request
+    end
+
+    def handle_response request
+      resp = @http.request @url, request
+      Hugs::Errors::status_error resp, @raise_4xx, @raise_5xx
+      resp.body = parse resp.body
+
+      resp
+    end
+
+    def path_with_query path, query
+      [path, query].compact.join "?"
+    end
+
+    def add_headers request
+      request.add_field "Accept", Headers[@type]
+      if [Net::HTTP::Post, Net::HTTP::Put].include? request.class
+        request.add_field "Content-Type", Headers[@type]
+      end
+
+      @headers.each do |header, value|
+        request.add_field header, value
+      end
+    end
+
+    def parse data
+      if is_json?
+        Yajl::Parser.parse data
+      elsif is_xml?
+        Nokogiri::XML.parse data
+      else
+        data
+      end
+    end
+
+    def encode body
+      return unless body
+      is_json? ? (Yajl::Encoder.encode body) : body
+    end
+
+    def requires_authentication?
+      @user && @password
+    end
+
+    def is_xml?
+      @type == :xml
+    end
+
+    def is_json?
+      @type == :json
+    end
+  end
+end

data/lib/hugs/errors.rb

@@ -0,0 +1,80 @@
+module Hugs
+  module Errors
+    class Error < StandardError; end
+
+    class HTTPStatusError < Error
+      def initialize msg
+        super msg
+      end
+    end
+
+    ##
+    # Taken from geemus:excon/lib/excon/errors.rb
+
+    class BadRequest < HTTPStatusError; end                   # 400
+    class Unauthorized < HTTPStatusError; end                 # 401
+    class PaymentRequired < HTTPStatusError; end              # 402
+    class Forbidden < HTTPStatusError; end                    # 403
+    class NotFound < HTTPStatusError; end                     # 404
+    class MethodNotAllowed < HTTPStatusError; end             # 405
+    class NotAcceptable < HTTPStatusError; end                # 406
+    class ProxyAuthenticationRequired < HTTPStatusError; end  # 407
+    class RequestTimeout < HTTPStatusError; end               # 408
+    class Conflict < HTTPStatusError; end                     # 409
+    class Gone < HTTPStatusError; end                         # 410
+    class LengthRequired < HTTPStatusError; end               # 411
+    class PreconditionFailed < HTTPStatusError; end           # 412
+    class RequestEntityTooLarge < HTTPStatusError; end        # 413
+    class RequestURITooLong < HTTPStatusError; end            # 414
+    class UnsupportedMediaType < HTTPStatusError; end         # 415
+    class RequestedRangeNotSatisfiable < HTTPStatusError; end # 416
+    class ExpectationFailed < HTTPStatusError; end            # 417
+    class UnprocessableEntity < HTTPStatusError; end          # 422
+    class InternalServerError < HTTPStatusError; end          # 500
+    class NotImplemented < HTTPStatusError; end               # 501
+    class BadGateway < HTTPStatusError; end                   # 502
+    class ServiceUnavailable < HTTPStatusError; end           # 503
+    class GatewayTimeout < HTTPStatusError; end               # 504
+
+
+    def self.status_error response, raise_4xx, raise_5xx
+      @errors ||= {
+        400 => [Hugs::Errors::BadRequest, 'Bad Request'],
+        401 => [Hugs::Errors::Unauthorized, 'Unauthorized'],
+        402 => [Hugs::Errors::PaymentRequired, 'Payment Required'],
+        403 => [Hugs::Errors::Forbidden, 'Forbidden'],
+        404 => [Hugs::Errors::NotFound, 'Not Found'],
+        405 => [Hugs::Errors::MethodNotAllowed, 'Method Not Allowed'],
+        406 => [Hugs::Errors::NotAcceptable, 'Not Acceptable'],
+        407 => [Hugs::Errors::ProxyAuthenticationRequired, 'Proxy Authentication Required'],
+        408 => [Hugs::Errors::RequestTimeout, 'Request Timeout'],
+        409 => [Hugs::Errors::Conflict, 'Conflict'],
+        410 => [Hugs::Errors::Gone, 'Gone'],
+        411 => [Hugs::Errors::LengthRequired, 'Length Required'],
+        412 => [Hugs::Errors::PreconditionFailed, 'Precondition Failed'],
+        413 => [Hugs::Errors::RequestEntityTooLarge, 'Request Entity Too Large'],
+        414 => [Hugs::Errors::RequestURITooLong, 'Request-URI Too Long'],
+        415 => [Hugs::Errors::UnsupportedMediaType, 'Unsupported Media Type'],
+        416 => [Hugs::Errors::RequestedRangeNotSatisfiable, 'Request Range Not Satisfiable'],
+        417 => [Hugs::Errors::ExpectationFailed, 'Expectation Failed'],
+        422 => [Hugs::Errors::UnprocessableEntity, 'Unprocessable Entity'],
+        500 => [Hugs::Errors::InternalServerError, 'InternalServerError'],
+        501 => [Hugs::Errors::NotImplemented, 'Not Implemented'],
+        502 => [Hugs::Errors::BadGateway, 'Bad Gateway'],
+        503 => [Hugs::Errors::ServiceUnavailable, 'Service Unavailable'],
+        504 => [Hugs::Errors::GatewayTimeout, 'Gateway Timeout']
+      }
+
+      case response.code
+        when raise_4xx && %r{^4[0-9]{2}$} ; raise_for(response.code)
+        when raise_5xx && %r{^5[0-9]{2}$} ; raise_for(response.code)
+      end
+    end
+
+  private
+    def self.raise_for code
+      error, message = @errors[code.to_i]
+      raise error.new message
+    end
+  end
+end

data/test/lib/hugs/client_test.rb

@@ -0,0 +1,241 @@
+%w(test_helper base64).each { |r| require r }
+
+describe Hugs::Client do
+  before do
+    @scheme = "https"
+    @host   = "example.com"
+    @port   = 80
+    @base   = "#{@host}:#{@port}"
+    @valid_options = {
+      :host     => @host,
+      :port     => @port,
+      :scheme   => @scheme,
+    }
+
+    WebMock.reset!
+    @instance = Hugs::Client.new @valid_options
+  end
+
+  describe "#response_for" do
+    before do
+      @request = Net::HTTP::Get
+    end
+
+    describe "path" do
+      it "is valid" do
+        stub_request :get, "#{@scheme}://#{@base}/"
+
+        @instance.send :response_for, @request, "/", {}
+
+        assert_requested :get, "#{@scheme}://#{@base}/"
+      end
+
+      it "is valid when an invalid :query is supplied" do
+        stub_request :get, "#{@scheme}://#{@base}/"
+
+        @instance.send :response_for, @request, "/", :query => nil
+
+        assert_requested :get, "#{@scheme}://#{@base}/"
+      end
+
+      it "also has a query string" do
+        stub_request(:get, "#{@scheme}://#{@base}/").with:query => {"foo" => "bar"}
+
+        @instance.send :response_for, @request, "/", :query => "foo=bar"
+
+        assert_requested :get, "#{@scheme}://#{@base}/", :query => {"foo" => "bar"}
+      end
+    end
+
+    describe "multi-part" do
+      Content_Type_Matcher = %r{multipart/form-data}
+
+      before do
+        @request = Net::HTTP::Post
+      end
+
+      it "uploads a file" do
+        stub_request :post, "#{@scheme}://#{@base}/"
+        upload = {
+          :upload => {
+            :parts => { :file => "/dev/null" },
+            :content_type => "type/subtype"
+          }
+        }
+
+        @instance.send :response_for, @request, "/", upload
+
+        assert_requested :post, "#{@scheme}://#{@base}/", :body => %r{Content-Type: type/subtype}, :headers => {
+          "Content-Type" => Content_Type_Matcher
+        }
+      end
+
+      it "has parts" do
+        stub_request :post, "#{@scheme}://#{@base}/"
+        upload = {
+          :upload => {
+            :parts => { :foo => :bar, :baz => :xyzzy },
+            :content_type => "foo/bar"
+          }
+        }
+
+        @instance.send :response_for, @request, "/", upload
+
+        ### wtf can't use mx together.
+        content_disposition_matcher = %r{^Content-Disposition: form-data; name="foo".*^bar.*^Content-Disposition: form-data; name="baz".*^xyzzy.*}m
+        assert_requested :post, "#{@scheme}://#{@base}/", :body => content_disposition_matcher, :headers => {
+          "Content-Type" => Content_Type_Matcher
+        }
+      end
+    end
+
+    describe "body" do
+      describe "parses response" do
+        describe "json" do
+          it "objectifies and returns a hash" do
+            stub_request(:get, "#{@scheme}://#{@base}/").to_return :body => '{"foo":"bar"}'
+            instance = Hugs::Client.new @valid_options.merge(:type => :json)
+
+            response = instance.get "/"
+
+            response.body.must_be_kind_of Hash
+          end
+        end
+
+        describe "xml" do
+          it "parses and returns a Nokogiri object" do
+            stub_request(:get, "#{@scheme}://#{@base}/").to_return :body => "<STORAGE></STORAGE>"
+            instance = Hugs::Client.new @valid_options.merge(:type => :xml)
+
+            response = instance.get "/"
+
+            response.body.must_be_kind_of Nokogiri::XML::Document
+          end
+        end
+      end
+
+      describe "encodes request" do
+        before do
+          stub_request :get, "#{@scheme}://#{@base}/"
+        end
+
+        it "is not set when :body invalid" do
+          @instance.send :response_for, @request, "/", :body => nil
+
+          assert_requested :get, "#{@scheme}://#{@base}/", :body => nil
+        end
+
+        it "is not set when :body is missing" do
+          @instance.send :response_for, @request, "/", {}
+
+          assert_requested :get, "#{@scheme}://#{@base}/", {}
+        end
+
+        describe "json" do
+          it "is valid" do
+            instance = Hugs::Client.new @valid_options.merge(:type => :json)
+
+            instance.send :response_for, @request, "/", :body => {:foo => :bar}
+
+            assert_requested :get, "#{@scheme}://#{@base}/", :body => '{"foo":"bar"}'
+          end
+        end
+
+        describe "xml" do
+          it "is valid" do
+            instance = Hugs::Client.new @valid_options.merge(:type => :xml)
+
+            instance.send :response_for, @request, "/", :body => "foo bar"
+
+            assert_requested :get, "#{@scheme}://#{@base}/", :body => "foo bar"
+          end
+        end
+      end
+    end
+
+
+    describe "headers" do
+      describe "authentication" do
+        it "uses basic auth when providing user and password" do
+          stub_request :get, "#{@scheme}://user:credentials@#{@base}/"
+          instance = Hugs::Client.new @valid_options.merge(:user => "user", :password => "credentials")
+
+          instance.send :response_for, @request, "/", {}
+          assert_requested :get, "#{@scheme}://user:credentials@#{@base}/"
+        end
+
+        it "doesn't use basic auth without a user" do
+          assert_doesnt_use_basic_auth_without :user
+        end
+
+        it "doesn't use basic auth without a password" do
+          assert_doesnt_use_basic_auth_without :password
+        end
+      end
+
+      describe "JSON" do
+        it "supports json GET" do
+          assert_supports_http_verb :json, :get
+        end
+
+        it "supports json DELETE" do
+          assert_supports_http_verb :json, :delete
+        end
+
+        it "supports json POST" do
+          assert_supports_http_verb :json, :post
+        end
+
+        it "supports json PUT" do
+          assert_supports_http_verb :json, :put
+        end
+      end
+
+      describe "XML" do
+        it "supports xml GET" do
+          assert_supports_http_verb :xml, :get
+        end
+
+        it "supports xml DELETE" do
+          assert_supports_http_verb :xml, :delete
+        end
+
+        it "supports xml POST" do
+          assert_supports_http_verb :xml, :post
+        end
+
+        it "supports xml PUT" do
+          assert_supports_http_verb :xml, :put
+        end
+      end
+    end
+
+    def assert_supports_http_verb type, verb
+      mimetype = {:xml  => 'application/xml',
+                  :json => 'application/json'}[type]
+
+      assert mimetype, "Unsupported Mimetype '#{type}'"
+
+      clazz = eval "Net::HTTP::#{verb.capitalize}"
+
+      stub_request verb, "#{@scheme}://#{@base}/"
+      instance = Hugs::Client.new @valid_options.merge(:type => type)
+
+      instance.send :response_for, clazz, "/", {}
+
+      headers = { "Accept" => ["*/*", mimetype] }
+      headers["Content-Type"] = mimetype if [:put, :put].include? type
+
+      assert_requested verb, "#{@scheme}://#{@base}/", :headers => headers
+    end
+
+    def assert_doesnt_use_basic_auth_without option
+      stub_request :get, "#{@scheme}://#{@base}/"
+      instance = Hugs::Client.new @valid_options.merge(option => "value")
+
+      instance.send :response_for, @request, "/", {}
+
+      assert_requested :get, "#{@scheme}://#{@base}/"
+    end
+  end
+end

data/test/lib/hugs/errors_test.rb

@@ -0,0 +1,74 @@
+require "test_helper"
+
+describe Hugs::Errors do
+  before do
+    @scheme = "https"
+    @host   = "example.com"
+    @port   = 80
+    @base   = "#{@host}:#{@port}"
+    @valid_options = {
+      :host     => @host,
+      :port     => @port,
+      :scheme   => @scheme,
+    }
+
+    @instance = Hugs::Client.new @valid_options
+    WebMock.reset!
+  end
+
+  Error_4xx = {
+    400 => [Hugs::Errors::BadRequest, 'Bad Request'],
+    401 => [Hugs::Errors::Unauthorized, 'Unauthorized'],
+    402 => [Hugs::Errors::PaymentRequired, 'Payment Required'],
+    403 => [Hugs::Errors::Forbidden, 'Forbidden'],
+    404 => [Hugs::Errors::NotFound, 'Not Found'],
+    405 => [Hugs::Errors::MethodNotAllowed, 'Method Not Allowed'],
+    406 => [Hugs::Errors::NotAcceptable, 'Not Acceptable'],
+    407 => [Hugs::Errors::ProxyAuthenticationRequired, 'Proxy Authentication Required'],
+    408 => [Hugs::Errors::RequestTimeout, 'Request Timeout'],
+    409 => [Hugs::Errors::Conflict, 'Conflict'],
+    410 => [Hugs::Errors::Gone, 'Gone'],
+    411 => [Hugs::Errors::LengthRequired, 'Length Required'],
+    412 => [Hugs::Errors::PreconditionFailed, 'Precondition Failed'],
+    413 => [Hugs::Errors::RequestEntityTooLarge, 'Request Entity Too Large'],
+    414 => [Hugs::Errors::RequestURITooLong, 'Request-URI Too Long'],
+    415 => [Hugs::Errors::UnsupportedMediaType, 'Unsupported Media Type'],
+    416 => [Hugs::Errors::RequestedRangeNotSatisfiable, 'Request Range Not Satisfiable'],
+    417 => [Hugs::Errors::ExpectationFailed, 'Expectation Failed'],
+    422 => [Hugs::Errors::UnprocessableEntity, 'Unprocessable Entity'],
+  }
+
+  Error_5xx = {
+    500 => [Hugs::Errors::InternalServerError, 'InternalServerError'],
+    501 => [Hugs::Errors::NotImplemented, 'Not Implemented'],
+    502 => [Hugs::Errors::BadGateway, 'Bad Gateway'],
+    503 => [Hugs::Errors::ServiceUnavailable, 'Service Unavailable'],
+    504 => [Hugs::Errors::GatewayTimeout, 'Gateway Timeout']
+  }
+
+  describe "error codes" do
+    before do
+      @instance.raise_4xx = false
+      @instance.raise_5xx = false
+    end
+
+    (Error_4xx.merge(Error_5xx)).each_pair do |code, errors|
+      error, message = errors
+
+      it "raises" do
+        (code.to_s =~ %r{^4[0-9]{2}$}) ? (@instance.raise_4xx = true) : (@instance.raise_5xx = true)
+        stub_request(:get, "#{@scheme}://#{@base}/").to_return :status => [code, message]
+
+        lambda { @instance.send :response_for, Net::HTTP::Get, "/", {} }.must_raise error
+      end
+
+      it "doesn't raise" do
+        stub_request(:get, "#{@scheme}://#{@base}/").to_return :status => [code, message]
+
+        response = @instance.send :response_for, Net::HTTP::Get, "/", {}
+
+        response.code.must_equal code.to_s
+      end
+    end
+  end
+end

data/test/{support.rb → test_helper.rb}

@@ -1,3 +1,4 @@
+require "bundler"
 Bundler.setup :default, :test
 
 %w(minitest/spec webmock ./lib/hugs).each { |r| require r }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 -08:00
+date: 2011-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,8 +154,11 @@ files:
 - VERSION
 - hugs.gemspec
 - lib/hugs.rb
-- test/support.rb
-- test/test_hugs.rb
+- lib/hugs/client.rb
+- lib/hugs/errors.rb
+- test/lib/hugs/client_test.rb
+- test/lib/hugs/errors_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/retr0h/hugs
 licenses: []
@@ -189,5 +192,6 @@ signing_key:
 specification_version: 3
 summary: Hugs net-http-persistent with convenient get, delete, post, and put methods.
 test_files: 
-- test/support.rb
-- test/test_hugs.rb
+- test/lib/hugs/client_test.rb
+- test/lib/hugs/errors_test.rb
+- test/test_helper.rb

data/test/test_hugs.rb

@@ -1,228 +0,0 @@
-%w(support base64 hugs).each { |r| require r }
-
-describe Hugs do
-  before do
-    @scheme = "https"
-    @host   = "example.com"
-    @port   = 80
-    @base   = "#{@host}:#{@port}"
-    @valid_options = {
-      :host     => @host,
-      :port     => @port,
-      :scheme   => @scheme,
-    }
-
-    WebMock.reset!
-    @instance = Hugs.new @valid_options
-  end
-
-  describe "#response_for" do
-    before do
-      @request = Net::HTTP::Get
-    end
-
-    describe "path" do
-      it "is valid" do
-        stub_request :get, "#{@scheme}://#{@base}/"
-
-        @instance.send :response_for, @request, "/", {}
-
-        assert_requested :get, "#{@scheme}://#{@base}/"
-      end
-
-      it "is valid when an invalid :query is supplied" do
-        stub_request :get, "#{@scheme}://#{@base}/"
-
-        @instance.send :response_for, @request, "/", :query => nil
-
-        assert_requested :get, "#{@scheme}://#{@base}/"
-      end
-
-      it "also has a query string" do
-        stub_request(:get, "#{@scheme}://#{@base}/").with:query => {"foo" => "bar"}
-
-        @instance.send :response_for, @request, "/", :query => "foo=bar"
-
-        assert_requested :get, "#{@scheme}://#{@base}/", :query => {"foo" => "bar"}
-      end
-    end
-
-    describe "multi-part" do
-      Content_Type_Matcher = %r{multipart/form-data}
-
-      before do
-        @request = Net::HTTP::Post
-      end
-
-      it "uploads a file" do
-        stub_request :post, "#{@scheme}://#{@base}/"
-
-        upload = {
-          :upload => {
-            :parts => { :file => "/dev/null" },
-            :content_type => "type/subtype"
-          }
-        }
-
-        @instance.send :response_for, @request, "/", upload
-
-        assert_requested :post, "#{@scheme}://#{@base}/", :body => %r{Content-Type: type/subtype}, :headers => {
-          "Content-Type" => Content_Type_Matcher
-        }
-      end
-
-      it "has parts" do
-        stub_request :post, "#{@scheme}://#{@base}/"
-
-        upload = {
-          :upload => {
-            :parts => { :foo => :bar, :baz => :xyzzy },
-            :content_type => "foo/bar"
-          }
-        }
-
-        @instance.send :response_for, @request, "/", upload
-
-        ### wtf can't use mx together.
-        content_disposition_matcher = %r{^Content-Disposition: form-data; name="foo".*^bar.*^Content-Disposition: form-data; name="baz".*^xyzzy.*}m
-        assert_requested :post, "#{@scheme}://#{@base}/", :body => content_disposition_matcher, :headers => {
-          "Content-Type" => Content_Type_Matcher
-        }
-      end
-    end
-
-    describe "body" do
-      before do
-        stub_request :get, "#{@scheme}://#{@base}/"
-      end
-
-      it "is not set when :body invalid" do
-        @instance.send :response_for, @request, "/", :body => nil
-
-        assert_requested :get, "#{@scheme}://#{@base}/", :body => nil
-      end
-
-      it "is not set when :body is missing" do
-        @instance.send :response_for, @request, "/", {}
-
-        assert_requested :get, "#{@scheme}://#{@base}/", {}
-      end
-
-      describe "json" do
-        before do
-          @instance = Hugs.new @valid_options.merge(:type => :json)
-        end
-
-        it "is valid" do
-          @instance.send :response_for, @request, "/", :body => {:foo => :bar}
-
-          assert_requested :get, "#{@scheme}://#{@base}/", :body => '{"foo":"bar"}'
-        end
-      end
-
-      describe "xml" do
-        before do
-          @instance = Hugs.new @valid_options.merge(:type => :xml)
-        end
-
-        it "is valid" do
-          @instance.send :response_for, @request, "/", :body => "foo bar"
-
-          assert_requested :get, "#{@scheme}://#{@base}/", :body => "foo bar"
-        end
-      end
-    end
-
-    describe "headers" do
-      it "authenticates" do
-        stub_request :get, "#{@scheme}://user:credentials@#{@base}/"
-
-        @instance = Hugs.new @valid_options.merge(:user => "user", :password => "credentials")
-
-        @instance.send :response_for, @request, "/", {}
-
-        assert_requested :get, "#{@scheme}://user:credentials@#{@base}/"
-      end
-
-      [:user, :password].each do |option|
-        it "doesn't authenticate when '#{option}' missing" do
-          stub_request :get, "#{@scheme}://#{@base}/"
-
-          invalid_options = @valid_options.reject { |k,v| k == option }
-          @instance       = Hugs.new invalid_options
-
-          @instance.send :response_for, @request, "/", {}
-
-          assert_requested :get, "#{@scheme}://#{@base}/"
-        end
-      end
-
-      [
-        { :json => "application/json" },
-        { :xml  => "application/xml" },
-      ].each do |pair|
-        pair.each_pair do |type, subtype|
-          [:post, :put].each do |verb|
-            clazz = eval "Net::HTTP::#{verb.capitalize}"
-
-            it "has '#{subtype}' Content-Type and Accept for '#{clazz}'" do
-              stub_request verb, "#{@scheme}://#{@base}/"
-
-              @instance = Hugs.new @valid_options.merge(:type => type)
-
-              @instance.send :response_for, clazz, "/", {}
-
-              assert_requested verb, "#{@scheme}://#{@base}/", :headers => {
-                "Accept" => ["*/*", subtype], "Content-Type" => subtype }
-            end
-          end
-
-          [:get, :delete].each do |verb|
-            clazz = eval "Net::HTTP::#{verb.capitalize}"
-
-            it "has '#{subtype}' Accept for '#{clazz}'" do
-              stub_request verb, "#{@scheme}://#{@base}/"
-
-              @instance = Hugs.new @valid_options.merge(:type => type)
-
-              @instance.send :response_for, clazz, "/", {}
-
-              assert_requested verb, "#{@scheme}://#{@base}/", :headers => {
-                "Accept" => ["*/*", subtype] }
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe "HTTP methods" do
-    describe "json" do
-      before do
-        @instance = Hugs.new @valid_options.merge(:type => :json)
-      end
-
-      it "objectifies and returns a hash" do
-        stub_request(:get, "#{@scheme}://#{@base}/").to_return :body => '{"foo":"bar"}'
-
-        response = @instance.get "/", :body => { :foo => :bar }
-
-        response.body.must_be_kind_of Hash
-      end
-    end
-
-    describe "xml" do
-      before do
-        @instance = Hugs.new @valid_options.merge(:type => :xml)
-      end
-
-      it "parses and returns a Nokogiri object" do
-        stub_request(:get, "#{@scheme}://#{@base}/").to_return :body => "<STORAGE></STORAGE>"
-
-        response = @instance.get "/", :body => { :foo => :bar }
-
-        response.body.must_be_kind_of Nokogiri::XML::Document
-      end
-    end
-  end
-end