restforce 0.1.2 → 0.1.3

data/lib/restforce/client.rb

@@ -353,18 +353,18 @@ module Restforce
     # Internal: Internal faraday connection where all requests go through
     def connection
       @connection ||= Faraday.new(@options[:instance_url]) do |builder|
-        builder.use Restforce::Middleware::Mashify, self, @options
-        builder.use Restforce::Middleware::Multipart
-        builder.request :json
-        builder.use authentication_middleware, self, @options if authentication_middleware
-        builder.use Restforce::Middleware::Authorization, self, @options
-        builder.use Restforce::Middleware::InstanceURL, self, @options
-        builder.use Restforce::Middleware::RaiseError
+        builder.use      Restforce::Middleware::Mashify, self, @options
+        builder.use      Restforce::Middleware::Multipart
+        builder.request  :json
+        builder.use      authentication_middleware, self, @options if authentication_middleware
+        builder.use      Restforce::Middleware::Authorization, self, @options
+        builder.use      Restforce::Middleware::InstanceURL, self, @options
         builder.response :json
-        builder.use Restforce::Middleware::Caching, cache, @options if cache
-        builder.use FaradayMiddleware::FollowRedirects
-        builder.use Restforce::Middleware::Logger, Restforce.configuration.logger, @options if Restforce.log?
-        builder.adapter Faraday.default_adapter
+        builder.use      Restforce::Middleware::Caching, cache, @options if cache
+        builder.use      FaradayMiddleware::FollowRedirects
+        builder.use      Restforce::Middleware::RaiseError
+        builder.use      Restforce::Middleware::Logger, Restforce.configuration.logger, @options if Restforce.log?
+        builder.adapter  Faraday.default_adapter
       end
       @connection
     end

data/lib/restforce/middleware/raise_error.rb

@@ -1,18 +1,23 @@
 module Restforce
   class Middleware::RaiseError < Faraday::Response::Middleware
     def on_complete(env)
+      @env = env
       case env[:status]
       when 404
-        raise Faraday::Error::ResourceNotFound, message(env)
+        raise Faraday::Error::ResourceNotFound, message
       when 401
-        raise Restforce::UnauthorizedError, message(env)
+        raise Restforce::UnauthorizedError, message
       when 400...600
-        raise Faraday::Error::ClientError, message(env)
+        raise Faraday::Error::ClientError, message
       end
     end
 
-    def message(env)
-      "#{env[:body].first['errorCode']}: #{env[:body].first['message']}"
+    def message
+      "#{body.first['errorCode']}: #{body.first['message']}"
+    end
+
+    def body
+      @body ||= JSON.parse(@env[:body])
     end
   end
 end

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'
 end

data/spec/lib/client_spec.rb

@@ -428,27 +428,22 @@ shared_examples_for 'methods' do
     end
 
     let(:cache) { MockCache.new }
-    let(:oauth_token) { 'foobar' }
 
     before do
-      @requests = [].tap do |requests|
-        requests << stub_request(:get, /query\?q=SELECT%20some,%20fields%20FROM%20object/)
-          .with(headers: { 'Authorization' => "OAuth #{oauth_token}" })
-          .to_return(status: 401, body: fixture('expired_session_response'))
+      @query = stub_request(:get, /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'))
 
-        requests << stub_request(:post, "https://login.salesforce.com/services/oauth2/token")
-          .with(: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))
-
-        requests << stub_request(:get, /query\?q=SELECT%20some,%20fields%20FROM%20object/)
-          .with(headers: { 'Authorization' => "OAuth 00Dx0000000BV7z!AR8AQAxo9UfVkh8AlV0Gomt9Czx9LjHnSSpwBMmbRcgKFmxOtvxjTrKW19ye6PE3Ds1eQz3z8jr3W7_VbWmEu4Q8TVGSTHxs" })
-          .to_return(status: 200, body: fixture('sobject/query_success_response'))
-      end
+      @login = stub_request(:post, "https://login.salesforce.com/services/oauth2/token")
+        .with(: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
-      @requests.each { |request| request.should have_been_requested }
+      @query.should have_been_made.times(2)
+      @login.should have_been_made
     end
 
     subject { client.query('SELECT some, fields FROM object') }

data/spec/lib/middleware/raise_error_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: