sfdc 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db9e563376f75fdd91451086288513ac98ff4bb
-  data.tar.gz: d5cc200a8a3e6cf90a5b0bfe89699ace0791d9b0
+  metadata.gz: b069e7a4c283823fd8d6c1cb4d91655843aeb825
+  data.tar.gz: 5f4ee6acdefbea239435a03d000e3ff2f5fbfdb0
 SHA512:
-  metadata.gz: 3d1c893e10b0a699b2e05616e8a109a6de09bd455c8f9fb9d6ad89da604d94e943e48bbd32c995464e058d9d7de3167044ea5fa254006ac2d30a329d7269075b
-  data.tar.gz: 25c0e5d419ed282040c7b5fc1a1dbbb679af0a79c583672ea4fd147be2c2b0071a8cd3f308d64a09827dca2d8dc14fe8c9c5178186556fff07a6f604c9a13b83
+  metadata.gz: 7b8ce424aa1aee8e13e61a8b3d79c90f0db1adde39258ff722492d49bc65afcb884352ec617b95db3245399ad238605d1145aed17f6dda7e5b1ec66379ced844
+  data.tar.gz: 476893d58baba2e78b4bbfb2ab111ae92fd756cef72115c712dbcdc29baed9844e5156261030085e1a65cbc322601b4ef5d69b004c668dabcfe7fe6c679d874b

data/README.md

@@ -422,6 +422,16 @@ end
 
 You can use Sfdc to decode signed requests from Salesforce. See [the example app](https://gist.github.com/4052312).
 
+## Tooling API
+
+To use the [Tooling API](http://www.salesforce.com/us/developer/docs/api_toolingpre/api_tooling.pdf),
+call `Sfdc.tooling` instead of `Sfdc.new`:
+
+```ruby
+client = Sfdc.tooling(...)
+```
+
+
 ## Contributing
 
 1. Fork it

data/lib/sfdc.rb

@@ -1,5 +1,3 @@
-require "sfdc/version"
-
 require 'faraday'
 require 'faraday_middleware'
 require 'json'
@@ -8,22 +6,54 @@ require 'sfdc/version'
 require 'sfdc/config'
 
 module Sfdc
-  autoload :SignedRequest, 'sfdc/signed_request'
-  autoload :Collection,    'sfdc/collection'
-  autoload :Middleware,    'sfdc/middleware'
-  autoload :Attachment,    'sfdc/attachment'
-  autoload :UploadIO,      'sfdc/upload_io'
-  autoload :SObject,       'sfdc/sobject'
-  autoload :Client,        'sfdc/client'
-  autoload :Mash,          'sfdc/mash'
-
-  AuthenticationError = Class.new(StandardError)
-  UnauthorizedError   = Class.new(StandardError)
+  autoload :AbstractClient, 'sfdc/abstract_client'
+  autoload :SignedRequest,  'sfdc/signed_request'
+  autoload :Collection,     'sfdc/collection'
+  autoload :Middleware,     'sfdc/middleware'
+  autoload :Attachment,     'sfdc/attachment'
+  autoload :UploadIO,       'sfdc/upload_io'
+  autoload :SObject,        'sfdc/sobject'
+  autoload :Client,         'sfdc/client'
+  autoload :Mash,           'sfdc/mash'
+
+  module Concerns
+    autoload :Authentication, 'sfdc/concerns/authentication'
+    autoload :Connection,     'sfdc/concerns/connection'
+    autoload :Picklists,      'sfdc/concerns/picklists'
+    autoload :Streaming,      'sfdc/concerns/streaming'
+    autoload :Caching,        'sfdc/concerns/caching'
+    autoload :Canvas,         'sfdc/concerns/canvas'
+    autoload :Verbs,          'sfdc/concerns/verbs'
+    autoload :Base,           'sfdc/concerns/base'
+    autoload :API,            'sfdc/concerns/api'
+  end
+
+  module Data
+    autoload :Client, 'sfdc/data/client'
+  end
+
+  module Tooling
+    autoload :Client, 'sfdc/tooling/client'
+  end
+
+  Error               = Class.new(StandardError)
+  AuthenticationError = Class.new(Error)
+  UnauthorizedError   = Class.new(Error)
 
   class << self
-    # Alias for Sfdc::Client.new
-    def new(options = {}, &block)
-      Sfdc::Client.new(options, &block)
+    # Alias for Sfdc::Data::Client.new
+    #
+    # Shamelessly pulled from https://github.com/pengwynn/octokit/blob/master/lib/octokit.rb
+    def new(*args)
+      data(*args)
+    end
+
+    def data(*args)
+      Sfdc::Data::Client.new(*args)
+    end
+
+    def tooling(*args)
+      Sfdc::Tooling::Client.new(*args)
     end
 
     # Helper for decoding signed requests.

data/lib/sfdc/abstract_client.rb

@@ -0,0 +1,9 @@
+module Sfdc
+  class AbstractClient
+    include Sfdc::Concerns::Base
+    include Sfdc::Concerns::Connection
+    include Sfdc::Concerns::Authentication
+    include Sfdc::Concerns::Caching
+    include Sfdc::Concerns::API
+  end
+end

data/lib/sfdc/client.rb

@@ -1,98 +1,3 @@
-require 'sfdc/client/connection'
-require 'sfdc/client/authentication'
-require 'sfdc/client/streaming'
-require 'sfdc/client/picklists'
-require 'sfdc/client/caching'
-require 'sfdc/client/canvas'
-require 'sfdc/client/api'
-
 module Sfdc
-  class Client
-    include Sfdc::Client::Connection
-    include Sfdc::Client::Authentication
-    include Sfdc::Client::Streaming
-    include Sfdc::Client::Picklists
-    include Sfdc::Client::Caching
-    include Sfdc::Client::Canvas
-    include Sfdc::Client::API
-
-    # 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).
-    #
-    #        :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.
-    #
-    #        :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')
-    #
-    #        :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).
-    #        :timeout                - Faraday connection request read/open timeout. (default: nil).
-    #
-    #        :proxy_uri              - Proxy URI: 'http://proxy.example.com:port' or 'http://user@pass:proxy.example.com:port'
-    #
-    # Examples
-    #
-    #   # Initialize a new client using password authentication:
-    #   Sfdc::Client.new :username => 'user',
-    #     :password => 'pass',
-    #     :security_token => 'security token',
-    #     :client_id => 'client id',
-    #     :client_secret => 'client secret'
-    #
-    #   # Initialize a new client using oauth authentication:
-    #   Sfdc::Client.new :oauth_token => 'access token',
-    #     :refresh_token => 'refresh token',
-    #     :instance_url => 'https://na1.salesforce.com',
-    #     :client_id => 'client id',
-    #     :client_secret => 'client secret'
-    #
-    #   # Initialize a new client without using any authentication middleware:
-    #   Sfdc::Client.new :oauth_token => 'access token',
-    #     :instance_url => 'https://na1.salesforce.com'
-    #
-    def initialize(opts = {})
-      raise 'Please specify a hash of options' unless opts.is_a?(Hash)
-      @options = Hash[Sfdc.configuration.options.map { |option| [option, Sfdc.configuration.send(option)] }]
-      @options.merge! opts
-      yield builder if block_given?
-    end
-
-    def instance_url
-      authenticate! unless @options[:instance_url]
-      @options[:instance_url]
-    end
-
-    # Public: Returns a url to the resource.
-    #
-    # resource - A record that responds to to_sparam or a String/Fixnum.
-    #
-    # Returns the url to the resource.
-    def url(resource)
-      "#{instance_url}/#{(resource.respond_to?(:to_sparam) ? resource.to_sparam : resource)}"
-    end
-
-    def inspect
-      "#<#{self.class} @options=#{@options.inspect}>"
-    end
-  end
+  Client = Data::Client
 end

data/lib/sfdc/{client → concerns}/api.rb

@@ -1,9 +1,9 @@
-require 'sfdc/client/verbs'
+require 'sfdc/concerns/verbs'
 
 module Sfdc
-  class Client
+  module Concerns
     module API
-      extend Sfdc::Client::Verbs
+      extend Sfdc::Concerns::Verbs
 
       # Public: Helper methods for performing arbitrary actions against the API using
       # various HTTP verbs.
@@ -77,15 +77,6 @@ module Sfdc
         query('select id from Organization').first['Id']
       end
 
-      # Public: Get the current user's Id.
-      # client.user_id
-      def user_id
-        response = authenticate!
-        info = get(response.id).body
-        user_id = info.user_id
-        return user_id
-      end
-
       # Public: Executs a SOQL query and returns the result.
       #
       # soql - A SOQL expression.
@@ -103,16 +94,6 @@ module Sfdc
         mashify? ? response.body : response.body['records']
       end
 
-      # Returns SFDC recent items Id.
-      # Returns Sfdc::SObject
-      # client.recent.each do |r|
-      #   puts r.Name + ' ' + r.Id
-      # end
-      def recent
-        response = api_get 'recent'
-        mashify? ? response.body : response.body['records']
-      end
-
       # Public: Perform a SOSL search
       #
       # sosl - A SOSL expression.
@@ -203,7 +184,7 @@ module Sfdc
       # Raises an exception if an error is returned from Salesforce.
       def update!(sobject, attrs)
         id = attrs.delete(attrs.keys.find { |k| k.to_s.downcase == 'id' })
-        raise 'Id field missing.' unless id
+        raise ArgumentError, 'Id field missing from attrs.' unless id
         api_patch "sobjects/#{sobject}/#{id}", attrs
         true
       end
@@ -294,8 +275,16 @@ module Sfdc
       def find(sobject, id, field=nil)
         api_get(field ? "sobjects/#{sobject}/#{field}/#{id}" : "sobjects/#{sobject}/#{id}").body
       end
-
-
+      
+      # Public: Get the current user's Id.
+      # client.user_id
+      def user_id
+        response = authenticate!
+        info = get(response.id).body
+        user_id = info.user_id
+        return user_id
+      end
+      
       #################### Chatter items ############################
       # @client.feeds.each do |f|
           # puts f.to_hash['id']
@@ -316,7 +305,7 @@ module Sfdc
       #   api_path('sobjects')
       #   # => '/services/data/v24.0/sobjects'
       def api_path(path)
-        "/services/data/v#{@options[:api_version]}/#{path}"
+        "/services/data/v#{options[:api_version]}/#{path}"
       end
 
       # Internal: Errors that should be rescued from in non-bang methods

data/lib/sfdc/{client → concerns}/authentication.rb

@@ -1,11 +1,11 @@
 module Sfdc
-  class Client
+  module Concerns
     module Authentication
 
       # Public: Force an authentication
       def authenticate!
         raise AuthenticationError, 'No authentication middleware present' unless authentication_middleware
-        middleware = authentication_middleware.new nil, self, @options
+        middleware = authentication_middleware.new nil, self, options
         middleware.authenticate!
       end
 
@@ -21,18 +21,18 @@ module Sfdc
       # Internal: Returns true if username/password (autonomous) flow should be used for
       # authentication.
       def username_password?
-        @options[:username] &&
-          @options[:password] &&
-          @options[:client_id] &&
-          @options[:client_secret]
+        options[:username] &&
+          options[:password] &&
+          options[:client_id] &&
+          options[:client_secret]
       end
 
       # Internal: Returns true if oauth token refresh flow should be used for
       # authentication.
       def oauth_refresh?
-        @options[:refresh_token] &&
-          @options[:client_id] &&
-          @options[:client_secret]
+        options[:refresh_token] &&
+          options[:client_id] &&
+          options[:client_secret]
       end
 
     end

data/lib/sfdc/concerns/base.rb

@@ -0,0 +1,58 @@
+module Sfdc
+  module Concerns
+    module Base
+
+      attr_reader :options
+
+      # 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).
+      #
+      #        :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.
+      #
+      #        :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')
+      #
+      #        :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).
+      #        :timeout                - Faraday connection request read/open timeout. (default: nil).
+      #
+      #        :proxy_uri              - Proxy URI: 'http://proxy.example.com:port' or 'http://user@pass:proxy.example.com:port'
+      def initialize(opts = {})
+        raise ArgumentError, 'Please specify a hash of options' unless opts.is_a?(Hash)
+        @options = Hash[Sfdc.configuration.options.map { |option| [option, Sfdc.configuration.send(option)] }]
+        @options.merge! opts
+        yield builder if block_given?
+      end
+
+      def instance_url
+        authenticate! unless options[:instance_url]
+        options[:instance_url]
+      end
+
+      def inspect
+        "#<#{self.class} @options=#{@options.inspect}>"
+      end
+
+    end
+  end
+end

data/lib/sfdc/{client → concerns}/caching.rb

@@ -1,5 +1,5 @@
 module Sfdc
-  class Client
+  module Concerns
     module Caching
 
       # Public: Runs the block with caching disabled.
@@ -8,17 +8,17 @@ module Sfdc
       #
       # Returns the result of the block
       def without_caching(&block)
-        @options[:use_cache] = false
+        options[:use_cache] = false
         block.call
       ensure
-        @options.delete(:use_cache)
+        options.delete(:use_cache)
       end
 
     private
 
       # Internal: Cache to use for the caching middleware
       def cache
-        @options[:cache]
+        options[:cache]
       end
 
     end

data/lib/sfdc/concerns/canvas.rb

@@ -0,0 +1,12 @@
+module Sfdc
+  module Concerns
+    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/lib/sfdc/{client → concerns}/connection.rb

@@ -1,5 +1,5 @@
 module Sfdc
-  class Client
+  module Concerns
     module Connection
 
       # Public: The Faraday::Builder instance used for the middleware stack. This
@@ -20,31 +20,31 @@ module Sfdc
 
       # Internal: Internal faraday connection where all requests go through
       def connection
-        @connection ||= Faraday.new(@options[:instance_url], connection_options) do |builder|
+        @connection ||= Faraday.new(options[:instance_url], connection_options) do |builder|
           # Parses JSON into Hashie::Mash structures.
-          builder.use      Sfdc::Middleware::Mashify, self, @options
+          builder.use      Sfdc::Middleware::Mashify, self, options
           # Handles multipart file uploads for blobs.
           builder.use      Sfdc::Middleware::Multipart
           # Converts the request into JSON.
           builder.request  :json
           # Handles reauthentication for 403 responses.
-          builder.use      authentication_middleware, self, @options if authentication_middleware
+          builder.use      authentication_middleware, self, options if authentication_middleware
           # Sets the oauth token in the headers.
-          builder.use      Sfdc::Middleware::Authorization, self, @options
+          builder.use      Sfdc::Middleware::Authorization, self, options
           # Ensures the instance url is set.
-          builder.use      Sfdc::Middleware::InstanceURL, self, @options
+          builder.use      Sfdc::Middleware::InstanceURL, self, options
           # Parses returned JSON response into a hash.
           builder.response :json, :content_type => /\bjson$/
           # Caches GET requests.
-          builder.use      Sfdc::Middleware::Caching, cache, @options if cache
+          builder.use      Sfdc::Middleware::Caching, cache, options if cache
           # Follows 30x redirects.
           builder.use      FaradayMiddleware::FollowRedirects
           # Raises errors for 40x responses.
           builder.use      Sfdc::Middleware::RaiseError
           # Log request/responses
-          builder.use      Sfdc::Middleware::Logger, Sfdc.configuration.logger, @options if Sfdc.log?
+          builder.use      Sfdc::Middleware::Logger, Sfdc.configuration.logger, options if Sfdc.log?
           # Compress/Decompress the request/response
-          builder.use      Sfdc::Middleware::Gzip, self, @options
+          builder.use      Sfdc::Middleware::Gzip, self, options
 
           builder.adapter  adapter
         end
@@ -57,9 +57,9 @@ module Sfdc
       # Internal: Faraday Connection options
       def connection_options
         { :request => {
-            :timeout => @options[:timeout],
-            :open_timeout => @options[:timeout] },
-          :proxy => @options[:proxy_uri]
+            :timeout => options[:timeout],
+            :open_timeout => options[:timeout] },
+          :proxy => options[:proxy_uri]
         }
       end
 

data/lib/sfdc/{client → concerns}/picklists.rb

@@ -1,5 +1,5 @@
 module Sfdc
-  class Client
+  module Concerns
     module Picklists
 
       # Public: Get the available picklist values for a picklist or multipicklist field.

data/lib/sfdc/{client → concerns}/streaming.rb

@@ -1,5 +1,5 @@
 module Sfdc
-  class Client
+  module Concerns
     module Streaming
 
       # Public: Subscribe to a PushTopic
@@ -14,8 +14,8 @@ module Sfdc
 
       # Public: Faye client to use for subscribing to PushTopics
       def faye
-        raise 'Instance URL missing. Call .authenticate! first.' unless @options[:instance_url]
-        @faye ||= Faye::Client.new("#{@options[:instance_url]}/cometd/#{@options[:api_version]}").tap do |client|
+        raise 'Instance URL missing. Call .authenticate! first.' unless options[:instance_url]
+        @faye ||= Faye::Client.new("#{options[:instance_url]}/cometd/#{options[:api_version]}").tap do |client|
           client.bind 'transport:down' do
             Sfdc.log "[COMETD DOWN]"
             client.set_header 'Authorization', "OAuth #{authenticate!.access_token}"

data/lib/sfdc/{client → concerns}/verbs.rb

@@ -1,5 +1,5 @@
 module Sfdc
-  class Client
+  module Concerns
     module Verbs
 
       # Internal: Define methods to handle a verb.
@@ -31,13 +31,13 @@ module Sfdc
       # Returns nil.
       def define_verb(verb)
         define_method verb do |*args, &block|
-          retries = @options[:authentication_retries]
+          retries = options[:authentication_retries]
           begin
             connection.send(verb, *args, &block)
           rescue Sfdc::UnauthorizedError
             if retries > 0
               retries -= 1
-              connection.url_prefix = @options[:instance_url]
+              connection.url_prefix = options[:instance_url]
               retry
             end
             raise

data/lib/sfdc/config.rb

@@ -82,7 +82,7 @@ module Sfdc
       end
     end
 
-    option :api_version, :default => '27.0'
+    option :api_version, :default => '26.0'
 
     # The username to use during login.
     option :username, :default => lambda { ENV['SALESFORCE_USERNAME'] }

data/lib/sfdc/data/client.rb

@@ -0,0 +1,18 @@
+module Sfdc
+  module Data
+    class Client < AbstractClient
+      include Sfdc::Concerns::Streaming
+      include Sfdc::Concerns::Picklists
+      include Sfdc::Concerns::Canvas
+
+      # Public: Returns a url to the resource.
+      #
+      # resource - A record that responds to to_sparam or a String/Fixnum.
+      #
+      # Returns the url to the resource.
+      def url(resource)
+        "#{instance_url}/#{(resource.respond_to?(:to_sparam) ? resource.to_sparam : resource)}"
+      end
+    end
+  end
+end

data/lib/sfdc/mash.rb

@@ -46,7 +46,7 @@ module Sfdc
       deep_update(source_hash) if source_hash
       default ? super(default) : super(&blk)
     end
-
+  
     def convert_value(val, duping=false)
       case val
       when self.class

data/lib/sfdc/middleware/authentication.rb

@@ -29,7 +29,7 @@ module Sfdc
 
     # Internal: The params to post to the OAuth service.
     def params
-      raise 'not implemented'
+      raise NotImplementedError
     end
 
     # Internal: Faraday connection to use when sending an authentication request.

data/lib/sfdc/middleware/authentication/password.rb

@@ -14,7 +14,7 @@ module Sfdc
     def password
       "#{@options[:password]}#{@options[:security_token]}"
     end
-
+  
   end
 
 end

data/lib/sfdc/middleware/authentication/token.rb

@@ -9,7 +9,7 @@ module Sfdc
         :client_id     => @options[:client_id],
         :client_secret => @options[:client_secret] }
     end
