active_force 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f65b3ee4d09a2cc85b6ff35e563104b90e35ef2e
-  data.tar.gz: 865295aff9ee4dfc2962fa13225d41041f3100d1
+  metadata.gz: 856379b1407c72d56da2e86be62b2a54af211d85
+  data.tar.gz: f35e9f84f5278754333157b749df193ce9f60034
 SHA512:
-  metadata.gz: 54eac72eb1033454434c97b997810587004df5655134574a445f8826318c69eda74783f2a902bd75cffe4addd88a41b49b93451029284d2002ca4c2928c3c988
-  data.tar.gz: 509928a1158a20cb8122efa37d98e893bf762ad1b9cf7329f35cf68ffed269fcd738a4613357bf4ec3830e86cffa6002b9d153baf6689356f555f5836f9b0248
+  metadata.gz: 15db0f8a8df68c7db8cf3eb8e2ebf5304748807823957b61e2348a90459615a7140b7fdf20753ad832ce7c2a24fb9a76e3df612bbde1b44e780d220f8f0f451c
+  data.tar.gz: e571dcf6b46d18b2d7fe1927600b7aafccbb5d12506ddaba558dbe3f18373967e5514818542b1d17d7cab455bfc9fea4f474ece36aed8fe768359e52cd14b65a

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 ## Not released
+
+## 0.7.1
+
+* Allow sfdc_client to be set. ([#92][])
+
+## 0.7.0
+
 * Rails4-style conditional has_many associations  ([Dan Olson][])
 * Add `#includes` query method to eager load has_many association.  ([Dan Olson][])
 * Add `#includes` query method to eager load belongs_to association. ([#65][])
@@ -84,6 +91,7 @@
 [#30]: https://github.com/ionia-corporation/active_force/issues/30
 [#33]: https://github.com/ionia-corporation/active_force/issues/33
 [#65]: https://github.com/ionia-corporation/active_force/issues/65
+[#92]: https://github.com/ionia-corporation/active_force/issues/92
 [Pablo Oldani]: https://github.com/olvap
 [Armando Andini]: https://github.com/antico5
 [José Piccioni]: https://github.com/lmhsjackson

data/README.md

@@ -38,6 +38,19 @@ environment variables to set up credentials.
 
 You might be interested in [dotenv-rails][3] to set up those in development.
 
+Also, you may specify which client to use as a configuration option, which is useful
+when having to reauthenticate utilizing oauth.
+
+```ruby
+ActiveForce.sfdc_client = Restforce.new()
+  oauth_token:         current_user.oauth_token,
+  refresh_token:       current_user.refresh_token,
+  instance_url:        current_user.instance_url,
+  client_id:           SALESFORCE_CLIENT_ID,
+  client_secret:       SALESFORCE_CLIENT_SECRET
+)
+```
+
 ## Usage
 
 ```ruby
@@ -47,6 +60,14 @@ class Medication < ActiveForce::SObject
 
   field :max_dossage  # defaults to "Max_Dossage__c"
   field :updated_from
+ 
+  ##
+  # You can cast field value using `as`
+  # field :address_primary_active, from: 's360a__AddressPrimaryActive__c', as: :boolean
+  # 
+  # Available options are :boolean, :int, :double, :percent, :date, :datetime, :string, :base64, 
+  # :byte, :ID, :reference, :currency, :textarea, :phone, :url, :email, :combobox, :picklist, 
+  # :multipicklist, :anyType, :location
 
   ##
   # Table name is inferred from class name.
@@ -97,7 +118,7 @@ class Account < ActiveForce::SObject
 
   has_many :today_log_entries,
     model: DailyLogEntry,
-    scoped_as: ->{ where(date: Time.now.in_time_zone.strftime("%Y-%m-%d") }
+    scoped_as: ->{ where(date: Time.now.in_time_zone.strftime("%Y-%m-%d")) }
 
   has_many :labs,
     scoped_as: ->{ where("Category__c = 'EMR' AND Date__c <> NULL").order('Date__c DESC') }

data/lib/active_force.rb

@@ -3,4 +3,11 @@ require 'active_force/sobject'
 require 'active_force/query'
 
 module ActiveForce
+
+  class << self
+    attr_accessor :sfdc_client
+  end
+
+  self.sfdc_client = Restforce.new
+
 end

data/lib/active_force/association/association.rb

@@ -42,7 +42,7 @@ module ActiveForce
 
       def infer_foreign_key_from_model(model)
         name = model.custom_table? ? model.name : model.table_name
-        "#{name.downcase}_id".to_sym
+        name.foreign_key.to_sym
       end
     end
 

data/lib/active_force/sobject.rb

@@ -199,7 +199,7 @@ module ActiveForce
     end
 
     def self.sfdc_client
-      @client ||= Restforce.new
+      ActiveForce.sfdc_client
     end
 
     def sfdc_client

data/lib/active_force/version.rb

@@ -1,3 +1,3 @@
 module ActiveForce
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/active_force/association_spec.rb

@@ -14,7 +14,7 @@ describe ActiveForce::SObject do
   end
 
   before do
-    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+    ActiveForce.sfdc_client = client
   end
 
   describe "has_many_query" do

data/spec/active_force/callbacks_spec.rb

@@ -4,7 +4,7 @@ describe ActiveForce::SObject do
   let(:client) { double 'Client', create!: 'id' }
 
   before do
-    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+    ActiveForce.sfdc_client = client
   end
 
   describe "save" do

data/spec/active_force/sobject/includes_spec.rb

@@ -5,7 +5,7 @@ module ActiveForce
     let(:client){ double "client" }
 
     before do
-      allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+      ActiveForce.sfdc_client = client
     end
 
     describe '.includes' do

data/spec/active_force/sobject_spec.rb

@@ -5,7 +5,7 @@ describe ActiveForce::SObject do
   let(:client) { double 'Client' }
 
   before do
-    allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+    ActiveForce.sfdc_client = client
   end
 
   describe ".new" do
@@ -264,7 +264,7 @@ describe ActiveForce::SObject do
     let(:territory){ Territory.new(id: '1', quota_id: '1') }
 
     before do
-      allow(ActiveForce::SObject).to receive(:sfdc_client).and_return client
+      ActiveForce.sfdc_client = client
     end
 
     it 'clears cached associations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Eloy Espinaco
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -192,3 +192,4 @@ test_files:
 - spec/support/restforce_factories.rb
 - spec/support/sobjects.rb
 - spec/support/whizbang.rb
+has_rdoc: