Commit 85c2de226bd6aa101a94bdeaf2c7906bc2a34c6e to auser's merb-plugins

auser / merb-plugins

Fork of wycats/merb-plugins
Description:	Merb Plugins: Even more modules to hook up your Merb installation
Homepage:	http://www.merbivore.com
Clone URL:	git://github.com/auser/merb-plugins.git Give this clone URL to anyone. `git clone git://github.com/auser/merb-plugins.git`

ORM plugins (AR, DM, Sequel) now hook into the BootLoader

ActiveRecord, DataMapper and Sequel plugins have been adapted
to insert a BootLoader to establish the connection right
after the BeforeAppLoads step.

fabien (author)

Mon Mar 10 12:18:35 -0700 2008

commit 85c2de226bd6aa101a94bdeaf2c7906bc2a34c6e
tree b8f8a04a3a2ce2aaf141c351a2b516d0810c56ef
parent af5894800a9a5a14456d3e83c1c228a5ae80b838

merb_activerecord/lib/active_record/merbtasks.rb
merb_activerecord/lib/merb/orms/active_record/connection.rb
merb_activerecord/lib/merb_activerecord.rb
merb_datamapper/lib/merb_datamapper.rb
merb_datamapper/lib/merb_datamapper/autoconnect.rb
merb_sequel/lib/merb_sequel.rb

merb_activerecord/lib/active_record/merbtasks.rb

0
@@ -1,8 +1,7 @@
0
 namespace :db do
0
   
0
   task :merb_start do
0
-    Merb.start :adapter => 'runner',
0
-               :environment => ENV['MERB_ENV'] || 'development'
0
+    Merb.start :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development'
0
   end
0
   
0
   namespace :create do

merb_activerecord/lib/merb/orms/active_record/connection.rb

0
@@ -5,8 +5,8 @@ module Merb
0
   module Orms
0
     module ActiveRecord
0
       class << self
0
-        def config_file() Merb.root / "config" / "database.yml" end
0
-        def sample_dest() Merb.root / "config" / "database.yml.sample" end
0
+        def config_file() Merb.dir_for(:config) / "database.yml" end
0
+        def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
0
         def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
0
       
0
         def copy_sample_config

merb_activerecord/lib/merb_activerecord.rb

0
@@ -1,12 +1,17 @@
0
-# make sure we're running inside Merb
0
-if defined?(Merb::Plugins)
0
+if defined?(Merb::Plugins)  
0
   dependency "activerecord"
0
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection")
0
+  Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))
0
   
0
-  Merb::BootLoader.after_app_loads do
0
-    Merb::Orms::ActiveRecord.connect
0
-    Merb::Orms::ActiveRecord.register_session_type
0
+  class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader
0
+
0
+    after BeforeAppRuns
0
+
0
+    def self.run
0
+      Merb::Orms::ActiveRecord.connect
0
+      Merb::Orms::ActiveRecord.register_session_type
0
+    end
0
+
0
   end
0
-  
0
-  Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))
0
-end
0
+
0
+end
0
\ No newline at end of file

merb_datamapper/lib/merb_datamapper.rb

0
@@ -1,5 +1,16 @@
0
 if defined?(Merb::Plugins)
0
-  autoload :DataMapper, File.join(File.dirname(__FILE__) / "merb_datamapper" / "autoconnect")
0
-  
0
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection")
0
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "base")
0
   Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
0
+  
0
+  class Merb::Orms::DataMapper::Connect < Merb::BootLoader
0
+
0
+    after BeforeAppRuns
0
+
0
+    def self.run
0
+      Merb::Orms::DataMapper.connect
0
+      Merb::Orms::DataMapper.register_session_type
0
+    end
0
+
0
+  end
0
 end
0
\ No newline at end of file

merb_sequel/lib/merb_sequel.rb

0
@@ -1,11 +1,17 @@
0
 if defined?(Merb::Plugins)
0
   Merb::Plugins.config[:merb_sequel] = {}
0
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection")
0
+  Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
0
   
0
-  Merb::BootLoader.after_app_loads do
0
-    Merb::Orms::Sequel.connect
0
-    Merb::Orms::Sequel.register_session_type
0
+  class Merb::Orms::Sequel::Connect < Merb::BootLoader
0
+
0
+    after BeforeAppRuns
0
+
0
+    def self.run
0
+      Merb::Orms::Sequel.connect
0
+      Merb::Orms::Sequel.register_session_type
0
+    end
0
+
0
   end
0
   
0
-  Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
0
 end
0
\ No newline at end of file

Comments

No one has commented yet.