databasedotcom 1.1.7 → 1.2.0

data/lib/databasedotcom/client.rb

@@ -412,24 +412,47 @@ module Databasedotcom
 
     def collection_from(response)
       response = JSON.parse(response)
-      array_response = response.is_a?(Array)
+      collection_from_hash( response )
+    end
+
+    # Converts a Hash of object data into a concrete SObject
+    def record_from_hash(data)
+      attributes = data.delete('attributes')
+      new_record = find_or_materialize(attributes["type"]).new
+      data.each do |name, value|
+        field = new_record.description['fields'].find do |field|
+          key_from_label(field["label"]) == name || field["name"] == name || field["relationshipName"] == name
+        end
+
+        # Field not found
+        if field == nil
+          break
+        end
+
+        # If reference/lookup field data was fetched, recursively build the child record and apply
+        if value.is_a?(Hash) and field['type'] == 'reference' and field["relationshipName"]
+          relation = record_from_hash( value )
+          set_value( new_record, field["relationshipName"], relation, 'reference' )
+
+        # Apply the raw value for all other field types
+        else
+          set_value(new_record, field["name"], value, field["type"]) if field
+        end
+      end
+      new_record
+    end
+
+    def collection_from_hash(data)
+      array_response = data.is_a?(Array)
       if array_response
-        records = response.collect { |rec| self.find(rec["attributes"]["type"], rec["Id"]) }
+        records = data.collect { |rec| self.find(rec["attributes"]["type"], rec["Id"]) }
       else
-        records = response["records"].collect do |record|
-          attributes = record.delete('attributes')
-          new_record = find_or_materialize(attributes["type"]).new
-          record.each do |name, value|
-            field = new_record.description['fields'].find do |field|
-              key_from_label(field["label"]) == name || field["name"] == name
-            end
-            set_value(new_record, field["name"], value, field["type"]) if field
-          end
-          new_record
+        records = data["records"].collect do |record|
+          record_from_hash( record )
         end
       end
 
-      Databasedotcom::Collection.new(self, array_response ? records.length : response["totalSize"], array_response ? nil : response["nextRecordsUrl"]).concat(records)
+      Databasedotcom::Collection.new(self, array_response ? records.length : data["totalSize"], array_response ? nil : data["nextRecordsUrl"]).concat(records)
     end
 
     def set_value(record, attr, value, attr_type)
@@ -492,7 +515,7 @@ module Databasedotcom
     def query_org_id
       query("select id from Organization")[0]["Id"]
     end
-    
+
     def const_defined_in_module(mod, const)
       mod.method(:const_defined?).arity == 1 ? mod.const_defined?(const) : mod.const_defined?(const, false)
     end

data/lib/databasedotcom/sobject/sobject.rb

@@ -127,7 +127,18 @@ module Databasedotcom
       #    client.materialize("Car")
       #    Car.attributes               #=> ["Id", "Name", "Color", "Year"]
       def self.attributes
-        self.description["fields"].collect { |f| f["name"] }
+        self.description["fields"].collect { |f| [f["name"], f["relationshipName"]] }.flatten.compact
+      end
+
+      def self.register_field( name, field )
+        attr_accessor name.to_sym
+        self.type_map[name] = {
+          :type => field["type"],
+          :label => field["label"],
+          :picklist_values => field["picklistValues"],
+          :updateable? => field["updateable"],
+          :createable? => field["createable"]
+        }
       end
 
       # Materializes the dynamically created Sobject class by adding all attribute accessors for each field as described in the description of the object on Force.com
@@ -139,16 +150,18 @@ module Databasedotcom
         self.sobject_name = sobject_name
         self.description = self.client.describe_sobject(self.sobject_name)
         self.type_map = {}
+        
         self.description["fields"].each do |field|
+          
+          # Register normal fields
           name = field["name"]
-          attr_accessor name.to_sym
-          self.type_map[name] = {
-            :type => field["type"],
-            :label => field["label"],
-            :picklist_values => field["picklistValues"],
-            :updateable? => field["updateable"],
-            :createable? => field["createable"]
-          }
+          register_field( field["name"], field )
+          
+          # Register relationship fields.
+          if( field["type"] == "reference" and field["relationshipName"] )
+            register_field( field["relationshipName"], field )
+          end
+          
         end
       end
 

data/lib/databasedotcom/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: databasedotcom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors: 
 - Glenn Gillen, Danny Burkes & Richard Zhao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post