tinder 1.4.1 → 1.4.2

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+1.4.2 - 2010-11-13
+* Use Faraday instead of HTTParty [eric]
+* Fix file uploads [eric]
+
 1.4.1 - 2010-10-09
 * Make SSL the default since it is available for all Campfire accounts.
 * Added MIT License

data/Rakefile

@@ -9,7 +9,8 @@ begin
     gem.homepage = 'http://github.com/collectiveidea/tinder'
     gem.rubyforge_project = "tinder"
     gem.add_dependency "activesupport"
-    gem.add_dependency "httparty"
+    gem.add_dependency "faraday", "~> 0.5.1"
+    gem.add_dependency "multipart-post"
     gem.add_dependency "mime-types"
     gem.add_dependency "twitter-stream"
     gem.add_dependency "eventmachine"

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/tinder.rb

@@ -1,10 +1,11 @@
 require 'active_support'
 require 'active_support/json'
+require 'mime/types'
 
 require 'tinder/connection'
-require 'tinder/multipart'
 require 'tinder/campfire'
 require 'tinder/room'
+require 'tinder/middleware'
 
 module Tinder
   class Error < StandardError; end

data/lib/tinder/campfire.rb

@@ -45,7 +45,7 @@ module Tinder
 
     # Creates and returns a new Room with the given +name+ and optionally a +topic+
     def create_room(name, topic = nil)
-      connection.post('/rooms.json', :body => { :room => { :name => name, :topic => topic } }.to_json)
+      connection.post('/rooms.json', { :room => { :name => name, :topic => topic } })
       find_room_by_name(name)
     end
 

data/lib/tinder/connection.rb

@@ -1,75 +1,93 @@
-require 'httparty'
-require 'active_support/core_ext/hash/indifferent_access'
-
-# override HTTParty's json parser to return a HashWithIndifferentAccess
-module HTTParty
-  class Parser
-    protected
-    def json
-      result = Crack::JSON.parse(body)
-      if result.is_a?(Hash)
-        result = HashWithIndifferentAccess.new(result)
-      end
-      result
-    end
-  end
-end
+require 'faraday'
 
 module Tinder
   class Connection
     HOST = "campfirenow.com"
 
     attr_reader :subdomain, :uri, :options
-    
+
+    def self.connection
+      @connection ||= Faraday::Connection.new do |conn|
+        conn.use      Faraday::Request::ActiveSupportJson
+        conn.adapter  Faraday.default_adapter
+        conn.use      Tinder::FaradayResponse::RaiseOnAuthenticationFailure
+        conn.use      Faraday::Response::ActiveSupportJson
+        conn.use      Tinder::FaradayResponse::WithIndifferentAccess
+
+        conn.headers['Content-Type'] = 'application/json'
+      end
+    end
+
+    def self.raw_connection
+      @raw_connection ||= Faraday::Connection.new do |conn|
+        conn.adapter  Faraday.default_adapter
+        conn.use      Tinder::FaradayResponse::RaiseOnAuthenticationFailure
+        conn.use      Faraday::Response::ActiveSupportJson
+        conn.use      Tinder::FaradayResponse::WithIndifferentAccess
+      end
+    end
+
     def initialize(subdomain, options = {})
       @subdomain = subdomain
       @options = { :ssl => true, :proxy => ENV['HTTP_PROXY'] }.merge(options)
       @uri = URI.parse("#{@options[:ssl] ? 'https' : 'http' }://#{subdomain}.#{HOST}")
       @token = options[:token]
-      
-      
-      class << self
-        include HTTParty
-        extend HTTPartyExtensions
-        
-        headers 'Content-Type' => 'application/json'
-      end
-      
-      if @options[:proxy]
-        proxy_uri = URI.parse(@options[:proxy])
-        http_proxy proxy_uri.host, proxy_uri.port
+
+      connection.basic_auth token, 'X'
+      raw_connection.basic_auth token, 'X'
+    end
+
+    def basic_auth_settings
+      { :username => token, :password => 'X' }
+    end
+
+    def connection
+      @connection ||= begin
+        conn = self.class.connection.dup
+        conn.url_prefix = @uri.to_s
+        conn.proxy options[:proxy]
+        conn
       end
-      base_uri @uri.to_s
-      basic_auth token, 'X'
     end
-    
-    module HTTPartyExtensions
-      def perform_request(http_method, path, options) #:nodoc:
-        response = super
-        raise AuthenticationFailed if response.code == 401
-        response
+
+    def raw_connection
+      @raw_connection ||= begin
+        conn = self.class.raw_connection.dup
+        conn.url_prefix = @uri.to_s
+        conn.proxy options[:proxy]
+        conn
       end
     end
-    
+
     def token
       @token ||= begin
-        self.basic_auth(options[:username], options[:password])
-        self.get('/users/me.json')['user']['api_auth_token']
+        connection.basic_auth(options[:username], options[:password])
+        get('/users/me.json')['user']['api_auth_token']
       end
     end
 
-    def metaclass
-      class << self; self; end
+    def get(url, *args)
+      response = connection.get(url, *args)
+      response.body
+    end
+
+    def post(url, body = nil, *args)
+      response = connection.post(url, body, *args)
+      response.body
     end
 
-    def method_missing(*args, &block)
-      metaclass.send(*args, &block)
+    def raw_post(url, body = nil, *args)
+      response = raw_connection.post(url, body, *args)
     end
-    
+
+    def put(url, body = nil, *args)
+      response = connection.put(url, body, *args)
+      response.body
+    end
+
     # Is the connection to campfire using ssl?
     def ssl?
       uri.scheme == 'https'
     end
-    
   end
 end

data/lib/tinder/middleware.rb

@@ -0,0 +1,30 @@
+module Tinder
+  module FaradayResponse
+    class WithIndifferentAccess < ::Faraday::Response::Middleware
+      begin
+        require 'active_support/core_ext/hash/indifferent_access'
+      rescue LoadError, NameError => error
+        self.load_error = error
+      end
+
+      def self.register_on_complete(env)
+        env[:response].on_complete do |response|
+          json = response[:body]
+          if json.is_a?(Hash)
+            response[:body] = ::HashWithIndifferentAccess.new(json)
+          elsif json.is_a?(Array) and json.first.is_a?(Hash)
+            response[:body] = json.map{|item| ::HashWithIndifferentAccess.new(item) }
+          end
+        end
+      end
+    end
+
+    class RaiseOnAuthenticationFailure < ::Faraday::Response::Middleware
+      def self.register_on_complete(env)
+        env[:response].on_complete do |response|
+          raise AuthenticationFailed if response[:status] == 401
+        end
+      end
+    end
+  end
+end

data/lib/tinder/room.rb

@@ -49,7 +49,7 @@ module Tinder
     end
 
     def update(attrs)
-      connection.put("/room/#{@id}.json", :body => {:room => attrs}.to_json)
+      connection.put("/room/#{@id}.json", {:room => attrs})
     end
 
     # Get the current topic
@@ -125,7 +125,7 @@ module Tinder
 
       require 'twitter/json_stream'
 
-      auth = connection.default_options[:basic_auth]
+      auth = connection.basic_auth_settings
       options = {
         :host => "streaming.#{Connection::HOST}",
         :path => room_url_for(:live),
@@ -178,11 +178,9 @@ module Tinder
       end
     end
 
-    def upload(filename)
-      File.open(filename, "rb") do |file|
-        params = Multipart::MultipartPost.new('upload' => file)
-        post(:uploads, :body => params.query)
-      end
+    def upload(file, content_type = nil, filename = nil)
+      content_type ||= MIME::Types.type_for(filename || file)
+      raw_post(:uploads, { :upload => Faraday::UploadIO.new(file, content_type, filename) })
     end
 
     # Get the list of latest files for this room
@@ -210,15 +208,19 @@ module Tinder
       end
 
       def send_message(message, type = 'TextMessage')
-        post 'speak', :body => {:message => {:body => message, :type => type}}.to_json
+        post 'speak', {:message => {:body => message, :type => type}}
+      end
+
+      def get(action)
+        connection.get(room_url_for(action))
       end
 
-      def get(action, options = {})
-        connection.get(room_url_for(action), options)
+      def post(action, body = nil)
+        connection.post(room_url_for(action), body)
       end
 
-      def post(action, options = {})
-        connection.post(room_url_for(action), options)
+      def raw_post(action, body = nil)
+        connection.raw_post(room_url_for(action), body)
       end
 
       def room_url_for(action)

data/spec/spec_helper.rb

@@ -10,4 +10,18 @@ FakeWeb.allow_net_connect = false
 
 def fixture(name)
   File.read(File.dirname(__FILE__) + "/fixtures/#{name}")
+end
+
+def stub_connection(object, &block)
+  @stubs ||= Faraday::Adapter::Test::Stubs.new
+
+  object.connection.build do |conn|
+    conn.use      Faraday::Request::ActiveSupportJson
+    conn.adapter :test, @stubs
+    conn.use      Tinder::FaradayResponse::RaiseOnAuthenticationFailure
+    conn.use      Faraday::Response::ActiveSupportJson
+    conn.use      Tinder::FaradayResponse::WithIndifferentAccess
+  end
+
+  block.call(@stubs)
 end

data/spec/tinder/campfire_spec.rb

@@ -7,8 +7,9 @@ describe Tinder::Campfire do
   
   describe "rooms" do
     before do
-      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/rooms.json",
-        :body => fixture('rooms.json'), :content_type => "application/json")
+      stub_connection(@campfire.connection) do |stub|
+        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+      end
     end
     
     it "should return rooms" do
@@ -25,11 +26,12 @@ describe Tinder::Campfire do
   
   describe "users" do
     before do
-      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/rooms.json",
-        :body => fixture('rooms.json'), :content_type => "application/json")
-      [80749, 80751].each do |id|
-        FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/room/#{id}.json",
-        :body => fixture("rooms/room#{id}.json"), :content_type => "application/json")
+      stub_connection(@campfire.connection) do |stub|
+        stub.get('/rooms.json') {[ 200, {}, fixture('rooms.json') ]}
+
+        [80749, 80751].each do |id|
+          stub.get("/room/#{id}.json") {[ 200, {}, fixture("rooms/room#{id}.json") ]}
+        end
       end
     end
     
@@ -42,8 +44,9 @@ describe Tinder::Campfire do
   
   describe "me" do
     before do
-      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/users/me.json",
-        :body => fixture('users/me.json'), :content_type => "application/json")
+      stub_connection(@campfire.connection) do |stub|
+        stub.get("/users/me.json") {[ 200, {}, fixture('users/me.json') ]}
+      end
     end
     
     it "should return the current user's information" do

data/spec/tinder/connection_spec.rb

@@ -3,27 +3,30 @@ require 'spec_helper'
 describe Tinder::Connection do
   describe "authentication" do
     it "should raise an exception with bad credentials" do
-      FakeWeb.register_uri(:get, "https://foo:X@test.campfirenow.com/rooms.json",
-        :status => ["401", "Unauthorized"])
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/rooms.json") {[ 401, {}, "Unauthorized" ]}
+      end
+
       connection = Tinder::Connection.new('test', :token => 'foo')
       lambda { connection.get('/rooms.json') }.should raise_error(Tinder::AuthenticationFailed)
     end
     
     it "should lookup token when username/password provided" do
-      FakeWeb.register_uri(:get, "https://user:pass@test.campfirenow.com/users/me.json",
-        :body => fixture('users/me.json'), :content_type => "application/json")
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/users/me.json") {[ 200, {}, fixture('users/me.json') ]}
+      end
+
       connection = Tinder::Connection.new('test', :username => 'user', :password => 'pass')
       connection.token.should.should == "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     end
     
     
     it "should use basic auth for credentials" do
-      FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/rooms.json",
-        :body => fixture('rooms.json'), :content_type => "application/json")
+      stub_connection(Tinder::Connection) do |stub|
+        stub.get("/rooms.json") {[ 200, {}, fixture('rooms.json') ]}
+      end
       connection = Tinder::Connection.new('test', :token => 'mytoken')
       lambda { connection.get('/rooms.json') }.should_not raise_error
     end
   end
-  
-  
 end

data/spec/tinder/room_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe Tinder::Room do
   before do
-    FakeWeb.register_uri(:get, "https://mytoken:X@test.campfirenow.com/room/80749.json",
-      :body => fixture('rooms/show.json'), :content_type => "application/json")
-    @room = Tinder::Room.new(Tinder::Connection.new('test', :token => 'mytoken'), 'id' => 80749)
+    @connection = Tinder::Connection.new('test', :token => 'mytoken')
+
+    stub_connection(@connection) do |stub|
+      stub.get('/room/80749.json') {[ 200, {}, fixture('rooms/show.json') ]}
+    end
+
+    @room = Tinder::Room.new(@connection, 'id' => 80749)
 
     # Get EventMachine out of the way. We could be using em-spec, but seems like overkill
     require 'twitter/json_stream'
@@ -15,7 +19,12 @@ describe Tinder::Room do
   end
 
   describe "join" do
-    FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/join.json", :status => '200')
+    before do
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+      end
+    end
+
 
     it "should post to join url" do
       @room.join
@@ -24,7 +33,9 @@ describe Tinder::Room do
 
   describe "leave" do
     before do
-      FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/leave.json", :status => '200')
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/leave.json') {[ 200, {}, "" ]}
+      end
     end
 
     it "should post to leave url" do
@@ -39,7 +50,9 @@ describe Tinder::Room do
 
   describe "lock" do
     before do
-      FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/lock.json", :status => '200')
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/lock.json') {[ 200, {}, "" ]}
+      end
     end
 
     it "should post to lock url" do
@@ -49,7 +62,9 @@ describe Tinder::Room do
 
   describe "unlock" do
     before do
-      FakeWeb.register_uri(:post, "https://mytoken:X@test.campfirenow.com/room/80749/unlock.json", :status => '200')
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/unlock.json') {[ 200, {}, "" ]}
+      end
     end
 
     it "should post to unlock url" do
@@ -79,13 +94,21 @@ describe Tinder::Room do
 
   describe "name=" do
     it "should put to update the room" do
-      FakeWeb.register_uri(:put, "https://mytoken:X@test.campfirenow.com/room/80749.json",
-        :status => '200')
+      stub_connection(@connection) do |stub|
+        stub.put('/room/80749.json') {[ 200, {}, "" ]}
+      end
+
       @room.name = "Foo"
     end
   end
 
   describe "listen" do
+    before do
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+      end
+    end
+
     it "should get from the streaming url" do
       Twitter::JSONStream.should_receive(:connect).
         with({:host=>"streaming.campfirenow.com", :path=>"/room/80749/live.json", :auth=>"mytoken:X", :timeout=>6, :ssl=>true}).
@@ -109,6 +132,10 @@ describe Tinder::Room do
 
   describe "stop_listening" do
     before do
+      stub_connection(@connection) do |stub|
+        stub.post('/room/80749/join.json') {[ 200, {}, "" ]}
+      end
+
       Twitter::JSONStream.stub!(:connect).and_return(@stream)
       @stream.stub!(:stop)
     end

data/tinder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tinder}
-  s.version = "1.4.1"
+  s.version = "1.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2010-10-09}
+  s.date = %q{2010-11-13}
   s.description = %q{A Ruby API for interfacing with Campfire, the 37Signals chat application.}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      "lib/tinder.rb",
      "lib/tinder/campfire.rb",
      "lib/tinder/connection.rb",
-     "lib/tinder/multipart.rb",
+     "lib/tinder/middleware.rb",
      "lib/tinder/room.rb",
      "site/index.html",
      "site/stylesheets/style.css",
@@ -61,7 +61,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<twitter-stream>, [">= 0"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
@@ -69,7 +70,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<faraday>, ["~> 0.5.1"])
+      s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<twitter-stream>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
@@ -78,7 +80,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<faraday>, ["~> 0.5.1"])
+    s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<twitter-stream>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -04:00
+date: 2010-11-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,19 +30,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: faraday
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: multipart-post
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -54,7 +56,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: twitter-stream
+  name: mime-types
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -66,7 +68,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: twitter-stream
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -78,7 +80,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: eventmachine
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -87,10 +89,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -101,6 +103,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: A Ruby API for interfacing with Campfire, the 37Signals chat application.
 email: brandon@opensoul.org
 executables: []
@@ -120,7 +134,7 @@ files:
 - lib/tinder.rb
 - lib/tinder/campfire.rb
 - lib/tinder/connection.rb
-- lib/tinder/multipart.rb
+- lib/tinder/middleware.rb
 - lib/tinder/room.rb
 - site/index.html
 - site/stylesheets/style.css

data/lib/tinder/multipart.rb

@@ -1,63 +0,0 @@
-require 'mime/types'
-require 'net/http'
-require 'cgi'
-
-module Multipart #:nodoc:
-  # From: http://deftcode.com/code/flickr_upload/multipartpost.rb
-  ## Helper class to prepare an HTTP POST request with a file upload
-  ## Mostly taken from
-  #http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/113774
-  ### WAS:
-  ## Anything that's broken and wrong probably the fault of Bill Stilwell
-  ##(bill@marginalia.org)
-  ### NOW:
-  ## Everything wrong is due to keith@oreilly.com
-
-  class Param #:nodoc:
-    attr_accessor :k, :v
-    def initialize(k, v)
-      @k = k
-      @v = v
-    end
-
-    def to_multipart
-      "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n"
-    end
-  end
-
-  class FileParam #:nodoc:
-    attr_accessor :k, :filename, :content
-    def initialize(k, filename, content)
-      @k = k
-      @filename = filename
-      @content = content
-    end
-
-    def to_multipart
-      "Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{filename}\"\r\n" +
-        "Content-Transfer-Encoding: binary\r\n" +
-        "Content-Type: #{MIME::Types.type_for(@filename)}\r\n\r\n" +
-        @content + "\r\n"
-    end
-  end
-
-  class MultipartPost #:nodoc:
-    BOUNDARY = 'campfire-is-awesome'
-    HEADER = {"Content-type" => "multipart/form-data, boundary=" + BOUNDARY + " "}
-    TIMEOUT_SECONDS = 30
-
-    attr_accessor :params, :query, :headers
-    def initialize(params)
-      @params = params
-      @query = {}
-      self.prepare_query
-    end
-
-    def prepare_query()
-      @query = @params.map do |k,v|
-        param = v.respond_to?(:read) ? FileParam.new(k, v.path, v.read) : Param.new(k, v)
-        "--#{BOUNDARY}\r\n#{param.to_multipart}"
-      end.join("") + "--#{BOUNDARY}--"
-    end
-  end
-end