databasedotcom 1.2.0 → 1.2.1

data/README.rdoc

@@ -17,7 +17,7 @@ Source is available at github[http://github.com/heroku/databasedotcom]
 
 = Usage
 == Initialization
-When you create a Databasedotcom::Client object, you need to configure it with a client id and client secret that corresponds to one of the Remote Access Applications configured within your SalesForce instance.  The SalesForce UI refers to the client id as "Consumer Key", and to the client secret as "Consumer Secret".
+When you create a Databasedotcom::Client object, you need to configure it with a client id and client secret that corresponds to one of the Remote Access Applications configured within your Salesforce instance.  The Salesforce UI refers to the client id as "Consumer Key", and to the client secret as "Consumer Secret".
 
 You can configure your Client object with a client id and client secret in one of several different ways:
 === Configuration from the environment
@@ -79,25 +79,25 @@ Then, when you create your client like:
 it will use the configuration information that you set with <tt>heroku config:add</tt>.
 
 == Authentication
-The first thing you need to do with the new Client is to authenticate with SalesForce.  You can do this in one of several ways:
+The first thing you need to do with the new Client is to authenticate with Salesforce.  You can do this in one of several ways:
 
 === Authentication via an externally-acquired OAuth access token
-If you have acquired an OAuth access token for your SalesForce instance through some external means, you can use it.  Note that you have to pass both the token and your SalesForce instance URL to the <tt>authenticate</tt> method:
+If you have acquired an OAuth access token for your Salesforce instance through some external means, you can use it.  Note that you have to pass both the token and your Salesforce instance URL to the <tt>authenticate</tt> method:
 
     client.authenticate :token => "my-oauth-token", :instance_url => "http://na1.salesforce.com"  #=> "my-oauth-token"
 
 === Authentication via Omniauth
-If you are using the gem within the context of a web application, and your web app is using Omniauth to do OAuth with SalesForce, you can authentication the Client direction via the Hash that Omniauth passes to your OAuth callback method, like so:
+If you are using the gem within the context of a web application, and your web app is using Omniauth to do OAuth with Salesforce, you can authentication the Client direction via the Hash that Omniauth passes to your OAuth callback method, like so:
 
     client.authenticate request.env['omniauth.auth']  #=> "the-oauth-token"
 
 === Authentication via username and password
-You can authenticate your Client directly with SalesForce with a valid username and password for a user in your SalesForce instance.  Note that, if access to your SalesForce instance requires a {security token}[http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_concepts_security.htm], the value that you pass for <tt>:password</tt> must be the password for the user concatenated with her security token.
+You can authenticate your Client directly with Salesforce with a valid username and password for a user in your Salesforce instance.  Note that, if access to your Salesforce instance requires a {security token}[http://www.salesforce.com/us/developer/docs/api/Content/sforce_api_concepts_security.htm], the value that you pass for <tt>:password</tt> must be the password for the user concatenated with her security token.
 
     client.authenticate :username => "foo@bar.com", :password => "ThePasswordTheSecurityToken"  #=> "the-oauth-token"
 
 == Accessing the Sobject API
-You can retrieve a list of Sobject defined in your SalesForce instance like so:
+You can retrieve a list of Sobject defined in your Salesforce instance like so:
 
     client.list_sobjects  #=> ['User', 'Group', 'Contact']
 
@@ -125,7 +125,7 @@ Materialized Sobject classes behave much like ActiveRecord classes:
       "Phone" => "4156543210"                           #=> change several attributes at once and save them
     contact.delete                                      #=> delete the contact from the database
 
-See the documentation for full details.
+See the documentation[http://rubydoc.info/github/heroku/databasedotcom/master/frames] for full details.
 
 == Accessing the Chatter API
 You can easily access Chatter feeds, group, conversations, etc.:
@@ -147,7 +147,7 @@ You can easily access Chatter feeds, group, conversations, etc.:
     you = Databasedotcom::Chatter::User.find(client, "your-user-id")
     me.follow(you)                                            #=> start following a user
 
-See the documentation for full details.
+See the documentation[http://rubydoc.info/github/heroku/databasedotcom/master/frames] for full details.
 
 = License
 

data/lib/databasedotcom/client.rb

@@ -31,6 +31,10 @@ module Databasedotcom
     attr_accessor :password
     # The SalesForce organization id for the authenticated user's Salesforce instance
     attr_reader :org_id
+    # The CA file configured for this instance, if any
+    attr_accessor :ca_file
+    # The SSL verify mode configured for this instance, if any
+    attr_accessor :verify_mode
 
     # Returns a new client object. _options_ can be one of the following
     #
@@ -42,6 +46,8 @@ module Databasedotcom
     #    debugging: true
     #    version: 23.0
     #    sobject_module: My::Module
+    #    ca_file: some/ca/file.cert
+    #    verify_mode: 
     # * A Hash containing the following keys:
     #    client_id
     #    client_secret
@@ -55,6 +61,7 @@ module Databasedotcom
     def initialize(options = {})
       if options.is_a?(String)
         @options = YAML.load_file(options)
+        @options["verify_mode"] = @options["verify_mode"].constantize if @options["verify_mode"] && @options["verify_mode"].is_a?(String)
       else
         @options = options
       end
@@ -73,10 +80,14 @@ module Databasedotcom
         self.client_secret = ENV['DATABASEDOTCOM_CLIENT_SECRET'] || @options[:client_secret]
         self.host = ENV['DATABASEDOTCOM_HOST'] || @options[:host] || "login.salesforce.com"
       end
+      
       self.debugging = ENV['DATABASEDOTCOM_DEBUGGING'] || @options[:debugging]
       self.version = ENV['DATABASEDOTCOM_VERSION'] || @options[:version]
       self.version = self.version.to_s if self.version
       self.sobject_module = ENV['DATABASEDOTCOM_SOBJECT_MODULE'] || @options[:sobject_module]
+      self.ca_file = ENV['DATABASEDOTCOM_CA_FILE'] || @options[:ca_file]
+      self.verify_mode = ENV['DATABASEDOTCOM_VERIFY_MODE'] || @options[:verify_mode]
+      self.verify_mode = self.verify_mode.to_i if self.verify_mode
   end
 
     # Authenticate to the Force.com API.  _options_ is a Hash, interpreted as follows:
@@ -366,7 +377,11 @@ module Databasedotcom
     end
 
     def https_request(host=nil)
-      Net::HTTP.new(host || URI.parse(self.instance_url).host, 443).tap{|n| n.use_ssl = true }
+      Net::HTTP.new(host || URI.parse(self.instance_url).host, 443).tap do |http| 
+        http.use_ssl = true 
+        http.ca_file = self.ca_file if self.ca_file
+        http.verify_mode = self.verify_mode if self.verify_mode
+      end
     end
 
     def encode_path_with_params(path, parameters={})

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-22 00:00:00 Z
+date: 2011-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -40,9 +40,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.6"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency