Fix gem issues: Remove ActiveSupport, upgrade DataMapper to 1.0

Gemfile

@@ -4,15 +4,14 @@ gem 'daemons'
 gem 'anise'
 
 group :pre_config do
-  gem 'activesupport', :require => 'active_support'
   gem 'facets'
 end
 
 # Only loaded if a database.yml file exists for a season
 group :datamapper do
-  gem 'do_mysql' # Change this to whatever adapter you need for your database
-  gem 'data_objects'
+  gem 'dm-mysql-adapter' # Change this to whatever adapter you need for your database
   gem 'dm-core'
+  gem 'dm-migrations'
 end
 
 # load each leaf's gem requirements in its own group

Gemfile.lock

@@ -1,13 +1,11 @@
 --- 
-hash: aa15ee85f9164ad34b1aabc9793c935648eb39cf
+hash: e20ec6131647f0225dd1d85532f5f0b84875dd52
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org
 specs: 
 - rake: 
     version: 0.8.7
-- activesupport: 
-    version: 2.3.8
 - addressable: 
     version: 2.1.2
 - facets: 
@@ -23,21 +21,27 @@ specs:
 - chronic: 
     version: 0.2.3
 - daemons: 
-    version: 1.0.10
+    version: 1.1.0
 - data_objects: 
     version: 0.10.2
 - extlib: 
     version: 0.9.15
 - dm-core: 
-    version: 0.10.2
+    version: 1.0.0
 - dm-ar-finders: 
+    version: 1.0.0
+- dm-do-adapter: 
+    version: 1.0.0
+- dm-migrations: 
+    version: 1.0.0
+- do_mysql: 
     version: 0.10.2
+- dm-mysql-adapter: 
+    version: 1.0.0
 - dm-timestamps: 
-    version: 0.10.2
+    version: 1.0.0
 - dm-validations: 
-    version: 0.10.2
-- do_mysql: 
-    version: 0.10.2
+    version: 1.0.0
 dependencies: 
   daemons: 
     version: ">= 0"
@@ -47,25 +51,19 @@ dependencies:
     version: ">= 0"
     group: 
     - :default
-  activesupport: 
-    version: ">= 0"
-    group: 
-    - :pre_config
-    require: 
-    - active_support
   facets: 
     version: ">= 0"
     group: 
     - :pre_config
-  do_mysql: 
+  dm-mysql-adapter: 
     version: ">= 0"
     group: 
     - :datamapper
-  data_objects: 
+  dm-core: 
     version: ">= 0"
     group: 
     - :datamapper
-  dm-core: 
+  dm-migrations: 
     version: ">= 0"
     group: 
     - :datamapper

libs/foliater.rb

@@ -140,7 +140,6 @@ def load_leaf_helpers(type)
     end
 
     def load_leaf_libs(type)
-      Extlib::Hook # fix some retarded autoload BS
       Bundler.require type.snakecase.to_sym
       Dir.glob("#{Autumn::Config.root}/leaves/#{type.snakecase}/lib/*.rb").each  { |lib_file| require lib_file }
     end

libs/leaf.rb

@@ -192,7 +192,7 @@ def method_missing(meth, *args)
 
     def preconfigure # :nodoc:
       if options[:authentication] then
-        @authenticator = Autumn::Authentication.const_get(options[:authentication]['type'].camelcase).new(options[:authentication].rekey(&:to_sym))
+        @authenticator = Autumn::Authentication.const_get(options[:authentication]['type'].camelcase(:upper)).new(options[:authentication].rekey(&:to_sym))
         stems.add_listener @authenticator
       end
     end

libs/misc.rb

@@ -30,6 +30,12 @@ class String # :nodoc:
   def except_first
     self[1, size-1]
   end
+
+  # Removes modules from a full class name.
+
+  def demodulize
+    split("::").last
+  end
 end
 
 class Hash # :nodoc:

libs/speciator.rb

@@ -132,8 +132,6 @@ def options_for_leaf(identifier)
   end
 
   class OptionsProxy # :nodoc:
-    extend ActiveSupport::Memoizable
-
     MERGED_METHODS = [ :[], :each, :each_key, :each_pair, :each_value, :eql?,
       :fetch, :has_key?, :include?, :key?, :member?, :has_value?, :value?,
       :hash, :index, :inspect, :invert, :keys, :length, :size, :merge, :reject,
@@ -150,18 +148,20 @@ def method_missing(meth, *args, &block)
         merged.send meth, *args, &block
       else
         returnval = @hashes.last.send(meth, *args, &block)
-        merged :reload
+        merged true
         returnval
       end
     end
 
     private
 
-    def merged
-      merged = Hash.new
-      @hashes.each { |hsh| merged.merge! hsh }
-      merged
+    def merged(reload=false)
+      @merged = nil if reload
+      @merged ||= begin
+        merged = Hash.new
+        @hashes.each { |hsh| merged.merge! hsh }
+        merged
+      end
     end
-    memoize :merged
   end
 end