dm-salesforce-adapter 1.0.3 → 1.0.5

data/lib/dm-salesforce-adapter/adapter.rb

@@ -136,7 +136,7 @@ class SalesforceAdapter
 
     sql = "SELECT #{fields} from #{query.model.storage_name(repository.name)}"
     sql << " WHERE (#{conditions})" unless conditions.empty?
-    sql << " ORDER BY #{order(query.order[0])}" unless query.order.empty?
+    sql << " ORDER BY #{order(query.order[0])}" unless query.order.nil? or query.order.empty?
     sql << " LIMIT #{query.limit}" if query.limit
 
     DataMapper.logger.debug sql if DataMapper.logger
@@ -165,7 +165,7 @@ class SalesforceAdapter
   def normalize_id_value(klass, property, value)
     return nil unless value
     properties = Array(klass.send(:salesforce_id_properties)).map { |p| p.to_sym } rescue []
-    return properties.include?(property.name) ? value[0..14] : value
+    return properties.include?(property.name) ? value[0..17] : value
   end
 end
 

data/lib/dm-salesforce-adapter/connection.rb

@@ -49,14 +49,14 @@ class SalesforceAdapter
 
     def field_name_for(klass_name, column)
       klass = SalesforceAPI.const_get(klass_name)
-      fields = [column, Inflector.camelize(column.to_s), "#{column}__c".downcase]
+      fields = [column, Inflector.camelize(column.to_s), "#{Inflector.camelize(column.to_s)}__c", "#{column}__c".downcase]
       options = /^(#{fields.join("|")})$/i
       matches = klass.instance_methods(false).grep(options)
       if matches.any?
         matches.first
       else
         raise FieldNotFound,
-            "You specified #{column} as a field, but neither #{fields.join(" or ")} exist. " \
+            "You specified #{column} as a field, but none of the expected field names exist: #{fields.join(", ")}. " \
             "Either manually specify the field name with :field, or check to make sure you have " \
             "provided a correct field name."
       end
@@ -64,7 +64,14 @@ class SalesforceAdapter
 
     def query(string)
       with_reconnection do
-        driver.query(:queryString => string).result
+        res = driver.query(:queryString => string).result
+        records = res.records
+        while !res.done
+          res = driver.queryMore(:queryLocator => res.queryLocator).result
+          records += res.records
+        end
+        res.records = records 
+        res
       end
     rescue SOAP::FaultError => e
       raise QueryError.new(e.message, [])
@@ -97,10 +104,10 @@ class SalesforceAdapter
       begin
         result = driver.login(:username => @username, :password => @password).result
       rescue SOAP::FaultError => error
-        if error.faultcode.to_s =~ /INVALID_LOGIN/
-          raise LoginFailed, error.faultstring.to_s
-        else
-          raise error
+        case error.faultcode.text
+        when "sf:INVALID_LOGIN" then raise LoginFailed, error.faultstring.text
+        # ...
+        else raise error
         end
       end
       driver.endpoint_url = result.serverUrl
@@ -127,17 +134,16 @@ class SalesforceAdapter
       yield
     rescue SOAP::FaultError => error
       retry_count ||= 0
-      if error.faultcode.to_s =~ /INVALID_SESSION_ID/
+
+      case error.faultcode.text
+      when "sf:INVALID_SESSION_ID" then
         DataMapper.logger.debug "Got a invalid session id; reconnecting" if DataMapper.logger
         @driver = nil
         login
         retry_count += 1
         retry unless retry_count > 5
-      else
-        raise error
+      else raise error
       end
-
-      raise SessionTimeout, "The Salesforce session could not be established"
     end
   end
 end

data/lib/dm-salesforce-adapter/property/boolean.rb

@@ -3,15 +3,16 @@ module SalesforceAdapter::Property
     FALSE = 0
     TRUE  = 1
 
-    def self.dump(value, property)
-      case value
-      when nil, false then FALSE
-      else TRUE
-      end
+    def load(value)
+      [true, 1, '1', 'true', 'TRUE'].include?(value) ? true : false
     end
 
-    def self.load(value, property)
-      [true, 1, '1', 'true', 'TRUE', TRUE].include?(value)
+    def typecast(value)
+      [true, 1, '1', 'true', 'TRUE'].include?(value) ? TRUE : FALSE
+    end
+
+    def custom?
+      true
     end
   end
 end

data/lib/dm-salesforce-adapter/property/serial.rb

@@ -3,10 +3,10 @@ module SalesforceAdapter::Property
     accept_options :serial
     serial true
 
-    length 15
+    length 18
 
-    def self.dump(value, property)
-      value[0..14] unless value.blank?
+    def dump(value)
+      value[0..17] unless value.blank?
     end
   end
 end

data/lib/dm-salesforce-adapter/sql.rb

@@ -83,7 +83,7 @@ class SalesforceAdapter
     end
 
     def quote_value(value, property)
-      if property.type == Property::Boolean
+      if property.kind_of? Property::Boolean
         # True on salesforce needs to be TRUE/FALSE for WHERE clauses but not for inserts.
         return value == Property::Boolean::TRUE ? 'TRUE' : 'FALSE'
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-salesforce-adapter
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Jordan Ritter
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -07:00
-default_executable: 
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -60,7 +59,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -68,6 +67,14 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,7 +83,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -84,6 +91,14 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -92,7 +107,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -100,6 +115,14 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -118,8 +141,8 @@ dependencies:
         version: 1.5.8
   type: :runtime
   version_requirements: *id006
-description: A DataMapper 1.1.x adapter to the Salesforce API
-email: jpr5@cloudcrowd.com
+description: A DataMapper 1.x adapter to the Salesforce API
+email: jpr5@serv.io
 executables: []
 
 extensions: []
@@ -142,7 +165,6 @@ files:
 - lib/dm-salesforce-adapter/sql.rb
 - lib/dm-salesforce-adapter/version.rb
 - lib/dm-salesforce-adapter.rb
-has_rdoc: true
 homepage: http://github.com/cloudcrowd/dm-salesforce-adapter
 licenses: []
 
@@ -172,9 +194,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A DataMapper 1.1.x adapter to the Salesforce API
+summary: A DataMapper 1.x adapter to the Salesforce API
 test_files: []