matthuhiggins-foreigner 0.4.1 → 0.5.0

data/README

@@ -14,9 +14,13 @@ Install as a plugin:
 
   ruby script/plugin install git://github.com/matthuhiggins/foreigner.git
 
-Install as a gem by adding the following to environment.rb:
+In Rails 2, install as a gem by adding the following to config/environment.rb:
 
-  config.gem "matthuhiggins-foreigner", :lib => "foreigner", :source => http://gemcutter.org
+  config.gem "matthuhiggins-foreigner", :lib => "foreigner"
+
+In Rails 3, install as a gem by adding the following to your Gemfile:
+
+  gem 'matthuhiggins-foreigner', :require => 'foreigner'
 
 API
 ---
@@ -94,6 +98,6 @@ 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 fighting Rails!
+This allows you to use foreign keys without switching to the :sql schema.
 
 Copyright (c) 2009 Matthew Higgins, released under the MIT license

data/lib/foreigner/connection_adapters/sql_2003.rb

@@ -8,23 +8,18 @@ module Foreigner
       def add_foreign_key(from_table, to_table, options = {})
         column  = options[:column] || "#{to_table.to_s.singularize}_id"
         foreign_key_name = foreign_key_name(from_table, column, options)
+        primary_key = options[:primary_key] || "id"
+        dependency = dependency_sql(options[:dependent])
 
         sql =
           "ALTER TABLE #{quote_table_name(from_table)} " +
           "ADD CONSTRAINT #{quote_column_name(foreign_key_name)} " +
-          foreign_key_definition(to_table, options)
-      
-        execute(sql)
-      end
-    
-      def foreign_key_definition(to_table, options = {})
-        column  = options[:column] || "#{to_table.to_s.singularize}_id"
-        primary_key = options[:primary_key] || "id"
-        dependency = dependency_sql(options[:dependent])
+          "FOREIGN KEY (#{quote_column_name(column)}) " +
+          "REFERENCES #{quote_table_name(ActiveRecord::Migrator.proper_table_name(to_table))}(#{primary_key})"
 
-        sql = "FOREIGN KEY (#{quote_column_name(column)}) REFERENCES #{quote_table_name(to_table)}(#{primary_key})"
         sql << " #{dependency}" unless dependency.blank?
-        sql
+      
+        execute(sql)
       end
 
       private

data/lib/foreigner.rb

@@ -3,19 +3,55 @@ require 'foreigner/connection_adapters/abstract/schema_definitions'
 require 'foreigner/connection_adapters/sql_2003'
 require 'foreigner/schema_dumper'
 
-module ActiveRecord
-  module ConnectionAdapters
-    include Foreigner::ConnectionAdapters::SchemaStatements
-    include Foreigner::ConnectionAdapters::SchemaDefinitions
-  end
-  
-  SchemaDumper.class_eval do
-    include Foreigner::SchemaDumper
-  end
+module Foreigner
+  mattr_accessor :adapters
+  self.adapters = {}
+
+  class << self
+    def register(adapter_name, file_name)
+      adapters[adapter_name] = file_name
+    end
   
-  Base.class_eval do
-    if %w(mysql postgresql).include? connection_pool.spec.config[:adapter].downcase
-      require "foreigner/connection_adapters/#{connection_pool.spec.config[:adapter].downcase}_adapter"
+    def load_adapter!
+      if adapters.key?(configured_adapter)
+        require adapters[configured_adapter]
+      end
+    end
+    
+    def configured_adapter
+      ActiveRecord::Base.connection.adapter_name.downcase
+    end
+    
+    def on_load(&block)
+      if 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
+
+Foreigner.register 'mysql', '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
+    end
+  end
+  
+  Foreigner.load_adapter!  
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: matthuhiggins-foreigner
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 -08:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Foreign keys for Rails migrations
+description: Adds helpers to migrations and correctly dumps foreign keys to schema.rb
 email: developer@matthewhiggins.com
 executables: []
 
@@ -35,34 +40,38 @@ files:
 - test/helper.rb
 - test/mysql_adapter_test.rb
 has_rdoc: true
-homepage: http://github.com/matthuhiggins/foreigner/tree/master
+homepage: http://github.com/matthuhiggins/foreigner
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --main
-- README
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: matthuhiggins-foreigner
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 1
-summary: Foreign keys for Rails migrations
+specification_version: 3
+summary: Foreign keys for Rails
 test_files: []