lib/anyway/config.rb in anyway_config-1.4.3 vs lib/anyway/config.rb in anyway_config-1.4.4

@@ -154,18 +154,16 @@
       load_from_file(config)
       load_from_env(config)
     end
 
     def load_from_file(config)
-      config_path = Anyway.env.fetch(env_prefix).delete('conf') ||
-                    "./config/#{config_name}.yml"
       config.deep_merge!(parse_yml(config_path) || {}) if config_path && File.file?(config_path)
       config
     end
 
     def load_from_env(config)
-      config.deep_merge!(Anyway.env.fetch(env_prefix))
+      config.deep_merge!(env_part)
       config
     end
 
     def option_parser
       @option_parser ||= begin
@@ -185,9 +183,21 @@
         obj[key.to_sym] = send(key)
       end.deep_dup.deep_freeze
     end
 
     private
+
+    def env_part
+      Anyway.env.fetch(env_prefix)
+    end
+
+    def config_path
+      env_part.delete('conf') || default_config_path
+    end
+
+    def default_config_path
+      "./config/#{config_name}.yml"
+    end
 
     def set_value(key, val)
       send("#{key}=", val) if respond_to?(key)
     end