databasedotcom 1.0.2 → 1.0.3

data/lib/databasedotcom/client.rb

@@ -64,17 +64,16 @@ module Databasedotcom
         self.client_secret = url_options[:oauth_secret]
         self.username = url_options[:user]
         self.password = url_options[:password]
-        self.sobject_module = "Databasedotcom::Sobject"
       else
         self.client_id = ENV['DATABASEDOTCOM_CLIENT_ID'] || @options[:client_id]
         self.client_secret = ENV['DATABASEDOTCOM_CLIENT_SECRET'] || @options[:client_secret]
         self.host = ENV['DATABASEDOTCOM_HOST'] || @options[:host] || "login.salesforce.com"
-        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 && @options[:sobject_module])
       end
-    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]
+  end
 
     # Authenticate to the Force.com API.  _options_ is a Hash, interpreted as follows:
     #
@@ -355,7 +354,7 @@ module Databasedotcom
     end
 
     def module_namespace
-      self.sobject_module || Object
+      (self.sobject_module && self.sobject_module.constantize) || Object
     end
 
     def collection_from(response)

data/lib/databasedotcom/core_extensions/string_extensions.rb

@@ -5,4 +5,12 @@ class String
   def resourcerize
     self.gsub(/([a-z])([A-Z])/, '\1-\2').downcase
   end
-end
+
+def constantize
+    unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ self
+      raise NameError, "#{self.inspect} is not a valid constant name!"
+    end
+    Object.module_eval("::#{$1}", __FILE__, __LINE__)
+  end
+
+end

data/lib/databasedotcom/version.rb

@@ -1,3 +1,3 @@
 module Databasedotcom
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao