lib/amee.rb in amee-4.2.0 vs lib/amee.rb in amee-4.3.0

@@ -2,11 +2,16 @@
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
 require 'rexml/document'
 require 'nokogiri'
 require 'active_support'
-require 'active_support/time'
+begin
+  require 'active_support/time'
+  require 'active_support/array'
+rescue LoadError
+  nil
+end
 require 'log4r'
 
 # We don't NEED the JSON gem, but if it's available, use it.
 begin
   require 'json'
@@ -57,16 +62,9 @@
 require 'amee/config'
 
 if defined?(Rails)
   require 'amee/rails'
   ActiveRecord::Base.send :include, AMEE::Rails
-  
-  amee_config = "#{Rails.root}/config/amee.yml"
-  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
     strftime("%Y%m%d")