lib/dao.rb in dao-5.6.1 vs lib/dao.rb in dao-7.0.0

@@ -8,85 +8,41 @@
   require 'tmpdir'
   require 'yaml'
 
 # dao libs
 #
-  module Dao
-    Version = '5.6.1' unless defined?(Version)
+  require "map"
+  require "fattr"
+  require "coerce"
+  require "tagz"
+  require "multi_json"
+  require "uuidtools"
+  require "wrap"
+  require "rails_current"
 
-    def version
-      Dao::Version
-    end
-
-    def dependencies
-      {
-        'rails'             => [ 'rails'             , ' ~> 3.1'   ] ,
-        'map'               => [ 'map'               , ' >= 6.0.0' ] ,
-        'fattr'             => [ 'fattr'             , ' >= 2.2'   ] ,
-        'coerce'            => [ 'coerce'            , ' >= 0.0.3' ] ,
-        'tagz'              => [ 'tagz'              , ' >= 9.9.2' ] ,
-        'multi_json'        => [ 'multi_json'        , ' >= 1.0.3' ] ,
-        'uuidtools'         => [ 'uuidtools'         , ' >= 2.1.2' ] ,
-        'wrap'              => [ 'wrap'              , ' >= 1.5.0' ] ,
-        'rails_current'     => [ 'rails_current'     , ' >= 1.8.0' ] ,
-        'rails_errors2html' => [ 'rails_errors2html' , ' >= 1.3.0' ] ,
-      }
-    end
-
-    def description
-      "presenter, conducer, api, and better form objects for you rails' pleasure"
-    end
-
-    def libdir(*args, &block)
-      @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
-      args.empty? ? @libdir : File.join(@libdir, *args)
-    ensure
-      if block
-        begin
-          $LOAD_PATH.unshift(@libdir)
-          block.call()
-        ensure
-          $LOAD_PATH.shift()
-        end
-      end
-    end
-
-    def load(*libs)
-      libs = libs.join(' ').scan(/[^\s+]+/)
-      Dao.libdir{ libs.each{|lib| Kernel.load(lib) } }
-    end
-
-    extend(Dao)
-  end
-
-# gems
 #
-  begin
-    require 'rubygems'
-  rescue LoadError
-    nil
-  end
+  require_relative 'dao/_lib.rb'
 
-  if defined?(gem)
-    Dao.dependencies.each do |lib, dependency|
-      gem(*dependency)
-      require(lib)
-    end
-  end
-
+#
   %w[
     action_controller
-    active_resource
     active_support
+    active_model
   ].each do |framework|
     begin
       require "#{ framework }/railtie"
     rescue LoadError
+      begin
+        require "#{ framework }"
+      rescue LoadError
+        raise
+      end
     end
   end
 
 
+#
   Dao.load %w[
     blankslate.rb
     instance_exec.rb
     extractor.rb
     exceptions.rb
@@ -95,10 +51,11 @@
     stdext.rb
 
     name.rb
     status.rb
     path_map.rb
+    errors2html.rb
     errors.rb
     messages.rb
     form.rb
     validations.rb
     data.rb
@@ -125,18 +82,5 @@
   unless defined?(::UUIDTools::Config)
     ::UUIDTools.module_eval do
       Config = ::RbConfig # shuts up warnings...
     end
   end
-
-# protect against rails' too clever reloading
-#
-=begin
-  if defined?(Rails)
-    unless defined?(unloadable)
-      require 'active_support'
-      require 'active_support/dependencies'
-    end
-    unloadable(Dao)
-  end
-  BEGIN{ Object.send(:remove_const, :Dao) if defined?(Dao) }
-=end