databasedotcom 1.3.0 → 1.3.1

data/README.rdoc

@@ -85,6 +85,11 @@ Then, when you create your client like:
 
 it will use the configuration information that you set with <tt>heroku config:add</tt>.
 
+=== Connect to a SalesForce sandbox account
+Specify the <tt>:host</tt> option when creating your Client, e.g,
+
+    Databasedotcom::Client.new :host => "test.salesforce.com", ...
+
 == 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:
 

data/lib/databasedotcom/client.rb

@@ -59,7 +59,7 @@ module Databasedotcom
     #    ca_file
     #    verify_mode
     # If the environment variables DATABASEDOTCOM_CLIENT_ID, DATABASEDOTCOM_CLIENT_SECRET, DATABASEDOTCOM_HOST,
-    # DATABASEDOTCOM_DEBUGGING, DATABASEDOTCOM_VERSION, DATABASEDOTCOM_SOBJECT_MODULE, DATABASEDOTCOM_CA_FILE, and/or 
+    # DATABASEDOTCOM_DEBUGGING, DATABASEDOTCOM_VERSION, DATABASEDOTCOM_SOBJECT_MODULE, DATABASEDOTCOM_CA_FILE, and/or
     # DATABASEDOTCOM_VERIFY_MODE are present, they override any other values provided
     def initialize(options = {})
       if options.is_a?(String)
@@ -83,7 +83,7 @@ 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
@@ -91,7 +91,7 @@ module Databasedotcom
       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
+    end
 
     # Authenticate to the Force.com API.  _options_ is a Hash, interpreted as follows:
     #
@@ -105,7 +105,7 @@ module Databasedotcom
         req = https_request(self.host)
         user = self.username || options[:username]
         pass = self.password || options[:password]
-        path = "/services/oauth2/token?grant_type=password&client_id=#{self.client_id}&client_secret=#{client_secret}&username=#{user}&password=#{pass}"
+        path = encode_path_with_params('/services/oauth2/token', :grant_type => 'password', :client_id => self.client_id, :client_secret => self.client_secret, :username => user, :password => pass)
         log_request("https://#{self.host}/#{path}")
         result = req.post(path, "")
         log_response(result)
@@ -380,8 +380,8 @@ module Databasedotcom
     end
 
     def https_request(host=nil)
-      Net::HTTP.new(host || URI.parse(self.instance_url).host, 443).tap do |http| 
-        http.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
@@ -494,11 +494,16 @@ module Databasedotcom
       if attrs.is_a?(Hash)
         coerced_attrs = {}
         attrs.keys.each do |key|
-          case clazz.field_type(key)
+          case clazz.field_type(key.to_s)
             when "multipicklist"
               coerced_attrs[key] = (attrs[key] || []).join(';')
             when "datetime"
-              coerced_attrs[key] = attrs[key] ? attrs[key].strftime(RUBY_VERSION.match(/^1.8/) ? "%Y-%m-%dT%H:%M:%S.000%z" : "%Y-%m-%dT%H:%M:%S.%L%z") : nil
+              begin
+                attrs[key] = DateTime.parse(attrs[key]) if attrs[key].is_a?(String)
+                coerced_attrs[key] = attrs[key].strftime(RUBY_VERSION.match(/^1.8/) ? "%Y-%m-%dT%H:%M:%S.000%z" : "%Y-%m-%dT%H:%M:%S.%L%z")
+              rescue
+                nil
+              end
             when "date"
               if attrs[key]
                 coerced_attrs[key] = attrs[key].respond_to?(:strftime) ? attrs[key].strftime("%Y-%m-%d") : attrs[key]

data/lib/databasedotcom/sobject/sobject.rb

@@ -14,7 +14,13 @@ module Databasedotcom
       def initialize(attrs = {})
         super()
         self.class.description["fields"].each do |field|
-          self.send("#{field["name"]}=", field["defaultValueFormula"])
+          if field['type'] =~ /(picklist|multipicklist)/ && picklist_option = field['picklistValues'].find { |p| p['defaultValue'] }
+            self.send("#{field["name"]}=", picklist_option["value"])
+          elsif field['type'] =~ /boolean/
+            self.send("#{field["name"]}=", field["defaultValue"])
+          else
+            self.send("#{field["name"]}=", field["defaultValueFormula"])
+          end
         end
         self.attributes=(attrs)
       end
@@ -22,7 +28,7 @@ module Databasedotcom
       # Returns a hash representing the state of this object
       def attributes
         self.class.attributes.inject({}) do |hash, attr|
-          hash[attr] = self.send(attr.to_sym)
+          hash[attr] = self.send(attr.to_sym) if self.respond_to?(attr.to_sym)
           hash
         end
       end
@@ -314,6 +320,7 @@ module Databasedotcom
             when "boolean"
               params[attr] = value.is_a?(String) ? value.to_i != 0 : value
             when "currency", "percent", "double"
+              value = value.gsub(/[^-0-9.0-9]/, '').to_f if value.respond_to?(:gsub)
               params[attr] = value.to_f
             when "date"
               params[attr] = Date.parse(value) rescue Date.today

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,106 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: databasedotcom
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Glenn Gillen, Danny Burkes & Richard Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multipart-post
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70124183107340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70124183107340
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70124183106920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70124183106920
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70124183106380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70124183106380
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70124183105960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70124183105960
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70124183105340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.6
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70124183105340
 description: A ruby wrapper for the Force.com REST API
-email: 
+email:
 - me@glenngillen.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.rdoc
 - MIT-LICENSE
 - lib/databasedotcom/chatter/comment.rb
@@ -129,38 +101,29 @@ files:
 - lib/databasedotcom/sobject.rb
 - lib/databasedotcom/version.rb
 - lib/databasedotcom.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: databasedotcom
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Force.com REST API
 test_files: []
-
+has_rdoc: