curb-fu 0.4.4 → 0.6.0

data/lib/curb-fu.rb

@@ -2,27 +2,25 @@ dir = File.dirname(__FILE__)
 $:.unshift(dir) unless $:.include?(dir)
 require 'curb-fu/response'
 require 'curb-fu/request'
-require 'curb-fu/entity'
 require 'curb-fu/authentication'
 require 'curb-fu/core_ext'
-require 'curb-fu/test'
 
 module CurbFu
   class << self
-    def get(*args)
-      CurbFu::Request.get(*args)
+    def get(*args, &block)
+      CurbFu::Request.get(*args, &block)
     end
 
-    def post(*args)
-      CurbFu::Request.post(*args)
+    def post(*args, &block)
+      CurbFu::Request.post(*args, &block)
     end
 
-    def put(*args)
-      CurbFu::Request.put(*args)
+    def put(*args, &block)
+      CurbFu::Request.put(*args, &block)
     end
 
-    def delete(*args)
-      CurbFu::Request.delete(*args)
+    def delete(*args, &block)
+      CurbFu::Request.delete(*args, &block)
     end
   
     attr_accessor :stubs

data/lib/curb-fu/core_ext.rb

@@ -1,19 +1,19 @@
 require 'cgi'
 
 ##
-# ActiveSupport look alike for to_param. Very useful.
+# ActiveSupport look alike for to_param_pair. Very useful.
 module CurbFu
   module HashExtensions
     def self.included(base)
-      base.send(:include, InstanceMethods) unless base.methods.include?(:to_param)
+      base.send(:include, InstanceMethods)
       #base.extend(ClassMethods)
     end
     
     module InstanceMethods
-      def to_param(prefix)
+      def to_param_pair(prefix)
         collect do |k, v|
           key_prefix = prefix ? "#{prefix}[#{k}]" : k
-          v.to_param(key_prefix)
+          v.to_param_pair(key_prefix)
         end.join("&")
       end
     end
@@ -21,12 +21,12 @@ module CurbFu
   
   module ObjectExtensions
     def self.included(base)
-      base.send(:include, InstanceMethods) unless base.methods.include?(:to_param)
+      base.send(:include, InstanceMethods)
       #base.extend(ClassMethods)
     end
     
     module InstanceMethods
-      def to_param(prefix)
+      def to_param_pair(prefix = self.class)
         value = CGI::escape(to_s)
         "#{prefix}=#{value}"
       end
@@ -35,14 +35,14 @@ module CurbFu
   
   module ArrayExtensions
     def self.included(base)
-      base.send(:include, InstanceMethods) unless base.methods.include?(:to_param)
+      base.send(:include, InstanceMethods)
       #base.extend(ClassMethods)
     end
     
     module InstanceMethods
-      def to_param(prefix)
+      def to_param_pair(prefix)
         prefix = "#{prefix}[]"
-        collect { |item| "#{item.to_param(prefix)}" }.join('&')
+        collect { |item| "#{item.to_param_pair(prefix)}" }.join('&')
       end
     end
   end
@@ -54,6 +54,9 @@ end
 class Array
   include CurbFu::ArrayExtensions
 end
-class Object
+class String
+  include CurbFu::ObjectExtensions
+end
+class Fixnum
   include CurbFu::ObjectExtensions
 end

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

@@ -3,7 +3,7 @@ module CurbFu
     module Base
       include Common
       
-      def build(url_params, query_params = {})
+      def build(url_params, query_params = {}, &block)
         curb = Curl::Easy.new(build_url(url_params, query_params))
 
         headers = global_headers
@@ -23,6 +23,8 @@ module CurbFu
         curb.headers = headers
         curb.timeout = @timeout
 
+        yield curb if block_given?
+
         curb
       end
       
@@ -38,23 +40,23 @@ module CurbFu
         @global_headers ||= {}
       end
       
-      def get(url, params = {})
-        curb = self.build(url, params)
+      def get(url, params = {}, &block)
+        curb = self.build(url, params, &block)
         curb.http_get
         CurbFu::Response::Base.from_curb_response(curb)
       end
 
-      def put(url, params = {})
-        curb = self.build(url, params)
+      def put(url, params = {}, &block)
+        curb = self.build(url, params, &block)
         curb.http_put("")
         CurbFu::Response::Base.from_curb_response(curb)
       end
 
-      def post(url, params = {})
+      def post(url, params = {}, &block)
         fields = create_post_fields(params)
         fields = [fields] if fields.is_a?(String)
 
-        curb = self.build(url)
+        curb = self.build(url, &block)
         curb.http_post(*fields)
         response = CurbFu::Response::Base.from_curb_response(curb)
         if CurbFu.debug?
@@ -66,11 +68,11 @@ module CurbFu
         response
       end
 
-      def post_file(url, params = {}, filez = {})
+      def post_file(url, params = {}, filez = {}, &block)
         fields = create_post_fields(params)
         fields += create_file_fields(filez)
 
-        curb = self.build(url)
+        curb = self.build(url, &block)
         curb.multipart_form_post = true
         
         begin
@@ -80,18 +82,10 @@ 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)
-        curb = self.build(url)
+      def delete(url, &block)
+        curb = self.build(url, &block)
         curb.http_delete
         CurbFu::Response::Base.from_curb_response(curb)
       end
@@ -130,4 +124,4 @@ module CurbFu
       end
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@ module CurbFu
       end
       
       def self.build_uri_params(param_hash)
-        param_hash.to_param
+        param_hash.to_param_pair
       end
       
       def self.build_post_fields(param_hash)
@@ -17,11 +17,11 @@ module CurbFu
       end
       
       def to_uri_param
-        value.to_param(name)
+        value.to_param_pair(name)
       end
       
       def to_curl_post_field
-        field_string = value.to_param(name)
+        field_string = value.to_param_pair(name)
         fields = field_string.split('&').collect do |field_value_pair|
           field_name, field_value = field_value_pair.split('=')
           Curl::PostField.content(field_name, CGI::unescape(field_value))

data/lib/curb-fu/response.rb

@@ -35,7 +35,10 @@ module CurbFu
         header_lines.shift
         header_lines.inject({}) do |hsh, line|
           whole_enchillada, key, value = /^(.*?):\s*(.*)$/.match(line.chomp).to_a
-          hsh[key] = value unless whole_enchillada.nil?
+          unless whole_enchillada.nil?
+            # note: headers with multiple instances should have multiple values in the headers hash
+            hsh[key] = hsh[key] ? [hsh[key]].flatten << value : value
+          end
           hsh
         end
       end
@@ -43,7 +46,31 @@ module CurbFu
       def to_hash
         { :status => status, :body => body, :headers => headers }
       end
-      
+
+      def content_length
+        if ( header_value = self['Content-Length'] )
+          header_value.to_i
+        end
+      end
+
+      def content_type
+        if ( header_value = self['Content-Type'] )
+          header_value.split(';').first
+        end
+      end
+
+      def get_fields(key)
+        if ( match = @headers.find{|k,v| k.downcase == key.downcase} )
+          [match.last].flatten
+        else
+          []
+        end
+      end
+
+      def [](key)
+        get_fields(key).last
+      end
+
       def set_response_type(status)
         case status
         when 100..199 then

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

@@ -7,62 +7,40 @@ describe "module inclusion" do
       include CurbFu::ObjectExtensions
     end
     
-    Tester.new.should respond_to(:to_param)
-  end
-  it "should not overwrite a pre-existing method named :to_param" do
-    class TesterWithToParam
-      def to_param
-        "hooray, to_param!"
-      end
-    end
-    
-    TesterWithToParam.send(:include, CurbFu::ObjectExtensions)
-    TesterWithToParam.new.to_param.should == "hooray, to_param!"
-  end
-  it "should not overwrite the pre-existing method even if it comes from a module" do
-    module ActsLikeRails
-      def to_param
-        "foo"
-      end
-    end
-    class TesterWithModule
-      include ActsLikeRails
-    end
-    TesterWithModule.send(:include, CurbFu::ObjectExtensions)
-    TesterWithModule.new.to_param.should == "foo"
+    Tester.new.should respond_to(:to_param_pair)
   end
 end
 
 describe String do
-  it "should respond_to #to_param" do
-    "".should respond_to(:to_param)
+  it "should respond_to #to_param_pair" do
+    "".should respond_to(:to_param_pair)
   end
-  describe "to_param" do
+  describe "to_param_pair" do
     it "should return itself as the value for the passed-in name" do
-      "foo".to_param("quux").should == "quux=foo"
+      "foo".to_param_pair("quux").should == "quux=foo"
     end
     it "should be CGI escaped" do
-      "Whee, some 'unsafe' uri things".to_param("safe").should == "safe=Whee%2C+some+%27unsafe%27+uri+things"
+      "Whee, some 'unsafe' uri things".to_param_pair("safe").should == "safe=Whee%2C+some+%27unsafe%27+uri+things"
     end
   end
 end
 
 describe Hash do
-  it "should respond to #to_param" do
-    {}.should respond_to(:to_param)
+  it "should respond to #to_param_pair" do
+    {}.should respond_to(:to_param_pair)
   end
-  describe "to_param" do
+  describe "to_param_pair" do
     it "should collect its keys and values into parameter pairs, prepending the provided prefix" do
       {
         "kraplach" => "messy",
         "zebot" => 2003
-      }.to_param("things").should == "things[kraplach]=messy&things[zebot]=2003"
+      }.to_param_pair("things").should == "things[kraplach]=messy&things[zebot]=2003"
     end
     it "should handle having an array as one of its parameters" do
       result = {
         "vielleicht" => "perhaps",
         "ratings" => [5, 3, 5, 2, 4]
-      }.to_param("things")
+      }.to_param_pair("things")
       result.split('&').size.should == 6
       result.should =~ /things\[vielleicht\]=perhaps/
       result.should =~ /things\[ratings\]\[\]=5/
@@ -75,26 +53,26 @@ describe Hash do
 end
 
 describe Array do
-  it "should respond_to #to_param" do
-    [].should respond_to(:to_param)
+  it "should respond_to #to_param_pair" do
+    [].should respond_to(:to_param_pair)
   end
-  describe "to_param" do
+  describe "to_param_pair" do
     it "should join each element, prepending a provided key prefix" do
-      [1, 23, 5].to_param("magic_numbers").should == ["magic_numbers[]=1", "magic_numbers[]=23", "magic_numbers[]=5"].join("&")
+      [1, 23, 5].to_param_pair("magic_numbers").should == ["magic_numbers[]=1", "magic_numbers[]=23", "magic_numbers[]=5"].join("&")
     end
-    it "should call to_param on each element, too" do
-      [1, 23, {"barkley" => 5}].to_param("magic_numbers").should == "magic_numbers[]=1&magic_numbers[]=23&magic_numbers[][barkley]=5"
+    it "should call to_param_pair on each element, too" do
+      [1, 23, {"barkley" => 5}].to_param_pair("magic_numbers").should == "magic_numbers[]=1&magic_numbers[]=23&magic_numbers[][barkley]=5"
     end
   end
 end
 
 describe Integer do
-  it "should respond_to #to_param" do
-    1.should respond_to(:to_param)
+  it "should respond_to #to_param_pair" do
+    1.should respond_to(:to_param_pair)
   end
-  describe "to_param" do
+  describe "to_param_pair" do
     it "should return a stringified version of itself, using the provided key" do
-      5.to_param("fixnum").should == "fixnum=5"
+      5.to_param_pair("fixnum").should == "fixnum=5"
     end
   end
-end
+end

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

@@ -142,7 +142,7 @@ describe CurbFu::Request::Test do
       response = CurbFu::Request.get('http://a.example.com/gimme/html')
       response.should be_a_kind_of(CurbFu::Response::Base)
       response.status.should == 200
-      response.headers.should == { 'Content-Type' => 'spec/testcase' }
+      response.headers.should == { 'Content-Type' => 'spec/testcase', "Content-Length"=>"39" }
       response.body.should == "A is for Archer, an excellent typeface."
     end
   end
@@ -162,7 +162,7 @@ describe CurbFu::Request::Test do
       response = CurbFu::Request.post('http://a.example.com/gimme/html')
       response.should be_a_kind_of(CurbFu::Response::Base)
       response.status.should == 200
-      response.headers.should == { 'Content-Type' => 'spec/testcase' }
+      response.headers.should == { 'Content-Type' => 'spec/testcase', "Content-Length"=>"39" }
       response.body.should == "A is for Archer, an excellent typeface."
     end
   end
@@ -181,7 +181,7 @@ describe CurbFu::Request::Test do
       response = CurbFu::Request.post_file('http://a.example.com/gimme/html')
       response.should be_a_kind_of(CurbFu::Response::Base)
       response.status.should == 200
-      response.headers.should == { 'Content-Type' => 'spec/testcase' }
+      response.headers.should == { 'Content-Type' => 'spec/testcase', "Content-Length"=>"39" }
       response.body.should == "A is for Archer, an excellent typeface."
     end
   end
@@ -198,7 +198,7 @@ describe CurbFu::Request::Test do
       response = CurbFu::Request.put('http://a.example.com/gimme/html')
       response.should be_a_kind_of(CurbFu::Response::Base)
       response.status.should == 200
-      response.headers.should == { 'Content-Type' => 'spec/testcase' }
+      response.headers.should == { 'Content-Type' => 'spec/testcase', "Content-Length"=>"39" }
       response.body.should == "A is for Archer, an excellent typeface."
     end
   end
@@ -216,7 +216,7 @@ describe CurbFu::Request::Test do
       response = CurbFu::Request.delete('http://a.example.com/gimme/html')
       response.should be_a_kind_of(CurbFu::Response::Base)
       response.status.should == 200
-      response.headers.should == { 'Content-Type' => 'spec/testcase' }
+      response.headers.should == { 'Content-Type' => 'spec/testcase', "Content-Length"=>"39" }
       response.body.should == "A is for Archer, an excellent typeface."
     end
   end

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

@@ -106,6 +106,110 @@ describe CurbFu::Response::Base do
         @cf.headers['Content-Length'].should == '18'
         @cf.headers.keys.length.should == 5
       end
+
+      it "should use an array to store values for headers fields with multiple instances" do
+        headers = "HTTP/1.1 200 OK\r\nSet-Cookie: first cookie value\r\nSet-Cookie: second cookie value\r\n\r\n"
+        mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+        @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+        @cf.headers['Set-Cookie'].should == ["first cookie value", "second cookie value"]
+      end
     end
   end
+
+  describe "get_fields" do
+
+    before(:each) do
+      headers = "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=ISO-8859-1\r\nContent-Length: 18\r\nSet-Cookie: first cookie value\r\nServer: gws\r\nTransfer-Encoding: chunked\r\nSet-Cookie: second cookie value\r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+    end
+
+    it "should return an array containing all matching field values" do
+      @cf.get_fields("Set-Cookie").should == ["first cookie value", "second cookie value"]
+      @cf.get_fields("Content-Length").should == ["18"]
+    end
+
+    it "should do a case-insensitive match of the key to header fields" do
+      @cf.get_fields("content-length").should == ["18"]
+    end
+
+    it "should return empty array when key matches no header field" do
+      @cf.get_fields("non-existent").should == []
+    end
+
+  end
+
+  describe "[]" do
+
+    before(:each) do
+      headers = "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=ISO-8859-1\r\nContent-Length: 18\r\nSet-Cookie: first cookie value\r\nServer: gws\r\nTransfer-Encoding: chunked\r\nSet-Cookie: second cookie value\r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+    end
+
+    it "should return the last matching field value" do
+      @cf["Set-Cookie"].should == "second cookie value"
+    end
+
+    it "should return the entire header value" do
+      @cf["Content-Type"].should == "text/html; charset=ISO-8859-1"
+    end
+
+    it "should return the header value as a string" do
+      @cf["Content-Length"].should == "18"
+    end
+
+    it "should do a case-insensitive match of the key to header fields" do
+      @cf["content-length"].should == "18"
+    end
+
+    it "should return nil when key matches no header field" do
+      @cf["non-existent"].should == nil
+    end
+
+  end
+
+  describe "content_type" do
+
+    it "should return the content-type as a mime type, disgarding charset or other info found in the content-type header" do
+      headers = "HTTP/1.1 200 OK\r\nContent-Length: 18\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+      @cf.content_type.should == "text/html"
+    end
+
+    it "should return the content-type from the last header field value" do
+      headers = "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=ISO-8859-1\r\nContent-Length: 18\r\nContent-Type: application/xhtml+xml; charset=UTF-8\r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+      @cf.content_type.should == "application/xhtml+xml"
+    end
+
+    it "should return nil when the response doesn't contain a content-type header" do
+      headers = "HTTP/1.1 200 OK\r\nr\nContent-Length: 18r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+      @cf.content_type.should == nil
+    end
+
+  end
+
+  describe "content_length" do
+
+    it "should return the last content-length header field value, as an integer" do
+      headers = "HTTP/1.1 200 OK\r\nContent-Length: 100\r\nContent-Length: 18\r\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+      @cf.content_length.should == 18
+    end
+
+    it "should return nil when the response doesn't contain a content-length header" do
+      headers = "HTTP/1.1 200 OK\r\nr\nContent-Type: text/htmlr\n\r\n"
+      mock_curb = mock(Object, :response_code => 200, :body_str => 'OK', :header_str => headers, :timeout= => nil)
+      @cf = CurbFu::Response::Base.from_curb_response(mock_curb)
+      @cf.content_length.should == nil
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require "rubygems"
-require 'spec'
 require 'htmlentities'
 
 dir = File.dirname(__FILE__)
@@ -8,4 +7,4 @@ $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
 Dir.glob(File.join(dir,'helpers','**','*')).each { |helper| require helper }
 
-require 'curb-fu'
+require 'curb-fu'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: curb-fu
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 4
-  version: 0.4.4
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Derek Kastner, Matt Wilson
@@ -14,21 +10,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
-default_executable: 
+date: 2011-08-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: curb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 4
-        - 0
         version: 0.5.4.0
   type: :runtime
   version_requirements: *id001
@@ -36,16 +27,35 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    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 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: development@greenviewdata.com
 executables: []
@@ -57,7 +67,6 @@ extra_rdoc_files: []
 files: 
 - lib/curb-fu/authentication.rb
 - lib/curb-fu/core_ext.rb
-- lib/curb-fu/entity.rb
 - lib/curb-fu/request/base.rb
 - lib/curb-fu/request/common.rb
 - lib/curb-fu/request/parameter.rb
@@ -68,7 +77,15 @@ files:
 - lib/curb-fu/test/server.rb
 - lib/curb-fu/test.rb
 - lib/curb-fu.rb
-has_rdoc: true
+- spec/fixtures/foo.txt
+- spec/lib/curb-fu/core_ext_spec.rb
+- spec/lib/curb-fu/request/base_spec.rb
+- spec/lib/curb-fu/request/parameter_spec.rb
+- spec/lib/curb-fu/request/test_spec.rb
+- spec/lib/curb-fu/response_spec.rb
+- spec/lib/curb_fu_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 homepage: 
 licenses: []
 
@@ -78,30 +95,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Friendly wrapper for curb
 test_files: 
 - spec/fixtures/foo.txt
 - spec/lib/curb-fu/core_ext_spec.rb
-- spec/lib/curb-fu/entity_spec.rb
 - spec/lib/curb-fu/request/base_spec.rb
 - spec/lib/curb-fu/request/parameter_spec.rb
 - spec/lib/curb-fu/request/test_spec.rb

data/lib/curb-fu/entity.rb

@@ -1,54 +0,0 @@
-require 'json'
-require 'uri'
-
-module CurbFu
-  class Entity
-    attr_accessor :content_type, :data
-    
-    def initialze(data)
-      self.data = data
-    end
-    
-    def data
-      @data ||= ''
-    end
-    
-    def to_request_data
-      return data if data.is_a?(String)
-      
-      case content_type
-      when :uri then 
-        to_uri
-      when 'application/json',:json then 
-        to_json
-      # when 'application/xml',:xml then to_xml
-      when 'text/www-form-urlencoded',:form,:url then 
-        to_www_form_url_encoded
-      end
-    end
-    
-    # def to_xml
-    #   "XML"
-    # end
-    
-    def to_uri
-      strings = data.inject([]) do |acc, (name, value)|
-        acc << "#{name.to_s}=#{value}"
-        acc
-      end
-      URI.escape(strings.join('&'))
-    end
-    
-    def to_json
-      data.to_json
-    end
-    
-    def to_www_form_url_encoded
-      strings = data.inject([]) do |acc, (name, value)|
-        acc << "#{CGI.escape(name.to_s)}=#{CGI.escape(value)}"
-        acc
-      end
-      strings.join('&')
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe "CurbFu::Entity" do
-  before(:each) do
-    @entity = CurbFu::Entity.new
-    @entity.data = {
-      :zoltan => "Space Emperor!",
-      "em-dashes" => "more space=good"
-    }
-  end
-  
-  describe "to_request_data" do
-    it "should be able to convert parameters into json" do
-      @entity.content_type = :json
-    
-      JSON.parse(@entity.to_request_data).should include("zoltan" => "Space Emperor!", "em-dashes" => "more space=good")
-    end
-    it "should be able to convert parameters into 'XML'" do
-      pending "We need to choose an xml library"
-    
-      @entity.content_type = "application/xml"
-    
-      @entity.to_request_data.should == "XML"
-    end
-    it "should be able to convert parameters into form_url_encoding" do
-      @entity.content_type = :form
-    
-      @entity.to_request_data.split('&').sort.should == ["em-dashes=more+space%3Dgood","zoltan=Space+Emperor%21"]
-    end
-    it "should not attempt to coerce plain text into the requested format" do
-      @entity.content_type = :json
-      @entity.data = "{\"my_own\": \"data\"}"
-
-      @entity.to_request_data.should == "{\"my_own\": \"data\"}"
-    end
-  end
-end