-
+  
   end
 
 end

data/lib/sfdc/middleware/authorization.rb

@@ -13,7 +13,7 @@ module Sfdc
     def token
       @options[:oauth_token]
     end
-
+  
   end
 
 end

data/lib/sfdc/middleware/instance_url.rb

@@ -12,7 +12,7 @@ module Sfdc
     def url_prefix_set?
       !!(connection.url_prefix && connection.url_prefix.host)
     end
-
+  
   end
 
 end

data/lib/sfdc/middleware/mashify.rb

@@ -13,6 +13,6 @@ module Sfdc
     def body
       @env[:body]
     end
-
+  
   end
 end

data/lib/sfdc/signed_request.rb

@@ -27,7 +27,7 @@ module Sfdc
       return nil if signature != hmac
       JSON.parse(Base64.decode64(payload))
     end
-
+    
   private
     attr_reader :client_secret, :signature, :payload
 

data/lib/sfdc/sobject.rb

@@ -57,7 +57,7 @@ module Sfdc
 
     def ensure_id
       return true if self.Id?
-      raise 'You need to query the Id for the record first.'
+      raise ArgumentError, 'You need to query the Id for the record first.'
     end
 
   end

data/lib/sfdc/tooling/client.rb

@@ -0,0 +1,13 @@
+module Sfdc
+  module Tooling
+    class Client < AbstractClient
+
+      private
+
+        def api_path(path)
+          super("tooling/#{path}")
+        end
+
+    end
+  end
+end

