salesforce_ar_sync 1.0.0 → 1.0.1

data/lib/salesforce_ar_sync/engine.rb

@@ -3,6 +3,30 @@ module SalesforceArSync
     initializer "salesforce_ar_sync.load_app_instance_data" do |app|
       SalesforceArSync.setup do |config|
         config.app_root = app.root
+        
+        #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
+        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"]
+
+        #do we have valid config options now?
+        if !SalesforceArSync.config["ORGANIZATION_ID"].present? || SalesforceArSync.config["ORGANIZATION_ID"].length != 18
+          SalesforceArSync.config["SYNC_ENABLED"] = false
+        end
       end
     end
   end

data/lib/salesforce_ar_sync/extenders/salesforce_syncable.rb

@@ -46,7 +46,7 @@ module SalesforceArSync
           # 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?
-            return true if SALESFORCE_AR_SYNC_CONFIG["SYNC_ENABLED"] == false
+            return true if SalesforceArSync.config["SYNC_ENABLED"] == false
             return (salesforce_skip_sync || !self.class.salesforce_sync_enabled || send(self.class.salesforce_skip_sync_method)) if self.class.salesforce_skip_sync_method.present?
             return (salesforce_skip_sync || !self.class.salesforce_sync_enabled)
           end

data/lib/salesforce_ar_sync/ip_constraint.rb

@@ -3,7 +3,7 @@ require 'ipaddr'
 module SalesforceArSync
   class IPConstraint
     def initialize
-    	@ip_ranges = SALESFORCE_AR_SYNC_CONFIG["IP_RANGES"]
+    	@ip_ranges = SalesforceArSync.config["IP_RANGES"]
     end
  
     def matches?(request)

data/lib/salesforce_ar_sync/soap_handler/base.rb

@@ -6,7 +6,7 @@ module SalesforceArSync
       def initialize organization, options = {}
         @options = options
         @xml_hashed = options
-        @organization = SALESFORCE_AR_SYNC_CONFIG["ORGANIZATION_ID"]
+        @organization = SalesforceArSync.config["ORGANIZATION_ID"]
         @sobjects = collect_sobjects if valid?
       end
 

data/lib/salesforce_ar_sync/version.rb

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

data/lib/salesforce_ar_sync.rb

@@ -8,6 +8,7 @@ require 'salesforce_ar_sync/ip_constraint'
 
 module SalesforceArSync
   mattr_accessor :app_root
+  mattr_accessor :config
   
   def self.setup
     yield self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails