restforce 0.1.4 → 0.1.5

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3
 script: bundle exec rake

data/lib/restforce.rb

@@ -41,4 +41,13 @@ module Restforce
 
   class AuthenticationError < StandardError; end
   class UnauthorizedError < StandardError; end
+
+  # Add .tap method in Ruby 1.8
+  module CoreExtensions
+    def tap
+      yield self
+      self
+    end
+  end
+  Object.send :include, Restforce::CoreExtensions unless Object.respond_to? :tap
 end

data/lib/restforce/client.rb

@@ -1,8 +1,11 @@
 module Restforce
   class Client
+    OPTIONS = [:username, :password, :security_token, :client_id, :client_secret, :host, :compress,
+       :api_version, :oauth_token, :refresh_token, :instance_url, :cache, :authentication_retries]
+
     # Public: Creates a new client instance
     #
-    # options - A hash of options to be passed in (default: {}).
+    # opts - A hash of options to be passed in (default: {}).
     #           :username               - The String username to use (required for password authentication).
     #           :password               - The String password to use (required for password authentication).
     #           :security_token         - The String security token to use 
@@ -55,15 +58,10 @@ module Restforce
     #   Restforce::Client.new :oauth_token => 'access token',
     #     :instance_url => 'https://na1.salesforce.com'
     #   # => #<Restforce::Client:0x007f934aab9980 @options={ ... }>
-    def initialize(options = {})
-      raise 'Please specify a hash of options' unless options.is_a?(Hash)
-      @options = {}.tap do |options|
-        [:username, :password, :security_token, :client_id, :client_secret, :host, :compress,
-         :api_version, :oauth_token, :refresh_token, :instance_url, :cache, :authentication_retries].each do |option|
-          options[option] = Restforce.configuration.send option
-        end
-      end
-      @options.merge!(options)
+    def initialize(opts = {})
+      raise 'Please specify a hash of options' unless opts.is_a?(Hash)
+      @options = Hash[OPTIONS.map { |option| [option, Restforce.configuration.send(option)] }]
+      @options.merge! opts
     end
 
     # Public: Get the names of all sobjects on the org.
@@ -96,11 +94,9 @@ module Restforce
     # Returns the Hash representation of the describe call.
     def describe(sobject=nil)
       if sobject
-        response = api_get "sobjects/#{sobject.to_s}/describe"
-        response.body
+        api_get("sobjects/#{sobject.to_s}/describe").body
       else
-        response = api_get 'sobjects'
-        response.body['sobjects']
+        api_get('sobjects').body['sobjects']
       end
     end
 
@@ -129,7 +125,7 @@ module Restforce
     # Returns a Restforce::Collection if Restforce.configuration.mashify is true.
     # Returns an Array of Hash for each record in the result if Restforce.configuration.mashify is false.
     def query(soql)
-      response = api_get 'query', q: soql
+      response = api_get 'query', :q => soql
       mashify? ? response.body : response.body['records']
     end
     
@@ -150,8 +146,7 @@ module Restforce
     # Returns a Restforce::Collection if Restforce.configuration.mashify is true.
     # Returns an Array of Hash for each record in the result if Restforce.configuration.mashify is false.
     def search(sosl)
-      response = api_get 'search', q: sosl
-      response.body
+      api_get('search', :q => sosl).body
     end
     
     # Public: Insert a new record.
@@ -176,8 +171,7 @@ module Restforce
     # Returns the String Id of the newly created sobject. Raises an error if
     # something bad happens.
     def create!(sobject, attrs)
-      response = api_post "sobjects/#{sobject}", attrs
-      response.body['id']
+      api_post("sobjects/#{sobject}", attrs).body['id']
     end
     alias_method :insert!, :create!
 

data/lib/restforce/middleware/authentication.rb

@@ -19,7 +19,7 @@ module Restforce
     # Internal: Performs the authentication and returns the response body.
     def authenticate!
       response = connection.post '/services/oauth2/token' do |req|
-        req.body = URI.encode_www_form params
+        req.body = encode_www_form(params)
       end
       raise Restforce::AuthenticationError, error_message(response) if response.status != 200
       @options[:instance_url] = response.body['instance_url']
@@ -46,5 +46,18 @@ module Restforce
     def error_message(response)
       "#{response.body['error']}: #{response.body['error_description']}"
     end
+
+    # Featured detect form encoding.
+    # URI in 1.8 does not include encode_www_form
+    def encode_www_form(params)
+      if URI.respond_to?(:encode_www_form)
+        URI.encode_www_form(params)
+      else
+        params.map do |k, v|
+          k, v = CGI.escape(k.to_s), CGI.escape(v.to_s)
+          "#{k}=#{v}"
+        end.join('&')
+      end
+    end
   end
 end

data/lib/restforce/middleware/logger.rb

@@ -4,7 +4,7 @@ module Restforce
   class Middleware::Logger < Faraday::Response::Middleware
     extend Forwardable
 
-    def initialize(app, logger = nil, options)
+    def initialize(app, logger, options)
       super(app)
       @options = options
       @logger = logger || begin
@@ -17,19 +17,19 @@ module Restforce
 
     def call(env)
       debug('request') do
-        dump url: env[:url].to_s,
-          method: env[:method],
-          headers: env[:request_headers],
-          body: env[:body]
+        dump :url => env[:url].to_s,
+          :method => env[:method],
+          :headers => env[:request_headers],
+          :body => env[:body]
       end
       super
     end
 
     def on_complete(env)
       debug('response') do
-        dump status: env[:status].to_s,
-          headers: env[:response_headers],
-          body: env[:body]
+        dump :status => env[:status].to_s,
+          :headers => env[:response_headers],
+          :body => env[:body]
       end
     end
 

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/restforce.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware', '~> 0.8.8'
   gem.add_dependency 'json', '~> 1.7.5'
   gem.add_dependency 'hashie', '~> 1.2.0'
-  gem.add_dependency 'faye'
+  gem.add_dependency 'faye', '0.8.3'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'webmock'

data/spec/lib/client_spec.rb

@@ -55,7 +55,7 @@ shared_examples_for 'methods' do
 
   describe '.list_sobjects' do
     before do
-      @request = stub_api_request :sobjects, with: 'sobject/describe_sobjects_success_response'
+      @request = stub_api_request :sobjects, :with => 'sobject/describe_sobjects_success_response'
     end
 
     after do
@@ -71,7 +71,7 @@ shared_examples_for 'methods' do
     context 'with no arguments' do
       before do
         @request = stub_api_request :sobjects,
-          with: 'sobject/describe_sobjects_success_response'
+          :with => 'sobject/describe_sobjects_success_response'
       end
 
       after do
@@ -85,7 +85,7 @@ shared_examples_for 'methods' do
     context 'with an argument' do
       before do
         @request = stub_api_request 'sobjects/Whizbang/describe',
-          with: 'sobject/sobject_describe_success_response'
+          :with => 'sobject/sobject_describe_success_response'
       end
 
       after do
@@ -100,7 +100,7 @@ shared_examples_for 'methods' do
   describe '.query' do
     before do
       @request = stub_api_request 'query\?q=SELECT%20some,%20fields%20FROM%20object',
-        with: 'sobject/query_success_response'
+        :with => 'sobject/query_success_response'
     end
 
     after do
@@ -114,7 +114,7 @@ shared_examples_for 'methods' do
   describe '.search' do
     before do
       @request = stub_api_request 'search\?q=FIND%20%7Bbar%7D',
-        with: 'sobject/search_success_response'
+        :with => 'sobject/search_success_response'
     end
 
     after do
@@ -129,7 +129,7 @@ shared_examples_for 'methods' do
   describe '.org_id' do
     before do
       @request = stub_api_request 'query\?q=select%20id%20from%20Organization',
-        with: 'sobject/org_query_response'
+        :with => 'sobject/org_query_response'
     end
 
     after do
@@ -144,32 +144,32 @@ shared_examples_for 'methods' do
     context 'without multipart' do
       before do
         @request = stub_api_request 'sobjects/Account',
-          with: 'sobject/create_success_response',
-          method: :post,
-          body: "{\"Name\":\"Foobar\"}"
+          :with => 'sobject/create_success_response',
+          :method => :post,
+          :body => "{\"Name\":\"Foobar\"}"
       end
 
       after do
         @request.should have_been_requested
       end
 
-      subject { client.create('Account', Name: 'Foobar') }
+      subject { client.create('Account', :Name => 'Foobar') }
       it { should eq 'some_id' }
     end
 
     context 'with multipart' do
       before do
         @request = stub_api_request 'sobjects/Account',
-          with: 'sobject/create_success_response',
-          method: :post,
-          body: %r(----boundary_string\r\nContent-Disposition: form-data; name=\"entity_content\";\r\nContent-Type: application/json\r\n\r\n{\"Name\":\"Foobar\"}\r\n----boundary_string\r\nContent-Disposition: form-data; name=\"Blob\"; filename=\"blob.jpg\"\r\nContent-Length: 42171\r\nContent-Type: image/jpeg\r\nContent-Transfer-Encoding: binary)
+          :with => 'sobject/create_success_response',
+          :method => :post,
+          :body => %r(----boundary_string\r\nContent-Disposition: form-data; name=\"entity_content\";\r\nContent-Type: application/json\r\n\r\n{\"Name\":\"Foobar\"}\r\n----boundary_string\r\nContent-Disposition: form-data; name=\"Blob\"; filename=\"blob.jpg\"\r\nContent-Length: 42171\r\nContent-Type: image/jpeg\r\nContent-Transfer-Encoding: binary)
       end
 
       after do
         @request.should have_been_requested
       end
 
-      subject { client.create('Account', Name: 'Foobar', Blob: Restforce::UploadIO.new(File.expand_path('../../fixtures/blob.jpg', __FILE__), 'image/jpeg')) }
+      subject { client.create('Account', :Name => 'Foobar', :Blob => Restforce::UploadIO.new(File.expand_path('../../fixtures/blob.jpg', __FILE__), 'image/jpeg')) }
       it { should eq 'some_id' }
     end
   end
@@ -178,49 +178,49 @@ shared_examples_for 'methods' do
     context 'with invalid Id' do
       before do
         @request = stub_api_request 'sobjects/Account/001D000000INjVe',
-          with: 'sobject/delete_error_response',
-          method: :patch,
-          body: "{\"Name\":\"Foobar\"}",
-          status: 404
+          :with => 'sobject/delete_error_response',
+          :method => :patch,
+          :body => "{\"Name\":\"Foobar\"}",
+          :status => 404
       end
 
       after do
         @request.should have_been_requested
       end
 
-      subject { client.update!('Account', Id: '001D000000INjVe', Name: 'Foobar') }
+      subject { client.update!('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
       specify { expect { subject }.to raise_error Faraday::Error::ResourceNotFound }
     end
   end
 
   describe '.update' do
     context 'with missing Id' do
-      subject { client.update('Account', Name: 'Foobar') }
+      subject { client.update('Account', :Name => 'Foobar') }
       specify { expect { subject }.to raise_error RuntimeError, 'Id field missing.' }
     end
 
     context 'with invalid Id' do
       before do
         @request = stub_api_request 'sobjects/Account/001D000000INjVe',
-          with: 'sobject/delete_error_response',
-          method: :patch,
-          body: "{\"Name\":\"Foobar\"}",
-          status: 404
+          :with => 'sobject/delete_error_response',
+          :method => :patch,
+          :body => "{\"Name\":\"Foobar\"}",
+          :status => 404
       end
 
       after do
         @request.should have_been_requested
       end
 
-      subject { client.update('Account', Id: '001D000000INjVe', Name: 'Foobar') }
+      subject { client.update('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
       it { should be_false }
     end
 
     context 'with success' do
       before do
         @request = stub_api_request 'sobjects/Account/001D000000INjVe',
-          method: :patch,
-          body: "{\"Name\":\"Foobar\"}"
+          :method => :patch,
+          :body => "{\"Name\":\"Foobar\"}"
       end
 
       after do
@@ -228,7 +228,7 @@ shared_examples_for 'methods' do
       end
 
       context 'with symbol Id key' do
-        subject { client.update('Account', Id: '001D000000INjVe', Name: 'Foobar') }
+        subject { client.update('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
         it { should be_true }
       end
 
@@ -243,8 +243,8 @@ shared_examples_for 'methods' do
     context 'when updated' do
       before do
         @request = stub_api_request 'sobjects/Account/External__c/foobar',
-          method: :patch,
-          body: "{\"Name\":\"Foobar\"}"
+          :method => :patch,
+          :body => "{\"Name\":\"Foobar\"}"
       end
 
       after do
@@ -252,7 +252,7 @@ shared_examples_for 'methods' do
       end
 
       context 'with symbol external Id key' do
-        subject { client.upsert!('Account', 'External__c', External__c: 'foobar', Name: 'Foobar') }
+        subject { client.upsert!('Account', 'External__c', :External__c => 'foobar', :Name => 'Foobar') }
         it { should be_true }
       end
 
@@ -265,9 +265,9 @@ shared_examples_for 'methods' do
     context 'when created' do
       before do
         @request = stub_api_request 'sobjects/Account/External__c/foobar',
-          method: :patch,
-          body: "{\"Name\":\"Foobar\"}",
-          with: 'sobject/upsert_created_success_response'
+          :method => :patch,
+          :body => "{\"Name\":\"Foobar\"}",
+          :with => 'sobject/upsert_created_success_response'
       end
 
       after do
@@ -275,7 +275,7 @@ shared_examples_for 'methods' do
       end
 
       context 'with symbol external Id key' do
-        subject { client.upsert!('Account', 'External__c', External__c: 'foobar', Name: 'Foobar') }
+        subject { client.upsert!('Account', 'External__c', :External__c => 'foobar', :Name => 'Foobar') }
         it { should eq 'foo' }
       end
 
@@ -292,9 +292,9 @@ shared_examples_for 'methods' do
     context 'with invalid Id' do
       before do
         @request = stub_api_request 'sobjects/Account/001D000000INjVe',
-          with: 'sobject/delete_error_response',
-          method: :delete,
-          status: 404
+          :with => 'sobject/delete_error_response',
+          :method => :delete,
+          :status => 404
       end
 
       after do
@@ -306,7 +306,7 @@ shared_examples_for 'methods' do
 
     context 'with success' do
       before do 
-        @request = stub_api_request 'sobjects/Account/001D000000INjVe', method: :delete
+        @request = stub_api_request 'sobjects/Account/001D000000INjVe', :method => :delete
       end
 
       after do
@@ -323,9 +323,9 @@ shared_examples_for 'methods' do
     context 'with invalid Id' do
       before do
         @request = stub_api_request 'sobjects/Account/001D000000INjVe',
-          with: 'sobject/delete_error_response',
-          method: :delete,
-          status: 404
+          :with => 'sobject/delete_error_response',
+          :method => :delete,
+          :status => 404
       end
 
       after do
@@ -337,7 +337,7 @@ shared_examples_for 'methods' do
 
     context 'with success' do
       before do 
-        @request = stub_api_request 'sobjects/Account/001D000000INjVe', method: :delete
+        @request = stub_api_request 'sobjects/Account/001D000000INjVe', :method => :delete
       end
 
       after do
@@ -350,9 +350,9 @@ shared_examples_for 'methods' do
 
   describe '.authenticate!' do
     before do
-      @request = stub_login_request(body: "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token")
-        .to_return(status: 200, body: fixture(:auth_success_response))
+      @request = stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
+        "client_secret&username=foo&password=barsecurity_token").
+        to_return(:status => 200, :body => fixture(:auth_success_response))
     end
 
     after do
@@ -409,7 +409,7 @@ shared_examples_for 'methods' do
 
     before do
       @request = stub_api_request 'query\?q=SELECT%20some,%20fields%20FROM%20object',
-        with: 'sobject/query_success_response'
+        :with => 'sobject/query_success_response'
       cache.should_receive(:fetch).never
     end
 
@@ -425,7 +425,7 @@ shared_examples_for 'methods' do
     subject { client.send(:faye) }
 
     context 'with missing oauth token' do
-      let(:instance_url) { 'foobar' }
+      let(:instance_url) { 'http://foobar' }
       let(:oauth_token) { nil }
       specify { expect { subject }.to raise_error RuntimeError, 'OAuth token missing. Call .authenticate! first.' }
     end
@@ -436,7 +436,7 @@ shared_examples_for 'methods' do
     end
 
     context 'with oauth token and instance url' do
-      let(:instance_url) { 'foo' }
+      let(:instance_url) { 'http://foobar' }
       let(:oauth_token) { 'bar' }
       specify { expect { subject }.to_not raise_error }
     end
@@ -446,11 +446,11 @@ shared_examples_for 'methods' do
     context 'when retries reaches 0' do
       before do
         @auth_request = stub_api_request('query\?q=SELECT%20some,%20fields%20FROM%20object',
-          status: 401,
-          with: 'expired_session_response')
-        @query_request = stub_login_request(body: "grant_type=password&client_id=client_id&client_secret=" \
-          "client_secret&username=foo&password=barsecurity_token")
-          .to_return(status: 200, body: fixture(:auth_success_response))
+          :status => 401,
+          :with => 'expired_session_response')
+        @query_request = stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
+          "client_secret&username=foo&password=barsecurity_token").
+          to_return(:status => 200, :body => fixture(:auth_success_response))
       end
 
       subject { client.query('SELECT some, fields FROM object') }
@@ -476,14 +476,14 @@ shared_examples_for 'methods' do
     let(:cache) { MockCache.new }
 
     before do
-      @query = stub_api_request('query\?q=SELECT%20some,%20fields%20FROM%20object')
-        .with(headers: { 'Authorization' => "OAuth #{oauth_token}" })
-        .to_return(status: 401, body: fixture('expired_session_response')).then
-        .to_return(status: 200, body: fixture('sobject/query_success_response'))
+      @query = stub_api_request('query\?q=SELECT%20some,%20fields%20FROM%20object').
+        with(:headers => { 'Authorization' => "OAuth #{oauth_token}" }).
+        to_return(:status => 401, :body => fixture('expired_session_response')).then.
+        to_return(:status => 200, :body => fixture('sobject/query_success_response'))
 
-      @login = stub_login_request(body: "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token")
-        .to_return(status: 200, body: fixture(:auth_success_response))
+      @login = stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
+        "client_secret&username=foo&password=barsecurity_token").
+        to_return(:status => 200, :body => fixture(:auth_success_response))
     end
 
     after do
@@ -511,8 +511,8 @@ describe 'with mashify middleware' do
       context 'with pagination' do
         before do
           @requests = [].tap do |requests|
-            requests << stub_api_request('query\?q', with: 'sobject/query_paginated_first_page_response')
-            requests << stub_api_request('query/01gD', with: 'sobject/query_paginated_last_page_response')
+            requests << stub_api_request('query\?q', :with => 'sobject/query_paginated_first_page_response')
+            requests << stub_api_request('query/01gD', :with => 'sobject/query_paginated_last_page_response')
           end
         end
 

data/spec/lib/collection_spec.rb

@@ -39,7 +39,7 @@ describe Restforce::Collection do
 
       describe '.next_page' do
         before do
-          client.should_receive(:get).and_return(Faraday::Response.new(body: Restforce::Collection.new({'records' => []}, client)))
+          client.should_receive(:get).and_return(Faraday::Response.new(:body => Restforce::Collection.new({'records' => []}, client)))
         end
 
         subject { records.next_page }

data/spec/lib/mash_spec.rb

@@ -5,7 +5,7 @@ describe Restforce::Mash do
     subject { described_class.build(input, nil) }
 
     context 'when array' do
-      let(:input) { [{ foo: 'hello' }, { bar: 'world' }] }
+      let(:input) { [{ :foo => 'hello' }, { :bar => 'world' }] }
       it 'mashifys each child object' do
         subject.each { |obj| obj.should be_a Restforce::Mash }
       end

data/spec/lib/middleware/authentication/password_spec.rb

@@ -6,25 +6,25 @@ describe Restforce::Middleware::Authentication::Password do
   let(:middleware) { described_class.new app, nil, options }
 
   let(:options) do
-    { host: 'login.salesforce.com',
-      username: 'foo',
-      password: 'bar',
-      security_token: 'security_token',
-      client_id: 'client_id',
-      client_secret: 'client_secret' }
+    { :host => 'login.salesforce.com',
+      :username => 'foo',
+      :password => 'bar',
+      :security_token => 'security_token',
+      :client_id => 'client_id',
+      :client_secret => 'client_secret' }
   end
 
   it_behaves_like 'authentication middleware' do
     let(:success_request) do
-      stub_login_request(body: "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token")
-        .to_return(status: 200, body: fixture(:auth_success_response))
+      stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
+        "client_secret&username=foo&password=barsecurity_token").
+        to_return(:status => 200, :body => fixture(:auth_success_response))
     end
 
     let(:fail_request) do
-      stub_login_request(body: "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token")
-        .to_return(status: 400, body: fixture(:auth_error_response))
+      stub_login_request(:body => "grant_type=password&client_id=client_id&client_secret=" \
+        "client_secret&username=foo&password=barsecurity_token").
+        to_return(:status => 400, :body => fixture(:auth_error_response))
     end
   end
 

data/spec/lib/middleware/authentication/token_spec.rb

@@ -6,23 +6,23 @@ describe Restforce::Middleware::Authentication::Token do
   let(:middleware) { described_class.new app, nil, options }
 
   let(:options) do
-    { host: 'login.salesforce.com',
-      refresh_token: 'refresh_token',
-      client_id: 'client_id',
-      client_secret: 'client_secret' }
+    { :host => 'login.salesforce.com',
+      :refresh_token => 'refresh_token',
+      :client_id => 'client_id',
+      :client_secret => 'client_secret' }
   end
 
   it_behaves_like 'authentication middleware' do
     let(:success_request) do
-      stub_login_request(body: "grant_type=refresh_token&refresh_token=refresh_token&" \
-        "client_id=client_id&client_secret=client_secret")
-        .to_return(:status => 200, :body => fixture(:auth_success_response))
+      stub_login_request(:body => "grant_type=refresh_token&refresh_token=refresh_token&" \
+        "client_id=client_id&client_secret=client_secret").
+        to_return(:status => 200, :body => fixture(:auth_success_response))
     end
 
     let(:fail_request) do
-      stub_login_request(body: "grant_type=refresh_token&refresh_token=refresh_token&" \
-        "client_id=client_id&client_secret=client_secret")
-        .to_return(:status => 400, :body => fixture(:refresh_error_response))
+      stub_login_request(:body => "grant_type=refresh_token&refresh_token=refresh_token&" \
+        "client_id=client_id&client_secret=client_secret").
+        to_return(:status => 400, :body => fixture(:refresh_error_response))
     end
   end
 end

data/spec/lib/middleware/authentication_spec.rb

@@ -4,7 +4,7 @@ describe Restforce::Middleware::Authentication do
   let(:app)        { double('app')            }
   let(:env)        { { }  }
   let(:retries)    { 3 }
-  let(:options)    { { host: 'login.salesforce.com', authentication_retries: retries } }
+  let(:options)    { { :host => 'login.salesforce.com', :authentication_retries => retries } }
   let(:middleware) { described_class.new app, nil, options }
 
   describe '.authenticate!' do
@@ -29,7 +29,7 @@ describe Restforce::Middleware::Authentication do
     context 'when an exception is thrown' do
       before do
         env[:body] = 'foo'
-        env[:request] = {proxy: nil}
+        env[:request] = {:proxy => nil}
       end
 
       it 'attempts to authenticate' do

data/spec/lib/middleware/authorization_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Restforce::Middleware::Authorization do
   let(:app)        { double('app')            }
-  let(:env)        { { request_headers: {} }  }
-  let(:options)    { { oauth_token: 'token' } }
+  let(:env)        { { :request_headers => {} }  }
+  let(:options)    { { :oauth_token => 'token' } }
   let(:middleware) { described_class.new app, nil, options }
 
   before do

data/spec/lib/middleware/gzip_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Restforce::Middleware::Gzip do
   let(:app)        { double('app')            }
-  let(:env)        { { request_headers: {}, response_headers: {} }  }
-  let(:options)    { { oauth_token: 'token' } }
+  let(:env)        { { :request_headers => {}, :response_headers => {} }  }
+  let(:options)    { { :oauth_token => 'token' } }
   let(:middleware) { described_class.new app, nil, options }
 
   # Return a gzipped string.

data/spec/lib/middleware/logger_spec.rb

@@ -4,7 +4,7 @@ describe Restforce::Middleware::Logger do
   let(:app)        { double('app')            }
   let(:env)        { { }  }
   let(:logger)     { double('logger') }
-  let(:options)    { { host: 'login.salesforce.com', client_secret: 'foo', password: 'bar' } }
+  let(:options)    { { :host => 'login.salesforce.com', :client_secret => 'foo', :password => 'bar' } }
   let(:middleware) { described_class.new app, logger, options }
 
   describe 'logging' do

data/spec/lib/middleware/mashify_spec.rb

@@ -11,7 +11,7 @@ describe Restforce::Middleware::Mashify do
   end
 
   context 'when the body contains a records key' do
-    let(:env) { { body: JSON.parse(fixture('sobject/query_success_response')) } }
+    let(:env) { { :body => JSON.parse(fixture('sobject/query_success_response')) } }
 
     it 'converts the response body into a restforce collection' do
       env[:body].should be_a Restforce::Collection
@@ -19,7 +19,7 @@ describe Restforce::Middleware::Mashify do
   end
 
   context 'when the body does not contain records' do
-    let(:env) { { body: { 'foo' => 'bar' } } }
+    let(:env) { { :body => { 'foo' => 'bar' } } }
 
     it 'does not touch the body' do
       env[:body].foo.should eq 'bar'

data/spec/lib/middleware/raise_error_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Restforce::Middleware::RaiseError do
   let(:app)        { double('app') }
   let(:body)       { fixture('sobject/query_error_response') }
-  let(:env)        { { status: status, body: body } }
+  let(:env)        { { :status => status, :body => body } }
   let(:middleware) { described_class.new app }
 
   describe '.on_complete' do

data/spec/lib/sobject_spec.rb

@@ -58,8 +58,8 @@ describe Restforce::SObject do
 
     context 'when an Id is present' do
       before do
-        hash.merge!(Id: '001D000000INjVe')
-        @request = stub_api_request 'sobjects/Whizbang/001D000000INjVe', method: :patch, body: "{\"Checkbox_Label\":false,\"Text_Label\":\"Hi there!\",\"Date_Label\":\"2010-01-01\",\"DateTime_Label\":\"2011-07-07T00:37:00.000+0000\",\"Picklist_Multiselect_Label\":\"four;six\"}"
+        hash.merge!(:Id => '001D000000INjVe')
+        @request = stub_api_request 'sobjects/Whizbang/001D000000INjVe', :method => :patch, :body => "{\"Checkbox_Label\":false,\"Text_Label\":\"Hi there!\",\"Date_Label\":\"2010-01-01\",\"DateTime_Label\":\"2011-07-07T00:37:00.000+0000\",\"Picklist_Multiselect_Label\":\"four;six\"}"
       end
 
       after do
@@ -79,8 +79,8 @@ describe Restforce::SObject do
 
     context 'when an Id is present' do
       before do 
-        hash.merge!(Id: '001D000000INjVe')
-        @request = stub_api_request 'sobjects/Whizbang/001D000000INjVe', method: :delete
+        hash.merge!(:Id => '001D000000INjVe')
+        @request = stub_api_request 'sobjects/Whizbang/001D000000INjVe', :method => :delete
       end
 
       after do
@@ -93,7 +93,7 @@ describe Restforce::SObject do
 
   describe '.describe' do
     before do
-      @request = stub_api_request 'sobjects/Whizbang/describe', with: 'sobject/sobject_describe_success_response'
+      @request = stub_api_request 'sobjects/Whizbang/describe', :with => 'sobject/sobject_describe_success_response'
     end
 
     after do

data/spec/support/basic_client.rb

@@ -33,5 +33,5 @@ shared_context 'basic client' do
 
   let(:client_options) { base_options }
 
-  let(:client) { Restforce::Client.new client_options }
+  let(:client) { Restforce::Client.new(client_options) }
 end

data/spec/support/fixture_helpers.rb

@@ -2,25 +2,25 @@ module FixtureHelpers
 
   def stub_api_request(endpoint, options = {})
     options = {
-      method: :get,
-      status: 200,
-      api_version: '24.0',
-      with: nil
+      :method => :get,
+      :status => 200,
+      :api_version => '24.0',
+      :with => nil
     }.merge(options)
 
     stub = stub_request(options[:method], %r{/services/data/v#{options[:api_version]}/#{endpoint}})
-    stub = stub.with(body: options[:body]) if options[:body]
-    stub = stub.to_return(status: options[:status], body: fixture(options[:with])) if options[:with]
+    stub = stub.with(:body => options[:body]) if options[:body] && !RUBY_VERSION.match(/^1.8/)
+    stub = stub.to_return(:status => options[:status], :body => fixture(options[:with])) if options[:with]
     stub
   end
 
   def stub_login_request(options = {})
     options = {
-      body: nil
+      :body => nil
     }.merge(options)
 
     stub = stub_request(:post, "https://login.salesforce.com/services/oauth2/token")
-    stub = stub.with(body: options[:body]) if options[:body]
+    stub = stub.with(:body => options[:body]) if options[:body] && !RUBY_VERSION.match(/^1.8/)
     stub
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement