hugs 2.2.0 → 2.3.0

data/README.md

@@ -36,8 +36,4 @@ See the 'Examples' section in the [wiki](http://github.com/retr0h/hugs/wiki/).
 
 Tests can run offline thanks to [webmock](https://github.com/bblimke/webmock).
 
-    $ bundle exec rake
-
-or
-
     $ rake

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/hugs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hugs}
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2011-01-04}
+  s.date = %q{2011-01-13}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/hugs/errors.rb

@@ -3,7 +3,10 @@ module Hugs
     class Error < StandardError; end
 
     class HTTPStatusError < Error
-      def initialize msg
+      attr_accessor :response
+
+      def initialize msg, response
+        @response = response
         super msg
       end
     end
@@ -66,15 +69,16 @@ module Hugs
       }
 
       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)
+        when raise_4xx && %r{^4[0-9]{2}$} ; raise_for(response)
+        when raise_5xx && %r{^5[0-9]{2}$} ; raise_for(response)
       end
     end
 
   private
-    def self.raise_for code
-      error, message = @errors[code.to_i]
-      raise error.new message
+    def self.raise_for response
+      error, message = @errors[response.code.to_i]
+
+      raise error.new message, response
     end
   end
 end

data/test/lib/hugs/client_test.rb

@@ -2,18 +2,9 @@
 
 describe Hugs::Client 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!
-    @instance = Hugs::Client.new @valid_options
   end
 
   describe "#response_for" do
@@ -23,27 +14,27 @@ describe Hugs::Client do
 
     describe "path" do
       it "is valid" do
-        stub_request :get, "#{@scheme}://#{@base}/"
+        stub_request :get, url
 
         @instance.send :response_for, @request, "/", {}
 
-        assert_requested :get, "#{@scheme}://#{@base}/"
+        assert_requested :get, url
       end
 
       it "is valid when an invalid :query is supplied" do
-        stub_request :get, "#{@scheme}://#{@base}/"
+        stub_request :get, url
 
         @instance.send :response_for, @request, "/", :query => nil
 
-        assert_requested :get, "#{@scheme}://#{@base}/"
+        assert_requested :get, url
       end
 
       it "also has a query string" do
-        stub_request(:get, "#{@scheme}://#{@base}/").with:query => {"foo" => "bar"}
+        stub_request(:get, url).with:query => {"foo" => "bar"}
 
         @instance.send :response_for, @request, "/", :query => "foo=bar"
 
-        assert_requested :get, "#{@scheme}://#{@base}/", :query => {"foo" => "bar"}
+        assert_requested :get, url, :query => {"foo" => "bar"}
       end
     end
 
@@ -55,7 +46,7 @@ describe Hugs::Client do
       end
 
       it "uploads a file" do
