Shouldn't be possible to use confs and ext-less confs.

iron-io · Jul 20, 2012 · db8331e · db8331e
1 parent 0cadbcb
commit db8331e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.2
+0.3.3
diff --git a/lib/iron_core/client.rb b/lib/iron_core/client.rb
@@ -26,7 +26,7 @@ def initialize(company, product, options = {}, default_options = {}, extra_optio
       end
 
       @env = options[:env] || options['env']
-      @env ||= ENV[company.upcase + '_' + product.upcase + '_ENV'] || ENV[product.upcase + '_ENV'] || ENV[company.upcase + '_ENV']
+      @env ||= ENV[company.upcase + '_' + product.upcase + '_ENV'] || ENV[company.upcase + '_ENV']
 
       IronCore::Logger.info 'IronCore', "Setting env to '#{@env}'" unless @env.nil?
 
@@ -35,25 +35,23 @@ def initialize(company, product, options = {}, default_options = {}, extra_optio
       load_from_config(company, product, options[:config] || options['config'])
 
       load_from_config(company, product, ENV[company.upcase + '_' + product.upcase + '_CONFIG'])
-      load_from_config(company, product, ENV[product.upcase + '_CONFIG'])
       load_from_config(company, product, ENV[company.upcase + '_CONFIG'])
 
       load_from_env(company.upcase + '_' + product.upcase)
-      load_from_env(product.upcase)
       load_from_env(company.upcase)
 
       suffixes = []
 
       unless @env.nil?
-        suffixes << "-#{env}"
-        suffixes << "_#{env}"
+        suffixes << "-#{@env}"
+        suffixes << "_#{@env}"
       end
 
       suffixes << ''
 
       suffixes.each do |suffix|
-        ['.json', ''].each do |ext|
-          ["#{company}-#{product}", "#{company}_#{product}", product, company].each do |config_base|
+        ['.json'].each do |ext|
+          ["#{company}-#{product}", "#{company}_#{product}", company].each do |config_base|
             load_from_config(company, product, "#{config_base}#{suffix}#{ext}")
             load_from_config(company, product, ".#{config_base}#{suffix}#{ext}")
             load_from_config(company, product, "~/#{config_base}#{suffix}#{ext}")
@@ -110,12 +108,16 @@ def load_from_config(company, product, config_file)
       return if config_file.nil?
 
       if File.exists?(File.expand_path(config_file))
+        config_data = '{}'
+
         begin
-          config = JSON.load(File.read(File.expand_path(config_file)))
+          config_data = File.read(File.expand_path(config_file))
         rescue
           return
         end
 
+        config = JSON.parse(config_data)
+
         unless @env.nil?
           load_from_hash(config_file, get_sub_hash(config, [@env, "#{company}_#{product}"]))
           load_from_hash(config_file, get_sub_hash(config, [@env, company, product]))