hugs 1.3.1 → 2.0.0

data/Gemfile

@@ -8,5 +8,5 @@ group :development do
   gem "rake"
   gem "jeweler", "~> 1.5.1"
   gem "minitest", "~> 2.0.0"
-  gem "mocha", "~> 0.9.10"
+  gem "webmock", "1.6.1"
 end

data/Gemfile.lock

@@ -1,17 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.2)
+    crack (0.1.8)
     git (1.2.5)
     jeweler (1.5.1)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     minitest (2.0.0)
-    mocha (0.9.10)
-      rake
     net-http-persistent (1.4.1)
     nokogiri (1.4.4)
     rake (0.8.7)
+    webmock (1.6.1)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
     yajl-ruby (0.7.8)
 
 PLATFORMS
@@ -20,8 +23,8 @@ PLATFORMS
 DEPENDENCIES
   jeweler (~> 1.5.1)
   minitest (~> 2.0.0)
-  mocha (~> 0.9.10)
   net-http-persistent (~> 1.4.1)
   nokogiri (~> 1.4.4)
   rake
+  webmock (= 1.6.1)
   yajl-ruby (~> 0.7.8)

data/README.md

@@ -30,8 +30,3 @@ will be implemented against an XML OCCI API.
 ### Examples
 
 See the 'Examples' section in the [wiki](http://github.com/retr0h/hugs/wiki/).
-
-### TODO
-
-* Move @request instance method in #response_for to local.  It was set to an instance
-  for ease of testing but it bothers me.

data/VERSION

@@ -1 +1 @@
-1.3.1
+2.0.0

data/hugs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hugs}
-  s.version = "1.3.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2010-12-15}
+  s.date = %q{2010-12-16}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_development_dependency(%q<webmock>, ["= 1.6.1"])
     else
       s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
       s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_dependency(%q<webmock>, ["= 1.6.1"])
     end
   else
     s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+    s.add_dependency(%q<webmock>, ["= 1.6.1"])
   end
 end
 

data/lib/hugs.rb

@@ -8,6 +8,8 @@ class Hugs
     :xml  => "application/xml",
   }.freeze
 
+  Verbs = %w(get delete post put).freeze
+
   ##
   # Required options:
   #   +host+: A String with the host to connect.
@@ -34,13 +36,15 @@ class Hugs
   #   - +:body+: A sub Hash to be JSON encoded, and  posted in
   #     the message body.
 
-  %w(get delete post put).each do |verb|
+  Verbs.each do |verb|
     define_method verb do |*args|
       path   = args[0]
       params = args[1] || {}
-      clazz  = eval "::Net::HTTP::#{verb.capitalize}"
+      clazz  = eval "Net::HTTP::#{verb.capitalize}"
 
-      parse response_for(clazz, path, params)
+      response      = response_for(clazz, path, params)
+      response.body = parse response.body
+      response
     end
   end
 
@@ -65,22 +69,22 @@ private
     query = params[:query] && params.delete(:query)
     body  = params[:body] && params.delete(:body)
 
-    @http ||= ::Net::HTTP::Persistent.new
-    @url  ||= ::URI.parse "#{@scheme}://#{@host}:#{@port}"
+    @http ||= Net::HTTP::Persistent.new
+    @url  ||= URI.parse "#{@scheme}://#{@host}:#{@port}"
 
-    @request      = request.new [path, query].compact.join "?"
-    @request.body = encode(body) if body
-    common_headers @request
+    request      = request.new [path, query].compact.join "?"
+    request.body = encode(body) if body
+    common_headers request
 
-    @http.request(@url, @request).body
+    @http.request(@url, request)
   end
 
   def common_headers request
     request.basic_auth(@user, @password) if requires_authentication?
     case request.class.to_s
-      when ::Net::HTTP::Get.to_s, ::Net::HTTP::Delete.to_s
+      when Net::HTTP::Get.to_s, Net::HTTP::Delete.to_s
         request.add_field "accept", Headers[@type]
-      when ::Net::HTTP::Post.to_s, ::Net::HTTP::Put.to_s
+      when Net::HTTP::Post.to_s, Net::HTTP::Put.to_s
         request.add_field "accept", Headers[@type]
         request.add_field "content-type", Headers[@type]
     end
@@ -88,14 +92,14 @@ private
 
   def parse data
     if is_json?
-      ::Yajl::Parser.parse data
+      Yajl::Parser.parse data
     elsif is_xml?
-      ::Nokogiri::XML.parse data
+      Nokogiri::XML.parse data
     end
   end
 
-  def encode hash
-    ::Yajl::Encoder.encode hash if is_json?
+  def encode body
+    is_json? ? (Yajl::Encoder.encode body) : body
   end
 
   def requires_authentication?

data/test/support.rb

@@ -1,11 +1,9 @@
-::Bundler.setup :default, :test
+Bundler.setup :default, :test
 
-require "minitest/spec"
-require "mocha"
-
-require "./lib/hugs"
+%w(minitest/spec webmock ./lib/hugs).each { |r| require r }
 
 class MiniTest::Unit::TestCase
+  include WebMock::API
 end
 
-::MiniTest::Unit.autorun
+MiniTest::Unit.autorun

data/test/test_hugs.rb

@@ -1,76 +1,103 @@
-require "support"
-require "base64"
-require "hugs"
+%w(support base64 hugs).each { |r| require r }
 
 describe Hugs do
   before do
-    @user          = "user",
-    @password      = "credentials"
     @valid_options = {
-      :user     => @user,
-      :password => @password,
       :host     => "example.com",
       :port     => 80,
       :scheme   => "https",
     }
 
-    @instance = ::Hugs.new @valid_options
+    WebMock.reset!
+    @instance = Hugs.new @valid_options
   end
 
   describe "#response_for" do
     before do
-      @http    = mock(:request => mock(:body => :body))
-      @request = ::Net::HTTP::Get
-
-      ::Net::HTTP::Persistent.stubs :new => @http
+      @request = Net::HTTP::Get
     end
 
     it "generates a path" do
+      stub_request :get, "https://example.com:80/"
+
       @instance.send :response_for, @request, "/", {}
 
-      @instance.instance_variable_get(:@request).path.must_equal "/"
+      assert_requested :get, "https://example.com:80/"
     end
 
     it "generates a path when a valid :query exists" do
+      stub_request(:get, "https://example.com:80/").with:query => {"foo" => "bar"}
+
       @instance.send :response_for, @request, "/", :query => "foo=bar"
 
-      @instance.instance_variable_get(:@request).path.must_equal "/?foo=bar"
+      assert_requested :get, "https://example.com:80/", :query => {"foo" => "bar"}
     end
 
     it "generates a path when a nil :query exists" do
+      stub_request :get, "https://example.com:80/"
+
       @instance.send :response_for, @request, "/", :query => nil
 
-      @instance.instance_variable_get(:@request).path.must_equal "/"
+      assert_requested :get, "https://example.com:80/"
     end
 
-    it "sets the body as JSON when a valid :body exists" do
-      @instance.send :response_for, @request, "/", :body => {:foo => :bar}
+    describe "body" do
+      before do
+        stub_request :get, "https://example.com:80/"
+      end
+
+      it "doesn't set the body when an invalid :body exists" do
+        @instance.send :response_for, @request, "/", :body => nil
 
-      @instance.instance_variable_get(:@request).body.must_equal '{"foo":"bar"}'
-    end
+        assert_requested :get, "https://example.com:80/", :body => nil
+      end
+
+      describe "json" do
+        before do
+          @instance = Hugs.new @valid_options.merge(:type => :json)
+        end
 
-    it "doesn't set the body when an invalid :body exists" do
-      @instance.send :response_for, @request, "/", :body => nil
+        it "sets the body when a valid :body exists" do
+          @instance.send :response_for, @request, "/", :body => {:foo => :bar}
 
-      @instance.instance_variable_get(:@request).body.must_be_nil
+          assert_requested :get, "https://example.com:80/", :body => '{"foo":"bar"}'
+        end
+      end
+
+      describe "xml" do
+        before do
+          @instance = Hugs.new @valid_options.merge(:type => :xml)
+        end
+
+        it "sets the body when a valid :body exists" do
+          @instance.send :response_for, @request, "/", :body => "foo bar"
+
+          assert_requested :get, "https://example.com:80/", :body => "foo bar"
+        end
+      end
     end
 
     describe "headers" do
-      it "has authentication" do
+      it "authenticates" do
+        stub_request :get, "https://user:credentials@example.com:80/"
+
+        @instance = Hugs.new @valid_options.merge(:user => "user", :password => "credentials")
+
         @instance.send :response_for, @request, "/", {}
 
-        @instance.instance_variable_get(:@request).get_fields("authorization").join.
-          must_match %r{Basic #{::Base64.encode64("#{@user}:#{@password}").delete("\r\n")}}
+        assert_requested :get, "https://user:credentials@example.com:80/"
       end
 
       [:user, :password].each do |option|
         it "doesn't authenticate when '#{option}' missing" do
+          stub_request :get, "https://example.com:80/"
+
           invalid_options = @valid_options.reject { |k,v| k == option }
-          @instance       = ::Hugs.new invalid_options
+          @instance       = Hugs.new invalid_options
 
           @instance.send :response_for, @request, "/", {}
 
-          @instance.instance_variable_get(:@request).get_fields("authorization").must_be_nil
+          assert_requested :get, "https://example.com:80/"
         end
       end
 
@@ -79,33 +106,67 @@ describe Hugs do
         { :xml  => "application/xml" },
       ].each do |pair|
         pair.each_pair do |type, subtype|
-          [::Net::HTTP::Post, ::Net::HTTP::Put].each do |clazz|
-            it "has '#{subtype}' content-type and accept for '#{clazz}'" do
-              @instance = ::Hugs.new @valid_options.merge(:type => type)
+          [:post, :put].each do |verb|
+            clazz = eval "Net::HTTP::#{verb.capitalize}"
+
+            it "has '#{subtype}' Content-Type and Accept for '#{clazz}'" do
+              stub_request verb, "https://example.com:80/"
+
+              @instance = Hugs.new @valid_options.merge(:type => type)
 
               @instance.send :response_for, clazz, "/", {}
 
-              @instance.instance_variable_get(:@request).get_fields("content-type").join.
-                must_match %r{#{subtype}}
-              @instance.instance_variable_get(:@request).get_fields("accept").join.
-                must_match %r{#{subtype}}
+              assert_requested verb, "https://example.com:80/", :headers => {
+                "Accept" => ["*/*", subtype], "Content-Type" => subtype }
             end
           end
 
-          [::Net::HTTP::Get, ::Net::HTTP::Delete].each do |clazz|
-            it "has '#{subtype}' accept for '#{clazz}'" do
-              @instance = ::Hugs.new @valid_options.merge(:type => type)
+          [:get, :delete].each do |verb|
+            clazz = eval "Net::HTTP::#{verb.capitalize}"
+
+            it "has '#{subtype}' Accept for '#{clazz}'" do
+              stub_request verb, "https://example.com:80/"
+
+              @instance = Hugs.new @valid_options.merge(:type => type)
 
               @instance.send :response_for, clazz, "/", {}
 
-              @instance.instance_variable_get(:@request).get_fields("accept").join.
-                must_match %r{#{subtype}}
-              @instance.instance_variable_get(:@request).get_fields("content-type").
-                must_be_nil
+              assert_requested verb, "https://example.com:80/", :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 the json and returns a hash" do
+        stub_request(:get, "https://example.com:80/").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 xml and returns a Nokogiri object" do
+        stub_request(:get, "https://example.com:80/").to_return :body => "<STORAGE></STORAGE>"
+
+        response = @instance.get "/", :body => { :foo => :bar }
+
+        response.body.must_be_kind_of Nokogiri::XML::Document
+      end
+    end
+  end
 end

metadata

@@ -3,10 +3,10 @@ name: hugs
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -08:00
+date: 2010-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,17 +106,17 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: webmock
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 9
-        - 10
-        version: 0.9.10
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: *id007