restforce 1.5.3 → 2.0.0

data/spec/integration/data/client_spec.rb

@@ -3,33 +3,41 @@ require 'spec_helper'
 shared_examples_for Restforce::Data::Client do
   describe '.picklist_values' do
     requests 'sobjects/Account/describe',
-      :fixture => 'sobject/sobject_describe_success_response'
+             fixture: 'sobject/sobject_describe_success_response'
 
     context 'when given a picklist field' do
       subject { client.picklist_values('Account', 'Picklist_Field') }
       it { should be_an Array }
       its(:length) { should eq 3 }
-      it { should include_picklist_values ['one', 'two', 'three'] }
+      it { should include_picklist_values %w(one two three) }
     end
 
     context 'when given a multipicklist field' do
       subject { client.picklist_values('Account', 'Picklist_Multiselect_Field') }
       it { should be_an Array }
       its(:length) { should eq 3 }
-      it { should include_picklist_values ['four', 'five', 'six'] }
+      it { should include_picklist_values %w(four five six) }
     end
 
     describe 'dependent picklists' do
       context 'when given a picklist field that has a dependency' do
-        subject { client.picklist_values('Account', 'Dependent_Picklist_Field', :valid_for => 'one') }
+        subject do
+          client.picklist_values('Account',
+                                 'Dependent_Picklist_Field',
+                                 valid_for: 'one')
+        end
+
         it { should be_an Array }
         its(:length) { should eq 2 }
-        it { should include_picklist_values ['seven', 'eight'] }
+        it { should include_picklist_values %w(seven eight) }
         it { should_not include_picklist_values ['nine'] }
       end
 
       context 'when given a picklist field that does not have a dependency' do
-        subject { client.picklist_values('Account', 'Picklist_Field', :valid_for => 'one') }
+        subject do
+          client.picklist_values('Account', 'Picklist_Field', valid_for: 'one')
+        end
+
         it 'raises an exception' do
           expect { subject }.to raise_error(/Picklist_Field is not a dependent picklist/)
         end
@@ -37,12 +45,15 @@ shared_examples_for Restforce::Data::Client do
     end
   end
 
-  describe '.faye', :event_machine => true do
+  describe '.faye', event_machine: true do
     subject { client.faye }
 
     context 'with missing instance url' do
       let(:instance_url) { nil }
-      specify { expect { subject }.to raise_error RuntimeError, 'Instance URL missing. Call .authenticate! first.' }
+
+      it "raises an error" do
+        expect { subject }.to raise_error RuntimeError, /Instance URL missing/
+      end
     end
 
     context 'with oauth token and instance url' do
@@ -67,7 +78,7 @@ shared_examples_for Restforce::Data::Client do
     end
   end
 
-  describe '.subscribe', :event_machine => true do
+  describe '.subscribe', event_machine: true do
     context 'when given a single pushtopic' do
       it 'subscribes to the pushtopic' do
         client.faye.should_receive(:subscribe).with(['/topic/PushTopic'])
@@ -77,8 +88,9 @@ shared_examples_for Restforce::Data::Client do
 
     context 'when given an array of pushtopics' do
       it 'subscribes to each pushtopic' do
-        client.faye.should_receive(:subscribe).with(['/topic/PushTopic1', '/topic/PushTopic2'])
-        client.subscribe(['PushTopic1', 'PushTopic2'])
+        client.faye.should_receive(:subscribe).with(['/topic/PushTopic1',
+                                                     '/topic/PushTopic2'])
+        client.subscribe(%w(PushTopic1 PushTopic2))
       end
     end
   end
@@ -89,7 +101,7 @@ describe Restforce::Data::Client do
     it_behaves_like Restforce::Client
   end
 
-  describe 'without mashify', :mashify => false do
+  describe 'without mashify', mashify: false do
     it_behaves_like Restforce::Client
   end
 end

data/spec/spec_helper.rb

@@ -11,10 +11,10 @@ WebMock.disable_net_connect!
 
 RSpec.configure do |config|
   config.order = 'random'
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }

data/spec/support/client_integration.rb

@@ -1,7 +1,11 @@
 module ClientIntegrationExampleGroup
   def self.included(base)
     base.class_eval do
-      let(:oauth_token)    { '00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtvxjTrKW19ye6PE3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs' }
+      let(:oauth_token) do
+        '00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtvxjTrKW19ye6P' \
+        'E3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs'
+      end
+
       let(:refresh_token)  { 'refresh' }
       let(:instance_url)   { 'https://na1.salesforce.com' }
       let(:username)       { 'foo'            }
@@ -13,15 +17,15 @@ module ClientIntegrationExampleGroup
 
       let(:base_options) do
         {
-          :oauth_token    => oauth_token,
-          :refresh_token  => refresh_token,
-          :instance_url   => instance_url,
-          :username       => username,
-          :password       => password,
-          :security_token => security_token,
-          :client_id      => client_id,
-          :client_secret  => client_secret,
-          :cache          => cache
+          oauth_token: oauth_token,
+          refresh_token: refresh_token,
+          instance_url: instance_url,
+          username: username,
+          password: password,
+          security_token: security_token,
+          client_id: client_id,
+          client_secret: client_secret,
+          cache: cache
         }
       end
 
@@ -33,13 +37,15 @@ module ClientIntegrationExampleGroup
 
   RSpec.configure do |config|
     config.include self,
-      :example_group => {
-        :describes => lambda { |described| described <= Restforce::AbstractClient },
-        :file_path => %r{spec/integration}
-      }
+                   example_group: {
+                     describes: lambda do |described|
+                       described <= Restforce::AbstractClient
+                     end,
+                     file_path: %r{spec/integration}
+                   }
 
-    config.before :mashify => false do
-      base_options.merge!(:mashify => false)
+    config.before mashify: false do
+      base_options.merge!(mashify: false)
     end
   end
-end
+end

data/spec/support/concerns.rb

@@ -13,6 +13,6 @@ module ConcernsExampleGroup
   end
 
   RSpec.configure do |config|
-    config.include self, :example_group => { :file_path => %r{spec/unit/concerns} }
+    config.include self, example_group: { file_path: %r{spec/unit/concerns} }
   end
-end
+end

data/spec/support/event_machine.rb

@@ -3,12 +3,12 @@ RSpec.configure do |config|
     EventMachine.stub(:connect) if defined?(EventMachine)
   end
 
-  config.filter_run_excluding :event_machine => true if RUBY_PLATFORM == 'java'
+  config.filter_run_excluding event_machine: true if RUBY_PLATFORM == 'java'
 
-  config.around :event_machine => true do |example|
+  config.around event_machine: true do |example|
     EM.run {
       example.run
       EM.stop
     }
   end
-end
+end

data/spec/support/fixture_helpers.rb

@@ -1,33 +1,37 @@
 module FixtureHelpers
   module InstanceMethods
-
-    def stub_api_request(endpoint, options={})
+    def stub_api_request(endpoint, options = {})
       options = {
-        :method => :get,
-        :status => 200,
-        :api_version => Restforce.configuration.api_version
+        method: :get,
+        status: 200,
+        api_version: Restforce.configuration.api_version
       }.merge(options)
 
-      stub = stub_request(options[:method], %r{/services/data/v#{options[:api_version]}/#{endpoint}})
-      stub = stub.with(:body => options[:with_body]) if options[:with_body] && !RUBY_VERSION.match(/^1.8/)
-      stub = stub.to_return(:status => options[:status], :body => fixture(options[:fixture]), :headers => { 'Content-Type' => 'application/json'}) if options[:fixture]
+      stub = stub_request(options[:method],
+                          %r{/services/data/v#{options[:api_version]}/#{endpoint}})
+
+      if options[:fixture]
+        stub = stub.to_return(status: options[:status],
+                              body: fixture(options[:fixture]),
+                              headers: { 'Content-Type' => 'application/json' })
+      end
+
       stub
     end
 
-    def stub_login_request(options={})
+    def stub_login_request(*)
       stub = stub_request(:post, "https://login.salesforce.com/services/oauth2/token")
-      stub = stub.with(:body => options[:with_body]) if options[:with_body] && !RUBY_VERSION.match(/^1.8/)
+
       stub
     end
 
     def fixture(f)
       File.read(File.expand_path("../../fixtures/#{f}.json", __FILE__))
     end
-
   end
 
   module ClassMethods
-    def requests(endpoint, options={})
+    def requests(endpoint, options = {})
       before do
         (@requests ||= []) << stub_api_request(endpoint, options)
       end

data/spec/support/middleware.rb

@@ -1,20 +1,24 @@
 module MiddlewareExampleGroup
   def self.included(base)
     base.class_eval do
-      let(:app)            { double('@app', :call => nil)            }
-      let(:env)            { { :request_headers => {}, :response_headers => {} } }
+      let(:app)            { double('@app', call: nil)            }
+      let(:env)            { { request_headers: {}, response_headers: {} } }
       let(:retries)        { 3 }
-      let(:options)        { { } }
+      let(:options)        { {} }
       let(:client)         { double(Restforce::AbstractClient) }
       let(:auth_callback)  { double(Proc) }
-      let(:success_response) { Restforce::Mash.new(JSON.parse(fixture(:auth_success_response))) }
+
+      let(:success_response) do
+        Restforce::Mash.new(JSON.parse(fixture(:auth_success_response)))
+      end
+
       subject(:middleware) { described_class.new app, client, options }
     end
   end
 
   RSpec.configure do |config|
     config.include self,
-      :example_group => { :file_path => %r{spec/unit/middleware} }
+                   example_group: { file_path: %r{spec/unit/middleware} }
   end
 end
 
@@ -35,12 +39,16 @@ shared_examples_for 'authentication middleware' do
         end
 
         its([:instance_url]) { should eq 'https://na1.salesforce.com' }
-        its([:oauth_token])  { should eq '00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtvxjTrKW19ye6PE3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs' }
+
+        its([:oauth_token])  do
+          should eq "00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtv" \
+                    "xjTrKW19ye6PE3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs"
+        end
       end
 
       context 'when an authentication_callback is specified' do
         before(:each) do
-          options.merge!(:authentication_callback => auth_callback)
+          options.merge!(authentication_callback: auth_callback)
         end
 
         it 'calls the authentication callback with the response body' do
@@ -61,7 +69,7 @@ shared_examples_for 'authentication middleware' do
 
       context 'when an authentication_callback is specified' do
         before(:each) do
-          options.merge!(:authentication_callback => auth_callback)
+          options.merge!(authentication_callback: auth_callback)
         end
 
         it 'does not call the authentication callback' do

data/spec/unit/abstract_client_spec.rb

@@ -8,4 +8,4 @@ describe Restforce::AbstractClient do
   it { should < Restforce::Concerns::Authentication }
   it { should < Restforce::Concerns::Caching }
   it { should < Restforce::Concerns::API }
-end
+end

data/spec/unit/attachment_spec.rb

@@ -8,7 +8,8 @@ describe Restforce::Attachment do
 
   describe '.Body' do
     it 'requests the body' do
-      client.should_receive(:get).with(body_url).and_return(double('response').as_null_object)
+      client.should_receive(:get).with(body_url).
+        and_return(double('response').as_null_object)
       sobject.Body
     end
   end

data/spec/unit/collection_spec.rb

@@ -21,8 +21,14 @@ describe Restforce::Collection do
     end
 
     context 'with pagination' do
-      let(:first_page)     { JSON.parse(fixture('sobject/query_paginated_first_page_response')) }
-      let(:next_page)      { JSON.parse(fixture('sobject/query_paginated_last_page_response')) }
+      let(:first_page) do
+        JSON.parse(fixture('sobject/query_paginated_first_page_response'))
+      end
+
+      let(:next_page) do
+        JSON.parse(fixture('sobject/query_paginated_last_page_response'))
+      end
+
       subject(:collection) { described_class.new(first_page, client) }
 
       it { should respond_to :each }
@@ -41,10 +47,13 @@ describe Restforce::Collection do
       context 'when all of the values are being requested' do
         before do
           client.stub(:get).
-            and_return(double(:body => Restforce::Collection.new(next_page, client)))
+            and_return(double(body: Restforce::Collection.new(next_page, client)))
+        end
+
+        its(:pages) do
+          should be_all { |page| expect(page).to be_a Restforce::Collection }
         end
 
-        its(:pages)          { should be_all { |page| expect(page).to be_a Restforce::Collection } }
         its(:has_next_page?) { should be_true }
         it { should be_all   { |record| expect(record).to be_a Restforce::SObject } }
         its(:next_page)      { should be_a Restforce::Collection }

data/spec/unit/concerns/api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restforce::Concerns::API do
-  let(:response) { double('Faraday::Response', :body => double('Body')) }
+  let(:response) { double('Faraday::Response', body: double('Body')) }
 
   describe '.user_info' do
     subject(:user_info) { client.user_info }
@@ -9,7 +9,7 @@ describe Restforce::Concerns::API do
     it 'returns the user info from identity url' do
       identity_url = double('identity_url')
       response.body.stub(:identity).and_return(identity_url)
-      client.should_receive(:api_get).with().and_return(response)
+      client.should_receive(:api_get).with.and_return(response)
 
       identity = double('identity')
       identity.stub(:body).and_return(identity)
@@ -23,7 +23,7 @@ describe Restforce::Concerns::API do
     subject { client.list_sobjects }
 
     before do
-      client.stub :describe => [ { 'name' => 'foo' } ]
+      client.stub describe: [{ 'name' => 'foo' }]
     end
 
     it { should eq ['foo'] }
@@ -64,7 +64,9 @@ describe Restforce::Concerns::API do
     end
 
     context 'when given the id of a layout' do
-      subject(:describe_layouts) { client.describe_layouts('Whizbang', '012E0000000RHEp') }
+      subject(:describe_layouts) do
+        client.describe_layouts('Whizbang', '012E0000000RHEp')
+      end
 
       it 'returns the describe for the specified layout' do
         client.should_receive(:api_get).
@@ -79,7 +81,7 @@ describe Restforce::Concerns::API do
     subject(:org_id) { client.org_id }
 
     it 'returns the organization id' do
-      organizations = [ { 'Id' => 'foo' } ]
+      organizations = [{ 'Id' => 'foo' }]
       client.should_receive(:query).
         with('select id from Organization').
         and_return(organizations)
@@ -93,12 +95,12 @@ describe Restforce::Concerns::API do
 
     context 'with mashify middleware' do
       before do
-        client.stub :mashify? => true
+        client.stub mashify?: true
       end
 
       it 'returns the body' do
         client.should_receive(:api_get).
-          with('query', :q => soql).
+          with('query', q: soql).
           and_return(response)
         expect(results).to eq response.body
       end
@@ -106,7 +108,7 @@ describe Restforce::Concerns::API do
 
     context 'without mashify middleware' do
       before do
-        client.stub :mashify? => false
+        client.stub mashify?: false
       end
 
       it 'returns the records attribute of the body' do
@@ -115,7 +117,7 @@ describe Restforce::Concerns::API do
           with('records').
           and_return(records)
         client.should_receive(:api_get).
-          with('query', :q => soql).
+          with('query', q: soql).
           and_return(response)
         expect(results).to eq records
       end
@@ -128,7 +130,7 @@ describe Restforce::Concerns::API do
 
     it 'performs a sosl search' do
       client.should_receive(:api_get).
-        with('search', :q => sosl).
+        with('search', q: sosl).
         and_return(response)
       expect(results).to eq response.body
     end
@@ -177,17 +179,17 @@ describe Restforce::Concerns::API do
     subject(:result) { client.update!(sobject, attrs) }
 
     context 'when the id field is present' do
-      let(:attrs) { { :id => '1234', :StageName => "Call Scheduled" } }
+      let(:attrs) { { id: '1234', StageName: "Call Scheduled" } }
 
       it 'sends an HTTP PATCH, and returns true' do
         client.should_receive(:api_patch).
-          with('sobjects/Whizbang/1234', { :StageName => "Call Scheduled" })
+          with('sobjects/Whizbang/1234', StageName: "Call Scheduled")
         expect(result).to be_true
       end
     end
 
     context 'when the id field is missing from the attrs' do
-      subject { lambda { result }}
+      subject { lambda { result } }
       it { should raise_error ArgumentError, 'Id field missing from attrs.' }
     end
   end