Reorganize initialization

bogdan · Oct 26, 2011 · 730ad80 · 730ad80
1 parent cdfda6c
commit 730ad80
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/lib/datagrid/core.rb b/lib/datagrid/core.rb
@@ -1,4 +1,4 @@
-require "datagrid/drivers/active_record_driver"
+require "datagrid/drivers"
 
 module Datagrid
   module Core

diff --git a/lib/datagrid/drivers.rb b/lib/datagrid/drivers.rb
@@ -0,0 +1 @@
+require "datagrid/drivers/active_record"
diff --git a/lib/datagrid/drivers/abstract_driver.rb b/lib/datagrid/drivers/abstract_driver.rb
diff --git a/lib/datagrid/drivers/active_record_driver.rb → lib/datagrid/drivers/active_record.rb b/lib/datagrid/drivers/active_record_driver.rb → lib/datagrid/drivers/active_record.rb
@@ -1,6 +1,6 @@
 module Datagrid
   module Drivers
-    module ActiveRecordDriver
+    module ActiveRecord
 
       def self.included(base)
         base.extend         ClassMethods
@@ -37,7 +37,9 @@ module InstanceMethods
 
     end
 
-    ActiveRecord::Base.send(:include, ActiveRecordDriver) if defined?(ActiveRecord)
 
   end
 end
+if defined?(::ActiveRecord)
+  ::ActiveRecord::Base.send(:include, Datagrid::Drivers::ActiveRecord)
+end