hello_sign 1.0.0 → 1.0.1

data/lib/hello_sign.rb

@@ -13,7 +13,7 @@ module HelloSign
     delegate [:account, :signature_request, :reusable_form, :team, :unclaimed_draft] => :client
 
     def client
-      @client = client_source.new(email_address, password) unless credentials_match?
+      @client = HelloSign::Client.new(email_address, password) unless credentials_match?
       @client
     end
 
@@ -27,10 +27,6 @@ module HelloSign
       @client && [@client.email_address, @client.password].hash == [email_address, password].hash
     end
 
-    def client_source
-      @client_source || HelloSign::Client
-    end
-
     Faraday.register_middleware :response, raise_error: HelloSign::Middleware::RaiseError
 
   end

data/lib/hello_sign/client.rb

@@ -42,7 +42,9 @@ module HelloSign
     end
 
     def base_connection
-      Faraday.new(url: API_ENDPOINT) do |connection|
+      options = {url: API_ENDPOINT, headers: {user_agent: "hello_sign gem v#{HelloSign::VERSION}"}}
+
+      Faraday.new(options) do |connection|
         yield connection
 
         connection.request  :multipart

data/lib/hello_sign/file.rb

@@ -0,0 +1,36 @@
+require 'hello_sign/file/mime_types'
+require 'faraday/upload_io'
+
+module HelloSign
+  class File
+    DEFAULT_MIME_TYPE = MIME_TYPES.fetch('txt')
+
+    attr_reader :filename, :io_object, :mime_type
+
+    def initialize(file_data)
+      @filename  = file_data[:filename]
+      @io_object = file_data[:io]
+      @mime_type = file_data[:mime]
+    end
+
+    def attachment
+      Faraday::UploadIO.new(*parameters)
+    end
+
+    private
+
+    def parameters
+      begin
+        io_object ? [io_object, mime_type, filename] : [filename, mime_type]
+      end.compact
+    end
+
+    def mime_type
+      @mime_type or begin
+        extension = (filename || '').split('.').last
+        MIME_TYPES.fetch(extension) { DEFAULT_MIME_TYPE }
+      end
+    end
+
+  end
+end

data/lib/hello_sign/{upload_io.rb → file/mime_types.rb}

@@ -1,8 +1,5 @@
-require 'faraday/upload_io'
-require 'hello_sign/error'
-
 module HelloSign
-  class UploadIO
+  class File
     MIME_TYPES = {
       'doc'  => 'application/msword',
       'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
@@ -20,37 +17,5 @@ module HelloSign
       'xls'  => 'application/vnd.ms-excel',
       'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
     }
-
-    attr_reader :filename, :io_object
-
-    def initialize(file_data)
-      @filename  = file_data[:filename]
-      @io_object = file_data[:io]
-      @mime_type = file_data[:mime]
-    end
-
-    def upload
-      file_converter_source.new(*parameters)
-    end
-
-    private
-
-    def parameters
-      begin
-        io_object ? [io_object, mime_type, filename] : [filename, mime_type]
-      end.compact
-    end
-
-    def mime_type
-      @mime_type or begin
-        extension = (filename || '').split('.').last
-        MIME_TYPES.fetch(extension) { 'text/plain' }
-      end
-    end
-
-    def file_converter_source
-      @file_converter_source || Faraday::UploadIO
-    end
-
   end
 end

data/lib/hello_sign/parameters/signature_request.rb

@@ -1,10 +1,10 @@
-require 'hello_sign/upload_io'
+require 'hello_sign/file'
 
 module HelloSign
   module Parameters
     class SignatureRequest
       attr_accessor :title, :subject, :message, :ccs
-      attr_writer :signers, :files, :upload_io_source
+      attr_writer :signers, :files
 
       def signers
         (@signers || {}).each_with_index.inject({}) do |parameter, (signer, index)|
@@ -20,7 +20,7 @@ module HelloSign
 
       def files
         (@files || {}).each_with_index.inject({}) do |parameter, (file_data, index)|
-          parameter[index + 1] = upload_io_source.new(file_data).upload
+          parameter[index + 1] = HelloSign::File.new(file_data).attachment
           parameter
         end
       end
@@ -36,12 +36,6 @@ module HelloSign
         }
       end
 
-      private
-
-      def upload_io_source
-        @upload_io_source || HelloSign::UploadIO
-      end
-
     end
   end
 end

data/lib/hello_sign/parameters/unclaimed_draft.rb

@@ -1,9 +1,9 @@
-require 'hello_sign/upload_io'
+require 'hello_sign/file'
 
 module HelloSign
   module Parameters
     class UnclaimedDraft
-      attr_writer :files, :upload_io_source
+      attr_writer :files
 
       def formatted
         {file: files}
@@ -13,15 +13,11 @@ module HelloSign
 
       def files
         @files.each_with_index.inject({}) do |parameter, (file_data, index)|
-          parameter[index] = upload_io_source.new(file_data).upload
+          parameter[index] = HelloSign::File.new(file_data).attachment
           parameter
         end
       end
 
-      def upload_io_source
-        @upload_io_source || HelloSign::UploadIO
-      end
-
     end
   end
 end

data/lib/hello_sign/proxy.rb

@@ -6,50 +6,25 @@ require 'hello_sign/proxy/unclaimed_draft'
 
 module HelloSign
   module Proxy
-    attr_writer :account_proxy_source, :signature_request_proxy_source,
-      :reusable_form_proxy_source, :team_proxy_source,
-      :unclaimed_draft_proxy_source
 
     def account
-      account_proxy_source.new(self)
+      HelloSign::Proxy::Account.new(self)
     end
 
     def signature_request(request_id = nil)
-      signature_request_proxy_source.new(self, request_id)
+      HelloSign::Proxy::SignatureRequest.new(self, request_id)
     end
 
     def reusable_form(form_id = nil)
-      reusable_form_proxy_source.new(self, form_id)
+      HelloSign::Proxy::ReusableForm.new(self, form_id)
     end
 
     def team
-      team_proxy_source.new(self)
+      HelloSign::Proxy::Team.new(self)
     end
 
     def unclaimed_draft
-      unclaimed_draft_proxy_source.new(self)
-    end
-
-    private
-
-    def account_proxy_source
-      @account_proxy_source || HelloSign::Proxy::Account
-    end
-
-    def signature_request_proxy_source
-      @signature_request_proxy_source || HelloSign::Proxy::SignatureRequest
-    end
-
-    def reusable_form_proxy_source
-      @reusable_form_proxy_source || HelloSign::Proxy::ReusableForm
-    end
-
-    def team_proxy_source
-      @team_proxy_source || HelloSign::Proxy::Team
-    end
-
-    def unclaimed_draft_proxy_source
-      @unclaimed_draft_proxy_source || HelloSign::Proxy::UnclaimedDraft
+      HelloSign::Proxy::UnclaimedDraft.new(self)
     end
 
   end

data/lib/hello_sign/proxy/account.rb

@@ -4,7 +4,6 @@ module HelloSign
   module Proxy
     class Account
       attr_reader :client
-      attr_writer :settings_proxy_source
 
       def initialize(client)
         @client = client
@@ -15,13 +14,7 @@ module HelloSign
       end
 
       def settings
-        settings_proxy_source.new(client)
-      end
-
-      private
-
-      def settings_proxy_source
-        @settings_proxy_source || HelloSign::Proxy::Settings
+        HelloSign::Proxy::Settings.new(client)
       end
 
     end

data/lib/hello_sign/proxy/signature_request.rb

@@ -5,7 +5,6 @@ module HelloSign
   module Proxy
     class SignatureRequest
       attr_reader :client, :request_id
-      attr_writer :request_parameters, :reusable_form_request_parameters
 
       def initialize(client, request_id)
         @client = client

data/lib/hello_sign/proxy/unclaimed_draft.rb

@@ -4,7 +4,6 @@ module HelloSign
   module Proxy
     class UnclaimedDraft
       attr_reader :client
-      attr_writer :draft_parameters
 
       def initialize(client)
         @client = client

data/lib/hello_sign/version.rb

@@ -1,3 +1,3 @@
 module HelloSign
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/integration/hello_sign_spec.rb

@@ -17,6 +17,12 @@ describe HelloSign do
       HelloSign.client.get('/resource')
       expect(a_get_with_auth('/resource')).to have_been_made
     end
+
+    example do
+      HelloSign.client.get('/resource')
+      headers = {'User-Agent' => "hello_sign gem v#{HelloSign::VERSION}"}
+      expect(a_get_with_auth('/resource').with(headers: headers)).to have_been_made
+    end
   end
 
   describe "#post" do

data/spec/shared_examples/proxy.rb

@@ -1,58 +1,47 @@
 shared_examples_for 'a proxy' do
-  let(:proxy_source) { double('proxy source') }
   let(:proxy)        { double('proxy') }
 
   describe "#account" do
-    before { client.account_proxy_source = proxy_source }
-
     it "returns an account proxy" do
-      proxy_source.should_receive(:new).with(client).and_return(proxy)
+      HelloSign::Proxy::Account.should_receive(:new).with(client).and_return(proxy)
       expect(client.account).to eq proxy
     end
   end
 
   describe "#signature_request" do
-    before { client.signature_request_proxy_source = proxy_source }
-
     it "returns a signature request proxy" do
-      proxy_source.should_receive(:new).with(client, nil).and_return(proxy)
+      HelloSign::Proxy::SignatureRequest.should_receive(:new).with(client, nil).and_return(proxy)
       expect(client.signature_request).to eq proxy
     end
 
     it "passes on an optional signature request ID" do
-      proxy_source.should_receive(:new).with(client, 'signature_request_id')
+      HelloSign::Proxy::SignatureRequest.should_receive(:new).with(client, 'signature_request_id')
       client.signature_request('signature_request_id')
     end
   end
 
   describe "#reusable_form" do
-    before { client.reusable_form_proxy_source = proxy_source }
-
     it "returns a reusable form proxy" do
-      proxy_source.should_receive(:new).with(client, nil).and_return(proxy)
+      HelloSign::Proxy::ReusableForm.should_receive(:new).with(client, nil).and_return(proxy)
       expect(client.reusable_form).to eq proxy
     end
 
     it "passes on an optional reusable form ID" do
-      proxy_source.should_receive(:new).with(client, 'reusable_form_id')
+      HelloSign::Proxy::ReusableForm.should_receive(:new).with(client, 'reusable_form_id')
       client.reusable_form('reusable_form_id')
     end
   end
 
   describe "#team" do
-    before { client.team_proxy_source = proxy_source }
-
     it "returns a team proxy" do
-      proxy_source.should_receive(:new).with(client).and_return(proxy)
+      HelloSign::Proxy::Team.should_receive(:new).with(client).and_return(proxy)
       expect(client.team).to eq proxy
     end
   end
 
   describe "#unclaimed_draft" do
-    before { client.unclaimed_draft_proxy_source = proxy_source }
-
     it "returns an unclaimed draft proxy" do
-      proxy_source.should_receive(:new).with(client).and_return(proxy)
+      HelloSign::Proxy::UnclaimedDraft.should_receive(:new).with(client).and_return(proxy)
       expect(client.unclaimed_draft).to eq proxy
     end
   end

data/spec/unit/client_spec.rb

@@ -7,9 +7,6 @@ describe HelloSign::Client do
   let(:password)      { double('password') }
   subject(:hs_client) { HelloSign::Client.new(email_address, password) }
 
-  its(:email_address) { should eq email_address }
-  its(:password)      { should eq password }
-
   it_behaves_like 'a proxy' do
     let(:client) { hs_client }
   end
@@ -47,9 +44,6 @@ describe HelloSign::Client do
   context "when a hash is passed to the constructor" do
     subject(:hs_client) { HelloSign::Client.new(email_address: email_address, password: password) }
 
-    its(:email_address) { should eq email_address }
-    its(:password)      { should eq password }
-
     it "raises an exception if an email address is not provided" do
       expect { HelloSign::Client.new(password: 'space') }.to raise_error ArgumentError
     end

data/spec/unit/hello_sign_spec.rb

@@ -10,24 +10,11 @@ describe HelloSign do
     HelloSign.password      = password
   end
 
-  its(:email_address) { should eq email_address }
-  its(:password)      { should eq password }
-
   describe "::client" do
-    let(:client_source) { double('client_source') }
-    let(:client)        { double('client') }
-
-    before do
-      HelloSign._set_internal_collaborator(:client_source, client_source)
-      client_source.stub(:new).and_return(client)
-    end
-
-    after { HelloSign.instance_variable_set(:@client, nil) }
-
-    its(:client) { should be client }
+    let(:client) { double('client') }
 
     it "passes the credentials when creating the client" do
-      client_source.should_receive(:new).with(email_address, password)
+      HelloSign::Client.should_receive(:new).with(email_address, password)
       HelloSign.client
     end
 
@@ -35,12 +22,14 @@ describe HelloSign do
       let(:new_client) { double('new client') }
 
       before do
-        client_source.stub(:new).and_return(client, new_client)
+        HelloSign::Client.stub(:new).and_return(client, new_client)
         client.stub(:email_address).and_return(email_address)
         client.stub(:password).and_return(password)
         HelloSign.client
       end
 
+      after { HelloSign.instance_variable_set(:@client, nil) }
+
       its(:client) { should be client }
 
       context "and the credentials change" do
@@ -55,13 +44,9 @@ describe HelloSign do
   end
 
   context "when calling delegated methods" do
-    let(:client_source) { double('client_source') }
     let(:client)        { double('client') }
 
-    before do
-      HelloSign._set_internal_collaborator(:client_source, client_source)
-      client_source.stub(:new).and_return(client)
-    end
+    before { HelloSign::Client.stub(:new).and_return(client) }
 
     after { HelloSign.instance_variable_set(:@client, nil) }
 

data/spec/unit/parameters/signature_request_spec.rb

@@ -4,19 +4,16 @@ require 'hello_sign/parameters/signature_request'
 describe HelloSign::Parameters::SignatureRequest do
   describe "#formatted" do
     let(:request_parameters) { HelloSign::Parameters::SignatureRequest.new }
-    let(:upload_io_source)   { double('upload IO source') }
     let(:text_file)          { double('text file') }
     let(:image_file)         { double('image file') }
 
-    before { request_parameters.upload_io_source = upload_io_source }
-
     context "when all required arguments are set" do
       let(:expected) do
         {
           title: 'Lease',
           subject: 'Sign this',
           message: 'You must sign this.',
-          cc_email_addresses: ['lawyer@lawfirm.com', 'spouse@family.com'], # BUGBUG: should have explicit indexes
+          cc_email_addresses: ['lawyer@lawfirm.com', 'spouse@family.com'],
           signers: {
             0 => {name: 'Jack', email_address: 'jack@hill.com', order: 0}, 
             1 => {name: 'Jill', email_address: 'jill@hill.com', order: 1}
@@ -41,9 +38,9 @@ describe HelloSign::Parameters::SignatureRequest do
       end
 
       it "returns formatted parameters" do
-        upload_io_source.should_receive(:new).with(@file_data_1).and_return(text_file)
-        upload_io_source.should_receive(:new).with(@file_data_2).and_return(image_file)
-        [text_file, image_file].each { |file| file.should_receive(:upload).and_return(file) }
+        HelloSign::File.should_receive(:new).with(@file_data_1).and_return(text_file)
+        HelloSign::File.should_receive(:new).with(@file_data_2).and_return(image_file)
+        [text_file, image_file].each { |file| file.should_receive(:attachment).and_return(file) }
 
         expect(request_parameters.formatted).to eq expected
       end

data/spec/unit/parameters/unclaimed_draft_spec.rb

@@ -4,11 +4,8 @@ require 'hello_sign/parameters/unclaimed_draft'
 require 'stringio'
 
 describe HelloSign::Parameters::UnclaimedDraft do
-  let(:upload_io_source)     { double('upload IO source') }
   subject(:draft_parameters) { HelloSign::Parameters::UnclaimedDraft.new }
 
-  before { draft_parameters.upload_io_source = upload_io_source }
-
   describe "#formatted" do
     let(:text_file) { double('text file') }
     let(:image)     { double('image') }
@@ -21,9 +18,9 @@ describe HelloSign::Parameters::UnclaimedDraft do
     end
 
     it "returns formatted parameters" do
-      upload_io_source.should_receive(:new).with(@file_data_1).and_return(text_file)
-      upload_io_source.should_receive(:new).with(@file_data_2).and_return(image)
-      [text_file, image].each { |file| file.should_receive(:upload).and_return(file) }
+      HelloSign::File.should_receive(:new).with(@file_data_1).and_return(text_file)
+      HelloSign::File.should_receive(:new).with(@file_data_2).and_return(image)
+      [text_file, image].each { |file| file.should_receive(:attachment).and_return(file) }
 
       expect(draft_parameters.formatted).to eq({file: {0 => text_file, 1 => image}})
     end

data/spec/unit/proxy/account_spec.rb

@@ -6,10 +6,7 @@ describe HelloSign::Proxy::Account do
   let(:api_response)      { double('API response') }
   subject(:account_proxy) { HelloSign::Proxy::Account.new(client) }
 
-  its(:client) { should eq client }
-
   describe "#create" do
-
     let(:email_address) { 'david@bowman.com' }
     let(:password)      { 'password' }
 
@@ -35,24 +32,14 @@ describe HelloSign::Proxy::Account do
         )
       ). to eq api_response
     end
-
   end
 
   describe "#settings" do
-
-    let(:settings_proxy_source) { double('settings proxy source') }
     let(:settings_proxy)        { double('settings proxy') }
 
-    before do
-      account_proxy.settings_proxy_source = settings_proxy_source
-    end
-
     it "returns a signature request proxy" do
-      settings_proxy_source.should_receive(:new)
-        .with(client)
-        .and_return(settings_proxy)
+      HelloSign::Proxy::Settings.should_receive(:new).with(client).and_return(settings_proxy)
       expect(account_proxy.settings).to be settings_proxy
     end
-
   end
 end

data/spec/unit/proxy/reusable_form_spec.rb

@@ -13,9 +13,6 @@ describe HelloSign::Proxy::ReusableForm do
     client.stub(:post).and_return(api_response)
   end
 
-  its(:client)  { should eq client }
-  its(:form_id) { should eq form_id }
-
   describe "#list" do
     it "sends a request to fetch the list of reusable forms" do
       client.should_receive(:get).with('/reusable_form/list', params: {page: 10})

data/spec/unit/proxy/signature_request_spec.rb

@@ -12,9 +12,6 @@ describe HelloSign::Proxy::SignatureRequest do
     client.stub(:post).and_return(api_response)
   end
 
-  its(:client)     { should eq client }
-  its(:request_id) { should eq request_id }
-
   describe "#deliver" do
     let(:formatted_request_body) { double('formatted request body') }
     let(:request_parameters)     { double('request parameters') }
@@ -22,7 +19,7 @@ describe HelloSign::Proxy::SignatureRequest do
     before do
       request_parameters.stub(:foo=)
       request_parameters.stub(:formatted).and_return(formatted_request_body)
-      sr_proxy.request_parameters = request_parameters
+      HelloSign::Parameters::SignatureRequest.stub(:new).and_return(request_parameters)
     end
 
     it "yields the request parameters to the block" do
@@ -31,8 +28,7 @@ describe HelloSign::Proxy::SignatureRequest do
     end
 
     it "sends a signature request" do
-      client.should_receive(:post)
-        .with('/signature_request/send', body: formatted_request_body)
+      client.should_receive(:post).with('/signature_request/send', body: formatted_request_body)
       sr_proxy.deliver { |params| params.foo = 'bar' }
     end
 
@@ -43,7 +39,7 @@ describe HelloSign::Proxy::SignatureRequest do
     context "when a reusable form is specified" do
       before do
         request_parameters.stub(:reusable_form_id=)
-        sr_proxy.reusable_form_request_parameters = request_parameters
+        HelloSign::Parameters::ReusableFormSignatureRequest.stub(:new).and_return(request_parameters)
       end
 
       it "sets the reusable form ID in the request parameters" do
@@ -52,8 +48,7 @@ describe HelloSign::Proxy::SignatureRequest do
       end
 
       it "sends a reusable form signature request" do
-        client.should_receive(:post)
-          .with('/signature_request/send_with_reusable_form', body: formatted_request_body)
+        client.should_receive(:post).with('/signature_request/send_with_reusable_form', body: formatted_request_body)
         sr_proxy.deliver(form: 'form_id') {}
       end
 
@@ -77,8 +72,7 @@ describe HelloSign::Proxy::SignatureRequest do
   describe "#list" do
     context "when called without a page number" do
       it "fetches the first page of signature requests" do
-        client.should_receive(:get)
-          .with('/signature_request/list', params: {page: 1})
+        client.should_receive(:get).with('/signature_request/list', params: {page: 1})
         sr_proxy.list
       end
 
@@ -90,8 +84,7 @@ describe HelloSign::Proxy::SignatureRequest do
 
     context "when called with a page number" do
       it "fetches a list of signature requests from the specified page" do
-        client.should_receive(:get)
-          .with('/signature_request/list', params: {page: 10})
+        client.should_receive(:get).with('/signature_request/list', params: {page: 10})
         sr_proxy.list(page: 10)
       end
 
@@ -106,8 +99,7 @@ describe HelloSign::Proxy::SignatureRequest do
     let(:email) { 'john@johnson.com' }
 
     it "sends a signature request reminder" do
-      client.should_receive(:post)
-        .with("/signature_request/remind/#{request_id}", body: {email_address: email})
+      client.should_receive(:post).with("/signature_request/remind/#{request_id}", body: {email_address: email})
       sr_proxy.remind(email: email)
     end
 

data/spec/unit/proxy/team_spec.rb

@@ -11,10 +11,7 @@ describe HelloSign::Proxy::Team do
     client.stub(:post).and_return(api_response)
   end
 
-  its(:client) { should eq client }
-
   describe "#create" do
-
     let(:name) { 'The Browncoats' }
 
     it "sends a request to create a team" do
@@ -25,11 +22,9 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.create(name: name)).to eq api_response
     end
-
   end
 
   describe "#show" do
-
     it "sends a request to fetch the team information" do
       client.should_receive(:get).with('/team')
       team_proxy.show
@@ -38,11 +33,9 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.show).to eq api_response
     end
-
   end
 
   describe "#update" do
-
     let(:new_name) { 'The Bluecoats' }
 
     it "sends a request to update the team information" do
@@ -53,11 +46,9 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.update(name: new_name)).to eq api_response
     end
-
   end
 
   describe "#destroy" do
-
     it "sends a request to destroy the team" do
       client.should_receive(:post).with('/team/destroy')
       team_proxy.destroy
@@ -66,11 +57,9 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.destroy).to eq api_response
     end
-
   end
 
   describe "#add_member" do
-
     let(:email_address) { 'john@johnson.com' }
 
     it "sends a request to add the member to the team" do
@@ -81,11 +70,9 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.add_member(email_address: email_address)).to eq api_response
     end
-
   end
 
   describe "#remove_member" do
-
     let(:email_address) { 'john@johnson.com' }
 
     it "sends a request to remove the member from the team" do
@@ -96,6 +83,5 @@ describe HelloSign::Proxy::Team do
     it "returns the API response" do
       expect(team_proxy.remove_member(email_address: email_address)).to eq api_response
     end
-
   end
 end

data/spec/unit/proxy/unclaimed_draft_spec.rb

@@ -6,19 +6,15 @@ describe HelloSign::Proxy::UnclaimedDraft do
   let(:api_response) { double('API response') }
   subject(:ud_proxy) { HelloSign::Proxy::UnclaimedDraft.new(client) }
 
-  its(:client) { should eq client }
-
   describe "#create" do
     let(:formatted_request_body) { double('formatted request body') }
     let(:draft_parameters)       { double('draft parameters') }
 
     before do
-      ud_proxy.draft_parameters = draft_parameters
+      HelloSign::Parameters::UnclaimedDraft.stub(:new).and_return(draft_parameters)
       draft_parameters.stub(:formatted).and_return(formatted_request_body)
       draft_parameters.should_receive(:foo=).with('bar')
-      client.should_receive(:post)
-        .with('/unclaimed_draft/create', body: formatted_request_body)
-        .and_return(api_response)
+      client.should_receive(:post).with('/unclaimed_draft/create', body: formatted_request_body).and_return(api_response)
     end
 
     it "sends a unclaimed draft creation request and returns the result" do

data/spec/unit/upload_io_spec.rb

@@ -1,60 +1,57 @@
 require 'helper'
-require 'hello_sign/upload_io'
+require 'hello_sign/file'
 
-describe HelloSign::UploadIO do
-  let(:upload_file) { double('upload file') }
-  let(:io_object)   { double('IO object') }
-  let(:file_converter_source) { double('file converter source') }
+describe HelloSign::File do
+  let(:attachment) { double('attachment') }
+  let(:io_object)  { double('IO object') }
 
-  before { HelloSign::UploadIO.any_instance.stub(:file_converter_source).and_return(file_converter_source) }
+  it "returns the attachment" do
+    Faraday::UploadIO.stub(:new).and_return(attachment)
 
-  it "returns the upload file" do
-    file_converter_source.stub(:new).and_return(upload_file)
-
-    expect(HelloSign::UploadIO.new(filename: 'test.txt').upload).to eq upload_file
+    expect(HelloSign::File.new(filename: 'test.txt').attachment).to eq attachment
   end
 
   context "#upload" do
     specify do
-      file_converter_source.should_receive(:new).with('test.txt', 'text/plain')
+      Faraday::UploadIO.should_receive(:new).with('test.txt', 'text/plain')
 
-      HelloSign::UploadIO.new(filename: 'test.txt').upload
+      HelloSign::File.new(filename: 'test.txt').attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with('test.foo', 'text/plain')
+      Faraday::UploadIO.should_receive(:new).with('test.foo', 'text/plain')
 
-      HelloSign::UploadIO.new(filename: 'test.foo').upload
+      HelloSign::File.new(filename: 'test.foo').attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with('test.baz', 'fake/mime')
+      Faraday::UploadIO.should_receive(:new).with('test.baz', 'fake/mime')
 
-      HelloSign::UploadIO.new(filename: 'test.baz', mime: 'fake/mime').upload
+      HelloSign::File.new(filename: 'test.baz', mime: 'fake/mime').attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with(io_object, 'text/plain')
+      Faraday::UploadIO.should_receive(:new).with(io_object, 'text/plain')
 
-      HelloSign::UploadIO.new(io: io_object).upload
+      HelloSign::File.new(io: io_object).attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with(io_object, 'fake/mime')
+      Faraday::UploadIO.should_receive(:new).with(io_object, 'fake/mime')
 
-      HelloSign::UploadIO.new(io: io_object, mime: 'fake/mime').upload
+      HelloSign::File.new(io: io_object, mime: 'fake/mime').attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with(io_object, 'fake/mime', 'test.foo')
+      Faraday::UploadIO.should_receive(:new).with(io_object, 'fake/mime', 'test.foo')
 
-      HelloSign::UploadIO.new(filename: 'test.foo', io: io_object, mime: 'fake/mime').upload
+      HelloSign::File.new(filename: 'test.foo', io: io_object, mime: 'fake/mime').attachment
     end
 
     specify do
-      file_converter_source.should_receive(:new).with(io_object, 'text/plain', 'test.foo')
+      Faraday::UploadIO.should_receive(:new).with(io_object, 'text/plain', 'test.foo')
 
-      HelloSign::UploadIO.new(filename: 'test.foo', io: io_object).upload
+      HelloSign::File.new(filename: 'test.foo', io: io_object).attachment
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hello_sign
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -107,7 +107,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-description: A Ruby interface to the HelloSign API.
+description: A Ruby interface to the HelloSign API
 email:
 - craiglttl@gmail.com
 executables: []
@@ -116,6 +116,8 @@ extra_rdoc_files: []
 files:
 - lib/hello_sign/client.rb
 - lib/hello_sign/error.rb
+- lib/hello_sign/file/mime_types.rb
+- lib/hello_sign/file.rb
 - lib/hello_sign/middleware/raise_error.rb
 - lib/hello_sign/parameters/reusable_form_signature_request.rb
 - lib/hello_sign/parameters/signature_request.rb
@@ -127,7 +129,6 @@ files:
 - lib/hello_sign/proxy/team.rb
 - lib/hello_sign/proxy/unclaimed_draft.rb
 - lib/hello_sign/proxy.rb
-- lib/hello_sign/upload_io.rb
 - lib/hello_sign/version.rb
 - lib/hello_sign.rb
 - spec/fixtures/test.jpg
@@ -178,10 +179,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A Ruby interface to the HelloSign API.
+summary: A Ruby interface to the HelloSign API
 test_files:
 - spec/fixtures/test.jpg
 - spec/fixtures/test.pdf