From b926cebaa8489eddedda98eedaf1580c01e6b4a8 Mon Sep 17 00:00:00 2001 From: JD Maresco Date: Wed, 2 Oct 2013 23:32:23 -0700 Subject: [PATCH] Look for api keys in ENV if parse_resource.yml not present --- lib/parse_resource/base.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/parse_resource/base.rb b/lib/parse_resource/base.rb index d01e98e..8593d17 100644 --- a/lib/parse_resource/base.rb +++ b/lib/parse_resource/base.rb @@ -276,7 +276,16 @@ def self.load_settings @@settings ||= begin path = "config/parse_resource.yml" environment = defined?(Rails) && Rails.respond_to?(:env) ? Rails.env : ENV["RACK_ENV"] - YAML.load(ERB.new(File.new(path).read).result)[environment] + if FileTest.exist? (path) + YAML.load(ERB.new(File.new(path).read).result)[environment] + elsif ENV['app_id'] && ENV['master_key'] + settings = HashWithIndifferentAccess.new + settings['app_id'] = ENV['app_id'] + settings['master_key'] = ENV['master_key'] + settings + else + raise "Cannot load parse_resource.yml and API keys are not set in environment" + end end @@settings end