data/lib/sfdc/version.rb

@@ -1,3 +1,3 @@
 module Sfdc
-  VERSION = "2.3.0"
+  VERSION = '2.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfdc
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Bruce Yue
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -116,18 +116,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/sfdc/abstract_client.rb
 - lib/sfdc/attachment.rb
-- lib/sfdc/client/api.rb
-- lib/sfdc/client/authentication.rb
-- lib/sfdc/client/caching.rb
-- lib/sfdc/client/canvas.rb
-- lib/sfdc/client/connection.rb
-- lib/sfdc/client/picklists.rb
-- lib/sfdc/client/streaming.rb
-- lib/sfdc/client/verbs.rb
 - lib/sfdc/client.rb
 - lib/sfdc/collection.rb
+- lib/sfdc/concerns/api.rb
+- lib/sfdc/concerns/authentication.rb
+- lib/sfdc/concerns/base.rb
+- lib/sfdc/concerns/caching.rb
+- lib/sfdc/concerns/canvas.rb
+- lib/sfdc/concerns/connection.rb
+- lib/sfdc/concerns/picklists.rb
+- lib/sfdc/concerns/streaming.rb
+- lib/sfdc/concerns/verbs.rb
 - lib/sfdc/config.rb
+- lib/sfdc/data/client.rb
 - lib/sfdc/mash.rb
 - lib/sfdc/middleware/authentication/password.rb
 - lib/sfdc/middleware/authentication/token.rb
@@ -143,6 +146,7 @@ files:
 - lib/sfdc/middleware.rb
 - lib/sfdc/signed_request.rb
 - lib/sfdc/sobject.rb
+- lib/sfdc/tooling/client.rb
 - lib/sfdc/upload_io.rb
 - lib/sfdc/version.rb
 - lib/sfdc.rb

data/lib/sfdc/client/canvas.rb

@@ -1,12 +0,0 @@
-module Sfdc
-  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