curb-fu 0.6.0 → 0.6.1

data/lib/curb-fu/request/base.rb

@@ -3,7 +3,7 @@ module CurbFu
     module Base
       include Common
       
-      def build(url_params, query_params = {}, &block)
+      def build(url_params, query_params = {}, cookies = nil, &block)
         curb = Curl::Easy.new(build_url(url_params, query_params))
 
         headers = global_headers
@@ -15,11 +15,14 @@ module CurbFu
           elsif url_params[:username]
             curb.http_auth_types = CurbFu::Authentication::BASIC
           end
-
+          
+          cookies ||= url_params[:cookies]
+          
           headers = headers.merge(url_params[:headers]) unless url_params[:headers].nil?
           headers["Expect"] = '' unless url_params[:headers] && url_params[:headers]["Expect"]
         end
         
+        curb.cookies = cookies if cookies
         curb.headers = headers
         curb.timeout = @timeout
 
@@ -40,23 +43,26 @@ module CurbFu
         @global_headers ||= {}
       end
       
-      def get(url, params = {}, &block)
-        curb = self.build(url, params, &block)
+      def get(url, params = {}, cookies = nil, &block)
+        curb = self.build(url, params, cookies, &block)
         curb.http_get
         CurbFu::Response::Base.from_curb_response(curb)
       end
 
-      def put(url, params = {}, &block)
-        curb = self.build(url, params, &block)
-        curb.http_put("")
+      def put(url, params = {}, cookies = nil, &block)
+        fields = create_post_fields(params)
+        fields = [fields] if fields.is_a?(String)
+
+        curb = self.build(url, {}, cookies, &block)
+        curb.http_put(*fields)
         CurbFu::Response::Base.from_curb_response(curb)
       end
 
-      def post(url, params = {}, &block)
+      def post(url, params = {}, cookies = nil, &block)
         fields = create_post_fields(params)
         fields = [fields] if fields.is_a?(String)
 
-        curb = self.build(url, &block)
+        curb = self.build(url, {}, cookies, &block)
         curb.http_post(*fields)
         response = CurbFu::Response::Base.from_curb_response(curb)
         if CurbFu.debug?
@@ -68,11 +74,11 @@ module CurbFu
         response
       end
 
-      def post_file(url, params = {}, filez = {}, &block)
+      def post_file(url, params = {}, filez = {}, cookies = nil, &block)
         fields = create_post_fields(params)
         fields += create_file_fields(filez)
 
-        curb = self.build(url, &block)
+        curb = self.build(url, {}, cookies, &block)
         curb.multipart_form_post = true
         
         begin
@@ -84,8 +90,8 @@ module CurbFu
         CurbFu::Response::Base.from_curb_response(curb)
       end
 
-      def delete(url, &block)
-        curb = self.build(url, &block)
+      def delete(url, cookies = nil, &block)
+        curb = self.build(url, {}, cookies, &block)
         curb.http_delete
         CurbFu::Response::Base.from_curb_response(curb)
       end

data/lib/curb-fu/request/common.rb

@@ -12,6 +12,8 @@ module CurbFu
       def build_url(url_params, query_params = {})
         if url_params.is_a? String
           built_url = url_params
+        elsif url_params[:url]
+          built_url = url_params[:url]
         else
           protocol = url_params[:protocol] || "http"
           built_url = "#{protocol}://#{url_params[:host]}"

data/spec/lib/curb-fu/request/base_spec.rb

@@ -30,6 +30,9 @@ describe CurbFu::Request::Base do
     it "should return a string if a string parameter is given" do
       TestHarness.build_url("http://www.cliffsofinsanity.com").should == "http://www.cliffsofinsanity.com"
     end
+    it "should return a string if a :url paramter is given" do
+      TestHarness.build_url(:url => "http://www.cliffsofinsanity.com", :headers => { 'Content-Type' => 'cash/dollars' }).should == "http://www.cliffsofinsanity.com"
+    end
     it "should return a built url with just a hostname if only the hostname is given" do
       TestHarness.build_url(:host => "poisonedwine.com").should == "http://poisonedwine.com"
     end
@@ -74,6 +77,15 @@ describe CurbFu::Request::Base do
       Curl::Easy.should_receive(:new).with(regex_for_url_with_params('http://www.google.com', 'search=MSU\+vs\+UNC', 'limit=200')).and_return(@mock_curb)
       TestHarness.get('http://www.google.com', { :search => 'MSU vs UNC', :limit => 200 })
     end
+    it "should set cookies" do
+      the_cookies = "SekretAuth=123134234"
+      
+      @mock_curb = mock(Curl::Easy, :headers= => nil, :headers => {}, :header_str => "", :response_code => 200, :body_str => 'yeeeah', :timeout= => nil, :http_get => nil)
+      Curl::Easy.should_receive(:new).and_return(@mock_curb)
+      @mock_curb.should_receive(:cookies=).with(the_cookies)
+      
+      TestHarness.get("http://google.com", {}, the_cookies)
+    end
 
     describe "with_hash" do
       it "should get google from {:host => \"www.google.com\", :port => 80}" do
@@ -94,6 +106,19 @@ describe CurbFu::Request::Base do
         Curl::Easy.should_receive(:new).with(regex_for_url_with_params('http://www.google.com', 'search=MSU\+vs\+UNC', 'limit=200')).and_return(@mock_curb)
         TestHarness.get({ :host => 'www.google.com' }, { :search => 'MSU vs UNC', :limit => 200 })
       end
+      it "should set cookies" do
+        the_cookies = "SekretAuth=123134234"
+
+        @mock_curb = mock(Curl::Easy, :headers= => nil, :headers => {}, :header_str => "", :response_code => 200, :body_str => 'yeeeah', :timeout= => nil, :http_get => nil)
+        Curl::Easy.should_receive(:new).and_return(@mock_curb)
+        @mock_curb.should_receive(:cookies=).with(the_cookies)
+
+        TestHarness.get({
+          :host => "google.com",
+          :port => 80,
+          :cookies => the_cookies
+        })
+      end
     end
   end
 
@@ -156,15 +181,34 @@ describe CurbFu::Request::Base do
     end
 
     it "should send each parameter to Curb#http_put" do
-      Curl::Easy.should_receive(:new).with('http://google.com:80/search?q=derek&r=matt').and_return(@mock_curb)
-      @mock_curb.should_receive(:http_put)
+      @mock_q = Curl::PostField.content('q','derek')
+      @mock_r = Curl::PostField.content('r','matt')
+      TestHarness.stub!(:create_post_fields).and_return([@mock_q,@mock_r])
 
+      @mock_curb.should_receive(:http_put).with(@mock_q,@mock_r)
+      
       response = TestHarness.put(
         {:host => "google.com", :port => 80, :path => "/search"},
         { 'q' => 'derek', 'r' => 'matt' })
     end
   end
   
+  describe "delete" do
+    before(:each) do
+      @resource_link = 'http://example.com/resource/1'
+      @mock_curb = mock(Curl::Easy, :headers= => nil, :headers => {}, :header_str => "", :response_code => 200, :body_str => 'yeeeah', :timeout= => nil)
+      Curl::Easy.stub!(:new).and_return(@mock_curb)
+    end
+
+    it "should send each parameter to Curb#http_delete" do
+      Curl::Easy.should_receive(:new).with(@resource_link).and_return(@mock_curb)
+      @mock_curb.should_receive(:http_delete)
+
+      response = TestHarness.delete(@resource_link)
+    end
+  end
+  
+  
   describe "create_post_fields" do
     it "should return the params if params is a string" do
       TestHarness.create_post_fields("my awesome data that I'm sending to you").

metadata

@@ -1,70 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: curb-fu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Derek Kastner, Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: curb
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152758580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152758580
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2152758040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152758040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152757500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152757500
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: &2152757120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2152757120
 description: 
 email: development@greenviewdata.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/curb-fu/authentication.rb
 - lib/curb-fu/core_ext.rb
 - lib/curb-fu/request/base.rb
@@ -88,32 +84,29 @@ files:
 - spec/spec_helper.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Friendly wrapper for curb
-test_files: 
+test_files:
 - spec/fixtures/foo.txt
 - spec/lib/curb-fu/core_ext_spec.rb
 - spec/lib/curb-fu/request/base_spec.rb