curb-fu 0.4.3 → 0.4.4

data/lib/curb-fu.rb

@@ -58,7 +58,5 @@ module CurbFu
     def debug?
       @debug
     end
-    
-    
   end
 end

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

@@ -56,7 +56,14 @@ module CurbFu
 
         curb = self.build(url)
         curb.http_post(*fields)
-        CurbFu::Response::Base.from_curb_response(curb)
+        response = CurbFu::Response::Base.from_curb_response(curb)
+        if CurbFu.debug?
+          puts "Response from server was"
+          puts "Status: #{response.status}"
+          puts "Headers: #{response.headers.inspect}"
+          puts "Body: #{response.body.inspect}"
+        end
+        response
       end
 
       def post_file(url, params = {}, filez = {})
@@ -73,6 +80,14 @@ module CurbFu
           raise e, "There was an attempt to post invalid fields.  The fields were:\n#{field_list.join("\n")}"
         end
         CurbFu::Response::Base.from_curb_response(curb)
+        response = CurbFu::Response::Base.from_curb_response(curb)
+        if CurbFu.debug?
+          puts "Response from server was"
+          puts "Status: #{response.status}"
+          puts "Headers: #{response.headers.inspect}"
+          puts "Body: #{response.body.inspect}"
+        end
+        response
       end
 
       def delete(url)

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

@@ -13,7 +13,8 @@ module CurbFu
         if url_params.is_a? String
           built_url = url_params
         else
-          built_url = "http://#{url_params[:host]}"
+          protocol = url_params[:protocol] || "http"
+          built_url = "#{protocol}://#{url_params[:host]}"
           built_url += ":" + url_params[:port].to_s if url_params[:port]
           built_url += url_params[:path] if url_params[:path]
         end

data/lib/curb-fu/response.rb

@@ -130,50 +130,50 @@ module CurbFu
     end
           
     module Information; end
-      module Continue;                           def self.to_i; 100; end; end
-      module SwitchProtocl; end
-    module Success;                              def self.to_i; 200; end; end
-      module OK;                                 def self.to_i; 200; end; end
-      module Created;                            def self.to_i; 201; end; end
-      module Accepted;                           def self.to_i; 202; end; end
-      module NonAuthoritativeInformation; end
-      module NoContent; end
-      module ResetContent; end
-      module PartialContent; end
-    module Redirection; end                    # 3xx
-      module MultipleChoice; end                 # 300
-      module MovedPermanently; end               # 301
-      module Found;                              def self.to_i; 302; end; end
-      module SeeOther; end                       # 303
-      module NotModified; end                    # 304
-      module UseProxy; end                       # 305
-      module TemporaryRedirect; end              # 307
-    module ClientError; end                    # 4xx
-      module BadRequest; end                     # 400
-      module Unauthorized; end                   # 401
-      module PaymentRequired; end                # 402
-      module Forbidden; end                      # 403
-      module NotFound;                           def self.to_i; 404; end; end
-      module MethodNotAllowed; end               # 405
-      module NotAcceptable; end                  # 406
-      module ProxyAuthenticationRequired; end    # 407
-      module RequestTimeOut; end                 # 408
-      module Conflict; end                       # 409
-      module Gone;                               def self.to_i; 410; end; end
-      module LengthRequired; end                 # 411
-      module PreconditionFailed; end             # 412
-      module RequestEntityTooLarge; end          # 413
-      module RequestURITooLong; end              # 414
-      module UnsupportedMediaType; end           # 415
-      module RequestedRangeNotSatisfiable; end   # 416
-      module ExpectationFailed; end              # 417
-    module ServerError; end                    # 5xx
-      module InternalServerError;                def self.to_i; 500; end; end
-      module NotImplemented; end                 # 501
-      module BadGateway; end                     # 502
-      module ServiceUnavailable;                 def self.to_i; 503; end; end
-      module GatewayTimeOut; end                 # 504
-      module VersionNotSupported; end            # 505
-    module UnknownResponse; end
+      module Continue;                            def self.to_i; 100; end; def message; "Continue"; end; end
+      module SwitchProtocol;                      def self.to_i; 101; end; def message; "Switch Protocol"; end; end
+    module Success;                               def self.to_i; 200; end; def message; "Success"; end; end
+      module OK;                                  def self.to_i; 200; end; def message; "OK"; end; end
+      module Created;                             def self.to_i; 201; end; def message; "Created"; end; end
+      module Accepted;                            def self.to_i; 202; end; def message; "Accepted"; end; end
+      module NonAuthoritativeInformation;         def self.to_i; 203; end; def message; "Non Authoritative Information"; end; end
+      module NoContent;                           def self.to_i; 204; end; def message; "No Content"; end; end
+      module ResetContent;                        def self.to_i; 205; end; def message; "Reset Content"; end; end
+      module PartialContent;                      def self.to_i; 206; end; def message; "Partial Content"; end; end
+    module Redirection;                           def self.to_i; 300; end; def message; "Redirection"; end; end
+      module MultipleChoice;                      def self.to_i; 300; end; def message; "Multiple Choice"; end; end
+      module MovedPermanently;                    def self.to_i; 301; end; def message; "Moved Permanently"; end; end
+      module Found;                               def self.to_i; 302; end; def message; "Found"; end; end
+      module SeeOther;                            def self.to_i; 303; end; def message; "See Other"; end; end
+      module NotModified;                         def self.to_i; 304; end; def message; "Not Modified"; end; end
+      module UseProxy;                            def self.to_i; 305; end; def message; "Use Proxy"; end; end
+      module TemporaryRedirect;                   def self.to_i; 307; end; def message; "Temporary Redirect"; end; end
+    module ClientError;                           def self.to_i; 400; end; def message; "Client Error"; end; end
+      module BadRequest;                          def self.to_i; 400; end; def message; "Bad Request"; end; end
+      module Unauthorized;                        def self.to_i; 401; end; def message; "Unauthorized"; end; end
+      module PaymentRequired;                     def self.to_i; 402; end; def message; "Payment Required"; end; end
+      module Forbidden;                           def self.to_i; 403; end; def message; "Forbidden"; end; end
+      module NotFound;                            def self.to_i; 404; end; def message; "Not Found"; end; end
+      module MethodNotAllowed;                    def self.to_i; 405; end; def message; "Method Not Allowed"; end; end
+      module NotAcceptable;                       def self.to_i; 406; end; def message; "Not Acceptable"; end; end
+      module ProxyAuthenticationRequired;         def self.to_i; 407; end; def message; "Proxy Authentication Required"; end; end
+      module RequestTimeOut;                      def self.to_i; 408; end; def message; "Request Time Out"; end; end
+      module Conflict;                            def self.to_i; 409; end; def message; "Conflict"; end; end
+      module Gone;                                def self.to_i; 410; end; def message; "Gone"; end; end
+      module LengthRequired;                      def self.to_i; 411; end; def message; "Length Required"; end; end
+      module PreconditionFailed;                  def self.to_i; 412; end; def message; "Precondition Failed"; end; end
+      module RequestEntityTooLarge;               def self.to_i; 413; end; def message; "Request Entity Too Large"; end; end
+      module RequestURITooLong;                   def self.to_i; 414; end; def message; "Request URI Too Long"; end; end
+      module UnsupportedMediaType;                def self.to_i; 415; end; def message; "Unsupported Media Type"; end; end
+      module RequestedRangeNotSatisfiable;        def self.to_i; 416; end; def message; "Requested Range Not Satisfiable"; end; end
+      module ExpectationFailed;                   def self.to_i; 417; end; def message; "Expectation Failed"; end; end
+    module ServerError;                           def self.to_i; 500; end; def message; "Server Error"; end; end
+      module InternalServerError;                 def self.to_i; 500; end; def message; "Internal Server Error"; end; end
+      module NotImplemented;                      def self.to_i; 501; end; def message; "Not Implemented"; end; end
+      module BadGateway;                          def self.to_i; 502; end; def message; "Bad Gateway"; end; end
+      module ServiceUnavailable;                  def self.to_i; 503; end; def message; "Service Unavailable"; end; end
+      module GatewayTimeOut;                      def self.to_i; 504; end; def message; "Gateway Time Out"; end; end
+      module VersionNotSupported;                 def self.to_i; 505; end; def message; "Version Not Supported"; end; end
+    module UnknownResponse;                       def self.to_i; 0; end; def message; "Unknown Response"; end; end
   end
 end

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

