salesforce_ar_sync 1.1.1 → 1.1.2

data/README.md

@@ -110,6 +110,7 @@ The options available to configure are
 
 * __organization_id__: the 18 character organization id of your Salesforce instance
 * __sync_enabled__: a global sync enabled flag which is a boolean true/false
+* __namespace_prefix__: Namespace prefix of your Salesforce app in case you specified one
 
 To generate a YAML file
 
@@ -123,6 +124,7 @@ which will create a template salesforce_ar_sync.yml in /config that looks like t
 
     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
@@ -130,7 +132,8 @@ initializer loads the ENV settings.
 
     $ export SALESFORCE_AR_SYNC_ORGANIZATION_ID=123456789123456789
     $ export SALESFORCE_AR_SYNC_SYNC_ENABLED=true
-    
+    $ export SALESFORCE_AR_NAMESPACE_PREFIX=my_prefix
+
 ### Model Options
 The model can have several options set:
 

data/lib/generators/salesforce_ar_sync/configuration/templates/salesforce_ar_sync.yml

@@ -3,15 +3,18 @@ production:
   sync_enabled: true
   # Salesforce owned IPs from: https://help.salesforce.com/apex/HTViewSolution?language=en_US&id=000003652
   ip_ranges: "204.14.232.0/23,204.14.237.0/24,96.43.144.0/22,96.43.148.0/22,204.14.234.0/23,204.14.238.0/23,182.50.76.0/22"
+  namespace_prefix:
   
 development:
   organization_id: <%= @organization_id %>
   sync_enabled: false
   # Salesforce owned IPs from: https://help.salesforce.com/apex/HTViewSolution?language=en_US&id=000003652
   ip_ranges: "204.14.232.0/23,204.14.237.0/24,96.43.144.0/22,96.43.148.0/22,204.14.234.0/23,204.14.238.0/23,182.50.76.0/22"
+  namespace_prefix:
     
 test:
   organization_id: <%= @organization_id %>
   sync_enabled: false
   # Salesforce owned IPs from: https://help.salesforce.com/apex/HTViewSolution?language=en_US&id=000003652
-  ip_ranges: "204.14.232.0/23,204.14.237.0/24,96.43.144.0/22,96.43.148.0/22,204.14.234.0/23,204.14.238.0/23,182.50.76.0/22"
+  ip_ranges: "204.14.232.0/23,204.14.237.0/24,96.43.144.0/22,96.43.148.0/22,204.14.234.0/23,204.14.238.0/23,182.50.76.0/22"
+  namespace_prefix:

data/lib/salesforce_ar_sync/engine.rb

@@ -12,12 +12,14 @@ module SalesforceArSync
           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 }
+          SalesforceArSync.config["NAMESPACE_PREFIX"] = config['namespace_prefix']
         end
 
         #if we have ENV flags prefer them
         SalesforceArSync.config["ORGANIZATION_ID"] = ENV["SALESFORCE_AR_SYNC_ORGANIZATION_ID"] if ENV["SALESFORCE_AR_SYNC_ORGANIZATION_ID"]
         SalesforceArSync.config["SYNC_ENABLED"] = ENV["SALESFORCE_AR_SYNC_SYNC_ENABLED"] if ENV.include? "SALESFORCE_AR_SYNC_SYNC_ENABLED"
         SalesforceArSync.config["IP_RANGES"] = ENV["SALESFORCE_AR_SYNC_IP_RANGES"].split(',').map{ |ip| ip.strip } if ENV["SALESFORCE_AR_SYNC_IP_RANGES"]
+        SalesforceArSync.config["NAMESPACE_PREFIX"] = ENV["SALESFORCE_AR_NAMESPACE_PREFIX"] if ENV["SALESFORCE_AR_NAMESPACE_PREFIX"]
 
         #do we have valid config options now?
         if !SalesforceArSync.config["ORGANIZATION_ID"].present? || SalesforceArSync.config["ORGANIZATION_ID"].length != 18

data/lib/salesforce_ar_sync/soap_handler/base.rb

@@ -41,6 +41,10 @@ module SalesforceArSync
         end
         return "<?xml version=\"1.0\" encoding=\"UTF-8\"?><soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><soapenv:Body><notificationsResponse>#{response}</notificationsResponse></soapenv:Body></soapenv:Envelope>"
       end
+
+      def self.namespaced(field)
+         SalesforceArSync.config["NAMESPACE_PREFIX"].present? ? :"#{SalesforceArSync.config["NAMESPACE_PREFIX"]}__#{field}" : :"#{field}"
+      end
     
       private
 

data/lib/salesforce_ar_sync/soap_handler/delete.rb

@@ -8,12 +8,12 @@ module SalesforceArSync
        end
 
        def self.delete_object(hash = {})
-         raise ArgumentError, "Object_Id__c parameter required" if hash[:Object_Id__c].blank?
-         raise ArgumentError, "Object_Type__c parameter required" if hash[:Object_Type__c].blank?
+         raise ArgumentError, "Object_Id__c parameter required" if hash[namespaced(:Object_Id__c)].blank?
+         raise ArgumentError, "Object_Type__c parameter required" if hash[namespaced(:Object_Type__c)].blank?
      
-         object = hash[:Object_Type__c].constantize.find_by_salesforce_id(hash[:Object_Id__c])
+         object = hash[namespaced(:Object_Type__c)].constantize.find_by_salesforce_id(hash[namespaced(:Object_Id__c)])
          object.destroy if object
        end
-     end
+    end
    end
  end

data/lib/salesforce_ar_sync/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails