household_people_and_contributions 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9671c3c6bcb0fd94db54cd9b0867332bc9239a
-  data.tar.gz: 351a66975be40f3dcdaa3c6155c72811f0832372
+  metadata.gz: 4b827cc54689810b5016338fd25f5d48abe3e72b
+  data.tar.gz: 13d21caec856b17af5a37a3b85d802f41322a871
 SHA512:
-  metadata.gz: 9644bc684cffa9c9fac35867d1a3b148ae2e68977ac267c52bc9bf15b657fcce896c5c1219c4e07f3ce1ea9be7f7fa00ee467ab08d8cbc25e38534bb357a87d2
-  data.tar.gz: 8c9896258beda5ee96f11012d529dabeb35ab0df277f1027e5228de375c6aae569248cddf7e8a7b54949b1bd0697f4c3305ab94cb8ad7d1b67e5fe13957bbc4d
+  metadata.gz: 795f3fcd411b2cf4c45743af89282769051480bf2a6cae0237fd5314a33fea66d214839d2c7249e1f94418f379aed7c63ca0e2192f45dcbb270dc2e0437bc35a
+  data.tar.gz: 4d0203baae91638059fb444a37a06583cc19962860735d99a8eb1a40a538af73e7b95fa7d22ce83ed1d203b5c9809149fabb6ff3a16b1db55a43812f86bd75d7

data/lib/household_people_and_contributions/client.rb

@@ -24,8 +24,10 @@ module HouseholdPeopleAndContributions
     CONFIG_DIR = "./config"
     fail help("missing config_dir: #{CONFIG_DIR.inspect}") unless File.exists?(CONFIG_DIR)
     KEY_FILE = ENV['KEY_FILE']
-    fail help("missing KEY_FILE: #{KEY_FILE.inspect}") unless KEY_FILE && File.exists?(KEY_FILE)
-    require_relative(KEY_FILE)
+    #fail help("missing KEY_FILE: #{KEY_FILE.inspect}") unless KEY_FILE && File.exists?(KEY_FILE)
+    if KEY_FILE && File.exists?(KEY_FILE)
+      require_relative(KEY_FILE)
+    end
 
     OUTPUT_DIR = "./output"
     fail help("missing output_dir: #{OUTPUT_DIR.inspect}") unless File.exists?(OUTPUT_DIR)
@@ -50,7 +52,7 @@ module HouseholdPeopleAndContributions
     def key
       unless @key
         @key =
-          F1Keys::CONSUMER_KEY
+          ENV['CONSUMER_KEY'] || F1Keys::CONSUMER_KEY
       end
       @key
     end
@@ -58,7 +60,7 @@ module HouseholdPeopleAndContributions
     def secret
       unless @secret
         @secret =
-          F1Keys::CONSUMER_SECRET
+          ENV['CONSUMER_SECRET'] || F1Keys::CONSUMER_SECRET
       end
       @secret
     end
@@ -66,7 +68,7 @@ module HouseholdPeopleAndContributions
     def consumer
       unless @consumer
         @consumer = OAuth::Consumer.new(key, secret, {
-          site: "https://#{F1Keys::CHURCH_CODE}.#{F1Keys::ENVIRONMENT}.fellowshiponeapi.com",
+          site: "https://#{ENV['CHURCH_CODE'] || F1Keys::CHURCH_CODE}.#{ENV['ENVIRONMENT'] || F1Keys::ENVIRONMENT}.fellowshiponeapi.com",
           request_token_path: "/v1/Tokens/RequestToken",
           authorize_path: "/v1/PortalUser/Login",
           # access_token_path: "/v1/Tokens/AccessToken",
@@ -80,13 +82,13 @@ module HouseholdPeopleAndContributions
     end
 
     def oauth_tokens?
-      F1Keys::OAUTH_TOKEN && F1Keys::OAUTH_SECRET
+      (ENV['OAUTH_TOKEN'] || F1Keys::OAUTH_TOKEN) && (ENV['OAUTH_SECRET'] || F1Keys::OAUTH_SECRET)
     end
 
     def access_token
       unless @access_token
         if oauth_tokens?
-          @access_token = OAuth::AccessToken.new(consumer, F1Keys::OAUTH_TOKEN, F1Keys::OAUTH_SECRET)
+          @access_token = OAuth::AccessToken.new(consumer, ENV['OAUTH_TOKEN'] || F1Keys::OAUTH_TOKEN, ENV['OAUTH_SECRET'] || F1Keys::OAUTH_SECRET)
         end
         unless @access_token
           if File.exists?(MARSHALED_ACCESS_TOKEN_FILE)

data/lib/household_people_and_contributions/version.rb

@@ -1,3 +1,3 @@
 module HouseholdPeopleAndContributions
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: household_people_and_contributions
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jay Tee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: household_people_and_contributions
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Extract GSP Data from Fellowshipone