lib/waffle/configuration.rb in waffle-0.1.0 vs lib/waffle/configuration.rb in waffle-0.1.1

@@ -1,9 +1,17 @@
+require 'yaml'
+
 module Waffle
   class Configuration
 
     def initialize(custom_params = {})
-      @configuration = {'strategy' => 'rabbitmq', 'url' => nil}.merge custom_params
+      @configuration = {'strategy' => 'rabbitmq', 'url' => nil}
+
+      if defined? Rails
+        @configuration.merge! YAML.load_file("#{Rails.root}/config/#{Rails.env}.waffle.yml")
+      end
+
+      @configuration.merge! custom_params
     end
 
     def method_missing(m, *args, &block)
       if @configuration.has_key? m.to_s
         @configuration[m.to_s]