-        stub_request :post, "#{@scheme}://#{@base}/"
+        stub_request :post, url
         upload = {
           :upload => {
             :parts => { :file => "/dev/null" },
@@ -65,13 +56,13 @@ describe Hugs::Client do
 
         @instance.send :response_for, @request, "/", upload
 
-        assert_requested :post, "#{@scheme}://#{@base}/", :body => %r{Content-Type: type/subtype}, :headers => {
+        assert_requested :post, url, :body => %r{Content-Type: type/subtype}, :headers => {
           "Content-Type" => Content_Type_Matcher
         }
       end
 
       it "has parts" do
-        stub_request :post, "#{@scheme}://#{@base}/"
+        stub_request :post, url
         upload = {
           :upload => {
             :parts => { :foo => :bar, :baz => :xyzzy },
@@ -83,7 +74,7 @@ describe Hugs::Client do
 
         ### 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 => {
+        assert_requested :post, url, :body => content_disposition_matcher, :headers => {
           "Content-Type" => Content_Type_Matcher
         }
       end
@@ -93,8 +84,8 @@ describe Hugs::Client 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)
+            stub_request(:get, url).to_return :body => '{"foo":"bar"}'
+            instance = Hugs::Client.new valid_options(:type => :json)
 
             response = instance.get "/"
 
@@ -104,8 +95,8 @@ describe Hugs::Client do
 
         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)
+            stub_request(:get, url).to_return :body => "<STORAGE></STORAGE>"
+            instance = Hugs::Client.new valid_options(:type => :xml)
 
             response = instance.get "/"
 
@@ -116,38 +107,38 @@ describe Hugs::Client do
 
       describe "encodes request" do
         before do
-          stub_request :get, "#{@scheme}://#{@base}/"
+          stub_request :get, url
         end
 
         it "is not set when :body invalid" do
           @instance.send :response_for, @request, "/", :body => nil
 
-          assert_requested :get, "#{@scheme}://#{@base}/", :body => nil
+          assert_requested :get, url, :body => nil
         end
 
         it "is not set when :body is missing" do
           @instance.send :response_for, @request, "/", {}
 
-          assert_requested :get, "#{@scheme}://#{@base}/", {}
+          assert_requested :get, url, {}
         end
 
         describe "json" do
           it "is valid" do
-            instance = Hugs::Client.new @valid_options.merge(:type => :json)
+            instance = Hugs::Client.new valid_options(:type => :json)
 
             instance.send :response_for, @request, "/", :body => {:foo => :bar}
 
-            assert_requested :get, "#{@scheme}://#{@base}/", :body => '{"foo":"bar"}'
+            assert_requested :get, url, :body => '{"foo":"bar"}'
           end
         end
 
         describe "xml" do
           it "is valid" do
-            instance = Hugs::Client.new @valid_options.merge(:type => :xml)
+            instance = Hugs::Client.new valid_options(:type => :xml)
 
             instance.send :response_for, @request, "/", :body => "foo bar"
 
-            assert_requested :get, "#{@scheme}://#{@base}/", :body => "foo bar"
+            assert_requested :get, url, :body => "foo bar"
           end
         end
       end
@@ -157,11 +148,11 @@ describe Hugs::Client do
     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")
+          stub_request :get, url("/", "user:credentials")
+          instance = Hugs::Client.new valid_options(:user => "user", :password => "credentials")
 
           instance.send :response_for, @request, "/", {}
-          assert_requested :get, "#{@scheme}://user:credentials@#{@base}/"
+          assert_requested :get, url("/", "user:credentials")
         end
 
         it "doesn't use basic auth without a user" do
@@ -216,26 +207,26 @@ describe Hugs::Client do
 
       assert mimetype, "Unsupported Mimetype '#{type}'"
 
-      clazz = eval "Net::HTTP::#{verb.capitalize}"
+      clazz = Net::HTTP.const_get verb.capitalize
 
-      stub_request verb, "#{@scheme}://#{@base}/"
-      instance = Hugs::Client.new @valid_options.merge(:type => type)
+      stub_request verb, url
+      instance = Hugs::Client.new valid_options(: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
+      assert_requested verb, url, :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")
+      stub_request :get, url
+      instance = Hugs::Client.new valid_options(option => "value")
 
       instance.send :response_for, @request, "/", {}
 
-      assert_requested :get, "#{@scheme}://#{@base}/"
+      assert_requested :get, url
     end
   end
 end

data/test/lib/hugs/errors_test.rb

@@ -2,73 +2,45 @@ 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
 
-    @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'],
-  }
+  describe "response codes" do
+    Errors_4xx = (400..417).to_a << 422
+    Errors_5xx = (500..504).to_a
 
-  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']
-  }
+    (Errors_4xx + Errors_5xx).each do |code|
+      it "raises on #{code}" do
+        assert_raises_on code
+      end
 
-  describe "error codes" do
-    before do
-      @instance.raise_4xx = false
-      @instance.raise_5xx = false
+      it "does not raise on #{code}" do
+        assert_does_not_raise_on code
+      end
     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]
+    def assert_raises_on code
+      (code.to_s =~ %r{^4[0-9]{2}$}) ? (@instance.raise_4xx = true) : (@instance.raise_5xx = true)
+      stub_request(:get, url).to_return :status => [code, "error #{code}"]
 
-        lambda { @instance.send :response_for, Net::HTTP::Get, "/", {} }.must_raise error
+      begin
+        @instance.send :response_for, Net::HTTP::Get, "/", {}
+      rescue => e
+        e.class.superclass.must_be_same_as Hugs::Errors::HTTPStatusError
+        e.must_respond_to :response
+        return
       end
+      raise StandardError.new "did not raise expected exception"
+    end
 
-      it "doesn't raise" do
-        stub_request(:get, "#{@scheme}://#{@base}/").to_return :status => [code, message]
+    def assert_does_not_raise_on code
+      stub_request(:get, url).to_return :status => [code, "error #{code}"]
 
-        response = @instance.send :response_for, Net::HTTP::Get, "/", {}
+      response = @instance.send :response_for, Net::HTTP::Get, "/", {}
 
-        response.code.must_equal code.to_s
-      end
+      response.code.must_equal code.to_s
     end
   end
 end

data/test/test_helper.rb

@@ -1,10 +1,27 @@
 require "bundler"
 Bundler.setup :default, :test
 
-%w(minitest/spec webmock ./lib/hugs).each { |r| require r }
+%w(minitest/spec webmock ./lib/hugs uri).each { |r| require r }
 
 class MiniTest::Unit::TestCase
   include WebMock::API
+
+  def valid_options opts = {}
+    {
+      :host   => "example.com",
+      :port   => 80,
+      :scheme => "https"
+    }.merge opts
+  end
+
+  def url path = "/", credentials = nil
+    URI::HTTPS.build(
+      valid_options(
+        :path => path,
+        :userinfo => credentials
+      )
+    ).to_s
+  end
 end
 
 MiniTest::Unit.autorun

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency