restforce 1.3.0 → 1.4.0

data/spec/unit/middleware/instance_url_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Restforce::Middleware::InstanceURL do
+  describe '.call' do
+    subject { lambda { middleware.call(nil) } }
+
+    context 'when the instance url is not set' do
+      before do
+        client.stub_chain :connection, :url_prefix => URI.parse('http:/')
+      end
+
+      it { should raise_error Restforce::UnauthorizedError }
+    end
+
+    context 'when the instance url is set' do
+      before do
+        client.stub_chain :connection, :url_prefix => URI.parse('http://foobar.com/')
+        app.should_receive(:call).once
+      end
+
+      it { should_not raise_error }
+    end
+  end
+end

data/spec/{lib → unit}/middleware/logger_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Restforce::Middleware::Logger do
-  let(:app)        { double('app')            }
-  let(:env)        { { }  }
   let(:logger)     { double('logger') }
-  let(:options)    { { :host => 'login.salesforce.com', :client_secret => 'foo', :password => 'bar' } }
   let(:middleware) { described_class.new app, logger, options }
 
-  describe 'logging' do
+  describe '.call' do
+    subject { lambda { middleware.call(env) } }
+
     before do
       app.should_receive(:call).once.and_return(app)
       app.should_receive(:on_complete).once { middleware.on_complete(env) }
@@ -15,8 +14,6 @@ describe Restforce::Middleware::Logger do
       logger.should_receive(:debug).with('response')
     end
 
-    it 'logs the request and response' do
-      middleware.call(env)
-    end
+    it { should_not raise_error }
   end
 end

data/spec/unit/middleware/mashify_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Restforce::Middleware::Mashify do
+  let(:env) { { :body => JSON.parse(fixture('sobject/query_success_response')) } }
+
+  describe '.call' do
+    subject { lambda { middleware.call(env) } }
+
+    it { should change { env[:body] }.to(kind_of(Restforce::Collection)) }
+  end
+end

data/spec/{lib → unit}/middleware/raise_error_spec.rb

@@ -1,27 +1,26 @@
 require 'spec_helper'
 
 describe Restforce::Middleware::RaiseError do
-  let(:app)        { double('app') }
   let(:body)       { fixture('sobject/query_error_response') }
   let(:env)        { { :status => status, :body => body } }
   let(:middleware) { described_class.new app }
 
   describe '.on_complete' do
-    subject { middleware.on_complete(env) }
+    subject { lambda { middleware.on_complete(env) } }
 
     context 'when the status code is 404' do
       let(:status) { 404 }
-      specify { expect { subject }.to raise_error Faraday::Error::ResourceNotFound, 'INVALID_FIELD: error_message' }
+      it { should raise_error Faraday::Error::ResourceNotFound, 'INVALID_FIELD: error_message' }
     end
 
     context 'when the status code is 400' do
       let(:status) { 400 }
-      specify { expect { subject }.to raise_error Faraday::Error::ClientError, 'INVALID_FIELD: error_message' }
+      it { should raise_error Faraday::Error::ClientError, 'INVALID_FIELD: error_message' }
     end
 
     context 'when the status code is 401' do
       let(:status) { 401 }
-      specify { expect { subject }.to raise_error Restforce::UnauthorizedError, 'INVALID_FIELD: error_message' }
+      it { should raise_error Restforce::UnauthorizedError, 'INVALID_FIELD: error_message' }
     end
   end
 end

data/spec/unit/sobject_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Restforce::SObject do
+  let(:client)      { double('Client') }
+  let(:hash)        { JSON.parse(fixture('sobject/query_success_response'))['records'].first }
+  subject(:sobject) { described_class.new(hash, client) }
+
+  describe '#new' do
+    context 'with valid options' do
+      it                 { should be_a Restforce::SObject }
+      it                 { should have_client client }
+      its(:sobject_type) { should eq 'Whizbang' }
+      its(:Text_Label)   { should eq 'Hi there!' }
+
+      describe 'children' do
+        subject(:children) { sobject.Whizbangs__r }
+
+        it { should be_a Restforce::Collection }
+
+        describe 'each child' do
+          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
+
+      describe 'parent' do
+        subject(:parent) { sobject.ParentWhizbang__r }
+
+        it                 { should be_a Restforce::SObject }
+        its(:sobject_type) { should eq 'Whizbang' }
+        its(:Name)         { should eq 'Parent Whizbang' }
+        it                 { should have_client client }
+      end
+    end
+  end
+
+  { :save     => :update,
+    :save!    => :update!,
+    :destroy  => :destroy,
+    :destroy! => :destroy! }.each do |method, receiver|
+    describe ".#{method}" do
+      subject { lambda { sobject.send(method) } }
+
+      context 'when an Id was not queried' do
+        it { should raise_error ArgumentError, 'You need to query the Id for the record first.' }
+      end
+
+      context 'when an Id is present' do
+        before do
+          hash.merge!(:Id => '001D000000INjVe')
+          client.should_receive(receiver)
+        end
+
+        it { should_not raise_error }
+      end
+    end
+  end
+
+  describe '.describe' do
+    subject { lambda { sobject.describe } }
+
+    before do
+      client.should_receive(:describe).with('Whizbang')
+    end
+
+    it { should_not raise_error }
+  end
+end

data/spec/unit/tooling/client_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Restforce::Tooling::Client do
+  subject { described_class }
+
+  it { should < Restforce::AbstractClient }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -151,22 +151,26 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/restforce.rb
+- lib/restforce/abstract_client.rb
 - lib/restforce/attachment.rb
 - lib/restforce/client.rb
-- lib/restforce/client/api.rb
-- lib/restforce/client/authentication.rb
-- lib/restforce/client/caching.rb
-- lib/restforce/client/canvas.rb
-- lib/restforce/client/connection.rb
-- lib/restforce/client/picklists.rb
-- lib/restforce/client/streaming.rb
-- lib/restforce/client/verbs.rb
 - lib/restforce/collection.rb
+- lib/restforce/concerns/api.rb
+- lib/restforce/concerns/authentication.rb
+- lib/restforce/concerns/base.rb
+- lib/restforce/concerns/caching.rb
+- lib/restforce/concerns/canvas.rb
+- lib/restforce/concerns/connection.rb
+- lib/restforce/concerns/picklists.rb
+- lib/restforce/concerns/streaming.rb
+- lib/restforce/concerns/verbs.rb
 - lib/restforce/config.rb
+- lib/restforce/data/client.rb
 - lib/restforce/mash.rb
 - lib/restforce/middleware.rb
 - lib/restforce/middleware/authentication.rb
@@ -182,6 +186,7 @@ files:
 - lib/restforce/middleware/raise_error.rb
 - lib/restforce/signed_request.rb
 - lib/restforce/sobject.rb
+- lib/restforce/tooling/client.rb
 - lib/restforce/upload_io.rb
 - lib/restforce/version.rb
 - restforce.gemspec
@@ -216,28 +221,40 @@ files:
 - spec/fixtures/sobject/upsert_multiple_error_response.json
 - spec/fixtures/sobject/upsert_updated_success_response.json
 - spec/fixtures/sobject/write_error_response.json
-- spec/lib/attachment_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/collection_spec.rb
-- spec/lib/config_spec.rb
-- spec/lib/mash_spec.rb
-- spec/lib/middleware/authentication/password_spec.rb
-- spec/lib/middleware/authentication/token_spec.rb
-- spec/lib/middleware/authentication_spec.rb
-- spec/lib/middleware/authorization_spec.rb
-- spec/lib/middleware/gzip_spec.rb
-- spec/lib/middleware/instance_url_spec.rb
-- spec/lib/middleware/logger_spec.rb
-- spec/lib/middleware/mashify_spec.rb
-- spec/lib/middleware/raise_error_spec.rb
-- spec/lib/signed_request_spec.rb
-- spec/lib/sobject_spec.rb
+- spec/integration/abstract_client_spec.rb
+- spec/integration/data/client_spec.rb
 - spec/spec_helper.rb
-- spec/support/basic_client.rb
+- spec/support/client_integration.rb
+- spec/support/concerns.rb
+- spec/support/event_machine.rb
 - spec/support/fixture_helpers.rb
 - spec/support/matchers.rb
 - spec/support/middleware.rb
 - spec/support/mock_cache.rb
+- spec/unit/abstract_client_spec.rb
+- spec/unit/attachment_spec.rb
+- spec/unit/collection_spec.rb
+- spec/unit/concerns/api_spec.rb
+- spec/unit/concerns/authentication_spec.rb
+- spec/unit/concerns/base_spec.rb
+- spec/unit/concerns/caching_spec.rb
+- spec/unit/concerns/canvas_spec.rb
+- spec/unit/concerns/connection_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/data/client_spec.rb
+- spec/unit/mash_spec.rb
+- spec/unit/middleware/authentication/password_spec.rb
+- spec/unit/middleware/authentication/token_spec.rb
+- spec/unit/middleware/authentication_spec.rb
+- spec/unit/middleware/authorization_spec.rb
+- spec/unit/middleware/gzip_spec.rb
+- spec/unit/middleware/instance_url_spec.rb
+- spec/unit/middleware/logger_spec.rb
+- spec/unit/middleware/mashify_spec.rb
+- spec/unit/middleware/raise_error_spec.rb
+- spec/unit/signed_request_spec.rb
+- spec/unit/sobject_spec.rb
+- spec/unit/tooling/client_spec.rb
 homepage: https://github.com/ejholmes/restforce
 licenses: []
 post_install_message: 
@@ -252,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2514062890750763667
+      hash: -563972279919245116
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2514062890750763667
+      hash: -563972279919245116
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -300,25 +317,37 @@ test_files:
 - spec/fixtures/sobject/upsert_multiple_error_response.json
 - spec/fixtures/sobject/upsert_updated_success_response.json
 - spec/fixtures/sobject/write_error_response.json
-- spec/lib/attachment_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/collection_spec.rb
-- spec/lib/config_spec.rb
-- spec/lib/mash_spec.rb
-- spec/lib/middleware/authentication/password_spec.rb
-- spec/lib/middleware/authentication/token_spec.rb
-- spec/lib/middleware/authentication_spec.rb
-- spec/lib/middleware/authorization_spec.rb
-- spec/lib/middleware/gzip_spec.rb
-- spec/lib/middleware/instance_url_spec.rb
-- spec/lib/middleware/logger_spec.rb
-- spec/lib/middleware/mashify_spec.rb
-- spec/lib/middleware/raise_error_spec.rb
-- spec/lib/signed_request_spec.rb
-- spec/lib/sobject_spec.rb
+- spec/integration/abstract_client_spec.rb
+- spec/integration/data/client_spec.rb
 - spec/spec_helper.rb
-- spec/support/basic_client.rb
+- spec/support/client_integration.rb
+- spec/support/concerns.rb
+- spec/support/event_machine.rb
 - spec/support/fixture_helpers.rb
 - spec/support/matchers.rb
 - spec/support/middleware.rb
 - spec/support/mock_cache.rb
+- spec/unit/abstract_client_spec.rb
+- spec/unit/attachment_spec.rb
+- spec/unit/collection_spec.rb
+- spec/unit/concerns/api_spec.rb
+- spec/unit/concerns/authentication_spec.rb
+- spec/unit/concerns/base_spec.rb
+- spec/unit/concerns/caching_spec.rb
+- spec/unit/concerns/canvas_spec.rb
+- spec/unit/concerns/connection_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/data/client_spec.rb
+- spec/unit/mash_spec.rb
+- spec/unit/middleware/authentication/password_spec.rb
+- spec/unit/middleware/authentication/token_spec.rb
+- spec/unit/middleware/authentication_spec.rb
+- spec/unit/middleware/authorization_spec.rb
+- spec/unit/middleware/gzip_spec.rb
+- spec/unit/middleware/instance_url_spec.rb
+- spec/unit/middleware/logger_spec.rb
+- spec/unit/middleware/mashify_spec.rb
+- spec/unit/middleware/raise_error_spec.rb
+- spec/unit/signed_request_spec.rb
+- spec/unit/sobject_spec.rb
+- spec/unit/tooling/client_spec.rb

data/lib/restforce/client/canvas.rb

@@ -1,12 +0,0 @@
-module Restforce
-  class Client
-    module Canvas
-
-      def decode_signed_request(signed_request)
-        raise 'client_secret not set' unless @options[:client_secret]
-        SignedRequest.decode(signed_request, @options[:client_secret])
-      end
-
-    end
-  end
-end

data/spec/lib/collection_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-describe Restforce::Collection do
-  let(:client) { double('client') }
-
-  describe '#new' do
-    subject { records }
-
-    context 'without pagination' do
-      let(:records) do
-        described_class.new(JSON.parse(fixture('sobject/query_success_response')), client)
-      end
-
-      it                   { should respond_to :each }
-      its(:size)           { should eq 1 }
-      its(:has_next_page?) { should be_false }
-      specify { expect(subject.instance_variable_get(:@client)).to eq client }
-
-      describe 'each record' do
-        subject { records }
-        it { should be_all { |record| expect(record).to be_a Restforce::SObject } }
-      end
-    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(:records) { described_class.new(first_page, client) }
-
-      it { should respond_to :each }
-      specify { expect(subject.instance_variable_get(:@client)).to eq client }
-
-      context 'when only values from the first page are being requested' do
-        before { client.should_not_receive(:get) }
-
-        its(:size) { should eq 2 }
-        its(:first) { should be_an_instance_of Restforce::SObject }
-      end
-
-      context 'when all of the values are being requested' do
-        before do
-          client.stub(:get).and_return(Faraday::Response.new(:body => Restforce::Collection.new(next_page, client)))
-        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 } }
-        specify { subject.next_page.should be_a Restforce::Collection }
-      end
-    end
-  end
-end

data/spec/lib/middleware/authentication_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe Restforce::Middleware::Authentication do
-  let(:app)        { double('app')            }
-  let(:env)        { { }  }
-  let(:retries)    { 3 }
-  let(:options)    { { :host => 'login.salesforce.com', :authentication_retries => retries } }
-  let(:middleware) { described_class.new app, nil, options }
-
-  describe '.authenticate!' do
-    it 'raises an error' do
-      expect {
-        middleware.authenticate!
-      }.to raise_error RuntimeError, 'not implemented'
-    end
-  end
-
-  describe '.call' do
-    context 'when all is good' do
-      before do
-        app.should_receive(:call).once
-      end
-
-      it 'calls the next middlware' do
-        middleware.call(env)
-      end
-    end
-
-    context 'when an exception is thrown' do
-      before do
-        env[:body] = 'foo'
-        env[:request] = {:proxy => nil}
-      end
-
-      it 'attempts to authenticate' do
-        app.should_receive(:call).once.and_raise(Restforce::UnauthorizedError.new('something bad'))
-        middleware.should_receive(:authenticate!)
-        expect { middleware.call(env) }.to raise_error Restforce::UnauthorizedError
-      end
-    end
-  end
-
-  describe '.connection' do
-    subject { middleware.connection }
-
-    its(:url_prefix) { should eq URI.parse('https://login.salesforce.com') }
-
-    describe '.builder' do
-      subject { middleware.connection.builder }
-
-      context 'with logging disabled' do
-        before do
-          Restforce.stub!(:log?).and_return(false)
-        end
-
-        its(:handlers) { should include FaradayMiddleware::ParseJson, Faraday::Adapter::NetHttp }
-        its(:handlers) { should_not include Restforce::Middleware::Logger  }
-      end
-
-      context 'with logging enabled' do
-        before do
-          Restforce.stub!(:log?).and_return(true)
-        end
-
-        its(:handlers) { should include FaradayMiddleware::ParseJson, Restforce::Middleware::Logger, Faraday::Adapter::NetHttp }
-      end
-    end
-  end
-end