restforce 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c933281225117c041f54a23bd3141f5c8d1f9e8d
-  data.tar.gz: 153b2c10c1dca6035afb0675d5ebeab94ce27df9
+  metadata.gz: 307702db9af787319aab32acd6a4d2d6969be792
+  data.tar.gz: b62523a1931297c0598f7c52043b5e4dbf0afe0b
 SHA512:
-  metadata.gz: fac6beab45f4f1819edbb8f58195c9a6b9e085cc5dfb9fce2903231fe6bed89a3da30e142053b86860e7636ec7d331424cd0f9c3e5b29b6692bc3a5e1fd1b145
-  data.tar.gz: aa9bcae26b2041087aa53d81ee27b77d3b224f54f8e0732a54b8a0210680aaaf33f174aa35666599646e49cbf96d56d272b43c18b77eb9c2f8caa9b85f531089
+  metadata.gz: f8a11572c3132c5f223ddc6d3159908957c4a250b4fb7805a4156c7f258e5789b30a58c6ce93a07f23c86d8b1068741a041326c8d5c8dcaad7f7c7bee4c7ba35
+  data.tar.gz: 17d37b8a1b9546fd3b90e211c73baa7ae6bb3cd7c429a22dd8f062c3e90a59bbfe5fe20aa36e86ed70ba8d10895c0b01f952edb099ebe52da69d2de6fa11f53e

data/README.md

@@ -483,6 +483,8 @@ created/updated.
 
 _See also: [Force.com Streaming API docs](http://www.salesforce.com/us/developer/docs/api_streaming/index.htm)_
 
+*Note:* Restforce's streaming implementation is known to be compatible with version `0.8.9` of the faye gem.
+
 * * *
 
 ### Caching
@@ -601,4 +603,4 @@ Using the scripts in `./script` instead of `bundle exec rspec`, `bundle console`
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/lib/restforce/concerns/connection.rb

@@ -38,14 +38,14 @@ module Restforce
           builder.use      Restforce::Middleware::Authorization, self, options
           # Ensures the instance url is set.
           builder.use      Restforce::Middleware::InstanceURL, self, options
-          # Parses returned JSON response into a hash.
-          builder.response :json, content_type: /\bjson$/
           # Caches GET requests.
           builder.use      Restforce::Middleware::Caching, cache, options if cache
           # Follows 30x redirects.
           builder.use      FaradayMiddleware::FollowRedirects
           # Raises errors for 40x responses.
           builder.use      Restforce::Middleware::RaiseError
+          # Parses returned JSON response into a hash.
+          builder.response :json, content_type: /\bjson$/
           # Log request/responses
           builder.use      Restforce::Middleware::Logger,
                            Restforce.configuration.logger,

data/lib/restforce/middleware/caching.rb

@@ -18,7 +18,7 @@ module Restforce
     end
 
     def use_cache?
-      !@options.key?(:use_cache) || @options[:use_cache]
+      @options.fetch(:use_cache, true)
     end
   end
 end

data/lib/restforce/middleware/raise_error.rb

@@ -16,11 +16,18 @@ module Restforce
     end
 
     def message
-      "#{body.first['errorCode']}: #{body.first['message']}"
+      "#{body['errorCode']}: #{body['message']}"
     end
 
     def body
-      JSON.parse(@env[:body])
+      @body = (@env[:body].respond_to?(:first) ? @env[:body].first : @env[:body])
+
+      case @body
+      when Hash
+        @body
+      else
+        { 'errorCode' => '(error code missing)', 'message' => @body }
+      end
     end
 
     def response_values

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/integration/abstract_client_spec.rb

@@ -100,13 +100,22 @@ shared_examples_for Restforce::AbstractClient do
                status: 404,
                fixture: 'sobject/delete_error_response'
 
+      let(:error) do
+        JSON.parse(fixture('sobject/delete_error_response'))
+      end
+
       subject do
         lambda do
           client.update!('Account', Id: '001D000000INjVe', Name: 'Foobar')
         end
       end
 
-      it { should raise_error Faraday::Error::ResourceNotFound }
+      it {
+        should raise_error(
+          Faraday::Error::ResourceNotFound,
+          "#{error.first['errorCode']}: #{error.first['message']}"
+        )
+      }
     end
   end
 
@@ -317,17 +326,20 @@ shared_examples_for Restforce::AbstractClient do
   end
 
   describe '.without_caching' do
-    requests 'query\?q=SELECT%20some,%20fields%20FROM%20object',
-             fixture: 'sobject/query_success_response'
+    let(:cache) { MockCache.new }
 
-    before do
-      cache.should_receive(:delete).and_call_original
-      cache.should_receive(:fetch).and_call_original
+    it 'deletes the cached value before querying the API' do
+      stub = stub_api_request(
+        'query\?q=SELECT%20some,%20fields%20FROM%20object',
+        fixture: 'sobject/query_success_response'
+      )
+      client.query('SELECT some, fields FROM object')
+
+      expect(cache).to receive(:delete).and_call_original.ordered
+      expect(cache).to receive(:read).and_call_original.ordered
+      client.without_caching { client.query('SELECT some, fields FROM object') }
+      expect(stub).to have_been_requested.twice
     end
-
-    let(:cache) { MockCache.new }
-    subject { client.without_caching { client.query('SELECT some, fields FROM object') } }
-    it { should be_an Enumerable }
   end
 
   describe 'authentication retries' do

data/spec/support/mock_cache.rb

@@ -3,6 +3,14 @@ class MockCache
     @storage = {}
   end
 
+  def read(key)
+    @storage[key]
+  end
+
+  def write(key, value)
+    @storage[key] = value
+  end
+
   def fetch(key, &block)
     @storage[key] ||= block.call
   end

data/spec/unit/middleware/raise_error_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Restforce::Middleware::RaiseError do
-  let(:body)       { fixture('sobject/query_error_response') }
+  let(:body)       { JSON.parse(fixture('sobject/query_error_response')) }
   let(:env)        { { status: status, body: body } }
   let(:middleware) { described_class.new app }
 
@@ -37,12 +37,21 @@ describe Restforce::Middleware::RaiseError do
 
     context 'when the status code is 413' do
       let(:status) { 413 }
-      let(:body) { '' } # Zero length response
 
       it "raises an error" do
         expect { on_complete }.to raise_error Faraday::Error::ClientError,
                                               'HTTP 413 - Request Entity Too Large'
       end
     end
+
+    context 'when status is 400+ and body is a string' do
+      let(:body)   { 'An error occured' }
+      let(:status) { 404 }
+
+      it 'raises an error with a non-existing error code' do
+        expect { on_complete }.to raise_error Faraday::Error::ClientError,
+                                              "(error code missing): #{body}"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Eric J. Holmes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday