restforce 0.1.9 → 0.1.10

data/README.md

@@ -1,18 +1,20 @@
 # Restforce [![travis-ci](https://secure.travis-ci.org/ejholmes/restforce.png)](https://secure.travis-ci.org/ejholmes/restforce) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/ejholmes/restforce)
 
 Restforce is a ruby gem for the [Salesforce REST api](http://www.salesforce.com/us/developer/docs/api_rest/index.htm).
-It's meant to be a lighter weight alternative to the [databasedotcom gem](https://github.com/heroku/databasedotcom).
+It's meant to be a lighter weight alternative to the [databasedotcom gem](https://github.com/heroku/databasedotcom) that offers
+greater flexibility and more advanced functionality.
 
-It attempts to solve a couple of key issues that the databasedotcom gem has been unable to solve:
+Features include:
 
+* A clean and modular architecture using [Faraday middleware](https://github.com/technoweenie/faraday) and [Hashie::Mash](https://github.com/intridea/hashie/tree/v1.2.0)'d responses.
 * Support for interacting with multiple users from different orgs.
 * Support for parent-to-child relationships.
 * Support for aggregate queries.
 * Remove the need to materialize constants.
-* Support for the Streaming API
+* Support for the [Streaming API](#streaming)
 * Support for blob data types.
 * Support for GZIP compression.
-* A clean and modular architecture using [Faraday middleware](https://github.com/technoweenie/faraday)
+* Support for [custom Apex REST endpoints](#custom-apex-rest-endpoints).
 * Support for decoding [Force.com Canvas](http://www.salesforce.com/us/developer/docs/platform_connectpre/canvas_framework.pdf) signed requests. (NEW!)
 
 [Documentation](http://rubydoc.info/gems/restforce/frames) | [Changelog](http://revision.io/restforce)
@@ -281,6 +283,36 @@ _See also: http://www.salesforce.com/us/developer/docs/api_rest/Content/dome_sob
 
 * * *
 
+### Custom Apex REST endpoints
+
+You can use Restforce to interact with your custom REST endpoints, by using
+`.get`, `.put`, `.patch`, `.post`, and `.delete`.
+
+For example, if you had the following Apex REST endpoint on Salesforce:
+
+```apex
+@RestResource(urlMapping='/FieldCase/*')
+global class RESTCaseController {
+  @HttpGet
+  global static List<Case> getOpenCases() {
+    String companyName = RestContext.request.params.get('company');
+    Account company = [ Select ID, Name, Email__c, BillingState from Account where Name = :companyName];
+
+    List<Case> cases = [SELECT Id, Subject, Status, OwnerId, Owner.Name from Case WHERE AccountId = :company.Id];
+    return cases;
+  }
+}
+```
+
+Then you could query the cases using Restforce:
+
+```ruby
+client.get '/services/apexrest/FieldCase', :company => 'GenePoint'
+# => #<Restforce::Collection ...>
+```
+
+* * *
+
 ### Streaming
 
 Restforce supports the [Streaming API](http://wiki.developerforce.com/page/Getting_Started_with_the_Force.com_Streaming_API), and makes implementing
@@ -292,7 +324,11 @@ pub/sub with Salesforce a trivial task:
 require 'faye'
 
 # Initialize a client with your username/password/oauth token/etc.
-client = Restforce.new
+client = Restforce.new :username => 'foo',
+  :password       => 'bar',
+  :security_token => 'security token'
+  :client_id      => 'client_id',
+  :client_secret  => 'client_secret'
 
 # Create a PushTopic for subscribing to Account changes.
 client.create! 'PushTopic', {

data/lib/restforce/client.rb

@@ -20,35 +20,33 @@ module Restforce
     # Public: Creates a new client instance
     #
     # 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 
-    #                                     (required for password authentication).
+    #        :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 (required for password authentication).
     #
-    #           :oauth_token            - The String oauth access token to authenticate api
-    #                                     calls (required unless password
-    #                                     authentication is used).
-    #           :refresh_token          - The String refresh token to obtain fresh
-    #                                     oauth access tokens (required if oauth
-    #                                     authentication is used).
-    #           :instance_url           - The String base url for all api requests
-    #                                     (required if oauth authentication is used).
+    #        :oauth_token            - The String oauth access token to authenticate api
+    #                                  calls (required unless password
+    #                                  authentication is used).
+    #        :refresh_token          - The String refresh token to obtain fresh
+    #                                  oauth access tokens (required if oauth
+    #                                  authentication is used).
+    #        :instance_url           - The String base url for all api requests
+    #                                  (required if oauth authentication is used).
     #
-    #           :client_id              - The oauth client id to use. Needed for both
-    #                                     password and oauth authentication
-    #           :client_secret          - The oauth client secret to use.
+    #        :client_id              - The oauth client id to use. Needed for both
+    #                                  password and oauth authentication
+    #        :client_secret          - The oauth client secret to use.
     #
-    #           :host                   - The String hostname to use during
-    #                                     authentication requests (default: 'login.salesforce.com').
+    #        :host                   - The String hostname to use during
+    #                                  authentication requests (default: 'login.salesforce.com').
     #
-    #           :api_version            - The String REST api version to use (default: '24.0')
+    #        :api_version            - The String REST api version to use (default: '24.0')
     #
-    #           :authentication_retries - The number of times that client
-    #                                     should attempt to reauthenticate
-    #                                     before raising an exception (default: 3).
+    #        :authentication_retries - The number of times that client
+    #                                  should attempt to reauthenticate
+    #                                  before raising an exception (default: 3).
     #
-    #           :compress               - Set to true to have Salesforce compress the
-    #                                     response (default: false).
+    #        :compress               - Set to true to have Salesforce compress the response (default: false).
     #
     # Examples
     #
@@ -58,7 +56,6 @@ module Restforce
     #     :security_token => 'security token',
     #     :client_id => 'client id',
     #     :client_secret => 'client secret'
-    #   # => #<Restforce::Client:0x007f934aa2dc28 @options={ ... }>
     #
     #   # Initialize a new client using oauth authentication:
     #   Restforce::Client.new :oauth_token => 'access token',
@@ -66,12 +63,11 @@ module Restforce
     #     :instance_url => 'https://na1.salesforce.com',
     #     :client_id => 'client id',
     #     :client_secret => 'client secret'
-    #   # => #<Restforce::Client:0x007f934aaaa0e8 @options={ ... }>
     #
-    #   # Initialize a new client with using any authentication middleware:
+    #   # Initialize a new client without using any authentication middleware:
     #   Restforce::Client.new :oauth_token => 'access token',
     #     :instance_url => 'https://na1.salesforce.com'
-    #   # => #<Restforce::Client:0x007f934aab9980 @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)] }]

data/lib/restforce/client/api.rb

@@ -1,6 +1,33 @@
+require 'restforce/client/verbs'
+
 module Restforce
   class Client
     module API
+      extend Restforce::Client::Verbs
+
+      # Public: Helper methods for performing arbitrary actions against the API using
+      # various HTTP verbs.
+      #
+      # Examples
+      #
+      #   # Perform a get request
+      #   client.get '/services/data/v24.0/sobjects'
+      #   client.api_get 'sobjects'
+      #
+      #   # Perform a post request
+      #   client.post '/services/data/v24.0/sobjects/Account', { ... }
+      #   client.api_post 'sobjects/Account', { ... }
+      #
+      #   # Perform a put request
+      #   client.put '/services/data/v24.0/sobjects/Account/001D000000INjVe', { ... }
+      #   client.api_put 'sobjects/Account/001D000000INjVe', { ... }
+      #
+      #   # Perform a delete request
+      #   client.delete '/services/data/v24.0/sobjects/Account/001D000000INjVe'
+      #   client.api_delete 'sobjects/Account/001D000000INjVe'
+      #
+      # Returns the Faraday::Response.
+      define_verbs :get, :post, :put, :delete, :patch
 
       # Public: Get the names of all sobjects on the org.
       #
@@ -132,7 +159,7 @@ module Restforce
       # Returns true if the sobject was successfully updated, raises an error
       # otherwise.
       def update!(sobject, attrs)
-        id = attrs.has_key?(:Id) ? attrs.delete(:Id) : attrs.delete('Id')
+        id = attrs.delete(attrs.keys.find { |k| k.to_s.downcase == 'id' })
         raise 'Id field missing.' unless id
         api_patch "sobjects/#{sobject}/#{id}", attrs
         true
@@ -192,49 +219,6 @@ module Restforce
         true
       end
 
-      # Public: Helper methods for performing arbitrary actions against the API using
-      # various HTTP verbs.
-      #
-      # Examples
-      #
-      #   # Perform a get request
-      #   client.get '/services/data/v24.0/sobjects'
-      #   client.api_get 'sobjects'
-      #
-      #   # Perform a post request
-      #   client.post '/services/data/v24.0/sobjects/Account', { ... }
-      #   client.api_post 'sobjects/Account', { ... }
-      #
-      #   # Perform a put request
-      #   client.put '/services/data/v24.0/sobjects/Account/001D000000INjVe', { ... }
-      #   client.api_put 'sobjects/Account/001D000000INjVe', { ... }
-      #
-      #   # Perform a delete request
-      #   client.delete '/services/data/v24.0/sobjects/Account/001D000000INjVe'
-      #   client.api_delete 'sobjects/Account/001D000000INjVe'
-      #
-      # Returns the Faraday::Response.
-      [:get, :post, :put, :delete, :patch].each do |method|
-        define_method method do |*args|
-          retries = @options[:authentication_retries]
-          begin
-            connection.send(method, *args)
-          rescue Restforce::UnauthorizedError
-            if retries > 0
-              retries -= 1
-              connection.url_prefix = @options[:instance_url]
-              retry
-            end
-            raise
-          end
-        end
-
-        define_method :"api_#{method}" do |*args|
-          args[0] = api_path(args[0])
-          send(method, *args)
-        end
-      end
-
     private
 
       # Internal: Returns a path to an api endpoint

data/lib/restforce/client/caching.rb

@@ -8,10 +8,10 @@ module Restforce
       #
       # Returns the result of the block
       def without_caching(&block)
-        @options[:perform_caching] = false
+        @options[:use_cache] = false
         block.call
       ensure
-        @options.delete(:perform_caching)
+        @options.delete(:use_cache)
       end
 
     private

data/lib/restforce/client/verbs.rb

@@ -0,0 +1,68 @@
+module Restforce
+  class Client
+    module Verbs
+
+      # Internal: Define methods to handle a verb.
+      #
+      # verbs - A list of verbs to define methods for.
+      #
+      # Examples
+      #
+      #   define_verbs :get, :post
+      #
+      # Returns nil.
+      def define_verbs(*verbs)
+        verbs.each do |verb|
+          define_verb(verb)
+          define_api_verb(verb)
+        end
+      end
+
+      # Internal: Defines a method to handle HTTP requests with the passed in
+      # verb.
+      #
+      # verb - Symbol name of the verb (e.g. :get).
+      #
+      # Examples
+      #
+      #   define_verb :get
+      #   # => get '/services/data/v24.0/sobjects'
+      #
+      # Returns nil.
+      def define_verb(verb)
+        define_method verb do |*args, &block|
+          retries = @options[:authentication_retries]
+          begin
+            connection.send(verb, *args, &block)
+          rescue Restforce::UnauthorizedError
+            if retries > 0
+              retries -= 1
+              connection.url_prefix = @options[:instance_url]
+              retry
+            end
+            raise
+          end
+        end
+      end
+
+      # Internal: Defines a method to handle HTTP requests with the passed in
+      # verb to a salesforce api endpoint.
+      #
+      # verb - Symbol name of the verb (e.g. :get).
+      #
+      # Examples
+      #   
+      #   define_api_verb :get
+      #   # => api_get 'sobjects'
+      #
+      # Returns nil.
+      def define_api_verb(verb)
+        define_method :"api_#{verb}" do |*args, &block|
+          args[0] = api_path(args[0])
+          send(verb, *args, &block)
+        end
+      end
+
+    end
+  end
+end

data/lib/restforce/middleware/caching.rb

@@ -2,7 +2,12 @@ module Restforce
   class Middleware::Caching < FaradayMiddleware::Caching
 
     def call(env)
-      perform_caching? ? super : @app.call(env)
+      expire(cache_key(env)) unless use_cache?
+      super
+    end
+
+    def expire(key)
+      cache.delete(key) if cache
     end
 
     # We don't want to cache requests for different clients, so append the
@@ -11,8 +16,8 @@ module Restforce
       super(env) + env[:request_headers][Restforce::Middleware::Authorization::AUTH_HEADER].gsub(/\s/, '')
     end
 
-    def perform_caching?
-      !@options.has_key?(:perform_caching) || @options[:perform_caching]
+    def use_cache?
+      !@options.has_key?(:use_cache) || @options[:use_cache]
     end
 
   end

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/restforce.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json', '~> 1.7.5'
   gem.add_dependency 'hashie', '~> 1.2.0'
 
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 2.12.0'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'faye', '0.8.3' unless RUBY_PLATFORM == 'java'

data/spec/lib/client_spec.rb

@@ -1,9 +1,23 @@
 require 'spec_helper'
 
+class MockCache
+  def initialize
+    @storage = {}
+  end
+
+  def fetch(key, &block)
+    @storage[key] ||= block.call
+  end
+
+  def delete(key)
+    @storage.delete(key)
+  end
+end
+
 shared_examples_for 'methods' do
   describe '#new' do
     context 'without options passed in' do
-      it 'should not raise an exception' do
+      it 'does not raise an exception' do
         expect {
           described_class.new
         }.to_not raise_error
@@ -11,7 +25,7 @@ shared_examples_for 'methods' do
     end
 
     context 'with a non-hash value' do
-      it 'should raise an exception' do
+      it 'raises an exception' do
         expect {
           described_class.new 'foo'
         }.to raise_error, 'Please specify a hash of options'
@@ -59,7 +73,7 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.list_sobjects }
@@ -75,7 +89,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.describe }
@@ -89,7 +103,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.describe('Whizbang') }
@@ -104,7 +118,7 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.query('SELECT some, fields FROM object') }
@@ -118,7 +132,7 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.search('FIND {bar}') }
@@ -133,7 +147,7 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.org_id }
@@ -150,7 +164,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.create('Account', :Name => 'Foobar') }
@@ -166,7 +180,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.create('Account', :Name => 'Foobar', :Blob => Restforce::UploadIO.new(File.expand_path('../../fixtures/blob.jpg', __FILE__), 'image/jpeg')) }
@@ -185,7 +199,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.update!('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
@@ -209,7 +223,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       subject { client.update('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
@@ -224,7 +238,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       context 'with symbol Id key' do
@@ -236,6 +250,11 @@ shared_examples_for 'methods' do
         subject { client.update('Account', 'Id' => '001D000000INjVe', 'Name' => 'Foobar') }
         it { should be_true }
       end
+
+      context 'with a lower case id' do
+        subject { client.update('Account', 'id' => '001D000000INjVe', 'Name' => 'Foobar') }
+        it { should be_true }
+      end
     end
   end
 
@@ -248,7 +267,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       context 'with symbol external Id key' do
@@ -271,7 +290,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       context 'with symbol external Id key' do
@@ -298,7 +317,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       specify { expect { subject }.to raise_error Faraday::Error::ResourceNotFound }
@@ -310,7 +329,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       it { should be_true }
@@ -329,7 +348,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       it { should be_false }
@@ -341,7 +360,7 @@ shared_examples_for 'methods' do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       it { should be_true }
@@ -356,7 +375,7 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.authenticate! }
@@ -405,16 +424,17 @@ shared_examples_for 'methods' do
   end
 
   describe '.without_caching' do
-    let(:cache) { double('cache') }
+    let(:cache) { MockCache.new }
 
     before do
       @request = stub_api_request 'query\?q=SELECT%20some,%20fields%20FROM%20object',
         :with => 'sobject/query_success_response'
-      cache.should_receive(:fetch).never
+      cache.should_receive(:delete).and_call_original
+      cache.should_receive(:fetch).and_call_original
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { client.without_caching { client.query('SELECT some, fields FROM object') } }
@@ -453,20 +473,6 @@ shared_examples_for 'methods' do
   end
 
   describe '.query with caching' do
-    class MockCache
-      def initialize
-        @storage = {}
-      end
-
-      def fetch(key, &block)
-        @storage[key] || begin
-          block.call.tap do |result|
-            @storage[key] = result
-          end
-        end
-      end
-    end
-
     let(:cache) { MockCache.new }
 
     before do
@@ -481,8 +487,8 @@ shared_examples_for 'methods' do
     end
 
     after do
-      @query.should have_been_made.times(2)
-      @login.should have_been_made
+      expect(@query).to have_been_made.times(2)
+      expect(@login).to have_been_made
     end
 
     subject { client.query('SELECT some, fields FROM object') }
@@ -511,12 +517,12 @@ describe 'with mashify middleware' do
         end
 
         after do
-          @requests.each { |request| request.should have_been_requested }
+          @requests.each { |request| expect(request).to have_been_requested }
         end
 
         subject { client.query('SELECT some, fields FROM object').next_page }
         it { should be_a Restforce::Collection }
-        specify { subject.first.Text_Label.should eq 'Last Page' }
+        specify { expect(subject.first.Text_Label).to eq 'Last Page' }
       end
     end
   end

data/spec/lib/collection_spec.rb

@@ -15,12 +15,12 @@ describe Restforce::Collection do
       its(:size)       { should eq 1 }
       its(:total_size) { should eq 1 }
       its(:next_page_url)  { should be_nil }
-      specify { subject.instance_variable_get(:@client).should eq client }
+      specify { expect(subject.instance_variable_get(:@client)).to eq client }
 
       describe 'each record' do
         it 'should be a Restforce::SObject' do
           records.each do |record|
-            record.should be_a Restforce::SObject
+            expect(record).to be_a Restforce::SObject
           end
         end
       end
@@ -35,7 +35,7 @@ describe Restforce::Collection do
       its(:size)       { should eq 1 }
       its(:total_size) { should eq 2 }
       its(:next_page_url)  { should eq '/services/data/v24.0/query/01gD' }
-      specify { subject.instance_variable_get(:@client).should eq client }
+      specify { expect(subject.instance_variable_get(:@client)).to eq client }
 
       describe '.next_page' do
         before do

data/spec/lib/config_spec.rb

@@ -28,7 +28,7 @@ describe Restforce do
         Restforce.configure do |config|
           config.send("#{attr}=", 'foobar')
         end
-        Restforce.configuration.send(attr).should eq 'foobar'
+        expect(Restforce.configuration.send(attr)).to eq 'foobar'
       end
     end
   end

data/spec/lib/mash_spec.rb

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

data/spec/lib/middleware/authorization_spec.rb

@@ -12,6 +12,6 @@ describe Restforce::Middleware::Authorization do
   end
 
   it 'adds the oauth token to the headers' do
-    env[:request_headers]['Authorization'].should eq 'OAuth token'
+    expect(env[:request_headers]['Authorization']).to eq 'OAuth token'
   end
 end

data/spec/lib/middleware/gzip_spec.rb

@@ -24,7 +24,7 @@ describe Restforce::Middleware::Gzip do
     context 'when :compress is false' do
       it 'does not add the Accept-Encoding header' do
         middleware.call(env)
-        env[:request_headers]['Accept-Encoding'].should be_nil
+        expect(env[:request_headers]['Accept-Encoding']).to be_nil
       end
     end
 
@@ -35,7 +35,7 @@ describe Restforce::Middleware::Gzip do
 
       it 'adds the Accept-Encoding header' do
         middleware.call(env)
-        env[:request_headers]['Accept-Encoding'].should eq 'gzip'
+        expect(env[:request_headers]['Accept-Encoding']).to eq 'gzip'
       end
     end
   end
@@ -52,7 +52,7 @@ describe Restforce::Middleware::Gzip do
 
     it 'decompresses the response body' do
       middleware.call(env)
-      env[:body].should eq fixture('sobject/query_success_response')
+      expect(env[:body]).to eq fixture('sobject/query_success_response')
     end
   end
 

data/spec/lib/middleware/mashify_spec.rb

@@ -14,7 +14,7 @@ describe Restforce::Middleware::Mashify do
     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
+      expect(env[:body]).to be_a Restforce::Collection
     end
   end
 
@@ -22,7 +22,7 @@ describe Restforce::Middleware::Mashify do
     let(:env) { { :body => { 'foo' => 'bar' } } }
 
     it 'does not touch the body' do
-      env[:body].foo.should eq 'bar'
+      expect(env[:body].foo).to eq 'bar'
     end
   end
 end

data/spec/lib/sobject_spec.rb

@@ -28,13 +28,9 @@ describe Restforce::SObject do
         it { should be_a Restforce::Collection }
 
         describe 'each child' do
-          it 'should be a Restforce::SObject' do
-            sobject.Whizbangs__r.each { |sobject| sobject.should be_a Restforce::SObject }
-          end
-
-          it 'should set the client' do
-            sobject.Whizbangs__r.each { |sobject| sobject.should have_client client }
-          end
+          subject { sobject.Whizbangs__r }
+          it { should be_all { |sobject| expect(sobject).to be_a Restforce::SObject } }
+          it { should be_all { |sobject| expect(sobject).to have_client client } }
         end
       end
 
@@ -66,7 +62,7 @@ describe Restforce::SObject do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       specify { expect { subject }.to_not raise_error }
@@ -86,7 +82,7 @@ describe Restforce::SObject do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       specify { expect { subject }.to raise_error Faraday::Error::ResourceNotFound }
@@ -107,7 +103,7 @@ describe Restforce::SObject do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       specify { expect { subject }.to_not raise_error }
@@ -127,7 +123,7 @@ describe Restforce::SObject do
       end
 
       after do
-        @request.should have_been_requested
+        expect(@request).to have_been_requested
       end
 
       specify { expect { subject }.to raise_error Faraday::Error::ResourceNotFound }
@@ -141,7 +137,7 @@ describe Restforce::SObject do
     end
 
     after do
-      @request.should have_been_requested
+      expect(@request).to have_been_requested
     end
 
     subject { sobject.describe }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-14 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: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - lib/restforce/client/canvas.rb
 - lib/restforce/client/connection.rb
 - lib/restforce/client/streaming.rb
+- lib/restforce/client/verbs.rb
 - lib/restforce/collection.rb
 - lib/restforce/config.rb
 - lib/restforce/mash.rb
@@ -257,18 +258,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2351979982713256813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2351979982713256813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -325,3 +320,4 @@ test_files:
 - spec/support/basic_client.rb
 - spec/support/fixture_helpers.rb
 - spec/support/middleware.rb
+has_rdoc: