Add support for aliases in Configuration

lib/cloudinary.rb

@@ -145,7 +145,18 @@ def self.make_new_config(config_module)
   #
   # @return [OpenStruct]
   def self.import_settings_from_file
-    OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
+    yaml_env_config = begin
+      yaml_source = ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result
+      yaml_config = if YAML.respond_to?(:safe_load)
+                      YAML.safe_load(yaml_source, aliases: true)
+                    else
+                      YAML.load(yaml_source)
+                    end
+      yaml_config[config_env]
+    rescue StandardError
+      {}
+    end
+    OpenStruct.new(yaml_env_config)
   end
 
   private_class_method :import_settings_from_file

spec/config_spec.rb

@@ -106,5 +106,12 @@
       expect(Cloudinary::config.api_secret).to eq(API_SECRET)
       expect(Cloudinary::config.oauth_token).to eq(OAUTH_TOKEN)
     end
+
+    it "supports config from Yaml, with aliases and ERB interpolation" do
+      ENV["CLOUDINARY_CONFIG_DIR"] = File.join(File.dirname(__FILE__), 'data')
+      ENV["CLOUDINARY_API_KEY"] = 'api_key'
+      expect(Cloudinary::config.cloud_name).to eq('test_cloud')
+      expect(Cloudinary::config.api_key).to eq('api_key')
+    end
   end
 end

spec/data/cloudinary.yml

@@ -0,0 +1,8 @@
+default: &default
+  api_key: '<%= ENV['CLOUDINARY_API_KEY'] %>'
+test:
+  <<: *default
+  cloud_name: test_cloud
+production:
+  <<: *default
+  cloud_name: production_cloud