@@ -49,6 +49,9 @@ describe CurbFu::Request::Base do
       TestHarness.build_url('http://chocolatecheese.com','?nuts=true').
         should == 'http://chocolatecheese.com?nuts=true'
     end
+    it "should accept a 'protocol' parameter" do
+      TestHarness.build_url(:host => "mybank.com", :protocol => "https").should == "https://mybank.com"
+    end
   end
 
   describe "get" do
@@ -196,8 +199,8 @@ describe CurbFu::Request::Base do
     end
     
     it 'should handle multiple parameters' do
-      TestHarness.create_put_fields(:rock => 'beatles', :rap => '2pac').
-        should == "rock=beatles&rap=2pac"
+      TestHarness.create_put_fields(:rock => 'beatles', :rap => '2pac').split("&").
+        should include("rock=beatles","rap=2pac")
     end
     
     it "should handle params that contain arrays" do

data/spec/lib/curb-fu/response_spec.rb

@@ -54,12 +54,24 @@ describe CurbFu::Response::Base do
   end
   
   describe "response modules" do
-    describe "to_i" do
+    describe ".to_i" do
       it "should return the status code represented by the module" do
         CurbFu::Response::OK.to_i.should == 200
         CurbFu::Response::NotFound.to_i.should == 404
       end
     end
+    describe "#message" do
+      it "should return a string indicating the english translation of the status code" do
+        r = CurbFu::Response::Base.new(200, {}, "text")
+        r.message.should == "OK"
+        r = CurbFu::Response::Base.new(404, {}, "text")
+        r.message.should == "Not Found"
+        r = CurbFu::Response::Base.new(302, {}, "text")
+        r.message.should == "Found"
+        r = CurbFu::Response::Base.new(505, {}, "text")
+        r.message.should == "Version Not Supported"
+      end
+    end
   end
   
   describe "parse_headers" do

metadata

@@ -1,39 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: curb-fu
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
-- Phil Green, Derek Kastner, Matt Wilson
+- Derek Kastner, Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: curb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 4
+        - 0
         version: 0.5.4.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
-email: support@greenviewdata.com
+email: development@greenviewdata.com
 executables: []
 
 extensions: []
@@ -67,18 +81,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Friendly wrapper for curb