uses env variables for tumblr key and secret

monfresh · Jul 10, 2012 · cadcac1 · cadcac1
1 parent c08e42a
commit cadcac1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/app/models/edit_job.rb b/app/models/edit_job.rb
@@ -1,14 +1,11 @@
 class EditJob < Struct.new(:user)
   def perform
 
-
-  		tumblr_config = YAML.load(File.open("#{::Rails.root}/config/oauth.yml").read)
-
 		Tumblr.configure do |config|
 			config.consumer_key = tumblr_config['tumblr']['key']
 			config.consumer_secret = tumblr_config['tumblr']['secret']
-			#config.consumer_key = ENV["TUMBLR_KEY"]
-			#config.consumer_secret = ENV["TUMBLR_SECRET"]
+			config.consumer_key = ENV["TUMBLR_KEY"]
+			config.consumer_secret = ENV["TUMBLR_SECRET"]
 			config.oauth_token = user.token
 			config.oauth_token_secret = user.secret
 		end

diff --git a/app/models/post_lookup.rb b/app/models/post_lookup.rb
@@ -9,13 +9,11 @@ def initialize
 	def configure_client
 		user = User.current
 
-		tumblr_config = YAML.load(File.open("#{::Rails.root}/config/oauth.yml").read)
-
 		Tumblr.configure do |config|
 			config.consumer_key = tumblr_config['tumblr']['key']
 			config.consumer_secret = tumblr_config['tumblr']['secret']
-			#config.consumer_key = ENV["TUMBLR_KEY"]
-			#config.consumer_secret = ENV["TUMBLR_SECRET"]
+			config.consumer_key = ENV["TUMBLR_KEY"]
+			config.consumer_secret = ENV["TUMBLR_SECRET"]
 			config.oauth_token = user.token
 			config.oauth_token_secret = user.secret
 		end

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
@@ -1,6 +1,3 @@
-config = YAML.load(File.open("#{::Rails.root}/config/oauth.yml").read)
-
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :tumblr, config['tumblr']['key'], config['tumblr']['secret']
-  #provider :tumblr, ENV["TUMBLR_KEY"], ENV["TUMBLR_SECRET"]
+  provider :tumblr, ENV["TUMBLR_KEY"], ENV["TUMBLR_SECRET"]
 end