restforce 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ecae4e8e7e8b52ae216ad1b0505000eebb2a4f
-  data.tar.gz: 27125a8223a2bf25ec80cc0dff6020021a8f0505
+  metadata.gz: c67387ede73e74537b9a9350642597ce127e65da
+  data.tar.gz: 5a467ccbed367d30f5ad7e5d7ac560c768bd8a2c
 SHA512:
-  metadata.gz: c829bf4711eadbadcb26b5db972a4ecc71d08181e124e64dfaf3663713f0e74d1490eee4617d71d3c29827e2c943319eb2ab5a0b0c26ed4f314ebfcc5cec748f
-  data.tar.gz: 90292fda7e4053b90f6de1a4d73ac1df40fa9f4867765fb6082e326de314e27577c1079920f1a04d547dbf1b4f4c9562e695210b842ed3ad294ef8aef131dd2f
+  metadata.gz: e3733f5db2df0daa8a00adee9b483d5927f7cafe808df32f2518c2c1fcfebb83eadf0408825ce68cd02dfaf54e3da61fea0d28e3cd0756ee7fdc08b3639d7d31
+  data.tar.gz: a009788abb56352ef24e8e6681877769df80f27aedecbac5ad18ac8f8ab6f7a51302f594c1e86558a6b9a19241c53c038e867874c53ca447aaec53e30f5e6e25

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.0
+  - 2.1
+  - 2.2
   - jruby-19mode
   - rbx-2
 gemfile:
   - Gemfile.travis
 script:
   - bundle exec rubocop
+  - bundle exec rspec spec

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.1.0 (Jun 29, 2015)
+
+* Added support for `query_all`, `explain` and `limits` API calls (which require a newer `api_version` than the default of 26.0) (@theSteveMitchell, @zenchild)
+* Added support for `recent` API call (@davebrace)
+* Changed `PROXY_URI` environment variable to `SALESFORCE_PROXY_URI` (with warning to `STDOUT` if the old variable is set) (@timrogers)
+* Implemented `version_guard` in `Restforce::Concerns::API` to standardise behaviour of API calls which require a particular version of the Salesforce API (@zenchild)
+* Fixed bug with construction of `Faraday::Error::ClientError` exceptions (@debussyman)
+* Added support for specifying SSL options to be passed to Faraday (@jonathanrico)
+* Added support for specifying a custom logger and log level (@ilyakatz)
+* Improved experience for contributors to the gem with bootstrapping process (@rafalchmiel)
+
+
 ## 2.0.0 (Jun 27, 2015)
 
 * Drop support for versions of Ruby earlier than 1.9.3, which were [end-of-lifed](https://www.ruby-lang.org/en/news/2014/07/01/eol-for-1-8-7-and-1-9-2/) long ago

data/Gemfile

@@ -6,4 +6,5 @@ gem 'jruby-openssl', :platforms => :jruby
 
 group :development do
   gem 'guard-rspec'
+  gem 'guard-rubocop'
 end

data/Guardfile

@@ -1,11 +1,13 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', all_on_start: false, all_after_pass: false do
+guard 'rspec', cmd: 'bundle exec rspec', all_on_start: false, all_after_pass: false do
   watch(%r{^spec/.+_spec\.rb$})
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb') { "spec" }
+
+  watch(%r{^lib/restforce/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
+  watch(%r{^lib/restforce/(.+)\.rb$}) { |m| "spec/integration/#{m[1]}_spec.rb" }
+  watch(%r{^spec/support/(.+)\.rb$})  { "spec" }
+end
 
-  watch(%r{^lib/restforce/(.+)\.rb$})                 { |m| "spec/unit/#{m[1]}_spec.rb" }
-  watch(%r{^lib/restforce/(.+)\.rb$})                 { |m| "spec/integration/#{m[1]}_spec.rb" }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+guard :rubocop, all_on_start: false do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -103,7 +103,7 @@ client = Restforce.new
 
 ### Proxy Support
 
-You can specify a HTTP proxy using the `proxy_uri` option, as follows, or by setting the `PROXY_URI` environment variable:
+You can specify a HTTP proxy using the `proxy_uri` option, as follows, or by setting the `SALESFORCE_PROXY_URI` environment variable:
 
 ```ruby
 client = Restforce.new :username => 'foo',
@@ -137,6 +137,28 @@ Restforce.configure do |config|
 end
 ```
 
+### API versions
+
+By default, the gem defaults to using version 26.0 (Winter '13) of the Salesforce API.
+Some more recent API endpoints will not be available without moving to a more recent
+version - if you're trying to use a method that is unavailable with your API version,
+Restforce will raise an `APIVersionError`.
+
+You can change the `api_version` setting from the default either on a per-client basis:
+
+```ruby
+client = Restforce.new api_version: "32.0" # ...
+```
+
+or, you may set it globally for Restofrce as a whole:
+
+```ruby
+Restforce.configure do |config|
+  config.api_version = "32.0"
+  # ...
+end
+```
+
 ### Bang! methods
 
 All the CRUD methods (`create`, `update`, `upsert`, `destroy`) have equivalent methods with
@@ -170,6 +192,29 @@ account.destroy
 # => true
 ```
 
+### query_all
+
+```ruby
+accounts = client.query_all("select Id, Something__c from Account where isDeleted = true")
+# => #<Restforce::Collection >
+
+query_all allows you to include results from your query that Salesforce hides in the default "query" method.  These include soft-deleted records and archived records (e.g. Task and Event records which are usually archived automatically after they are a year old).
+
+*Only available in [version 29.0](#api-versions) and later of the Salesforce API.*
+
+### explain
+
+`explain` takes the same parameters as `query` and returns a query plan in JSON format.
+For the nitty-gritty details on the response meanings visit the
+[Salesforce Query Explain](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_query_explain.htm) page.
+
+```ruby
+accounts = client.explain("select Id, Something__c from Account where Id = 'someid'")
+# => #<Restforce::Mash >
+```
+
+*Only available in [version 30.0](#api-versions) and later of the Salesforce API.*
+
 ### find
 
 ```ruby
@@ -249,7 +294,7 @@ client.describe('Account')
 
 ```ruby
 # Get layouts for an sobject type
-client.describe_layout('Account')
+client.describe_layouts('Account')
 # => { ... }
 
 # Get the details for a specific layout by its ID
@@ -257,6 +302,8 @@ client.describe_layouts('Account', '012E0000000RHEp')
 # => { ... }
 ```
 
+*Only available in [version 28.0](#api-versions) and later of the Salesforce API.*
+
 ### picklist\_values
 
 
@@ -280,6 +327,22 @@ client.user_info
 # => #<Restforce::Mash active=true display_name="Chatty Sassy" email="user@example.com" ... >
 ```
 
+### limits
+
+`limits` returns the API limits for the currently connected organization. This includes information such as **Daily API calls** and **Daily Bulk API calls**. More information can be found on the
+[Salesforce Limits](https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_limits.htm) page.
+
+```ruby
+# Get the current limit info
+limits = client.limits
+# => #<Restforce::Mash >
+
+limits["DailyApiRequests"]
+# => {"Max"=>15000, "Remaining"=>14746}
+```
+
+*Only available in [version 29.0](#api-versions) and later of the Salesforce API.*
+
 * * *
 
 ### authenticate!
@@ -435,11 +498,19 @@ end
 
 ### Logging/Debugging/Instrumenting
 
-You can easily inspect what Restforce is sending/receiving by setting
-`Restforce.log = true`.
+You can easily inspect what Restforce is sending/receiving by enabling logging, either
+globally (as below) or on a per-client basis.
 
 ```ruby
 Restforce.log = true
+
+# Restforce will log to STDOUT with the `:debug` log level by default, or you can
+# optionally set your own logger and log level
+Restforce.configure do |config|
+  config.logger = Logger.new("/tmp/log/restforce.log")
+  config.log_level = :info
+end
+
 client = Restforce.new.query('select Id, Name from Account')
 ```
 
@@ -482,6 +553,34 @@ If you need a full Active Record experience, may be you can use
 Restforce and adds Associations, Query Building (like AREL), Validations and
 Callbacks.
 
+## Development
+
+If you want to hack on Restforce locally, we try to make [bootstrapping the project](http://wynnnetherland.com/linked/2013012801/bootstrapping-consistency) as painless as possible. Just clone and run:
+
+```bash
+$ script/bootstrap
+```
+
+This will install project dependencies and get you up and running. If you want to run a Ruby console to poke on Restforce, you can crank one up with:
+
+```bash
+$ script/console
+```
+
+In order to run the specs, use:
+
+```bash
+$ script/test
+```
+
+Alternatively, use Guard which will run the specs on file changes:
+
+```bash
+$ script/guard
+```
+
+Using the scripts in `./script` instead of `bundle exec rspec`, `bundle console`, etc. ensures your dependencies are up-to-date.
+
 ## Contributing
 
 1. Fork it

data/lib/restforce.rb

@@ -39,6 +39,7 @@ module Restforce
   Error               = Class.new(StandardError)
   AuthenticationError = Class.new(Error)
   UnauthorizedError   = Class.new(Error)
+  APIVersionError     = Class.new(Error)
 
   class << self
     # Alias for Restforce::Data::Client.new
@@ -71,3 +72,9 @@ module Restforce
   end
   Object.send :include, Restforce::CoreExtensions unless Object.respond_to? :tap
 end
+
+if ENV['PROXY_URI']
+  warn "[restforce] You must now use the SALESFORCE_PROXY_URI environment variable (as " \
+       "opposed to PROXY_URI) to set a proxy server for Restforce. Please update your " \
+       "environment's configuration."
+end

data/lib/restforce/concerns/api.rb

@@ -55,6 +55,15 @@ module Restforce
         describe.collect { |sobject| sobject['name'] }
       end
 
+      # Public: Get info about limits in the connected organization
+      #
+      # Only available in version 29.0 and later of the Salesforce API.
+      #
+      # Returns an Array of String names for each SObject.
+      def limits
+        version_guard(29.0) { api_get("limits").body }
+      end
+
       # Public: Returns a detailed describe result for the specified sobject
       #
       # sobject - Stringish name of the sobject (default: nil).
@@ -82,7 +91,7 @@ module Restforce
       # specified sobject type, or URIs for layouts if the sobject has
       # multiple Record Types.
       #
-      # This resource was introduced in version 28.0.
+      # Only available in version 28.0 and later of the Salesforce API.
       #
       # Examples:
       #  # get the layouts for the sobject
@@ -95,10 +104,12 @@ module Restforce
       #
       # Returns the Hash representation of the describe_layouts result
       def describe_layouts(sobject, layout_id = nil)
-        if layout_id
-          api_get("sobjects/#{sobject}/describe/layouts/#{layout_id}").body
-        else
-          api_get("sobjects/#{sobject}/describe/layouts").body
+        version_guard(28.0) do
+          if layout_id
+            api_get("sobjects/#{sobject}/describe/layouts/#{layout_id}").body
+          else
+            api_get("sobjects/#{sobject}/describe/layouts").body
+          end
         end
       end
 
@@ -132,6 +143,48 @@ module Restforce
         mashify? ? response.body : response.body['records']
       end
 
+      # Public: Explain a SOQL query execution plan.
+      #
+      # Only available in version 30.0 and later of the Salesforce API.
+      #
+      # soql - A SOQL expression.
+      #
+      # Examples
+      #
+      #   # Find the names of all Accounts
+      #   client.explain('select Name from Account')
+      #
+      # Returns a Hash in the form {:plans => [Array of plan data]}
+      # See: https://www.salesforce.com/us/developer/docs/api_rest/Content/dome_query_expl
+      #      ain.htm
+      def explain(soql)
+        version_guard(30.0) { api_get("query", explain: soql).body }
+      end
+
+      # Public: Executes a SOQL query and returns the result.  Unlike the Query resource,
+      # QueryAll will return records that have been deleted because of a merge or delete.
+      # QueryAll will also return information about archived Task and Event records.
+      #
+      # Only available in version 29.0 and later of the Salesforce API.
+      #
+      # soql - A SOQL expression.
+      #
+      # Examples
+      #
+      #   # Find the names of all Accounts
+      #   client.query_all('select Name from Account').map(&:Name)
+      #   # => ['Foo Bar Inc.', 'Whizbang Corp']
+      #
+      # 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_all(soql)
+        version_guard(29.0) do
+          response = api_get 'queryAll', q: soql
+          mashify? ? response.body : response.body['records']
+        end
+      end
+
       # Public: Perform a SOSL search
       #
       # sosl - A SOSL expression.
@@ -338,6 +391,21 @@ module Restforce
         api_get(path).body
       end
 
+      # Public: Finds recently viewed items for the logged-in user.
+      #
+      # limit - An optional limit that specifies the maximum number of records to be
+      #         returned.
+      #         If this parameter is not specified, the default maximum number of records
+      #         returned is the maximum number of entries in RecentlyViewed, which is 200
+      #         records per object.
+      #
+      # Returns an array of the recently viewed Restforce::SObject records.
+      def recent(limit = nil)
+        path = limit ? "recent?limit=#{limit}" : "recent"
+
+        api_get(path).body
+      end
+
       private
 
       # Internal: Returns a path to an api endpoint
@@ -350,6 +418,20 @@ module Restforce
         "/services/data/v#{options[:api_version]}/#{path}"
       end
 
+      # Internal: Ensures that the `api_version` set for the Restforce client is at least
+      # the provided version before performing a particular action
+      def version_guard(version)
+        if version.to_f <= options[:api_version].to_f
+          yield
+        else
+          raise APIVersionError, "You must set an `api_version` of at least #{version} " \
+                                 "to use this feature in the Salesforce API. Set the " \
+                                 "`api_version` option when configuring the client - " \
+                                 "see https://github.com/ejholmes/restforce/blob/master" \
+                                 "/README.md#api-versions"
+        end
+      end
+
       # Internal: Errors that should be rescued from in non-bang methods
       def exceptions
         [Faraday::Error::ClientError]

data/lib/restforce/concerns/connection.rb

@@ -66,7 +66,8 @@ module Restforce
         { request: {
             timeout: options[:timeout],
             open_timeout: options[:timeout] },
-          proxy: options[:proxy_uri]
+          proxy: options[:proxy_uri],
+          ssl: options[:ssl]
         }
       end
 

data/lib/restforce/config.rb

@@ -32,7 +32,7 @@ module Restforce
 
     def log(message)
       return unless Restforce.log?
-      Restforce.configuration.logger.send :debug, message
+      configuration.logger.send(configuration.log_level, message)
     end
   end
 
@@ -133,15 +133,19 @@ module Restforce
     # Faraday adapter to use. Defaults to Faraday.default_adapter.
     option :adapter, default: lambda { Faraday.default_adapter }
 
-    # TODO: Rename this to `SALESFORCE_PROXY_URI` in next major version
-    option :proxy_uri, default: lambda { ENV['PROXY_URI'] }
+    option :proxy_uri, default: lambda { ENV['SALESFORCE_PROXY_URI'] }
 
     # A Proc that is called with the response body after a successful authentication.
     option :authentication_callback
 
-    def logger
-      @logger ||= ::Logger.new STDOUT
-    end
+    # Set SSL options
+    option :ssl, default: {}
+
+    # Set a logger for when Restforce.log is set to true, defaulting to STDOUT
+    option :logger, default: ::Logger.new(STDOUT)
+
+    # Set a log level for logging when Restforce.log is set to true, defaulting to :debug
+    option :log_level, default: :debug
 
     def options
       self.class.options

data/lib/restforce/middleware/raise_error.rb

@@ -9,9 +9,9 @@ module Restforce
         raise Restforce::UnauthorizedError, message
       when 413
         raise Faraday::Error::ClientError.new("HTTP 413 - Request Entity Too Large",
-                                              env[:response])
+                                              response_values)
       when 400...600
-        raise Faraday::Error::ClientError.new(message, env[:response])
+        raise Faraday::Error::ClientError.new(message, response_values)
       end
     end
 
@@ -22,5 +22,13 @@ module Restforce
     def body
       JSON.parse(@env[:body])
     end
+
+    def response_values
+      {
+        status: @env[:status],
+        headers: @env[:response_headers],
+        body: @env[:body]
+      }
+    end
   end
 end

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/restforce.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{A lightweight ruby client for the Salesforce REST API.}
   gem.summary       = %q{A lightweight ruby client for the Salesforce REST API.}
   gem.homepage      = "https://github.com/ejholmes/restforce"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/script/bootstrap

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+bundle install --quiet "$@"

data/script/console

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+dir=`pwd`
+
+echo "===> Bundling..."
+script/bootstrap
+
+echo "===> Launching console..."
+bundle console

data/script/guard

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "===> Bundling..."
+script/bootstrap
+
+echo "===> Running Guard..."
+bundle exec guard

data/script/test

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "===> Bundling..."
+script/bootstrap --quiet
+
+echo "===> Running specs..."
+bundle exec rspec
+
+echo "===> Running Rubocop..."
+bundle exec rubocop

data/spec/unit/concerns/api_spec.rb

@@ -29,6 +29,42 @@ describe Restforce::Concerns::API do
     it { should eq ['foo'] }
   end
 
+  describe '.limits' do
+    subject { client.limits }
+
+    it 'returns the limits for an organization' do
+      limits = double('limits')
+      limits.stub(:body).and_return({})
+      client.should_receive(:api_get).with("limits").and_return(limits)
+      client.should_receive(:options).and_return(api_version: 29.0)
+      expect(client.limits).to eq({})
+    end
+
+    it "raises an exception if we aren't at version 29.0 or above" do
+      client.should_receive(:options).at_least(:once).and_return(api_version: 24.0)
+      expect { client.limits }.to raise_error(Restforce::APIVersionError)
+    end
+  end
+
+  describe '.explain' do
+    let(:soql)        { 'Select Id from Account' }
+    subject(:results) { client.explain(soql) }
+
+    it "returns an execute plan for this SOQL" do
+      plans = double("plans")
+      plans.stub(:body).and_return("plans" => [])
+      client.should_receive(:api_get).with("query", explain: soql).
+        and_return(plans)
+      client.should_receive(:options).and_return(api_version: 30.0)
+      expect(results).to eq("plans" => [])
+    end
+
+    it "raises an exception if we aren't at version 30.0 or above" do
+      client.should_receive(:options).at_least(:once).and_return(api_version: 24.0)
+      expect { results }.to raise_error(Restforce::APIVersionError)
+    end
+  end
+
   describe '.describe' do
     subject(:describe) { client.describe }
 
@@ -56,24 +92,36 @@ describe Restforce::Concerns::API do
   describe '.describe_layouts' do
     subject(:describe_layouts) { client.describe_layouts('Whizbang') }
 
-    it 'returns the layouts for the sobject' do
-      client.should_receive(:api_get).
-        with('sobjects/Whizbang/describe/layouts').
-        and_return(response)
-      expect(describe_layouts).to eq response.body
-    end
-
-    context 'when given the id of a layout' do
-      subject(:describe_layouts) do
-        client.describe_layouts('Whizbang', '012E0000000RHEp')
-      end
+    context "API version where describe_layouts is supported" do
+      before { client.should_receive(:options).and_return(api_version: 28.0) }
 
-      it 'returns the describe for the specified layout' do
+      it 'returns the layouts for the sobject' do
         client.should_receive(:api_get).
-          with('sobjects/Whizbang/describe/layouts/012E0000000RHEp').
+          with('sobjects/Whizbang/describe/layouts').
           and_return(response)
         expect(describe_layouts).to eq response.body
       end
+
+      context 'when given the id of a layout' do
+        subject(:describe_layouts) do
+          client.describe_layouts('Whizbang', '012E0000000RHEp')
+        end
+
+        it 'returns the describe for the specified layout' do
+          client.should_receive(:api_get).
+            with('sobjects/Whizbang/describe/layouts/012E0000000RHEp').
+            and_return(response)
+          expect(describe_layouts).to eq response.body
+        end
+      end
+    end
+
+    context "an API version where describe_layouts is not supported" do
+      before { client.should_receive(:options).and_return(api_version: 24.0) }
+
+      it "raises a error" do
+        expect { describe_layouts }.to raise_error(Restforce::APIVersionError)
+      end
     end
   end
 
@@ -124,6 +172,49 @@ describe Restforce::Concerns::API do
     end
   end
 
+  describe '.query_all' do
+    let(:soql)        { 'Select Id from Account' }
+    subject(:results) { client.query_all(soql) }
+
+    context "with supported api_version" do
+      before { client.should_receive(:options).and_return(api_version: 31.0) }
+
+      context 'with mashify middleware' do
+        before { client.stub(mashify?: true) }
+
+        it 'returns the body' do
+          client.should_receive(:api_get).with('queryAll', q: soql).
+            and_return(response)
+          expect(results).to eq(response.body)
+        end
+      end
+
+      context 'without mashify middleware' do
+        before do
+          client.stub(mashify?: false)
+        end
+
+        it 'returns the records attribute of the body' do
+          records = double('records')
+          response.body.stub(:[]).with('records').and_return(records)
+          client.should_receive(:api_get).with('queryAll', q: soql).
+            and_return(response)
+          expect(results).to eq(records)
+        end
+      end
+    end
+
+    context "with unsupported api_version" do
+      before { client.should_receive(:options).and_return(api_version: 26.0) }
+
+      subject(:query_all) { client.query_all(soql) }
+
+      it "raises an error" do
+        expect { query_all }.to raise_error(Restforce::APIVersionError)
+      end
+    end
+  end
+
   describe '.search' do
     let(:sosl)        { 'FIND {bar}' }
     subject(:results) { client.search(sosl) }
@@ -308,4 +399,25 @@ describe Restforce::Concerns::API do
       end
     end
   end
+
+  describe "#recent" do
+    let(:limit) { nil }
+    subject(:result) { client.recent(limit) }
+
+    context "given no limit is specified" do
+      it "returns the most recently viewed items for the logged-in user" do
+        client.should_receive(:api_get).with('recent').and_return(response)
+        expect(result).to eq response.body
+      end
+    end
+
+    context "given a limit is specified" do
+      let(:limit) { 10 }
+
+      it "returns up to the limit specified results" do
+        client.should_receive(:api_get).with('recent?limit=10').and_return(response)
+        expect(result).to eq response.body
+      end
+    end
+  end
 end

data/spec/unit/concerns/connection_spec.rb

@@ -12,6 +12,15 @@ describe Restforce::Concerns::Connection do
     it { should eq builder }
   end
 
+  describe "#connection_options" do
+    let(:options) { { ssl: { verify: false } } }
+    before { client.stub(options: options) }
+
+    it "picks up passed-in SSL options" do
+      expect(client.send(:connection_options)).to include(options)
+    end
+  end
+
   describe 'private #connection' do
     describe ':mashify option' do
       let(:options) { { adapter: Faraday.default_adapter } }

data/spec/unit/config_spec.rb

@@ -23,6 +23,7 @@ describe Restforce do
       its(:host)                   { should eq 'login.salesforce.com' }
       its(:authentication_retries) { should eq 3 }
       its(:adapter)                { should eq Faraday.default_adapter }
+      its(:ssl)                    { should eq({}) }
       [:username, :password, :security_token, :client_id, :client_secret,
        :oauth_token, :refresh_token, :instance_url, :compress, :timeout,
        :proxy_uri, :authentication_callback, :mashify].each do |attr|
@@ -37,7 +38,7 @@ describe Restforce do
           'SALESFORCE_SECURITY_TOKEN' => 'foobar',
           'SALESFORCE_CLIENT_ID'      => 'client id',
           'SALESFORCE_CLIENT_SECRET'  => 'client secret',
-          'PROXY_URI'                 => 'proxy',
+          'SALESFORCE_PROXY_URI'      => 'proxy',
           'SALESFORCE_HOST'           => 'test.host.com' }.
         each { |var, value| ENV.stub(:[]).with(var).and_return(value) }
       end
@@ -55,7 +56,8 @@ describe Restforce do
   describe '#configure' do
     [:username, :password, :security_token, :client_id, :client_secret, :compress,
      :timeout, :oauth_token, :refresh_token, :instance_url, :api_version, :host, :mashify,
-     :authentication_retries, :proxy_uri, :authentication_callback].each do |attr|
+     :authentication_retries, :proxy_uri, :authentication_callback, :ssl, :log_level,
+     :logger].each do |attr|
       it "allows #{attr} to be set" do
         Restforce.configure do |config|
           config.send("#{attr}=", 'foobar')
@@ -86,14 +88,40 @@ describe Restforce do
     end
 
     context 'with logging enabled' do
-      before do
-        Restforce.stub log?: true
-        Restforce.configuration.logger.should_receive(:debug).with('foobar')
-      end
+      before { Restforce.stub(log?: true) }
 
       it 'logs something' do
+        Restforce.configuration.logger.should_receive(:debug).with('foobar')
         Restforce.log 'foobar'
       end
+
+      context "with a custom logger" do
+        let(:fake_logger) { double(debug: true) }
+
+        before do
+          Restforce.configure do |config|
+            config.logger = fake_logger
+          end
+        end
+
+        it "logs using the provided logger" do
+          fake_logger.should_receive(:debug).with('foobar')
+          Restforce.log('foobar')
+        end
+      end
+
+      context "with a custom log_level" do
+        before do
+          Restforce.configure do |config|
+            config.log_level = :info
+          end
+        end
+
+        it 'logs with the provided log_level' do
+          Restforce.configuration.logger.should_receive(:info).with('foobar')
+          Restforce.log 'foobar'
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric J. Holmes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -204,6 +204,10 @@ files:
 - lib/restforce/upload_io.rb
 - lib/restforce/version.rb
 - restforce.gemspec
+- script/bootstrap
+- script/console
+- script/guard
+- script/test
 - spec/fixtures/auth_error_response.json
 - spec/fixtures/auth_success_response.json
 - spec/fixtures/blob.jpg
@@ -272,7 +276,8 @@ files:
 - spec/unit/sobject_spec.rb
 - spec/unit/tooling/client_spec.rb
 homepage: https://github.com/ejholmes/restforce
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []