salesforce_ar_sync 1.0.1 → 1.1.1

data/README.md

@@ -46,8 +46,10 @@ properly. Make sure each of the models you wish to sync are materialized.
 ````ruby
 $sf_client = Databasedotcom::Client.new("config/databasedotcom.yml")
 $sf_client.authenticate :username => <username>, :password => <password>
-$sf_client.sobject_module = Databasedotcom
-$sf_client.materialize "User"
+
+module SalesforceArSync::SalesforceSync
+  SF_CLIENT = $sf_client
+end
 ````
 
 ### Gem Installation
@@ -140,8 +142,7 @@ The model can have several options set:
 [__web_id_attribute_name__](#web_id_attribute_name)  
 [__salesforce_sync_web_id__](#salesforce_sync_web_id)  
 [__web_class_name__](#web_class_name)  
-[__salesforce_object_name__](#salesforce_object_name)  
-[__salesforce_object__](#salesforce_object)  
+[__salesforce_object_name__](#salesforce_object_name)   
 [__except__](#except)  
 
 #### <a id="salesforce_sync_enabled"></a>salesforce_sync_enabled
@@ -216,14 +217,6 @@ Optionally holds the name of a method which will return the name of the Salesfor
 :salesforce_object_name => :salesforce_object_name_method_name
 ````
 
-#### salesforce_object
-Optionally holds the name of a method which will retrieve a Salesforce object. Default implementation is called if no 
-method is specified, defaults to nil.
-
-````ruby
-:salesforce_object => :salesforce_object_method_name
-````
-
 #### except
 Optionally holds the name of a method which can contain logic to determine if a record should be synced on save. If no 
 method is given then only the salesforce_skip_sync attribute is used. Defaults to nil.
@@ -367,9 +360,9 @@ class Contact < ActiveRecord::Base
   attr_accessor :first_name, :last_name, :phone, :email, :last_login_time
   
   salesforce_syncable :sync_attributes => {:FirstName => :first_name, :LastName => :last_name, :Phone => :phone, :Email => :email},
-                      :salesforce_object => :custom_salesforce_object
+                      :salesforce_object_name => :custom_salesforce_object_name
 
-  def custom_salesforce_object
+  def custom_salesforce_object_name
     "CustomContact__c"
   end
 end

data/app/controllers/salesforce_ar_sync/soap_message_controller.rb

@@ -0,0 +1,31 @@
+module SalesforceArSync
+  class SoapMessageController < ::ApplicationController
+    before_filter :validate_ip_ranges
+    
+    def sync_object
+      delayed_soap_handler SalesforceArSync::SoapHandler::Base
+    end
+
+    def delete
+      delayed_soap_handler SalesforceArSync::SoapHandler::Delete
+    end
+
+    private
+
+    def delayed_soap_handler (klass, priority = 90)
+      begin
+        soap_handler = klass.new(SalesforceArSync.config["ORGANIZATION_ID"], params)
+        soap_handler.process_notifications(priority) if soap_handler.sobjects
+        render :xml => soap_handler.generate_response, :status => :created
+      rescue Exception => ex
+        render :xml => soap_handler.generate_response(ex), :status => :created
+      end
+    end
+
+    # to be used in a before_filter, checks ip ranges specified in configuration
+    # and renders a 404 unless the request matches
+    def validate_ip_ranges
+      raise ActionController::RoutingError.new('Not Found') unless SalesforceArSync::IPConstraint.new.matches?(request)
+    end
+  end
+end

data/config/routes.rb

@@ -0,0 +1,4 @@
+SalesforceArSync::Engine.routes.draw do
+  match '/sf_soap/delete' => 'salesforce_ar_sync/soap_message#delete', :via => :post
+  match '/sf_soap/*klass' => 'salesforce_ar_sync/soap_message#sync_object', :via => :post
+end

data/lib/salesforce_ar_sync/engine.rb

@@ -6,16 +6,12 @@ module SalesforceArSync
         
         #Load the configuration from the environment or a yaml file or disable it if no config present
         SalesforceArSync.config = Hash.new
-
         #load the config file if we have it
         if FileTest.exist?("#{Rails.root}/config/salesforce_ar_sync.yml")
-          config = YAML.load_file("#{Rails.root}/config/salesforce_ar_sync.yml")
-          config = config[Rails.env]
-          if config['organization_id'].present? && config['ip_ranges'].present? && config['sync_enabled'].present?
-            SalesforceArSync.config["ORGANIZATION_ID"] = config['organization_id']
-            SalesforceArSync.config["SYNC_ENABLED"] = config['sync_enabled']
-            SalesforceArSync.config["IP_RANGES"] = config['ip_ranges'].split(',').map{ |ip| ip.strip }
-          end
+          config = YAML.load_file("#{Rails.root}/config/salesforce_ar_sync.yml")[Rails.env]
+          SalesforceArSync.config["ORGANIZATION_ID"] = config['organization_id']
+          SalesforceArSync.config["SYNC_ENABLED"] = config['sync_enabled']
+          SalesforceArSync.config["IP_RANGES"] = config['ip_ranges'].split(',').map{ |ip| ip.strip }
         end
 
         #if we have ENV flags prefer them
@@ -30,4 +26,4 @@ module SalesforceArSync
       end
     end
   end
-end
+end

data/lib/salesforce_ar_sync/extenders/salesforce_syncable.rb

@@ -15,12 +15,11 @@ module SalesforceArSync
         self.salesforce_web_class_name = options.has_key?(:web_class_name) ? options[:web_class_name] : self.name
         
         self.salesforce_object_name_method = options.has_key?(:salesforce_object_name) ? options[:salesforce_object_name] : nil
-        self.salesforce_object_method = options.has_key?(:salesforce_object) ? options[:salesforce_object] : nil
         self.salesforce_skip_sync_method = options.has_key?(:except) ? options[:except] : nil
         
         instance_eval do
           before_save :salesforce_sync
-          after_create :sync_web_id     
+          after_create :sync_web_id
           
           def salesforce_sync_web_id?
             self.salesforce_sync_web_id
@@ -35,13 +34,6 @@ module SalesforceArSync
             return self.class.name
           end
           
-          # Calls a method, if provided, to retrieve an object from Salesforce. Calls the default implementation if
-          # no custom method is specified
-          def salesforce_object
-            return send(self.class.salesforce_object_method) if self.class.salesforce_object_method.present?
-            return send(:salesforce_object_default)
-          end
-          
           # Calls a method, if provided, to determine if a record should be synced to Salesforce. 
           # The salesforce_skip_sync instance variable is also used.
           # The SALESFORCE_AR_SYNC_ENABLED flag overrides all the others if set to false
@@ -54,4 +46,4 @@ module SalesforceArSync
       end
     end
   end
-end
+end

data/lib/salesforce_ar_sync/salesforce_object_sync.rb

@@ -1,16 +1,13 @@
 module SalesforceArSync
   # simple object to be serialized when asynchronously sending data to Salesforce
-  class SalesforceObjectSync < Struct.new(:web_object_name, :salesforce_object_name, :salesforce_id, :attributes)
+  class SalesforceObjectSync < Struct.new(:web_object_name, :salesforce_id, :attributes)
     def perform        
-      sf_object = "Databasedotcom::#{salesforce_object_name}".constantize.find_by_Id salesforce_id
-    
-      if sf_object
-        sf_object.update_attributes(attributes)
-        sf_object.reload
-    
-        web_object = "#{web_object_name}".constantize.find_by_salesforce_id salesforce_id
-        web_object.update_attribute(:salesforce_updated_at, sf_object.SystemModstamp) unless web_object.nil?
+      web_object = "#{web_object_name}".constantize.find_by_salesforce_id salesforce_id
+      #object exists in salesforce if we call its system_mod_stamp
+      if (system_mod_stamp = web_object.system_mod_stamp)
+        web_object.salesforce_update_object(web_object.salesforce_attributes_to_update(true))
+        web_object.update_attribute(:salesforce_updated_at, system_mod_stamp)
       end
     end
   end
-end
+end

data/lib/salesforce_ar_sync/salesforce_sync.rb

@@ -39,11 +39,7 @@ module SalesforceArSync
       
       # Optionally holds the name of a method which will return the name of the Salesforce object to sync to
       attr_accessor :salesforce_object_name_method
-      
-      # Optionally holds the name of a method which will retrieve a Salesforce object. Default implementation is called
-      # if no method is specified
-      attr_accessor :salesforce_object_method
-      
+
       # Optionally holds the name of a method which can contain logic to determine if a record should be synced on save.
       # If no method is given then only the salesforce_skip_sync attribute is used.
       attr_accessor :salesforce_skip_sync_method
@@ -116,16 +112,22 @@ module SalesforceArSync
       self.save!
     end
 
-    # This method will fetch the salesforce object and go looking for it if it doesn't exist
-    def salesforce_object_default
-      return @sf_object if @sf_object.present?
-
-      @sf_object = "Databasedotcom::#{self.salesforce_object_name}".constantize.send("find_by_#{self.class.salesforce_id_attribute_name.to_s}", salesforce_id) unless salesforce_id.nil?
+#    def salesforce_object_exists?
+#      return salesforce_object_exists_method if respond_to? salesforce_exists_method
+#      return salesforce_object_exists_default
+#    end
+    
+    
+    # Finds a salesforce record by its Id and returns nil or its SystemModstamp
+    def system_mod_stamp
+      hash = JSON.parse(SF_CLIENT.http_get("/services/data/v#{SF_CLIENT.version}/query", :q => "SELECT SystemModstamp FROM #{salesforce_object_name} WHERE Id = '#{salesforce_id}'").body)
+      hash["records"].first.try(:[], "SystemModstamp")    
+    end
 
-      # Look up and link object by web id
-      @sf_object ||= "Databasedotcom::#{self.salesforce_object_name}".constantize.send("find_by_#{self.class.salesforce_web_id_attribute_name.to_s}", id) if self.class.salesforce_sync_web_id? && !new_record?
 
-      return @sf_object
+    def salesforce_object_exists?
+      return @exists_in_salesforce if @exists_in_salesforce
+      @exists_in_salesforce = !system_mod_stamp.nil?
     end
 
     # Checks if the passed in attribute should be updated in Salesforce.com
@@ -157,12 +159,14 @@ module SalesforceArSync
 
     def salesforce_create_object(attributes)
       attributes.merge!(self.class.salesforce_web_id_attribute_name.to_s => id) if self.class.salesforce_sync_web_id? && !new_record?
-      @sf_object = "Databasedotcom::#{self.salesforce_object_name}".constantize.create(attributes)
+      result = SF_CLIENT.http_post("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}", attributes.to_json)
+      self.salesforce_id = JSON.parse(result.body)["id"]
+      @exists_in_salesforce = true
     end
 
     def salesforce_update_object(attributes)
       attributes.merge!(self.class.salesforce_web_id_attribute_name.to_s => id) if self.class.salesforce_sync_web_id? && !new_record?
-      salesforce_object.update_attributes(attributes) if salesforce_object
+      SF_CLIENT.http_patch("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}/#{salesforce_id}", attributes.to_json)
     end
 
     # if attributes specified in the async_attributes array are the only attributes being modified, then sync the data 
@@ -175,23 +179,24 @@ module SalesforceArSync
     # sync model data to Salesforce, adding any Salesforce validation errors to the models errors
     def salesforce_sync
       return if self.salesforce_skip_sync?
-
       if salesforce_perform_async_call?
-        Delayed::Job.enqueue(SalesforceArSync::SalesforceObjectSync.new(self.class.salesforce_web_class_name, self.salesforce_object_name, salesforce_id, salesforce_attributes_to_update), :priority => 50)
+        Delayed::Job.enqueue(SalesforceArSync::SalesforceObjectSync.new(self.class.salesforce_web_class_name, salesforce_id, salesforce_attributes_to_update), :priority => 50)
       else
-        salesforce_update_object(salesforce_attributes_to_update) if salesforce_attributes_to_update.present? && salesforce_object
-        salesforce_create_object(salesforce_attributes_to_update(!new_record?)) if salesforce_id.nil? && salesforce_object.nil?
-
-        self.salesforce_id = salesforce_object.send(self.class.salesforce_id_attribute_name) unless salesforce_object.nil?
+        if salesforce_object_exists?
+          salesforce_update_object(salesforce_attributes_to_update) if salesforce_attributes_to_update.present?
+        else
+          salesforce_create_object(salesforce_attributes_to_update(!new_record?)) if salesforce_id.nil? 
+        end
       end
     rescue Exception => ex
       self.errors[:base] << ex.message
       return false
     end
-
-    def sync_web_id
+    
+    def sync_web_id 	
       return false if !self.class.salesforce_sync_web_id? || self.salesforce_skip_sync?
-      salesforce_object.update_attribute(self.class.salesforce_web_id_attribute_name.to_s, id) if salesforce_id && salesforce_object
-    end    
+      SF_CLIENT.http_patch("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}/#{salesforce_id}", { self.class.salesforce_web_id_attribute_name.to_s => id }.to_json) if salesforce_id
+    end
+
   end
-end
+end

data/lib/salesforce_ar_sync/version.rb

@@ -1,3 +1,3 @@
 module SalesforceArSync
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,6 +185,8 @@ files:
 - lib/salesforce_ar_sync/soap_handler/delete.rb
 - lib/salesforce_ar_sync/version.rb
 - lib/salesforce_ar_sync.rb
+- app/controllers/salesforce_ar_sync/soap_message_controller.rb
+- config/routes.rb
 homepage: http://github.com/InfoTech/
 licenses: []
 post_install_message: 
@@ -205,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension & rails engine for syncing data with Salesforce.com