salesforce_ar_sync 1.1.2 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b19087f9160aa21606e6de401c9813e693fb306d
+  data.tar.gz: 7bded65098335e5f1be42efa9bca7a8219c9e419
+SHA512:
+  metadata.gz: 5a7d57027cd4067238f8992cfffda917b6dee7654cef6068e4e21c86f27f829fdb65e20e20497558581691165d4b1a02c814a989ba0c788ce310da3879f24b66
+  data.tar.gz: 36219dd2e81e11afcfb77f73ba098c0f6dc427b9a9a7e764fa420c467eea15e2c5fc04877d79717119da6e0fad14675711e2a6dc37289d7ea0d2a59a75da3120

data/README.md

@@ -1,13 +1,13 @@
 # SalesforceArSync
 
-SalesforceARSync allows you to sync models and fields with Salesforce through a combination of 
+SalesforceARSync allows you to sync models and fields with Salesforce through a combination of
 Outbound Messaging, SOAP and databasedotcom.
 
 ## Installation
 
 ### Requirements
 
-* Rails >= 3.1
+* Rails ~> 4.0
 * Salesforce.com instance
 * [Have your 18 character organization id ready](#finding-your-18-character-organization-id)
 * databasedotcom gem >= 1.3 installed and configured [see below](#databasedotcom)
@@ -15,32 +15,32 @@ Outbound Messaging, SOAP and databasedotcom.
 
 ### Salesforce Setup
 
-Before you can start syncing your data several things must be completed in Salesforce. 
+Before you can start syncing your data several things must be completed in Salesforce.
 
 #### 1. Setup Remote Access
-Create a new Remote Access Application entry by going to 
+Create a new Remote Access Application entry by going to
 
     Setup -> Develop -> Remote Access
-    
+
 You can use http://localhost/nothing for the _Callback URL_
 
 #### 2. Setup Outbound Messaging
-Each model you wish to sync requires a workflow to trigger outbound messaging. You can set the worflow 
-to trigger on the specific fields you wish to update. 
+Each model you wish to sync requires a workflow to trigger outbound messaging. You can set the worflow
+to trigger on the specific fields you wish to update.
 
     Setup -> Create -> Workflow & Approvals -> Worflow Rules
-    
-Click _New Rule_, select the object (model) you wish to sync and click _Next_, give the rule a name, select 
-_Every time a record is created or edited_ and set a rule on the field(s) you want to sync ( a formula checking 
+
+Click _New Rule_, select the object (model) you wish to sync and click _Next_, give the rule a name, select
+_Every time a record is created or edited_ and set a rule on the field(s) you want to sync ( a formula checking
 if the fields have changed is recommended). Click _Save & Next_, in the _Add Worflow Action_ dropdown select
-_New Outbound Message_. Enter a name and set the _Endpoint URL_ to be http://yoursite.com/integration/sf_soap/model_name. 
-Select the fields you wish to sync (Id and SystemModstamp are required). 
+_New Outbound Message_. Enter a name and set the _Endpoint URL_ to be http://yoursite.com/integration/sf_soap/model_name.
+Select the fields you wish to sync (Id and SystemModstamp are required).
 
 *You need to do this for each object/model you want to sync.
 
 ### databasedotcom
 
-Before using the salesforce_ar_sync gem you must ensure you have the databasedotcom gem installed and configured 
+Before using the salesforce_ar_sync gem you must ensure you have the databasedotcom gem installed and configured
 properly. Make sure each of the models you wish to sync are materialized.
 
 ````ruby
@@ -65,17 +65,17 @@ And then execute:
 Or install it yourself as:
 
     $ gem install salesforce_ar_sync
-    
+
 ### Application Setup
 
-Before using the gem you must complete the setup of your rails app. 
+Before using the gem you must complete the setup of your rails app.
 
 The gem needs to know your 18 character organization id, it can be stored in a YAML file or in the ENV class.
 
 To create the yaml file run
 
     $ rails generate salesforce_ar_sync:configuration <organization id>
-    
+
 Next you will need to decide which models you want to sync. For each model you must create a migration and run them
 
     $ rails generate salesforce_ar_sync:migrations <models> --migrate
@@ -87,7 +87,7 @@ To mount the engine add the following line to your routes.rb file
 You can change '/integration' to whatever you want, all of the engine routes will be based off of this path. Running
 
 	$ rake routes | grep salesforce_ar_sync
-	
+
 will show you all of the gems routes, make sure you point your outbound messages at these urls.
 
 Next you will need to tell the gem which models are syncable by adding _salesforce_syncable_ to your model class
@@ -97,7 +97,7 @@ and specifying which attributes you would like to sync.
 salesforce_syncable :sync_attributes => {:FirstName => :first_name, :LastName => :last_name}
 ````
 
-The first parameter in the _:sync_attributes_ hash is the Salesforce field name and the second is the model attribute 
+The first parameter in the _:sync_attributes_ hash is the Salesforce field name and the second is the model attribute
 name.
 
 ## Usage
@@ -115,18 +115,18 @@ The options available to configure are
 To generate a YAML file
 
     $ rails generate salesforce_ar_sync:configuration
-    
+
 Or with an organization id
-    
+
     $ rails generate salesforce_ar_sync:configuration 123456789123456789
-    
+
 which will create a template salesforce_ar_sync.yml in /config that looks like the following
 
     organization_id: <organization id> #18 character organization_id
     sync_enabled: true
     namespace_prefix:
 
-    
+
 To use the ENV variable you must pass environemnt variables to rails via the _export_ command in bash or before the
 initializer loads the ENV settings.
 
@@ -137,16 +137,27 @@ initializer loads the ENV settings.
 ### Model Options
 The model can have several options set:
 
-[__salesforce_sync_enabled__](#salesforce_sync_enabled)  
-[__sync_attributes__](#sync_attributes)  
-[__async_attributes__](#async_attributes)  
-[__default_attributes_for_create__](#default_attributes_for_create)  
-[__salesforce_id_attribute_name__](#salesforce_id_attribute_name)  
-[__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)   
-[__except__](#except)  
+[__salesforce_sync_enabled__](#salesforce_sync_enabled)
+
+[__sync_attributes__](#sync_attributes)
+
+[__async_attributes__](#async_attributes)
+
+[__default_attributes_for_create__](#default_attributes_for_create)
+
+[__salesforce_id_attribute_name__](#salesforce_id_attribute_name)
+
+[__web_id_attribute_name__](#web_id_attribute_name)
+
+[__activerecord_web_id_attribute_name__](#activerecord_web_id_attribute_name)
+
+[__salesforce_sync_web_id__](#salesforce_sync_web_id)
+
+[__web_class_name__](#web_class_name)
+
+[__salesforce_object_name__](#salesforce_object_name)
+
+[__except__](#except)
 
 #### <a id="salesforce_sync_enabled"></a>salesforce_sync_enabled
 Model level option to enable disable the sync, defaults to true.
@@ -154,11 +165,11 @@ Model level option to enable disable the sync, defaults to true.
 ````ruby
 :salesforce_sync_enabled => false
 ````
-    
+
 #### sync_attributes
-Hash mapping of Salesforce attributes to web attributes, defaults to empty hash.  
-"Web" attributes can be actual method names to return a custom value.If you are providing a method name to return a 
-value, you should also implement a corresponding my_method_changed? to return if the value has changed.  Otherwise 
+Hash mapping of Salesforce attributes to web attributes, defaults to empty hash.
+"Web" attributes can be actual method names to return a custom value.If you are providing a method name to return a
+value, you should also implement a corresponding my_method_changed? to return if the value has changed.  Otherwise
 it will always be synced.
 
 ````ruby
@@ -166,16 +177,16 @@ it will always be synced.
 ````
 
 #### async_attributes
-An array of Salesforce attributes which should be synced asynchronously, defaults to an empty array. When an object is saved and only attributes contained in this array, the save to Salesforce will be queued and processed asyncronously. 
+An array of Salesforce attributes which should be synced asynchronously, defaults to an empty array. When an object is saved and only attributes contained in this array, the save to Salesforce will be queued and processed asyncronously.
 Use this carefully, nothing is done to ensure data integrity, if multiple jobs are queued for a single object there is no way to guarentee that they are processed in order, or that the save to Salesforce will succeed.
 
 ````ruby
 :async_attributes => ["Last_Login__c", "Login_Count__c"]
 ````
 
-Note:  The model will fall back to synchronous sync if non-synchronous attributes are changed along with async 
+Note:  The model will fall back to synchronous sync if non-synchronous attributes are changed along with async
 attributes
- 
+
 #### default_attributes_for_create
 A hash of default attributes that should be used when we are creating a new record, defaults to empty hash.
 
@@ -197,6 +208,13 @@ The field name of the web id attribute in the Salesforce Object, defaults to _We
 :web_id_attribute_name  => :WebId__c
 ````
 
+#### activerecord_web_id_attribute_name
+The field name of the web id attribute in the Active Record Object, defaults to id
+
+````ruby
+:activerecord_web_id_attribute_name  => :id
+````
+
 #### salesforce_sync_web_id
 Enable or disable sync of the web id, defaults to false. Use this if you have a need for the id field of the ActiveRecord model to by synced to Salesforce.
 
@@ -205,10 +223,10 @@ Enable or disable sync of the web id, defaults to false. Use this if you have a
 ````
 
 #### web_class_name
-The name of the Web Objects class. A custom value can be provided if you wish to sync to a SF object and back to a 
-different web object. Defaults to the model name. This would generally be used if you wanted to flatten a web object 
+The name of the Web Objects class. A custom value can be provided if you wish to sync to a SF object and back to a
+different web object. Defaults to the model name. This would generally be used if you wanted to flatten a web object
 into a larger SF object like Contact.
-      
+
 ````ruby
 :web_class_name => 'Contact',
 ````
@@ -221,7 +239,7 @@ Optionally holds the name of a method which will return the name of the Salesfor
 ````
 
 #### except
-Optionally holds the name of a method which can contain logic to determine if a record should be synced on save. If no 
+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.
 
 ````ruby
@@ -230,9 +248,9 @@ method is given then only the salesforce_skip_sync attribute is used. Defaults t
 
 ### Stopping the Sync
 
-Stopping the gem from syncing can be done on three levels. 
+Stopping the gem from syncing can be done on three levels.
 
-* The global level before the app starts via the .yml file, ENV variables or after the app starts with the gem's 
+* The global level before the app starts via the .yml file, ENV variables or after the app starts with the gem's
 configuration variable _SALESFORCE_AR_SYNC_CONFIG["SYNC_ENABLED"]_
 * The model level by setting the _:salesforce_sync_enabled => false_ or _:except => :method_name_
 * The instance level by setting _:salesforce_skip_sync => true_ in the instance
@@ -254,7 +272,7 @@ end
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   attr_accessor :first_name, :last_name, :phone, :email
-  
+
   salesforce_syncable :sync_attributes => {:FirstName => :first_name, :LastName => :last_name, :Phone => :phone, :Email => :email}
 end
 ```
@@ -265,7 +283,7 @@ end
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   attr_accessor :first_name, :last_name, :phone, :email
-  
+
   salesforce_syncable :sync_attributes => {:FirstName => :first_name, :LastName => :last_name, :Phone => :phone, :Email => :email},
                       :salesforce_sync_enabled => false
 end
@@ -277,10 +295,10 @@ end
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   attr_accessor :first_name, :last_name, :phone, :email
-  
+
   salesforce_syncable :sync_attributes => {:FirstName => :first_name, :LastName => :last_name, :Phone => :phone, :Email => :email},
                       :except => :skip_sync?
-                      
+
   def skip_sync?
     if first_name.blank?
       return true
@@ -302,7 +320,7 @@ customer.salesforce_skip_sync = true
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   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, :Last_Login_Time__c => :last_login_time},
                       :async_attributes => ["Last_Login_Time__c"]
 end
@@ -314,7 +332,7 @@ end
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   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},
                       :default_attributes_for_create => {:password_change_required => true}
 end
@@ -348,11 +366,11 @@ using the 18 digit Salesforce id, but maintain our ActiveRecord relationships.
 		end
 
 		def salesforce_account_id=(account_id)
-		  self.account = nil and return if account_id.nil?
+		  self.account = nil if account_id.nil? and return
 		  self.account = Account.find_or_create_by_salesforce_id(account_id)
 		end
 	end
-	
+
 ```
 
 ### Defining a Custom Salesforce Object
@@ -361,7 +379,7 @@ using the 18 digit Salesforce id, but maintain our ActiveRecord relationships.
 class Contact < ActiveRecord::Base
   attributes :first_name, :last_name, :phone, :email, :last_login_time, :salesforce_id, :salesforce_updated_at
   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_name => :custom_salesforce_object_name
 
@@ -372,6 +390,7 @@ end
 ```
 
 ## Deletes
+### Inbound Deletes
 In order to handle the delete of objects coming from Salesforce, a bit of code is necessary because an Outbound Message cannot be triggered when
 an object is deleted. To work around this you will need to create a new Custom Object in your Salesforce environment:
 
@@ -387,6 +406,30 @@ Object_Type__c will hold the name of the Rails Model that the Salesforce object
 If you trigger a record to be written to this object whenever another object is deleted, and configure an Outbound Message to send to the /sf_soap/delete action
 whenever a Deleted_Object__c record is created, the corresponding record will be removed from your Rails app.
 
+Syncing inbound deletes is enabled by default, but can be configured in the Rails Model.
+This is done using the :sync_inbound_delete option, which can take either a boolean value, or the name of a method that returns a boolean value.
+
+```ruby
+  salesforce_syncable :sync_inbound_delete => :inbound_delete
+                     #:sync_inbound_delete => true
+  def inbound_delete
+    return self.comments.count == 0
+  end
+```
+
+### Outbound Deletes
+Syncing outbound deletes to Salesforce is disabled by default, but can be configured in the Rails Model.
+This is done using the :sync_outbound_delete option, which can take either a boolean value, or the name of a method that returns a boolean value.
+
+```ruby
+  salesforce_syncable :sync_outbound_delete => :outbound_delete
+                     #:sync_outbound_delete => false
+
+  def outbound_delete
+    return self.is_trial_user?
+  end
+```
+
 ## Errors
 
 ### Outbound Message Errors
@@ -396,8 +439,8 @@ If the SOAP handler encounters an error it will be recorded in the log of the ou
     Setup -> Monitoring -> Outbound Messages
 
 ## <a id="orga_id"></a>Finding your 18 Character Organization ID
- Your 15 character organization id can be found in _Setup -> Company Profile -> Company Information_. You must convert 
- it to an 18 character id by running it through the tool located here: 
+ Your 15 character organization id can be found in _Setup -> Company Profile -> Company Information_. You must convert
+ it to an 18 character id by running it through the tool located here:
  http://cloudjedi.wordpress.com/no-fuss-salesforce-id-converter/ or by installing the Force.com Utility Belt for Chrome.
 
 ## Contributing

data/lib/generators/salesforce_ar_sync/migrations/migrations_generator.rb

@@ -17,7 +17,7 @@ module SalesforceArSync
 
       def create_migrations
         models.each do |model|
-          create_migration(model)
+          create_ar_sync_migration(model)
         end
 
         if options[:migrate] == "yes" 
@@ -41,7 +41,7 @@ module SalesforceArSync
         @prev_migration_nr.to_s
       end
 
-      def create_migration(model_name)
+      def create_ar_sync_migration(model_name)
         #we can't load all the models in so let's assume it follows the standard nameing convention
         @table_name = model_name.tableize
         @model_name = model_name

data/lib/salesforce_ar_sync/extenders/salesforce_syncable.rb

@@ -1,6 +1,6 @@
 module SalesforceArSync
   module Extenders
-    module SalesforceSyncable      
+    module SalesforceSyncable
       def salesforce_syncable(options = {})
         require 'salesforce_ar_sync/salesforce_sync'
         include SalesforceArSync::SalesforceSync
@@ -11,21 +11,26 @@ module SalesforceArSync
         self.salesforce_default_attributes_for_create = options.has_key?(:default_attributes_for_create) ? options[:default_attributes_for_create] : {}
         self.salesforce_id_attribute_name = options.has_key?(:salesforce_id_attribute_name) ? options[:salesforce_id_attribute_name] : :Id
         self.salesforce_web_id_attribute_name = options.has_key?(:web_id_attribute_name) ? options[:web_id_attribute_name] : :WebId__c
+        self.activerecord_web_id_attribute_name = options.has_key?(:activerecord_web_id_attribute_name) ? options[:activerecord_web_id_attribute_name] : :id
         self.salesforce_sync_web_id = options.has_key?(:salesforce_sync_web_id) ? options[:salesforce_sync_web_id] : false
         self.salesforce_web_class_name = options.has_key?(:web_class_name) ? options[:web_class_name] : self.name
-        
+
+        self.sync_inbound_delete = options.has_key?(:sync_inbound_delete) ? options[:sync_inbound_delete] : true
+        self.sync_outbound_delete = options.has_key?(:sync_outbound_delete) ? options[:sync_outbound_delete] : false
+
         self.salesforce_object_name_method = options.has_key?(:salesforce_object_name) ? options[:salesforce_object_name] : 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_commit :salesforce_delete_object, on: :destroy
+
           def salesforce_sync_web_id?
             self.salesforce_sync_web_id
           end
         end
-        
+
         class_eval do
           # Calls a method if provided to return the name of the Salesforce object the model is syncing to.
           # If no method is provided, defaults to the class name
@@ -33,8 +38,8 @@ module SalesforceArSync
             return send(self.class.salesforce_object_name_method) if self.class.salesforce_object_name_method.present?
             return self.class.name
           end
-          
-          # Calls a method, if provided, to determine if a record should be synced to Salesforce. 
+
+          # 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
           def salesforce_skip_sync?

data/lib/salesforce_ar_sync/railtie.rb

@@ -0,0 +1,7 @@
+module SalesforceArSync
+  class Railtie < Rails::Railtie
+    initializer 'salesforce_ar_sync.insert_middleware' do |app|
+      app.config.middleware.insert_after ActionDispatch::ParamsParser, ActionDispatch::XmlParamsParser
+    end
+  end
+end

data/lib/salesforce_ar_sync/salesforce_sync.rb

@@ -1,11 +1,11 @@
 require 'active_support/concern'
 
 module SalesforceArSync
-  module SalesforceSync  
+  module SalesforceSync
     extend ActiveSupport::Concern
-    
-    module ClassMethods    
-      # Optionally holds the value to determine if salesforce syncing is enabled. Defaults to true. If set 
+
+    module ClassMethods
+      # Optionally holds the value to determine if salesforce syncing is enabled. Defaults to true. If set
       # to false syncing will be disabled for the class
       attr_accessor :salesforce_sync_enabled
 
@@ -14,15 +14,15 @@ module SalesforceArSync
       # { :Email => :login, :FirstName => :first_name, :LastName => :last_name }
       #
       # "Web" attributes can be actual method names to return a custom value
-      # If you are providing a method name to return a value, you should also implement a corresponding my_method_changed? to 
+      # If you are providing a method name to return a value, you should also implement a corresponding my_method_changed? to
       # return if the value has changed.  Otherwise it will always be synced.
       attr_accessor :salesforce_sync_attribute_mapping
-        
+
       # Returns an array of Salesforce attributes which should be synced asynchronously
       # Example:  ["Last_Login_Date__c", "Login_Count__c" ]
       # Note:  The model will fall back to synchronous sync if non-synchronous attributes are changed along with async attributes
       attr_accessor :salesforce_async_attributes
-        
+
       # Returns a hash of default attributes that should be used when we are creating a new record
       attr_accessor :salesforce_default_attributes_for_create
 
@@ -31,19 +31,25 @@ module SalesforceArSync
 
       # Returns the name of the Web Objects class. A custom value can be provided if you wish
       # to sync to a SF object and back to a different web object.  This would generally be used
-      # if you wanted to flatten a web object into a larger SF object like Contact     
+      # if you wanted to flatten a web object into a larger SF object like Contact
       attr_accessor :salesforce_web_class_name
 
-      attr_accessor :salesforce_web_id_attribute_name        
+      # Specify whether or not we sync deletes inbound from salesforce or outbound from this app
+      # Accepts either a true/false or a symbol to a method to be called
+      attr_accessor :sync_inbound_delete
+      attr_accessor :sync_outbound_delete
+
+      attr_accessor :salesforce_web_id_attribute_name
       attr_accessor :salesforce_sync_web_id
-      
+      attr_accessor :activerecord_web_id_attribute_name
+
       # 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 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
-      
+
       # Accepts values from an outbound message hash and will either update an existing record OR create a new record
       # Firstly attempts to find an object by the salesforce_id attribute
       # Secondly attempts to look an object up by it's ID (WebId__c in outbound message)
@@ -51,9 +57,9 @@ module SalesforceArSync
       def salesforce_update(attributes={})
         raise ArgumentError, "#{salesforce_id_attribute_name} parameter required" if attributes[salesforce_id_attribute_name].blank?
 
-        object = self.find_by_salesforce_id attributes[salesforce_id_attribute_name]
-        object ||= self.find_by_id attributes[salesforce_web_id_attribute_name] if salesforce_sync_web_id? && attributes[salesforce_web_id_attribute_name]
-        
+        object = self.find_by(salesforce_id: attributes[salesforce_id_attribute_name])
+        object ||= self.find_by(activerecord_web_id_attribute_name => attributes[salesforce_web_id_attribute_name]) if salesforce_sync_web_id? && attributes[salesforce_web_id_attribute_name]
+
         if object.nil?
           object = self.new
           salesforce_default_attributes_for_create.merge(:salesforce_id => attributes[salesforce_id_attribute_name]).each_pair do |k, v|
@@ -68,7 +74,7 @@ module SalesforceArSync
     # if this instance variable is set to true, the salesforce_sync method will return without attempting
     # to sync data to Salesforce
     attr_accessor :salesforce_skip_sync
-    
+
     # Salesforce completely excludes any empty/null fields from Outbound Messages
     # We initialize all declared attributes as nil before mapping the values from the message
     def salesforce_empty_attributes
@@ -81,8 +87,8 @@ module SalesforceArSync
 
     # An internal method used to get a hash of values that we are going to set from a Salesforce outbound message hash
     def salesforce_attributes_to_set(attributes = {})
-      {}.tap do |hash| 
-        # loop through the hash of attributes from the outbound message, and compare to our sf mappings and 
+      {}.tap do |hash|
+        # loop through the hash of attributes from the outbound message, and compare to our sf mappings and
         # create a reversed hash of value's and key's to pass to update_attributes
         attributes.each do |key, value|
           # make sure our sync_mapping contains the salesforce attribute AND that our object has a setter for it
@@ -106,9 +112,9 @@ module SalesforceArSync
       attributes_to_update.each_pair do |k, v|
         self.send("#{k}=", v)
       end
-      
+
       # we don't want to keep going in a endless loop.  SF has just updated these values.
-      self.salesforce_skip_sync = true 
+      self.salesforce_skip_sync = true
       self.save!
     end
 
@@ -116,12 +122,12 @@ module SalesforceArSync
 #      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")    
+      hash["records"].first.try(:[], "SystemModstamp")
     end
 
 
@@ -137,7 +143,7 @@ module SalesforceArSync
 
     # create a hash of updates to send to salesforce
     def salesforce_attributes_to_update(include_all = false)
-      {}.tap do |hash| 
+      {}.tap do |hash|
         self.class.salesforce_sync_attribute_mapping.each do |key, value|
           if self.respond_to?(value)
 
@@ -150,7 +156,7 @@ module SalesforceArSync
             hash[key] = attribute_value if include_all || salesforce_should_update_attribute?(value)
           end
         end
-      end    
+      end
     end
 
     def is_boolean?(attribute)
@@ -159,17 +165,33 @@ 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?
-      result = SF_CLIENT.http_post("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}", attributes.to_json)
+      result = SF_CLIENT.http_post("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}", format_attributes(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?
-      SF_CLIENT.http_patch("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}/#{salesforce_id}", attributes.to_json)
+      SF_CLIENT.http_patch("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}/#{salesforce_id}", format_attributes(attributes).to_json)
     end
 
-    # if attributes specified in the async_attributes array are the only attributes being modified, then sync the data 
+    def salesforce_delete_object
+      if self.ar_sync_outbound_delete?
+        SF_CLIENT.http_delete("/services/data/v#{SF_CLIENT.version}/sobjects/#{salesforce_object_name}/#{salesforce_id}")
+      end
+    end
+
+    # Check to see if the user passed in a true/false, if so return that, if not then they passed int a symbol to a method
+    # We then call the method and use its value instead
+    def ar_sync_inbound_delete?
+      [true,false].include?(self.class.sync_inbound_delete) ? self.class.sync_inbound_delete : send(self.class.sync_inbound_delete)
+    end
+
+    def ar_sync_outbound_delete?
+      [true,false].include?(self.class.sync_outbound_delete) ? self.class.sync_outbound_delete : send(self.class.sync_outbound_delete)
+    end
+
+    # if attributes specified in the async_attributes array are the only attributes being modified, then sync the data
     # via delayed_job
     def salesforce_perform_async_call?
       return false if salesforce_attributes_to_update.empty? || self.class.salesforce_async_attributes.empty?
@@ -185,18 +207,33 @@ module SalesforceArSync
         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? 
+          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?
-      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
+      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 => get_activerecord_web_id }.to_json) if salesforce_id
+    end
+
+    def get_activerecord_web_id
+      self.send(self.class.activerecord_web_id_attribute_name)
     end
 
+    private
+
+    # Multi-picklists in the SF Rest API are expected to be in a semicolon separated list
+    # This method converts all attribute that are arrays into these values
+    # Eg. ["A","B","C"]  =>  "A;B;C"
+    def format_attributes(attributes)
+      attributes.each do |k,v|
+        attributes[k] = v.join(";") if v.is_a?(Array)
+      end
+      return attributes
+    end
   end
 end

data/lib/salesforce_ar_sync/soap_handler/delete.rb

@@ -12,7 +12,7 @@ module SalesforceArSync
          raise ArgumentError, "Object_Type__c parameter required" if hash[namespaced(:Object_Type__c)].blank?
      
          object = hash[namespaced(:Object_Type__c)].constantize.find_by_salesforce_id(hash[namespaced(:Object_Id__c)])
-         object.destroy if object
+         object.destroy if object && object.ar_sync_inbound_delete?
        end
     end
    end

data/lib/salesforce_ar_sync/version.rb

@@ -1,3 +1,3 @@
 module SalesforceArSync
-  VERSION = "1.1.2"
+  VERSION = "2.0.0"
 end

data/lib/salesforce_ar_sync.rb

@@ -5,11 +5,12 @@ require 'salesforce_ar_sync/salesforce_object_sync'
 require 'salesforce_ar_sync/soap_handler/base'
 require 'salesforce_ar_sync/soap_handler/delete'
 require 'salesforce_ar_sync/ip_constraint'
+require 'salesforce_ar_sync/railtie'
 
 module SalesforceArSync
   mattr_accessor :app_root
   mattr_accessor :config
-  
+
   def self.setup
     yield self
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Halliday
@@ -13,150 +12,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: actionpack-xml_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: supermodel
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: databasedotcom
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveRecord extension & rails engine for syncing data with Salesforce.com
@@ -165,50 +146,50 @@ email:
 - nneufeld@infotech.com
 - acoates@infotech.com
 - dnoonan@infotech.com
-- lnediger@infotech.com.com
+- lnediger@infotech.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
+- app/controllers/salesforce_ar_sync/soap_message_controller.rb
+- config/routes.rb
 - lib/generators/salesforce_ar_sync/configuration/configuration_generator.rb
 - lib/generators/salesforce_ar_sync/configuration/templates/salesforce_ar_sync.yml
 - lib/generators/salesforce_ar_sync/migrations/migrations_generator.rb
 - lib/generators/salesforce_ar_sync/migrations/templates/migration.rb
+- lib/salesforce_ar_sync.rb
 - lib/salesforce_ar_sync/engine.rb
 - lib/salesforce_ar_sync/extenders/salesforce_syncable.rb
 - lib/salesforce_ar_sync/ip_constraint.rb
+- lib/salesforce_ar_sync/railtie.rb
 - lib/salesforce_ar_sync/salesforce_object_sync.rb
 - lib/salesforce_ar_sync/salesforce_sync.rb
 - lib/salesforce_ar_sync/soap_handler/base.rb
 - 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: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord extension & rails engine for syncing data with Salesforce.com
 test_files: []