matthuhiggins-foreigner 0.6.4 → 0.7.0

data/{README → README.rdoc}

@@ -1,5 +1,4 @@
-Foreigner
-=========
+= Foreigner
 
 Rails does not come with methods to add foreign keys. Foreigner introduces a few
 methods to your migrations for adding and removing foreign key constraints.
@@ -7,8 +6,7 @@ methods to your migrations for adding and removing foreign key constraints.
 Since each adapter implements the API, migrations using Foreigner will continue to
 work on databases that do not support foreign keys, such as sqlite3.
 
-Installation
-------------
+== Installation
 
 Install as a plugin:
 
@@ -22,8 +20,7 @@ In Rails 3, install as a gem by adding the following to your Gemfile:
 
   gem 'matthuhiggins-foreigner', :require => 'foreigner'
 
-API
----
+== API
 
 An adapter implementing the Foreigner API implements three methods.
 (Options are documented in connection_adapters/abstract/schema_definitions.rb):
@@ -32,8 +29,7 @@ An adapter implementing the Foreigner API implements three methods.
   remove_foreign_key(from_table, options)
   foreign_keys(table_name)
 
-Example
--------
+== Example
 
 The most common use of foreign keys is to reference a table that a model belongs to.
 For example, given the following model:
@@ -62,40 +58,37 @@ Lastly, a name can be specified for the foreign key constraint:
 
   add_foreign_key(:comments, :posts, :name => 'comment_article_foreign_key')
 
-Create/Change Table Shorthand
------------------------------
+== Create/Change Table Shorthand
 
 Foreigner adds extra behavior to change_table, which lets you define foreign keys using shorthand.
 
 Add a missing foreign key to comments:
 
-change_table :comments do |t|
-  t.foreign_key :posts, :dependent => :delete
-end
+  change_table :comments do |t|
+    t.foreign_key :posts, :dependent => :delete
+  end
 
 t.foreign_key accepts the same options as add_foreign_key.
 
 
-Additional t.references option
-------------------------------
+== Additional t.references option
 
 Foreigner extends table.references with the :foreign_key option. Pass true, and the default
 foreign key options are used:
 
-change_table :comments do |t|
-  t.references :post, :foreign_key => true
-end
+  change_table :comments do |t|
+    t.references :post, :foreign_key => true
+  end
 
 An options hash can also be passed. It accepts the same options as add_foreign_key:
 
-change_table :comments do |t|
-  t.references :author, :foreign_key => {:dependent => :destroy}
-end
+  change_table :comments do |t|
+    t.references :author, :foreign_key => {:dependent => :destroy}
+  end
 
 By default, t.references will not generate a foreign key.
 
-schema.rb
----------
+== schema.rb
 
 Similar to indexes, the foreign keys in your database are automatically dumped to schema.rb.
 This allows you to use foreign keys without switching to the :sql schema.

data/lib/foreigner.rb

@@ -13,6 +13,15 @@ module Foreigner
     end
   
     def load_adapter!
+      ActiveRecord::ConnectionAdapters.module_eval do
+        include Foreigner::ConnectionAdapters::SchemaStatements
+        include Foreigner::ConnectionAdapters::SchemaDefinitions
+      end
+
+      ActiveRecord::SchemaDumper.class_eval do
+        include Foreigner::SchemaDumper
+      end
+
       if adapters.key?(configured_adapter)
         require adapters[configured_adapter]
       end
@@ -21,20 +30,6 @@ module Foreigner
     def configured_adapter
       ActiveRecord::Base.connection_pool.spec.config[:adapter]
     end
-    
-    def on_load(&block)
-      if defined?(Rails) && Rails.version >= '3.0'
-        ActiveSupport.on_load :active_record do
-          unless ActiveRecord::Base.connected?
-            ActiveRecord::Base.configurations = Rails.application.config.database_configuration
-            ActiveRecord::Base.establish_connection
-          end
-          block.call
-        end
-      else
-        yield
-      end
-    end
   end
 end
 
@@ -42,17 +37,14 @@ Foreigner.register 'mysql', 'foreigner/connection_adapters/mysql_adapter'
 Foreigner.register 'mysql2', 'foreigner/connection_adapters/mysql_adapter'
 Foreigner.register 'postgresql', 'foreigner/connection_adapters/postgresql_adapter'
 
-Foreigner.on_load do
-  module ActiveRecord
-    module ConnectionAdapters
-      include Foreigner::ConnectionAdapters::SchemaStatements
-      include Foreigner::ConnectionAdapters::SchemaDefinitions
-    end
-
-    SchemaDumper.class_eval do
-      include Foreigner::SchemaDumper
+if defined?(Rails::Railtie)
+  class Railtie < Rails::Railtie
+    initializer 'foreigner.load_adapter' do
+      ActiveSupport.on_load :active_record do
+        Foreigner.load_adapter!
+      end
     end
   end
-  
+else
   Foreigner.load_adapter!
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: matthuhiggins-foreigner
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -07:00
+date: 2010-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +25,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - MIT-LICENSE
 - Rakefile
-- README
+- README.rdoc
 - lib/foreigner.rb
 - lib/foreigner/schema_dumper.rb
 - lib/foreigner/connection_adapters/sql_2003.rb
@@ -54,7 +53,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
       segments: 
       - 1
       - 8
@@ -65,7 +63,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
       segments: 
       - 1
       - 3