lib/dao.rb in dao-8.0.0 vs lib/dao.rb in dao-8.0.1
- old
+ new
@@ -8,20 +8,27 @@
require 'tmpdir'
require 'yaml'
require 'securerandom'
require 'json'
-# dao libs
#
- require 'map'
- require 'fattr'
- require 'tagz'
- require 'rails_current'
+ require_relative 'dao/_lib.rb'
+# gems
#
- require_relative 'dao/_lib.rb'
+ begin
+ require 'rubygems'
+ rescue LoadError
+ nil
+ end
+ Dao.dependencies.each do |lib, dependency|
+ gem(*dependency) if defined?(gem)
+ require(lib)
+ end
+
+# rails frameworks
#
%w[
action_controller
active_support
active_model
@@ -35,10 +42,10 @@
raise
end
end
end
-
+# dao libs
#
Dao.load %w[
blankslate.rb
coerce.rb
wrap.rb