amee.rb in amee-4.1.0

- old
+ new

@@ -29,11 +29,11 @@
   end
   def is_v2_atom?
     is_xml? && (include?('<feed ') || include?('<entry ')) && include?('xmlns:amee="http://schemas.amee.cc/2.0"')
   end
 end
-
+require 'amee/core-extensions/hash'
 require 'amee/logger'
 require 'amee/exceptions'
 require 'amee/connection'
 require 'amee/parse_helper'
 require 'amee/collection'
@@ -52,17 +52,20 @@
 require 'amee/pager'
 require 'amee/item_definition'
 require 'amee/item_value_definition'
 require 'amee/user'
 require 'amee/v3'
+require 'amee/config'
 
 if defined?(Rails)
   require 'amee/rails'
   ActiveRecord::Base.send :include, AMEE::Rails
-  
-  amee_config = "config/amee.yml"
-  if File.exist?(amee_config)
-    $AMEE_CONFIG = YAML.load_file(amee_config)[Rails.env]
+
+
+  if File.exist? amee_config
+    $AMEE_CONFIG = AMEE::Config.setup(amee_config, Rails.env)
+  else  
+    $AMEE_CONFIG = AMEE::Config.setup
   end
 end
 
 class Date
   def amee1_date