sparkfly-foreigner 0.6.0 → 0.7.1

data/Gemfile

@@ -0,0 +1,13 @@
+source 'http://rubygems.org'
+
+# This Gemfile is here for testing purposes. The Gemfile.lock will contain
+# the exact versions of the gems used to test Foreigner
+
+group :test do
+  gem 'activerecord'
+  gem 'rspec'
+  gem 'pg'
+  #gem 'mysql2', '0.2.6' # Should be using this instead of mysql gem, but refuses to load
+  gem 'mysql'
+  gem 'sqlite3'
+end

data/Gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    mysql (2.8.1)
+    pg (0.11.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.27)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  mysql
+  pg
+  rspec
+  sqlite3

data/README.textile

@@ -9,10 +9,12 @@ was taken out.
 
 h2. Test Coverage
 
-These tests were created and tested against our target platform, Rails 2.3.5. Support for Rails 3 will come in the future
-when we actually move our platform to Rails 3. The PostgreSQL 8.3 has the best coverage.
+These tests were created and tested against our target platform, Rails 3. If you are using Rails 2.3.5, 
+use sparkfly-foreigner 0.6.0. this currently works with Rails 3.0 beta 3.
 
-PostgreSQL (tested against 8.3.9)
+Rspec coverage was against Rspec 2.0 beta6
+
+PostgreSQL (tested against 8.3.9, 8.4.2)
  - "Schema" tests: do the table migrations actually add referential integrity?
  - "Schema Extractor" tests: does the foreign_key() method extract out the foreign key from information_schema? 
  - "Semantics" tests: do the add/drop constraints emit proper SQL?
@@ -24,6 +26,7 @@ MySQL (tested against 5.0.90 / Gentoo mysql-5.0.90-r2 hardened x86_64)
 
 SQLite3 (tested against 3.6.22 in-memory only)
  - "Semantics" tests: do the add/drop constraints emit proper SQL?
+ - Warning: sqlite3 probably does not actually work when you use it.
 
 Schema Dumper
  - Are we emitting the correct schema.rb syntax for adding foreign key constraints?
@@ -34,6 +37,15 @@ TODO:
 
 h2. Usage 
 
+h3. Installation
+
+Add this to your Gemfile:
+<pre>
+  gem 'sparkfly-foreigner', :require => 'foreigner'
+</pre>
+
+h3. Migrations
+
 To specify a different column name you can do the following:
 <pre>
   create_table :comments do |t|
@@ -66,7 +78,7 @@ To specify a reference with a foreign key constraint using Rails convention:
 
 Read the specs for more example usage.
 
-h2. schema.rb
+h3. schema.rb
 
 All of the constrants are updated in schema.rb when you either:
 <pre>
@@ -76,25 +88,17 @@ All of the constrants are updated in schema.rb when you either:
 This allows you to see the state of your migratons and
 take advantage of using <pre>rake db:schema:load</pre>
 
-h2. Installation
-
-h3. Rails 3
-
-- Have not tested any of these changes against Rails 3.
-- See the matthuhiggins-foreigner or dwilkie-foreigner if you want a Foreigner that plays nice with Rails 3. 
-
-h3. Rails 2.3.5
+h2. Testing
 
-Add the following to environment.rb:
-<pre>config.gem "sparkfly-foreigner", :lib => "foreigner"</pre>
-Then run:
-<pre>sudo rake gems:install</pre>
+You will need rspec 2.0. At the time of this writing, you install it with:
+<pre>
+gem install rspec --pre
+</pre>
 
-h2. Testing
+You will also want to make sure you have Rubygems 1.3.6
 
-You will need rspec and possibly rspec-rails. Run "rake spec" to run all the spec. Make sure
-that all of the PostgreSQL and MySQL databases defined in spec/spec_helper.rb are created
-before you run those tests.
+Run "rake spec" to run all the spec. Make sure that all of the PostgreSQL and MySQL databases defined in 
+spec/spec_helper.rb are created before you run those tests.
 
 h2. Copyrights
 
@@ -103,3 +107,6 @@ Copyright (c) 2010 Ho-Sheng Hsiao, released under the MIT license
 Modified from code written by David Wilkie and Matt Higgins. See http://github.com/sparkfly/foreigner for details on
 what got changed from what.
 
+Contributions:
+ - theaboutbox https://github.com/theaboutbox/foreigner
+

data/Rakefile

@@ -1,15 +1,15 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc 'Default: run specs.'
 task :default => :spec
 
 desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-      t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
+  #t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
 desc 'Generate documentation for the foreigner plugin.'

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.1

data/lib/foreigner.rb

@@ -25,11 +25,13 @@ module Foreigner
     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
+          ActiveSupport.on_load :before_initialize do
+            unless ActiveRecord::Base.connected?
+              ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+              ActiveRecord::Base.establish_connection
+            end
+            block.call
           end
-          block.call
         end
       else
         yield

data/lib/foreigner/connection_adapters/mysql_adapter.rb

@@ -11,10 +11,10 @@ module Foreigner
 
       def foreign_keys(table_name)
         fk_info = select_all %{
-          SELECT fk.referenced_table_name as 'to_table'
-                ,fk.referenced_column_name as 'primary_key'
-                ,fk.column_name as 'column'
-                ,fk.constraint_name as 'name'
+          SELECT fk.referenced_table_name as 'to_table',
+            fk.referenced_column_name as 'primary_key',
+            fk.column_name as 'column',
+            fk.constraint_name as 'name'
           FROM information_schema.key_column_usage fk
           WHERE fk.referenced_column_name is not null
             AND fk.table_schema = '#{@config[:database]}'

data/lib/foreigner/connection_adapters/postgresql_adapter.rb

@@ -6,18 +6,18 @@ module Foreigner
       
       def foreign_keys(table_name)
         fk_info = select_all %{
-          SELECT tc.constraint_name as name
-                ,ccu.table_name as to_table
-                ,ccu.column_name as primary_key
-                ,kcu.column_name as column
-                ,rc.delete_rule as dependency
+          SELECT tc.constraint_name as name,
+            ccu.table_name as to_table,
+            ccu.column_name as primary_key,
+            kcu.column_name as column,
+            rc.delete_rule as dependency
           FROM information_schema.table_constraints tc
           JOIN information_schema.key_column_usage kcu
-          USING (constraint_catalog, constraint_schema, constraint_name)
+            USING (constraint_catalog, constraint_schema, constraint_name)
           JOIN information_schema.referential_constraints rc
-          USING (constraint_catalog, constraint_schema, constraint_name)
+            USING (constraint_catalog, constraint_schema, constraint_name)
           JOIN information_schema.constraint_column_usage ccu
-          USING (constraint_catalog, constraint_schema, constraint_name)
+            USING (constraint_catalog, constraint_schema, constraint_name)
           WHERE tc.constraint_type = 'FOREIGN KEY'
             AND tc.constraint_catalog = '#{@config[:database]}'
             AND tc.table_name = '#{table_name}'

data/lib/foreigner/connection_adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-require 'foreigner/connection_adapters/sql_2003'
+require 'foreigner/semantics/sql_2003'
 
 module Foreigner
   module ConnectionAdapters

data/lib/foreigner/semantics/sql_2003.rb

@@ -15,7 +15,7 @@ module Foreigner
       end
 
       def add_foreign_key(from_table, to_table, options = {})
-        column  = options[:column] || "#{to_table.to_s.singularize}_id"
+        column  = options[:column] || column_name(to_table)
         foreign_key_name = foreign_key_name(from_table, column, options)
         primary_key = options[:primary_key] || "id"
         reference = sql_for_reference(to_table, primary_key)

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-
-require 'rubygems'
+require 'rspec'
 
 require 'active_support'
 require 'active_record'
@@ -11,36 +10,17 @@ require "foreigner/connection_adapters/postgresql_adapter"
 require "foreigner/connection_adapters/mysql_adapter"
 require "foreigner/connection_adapters/sqlite3_adapter"
 
-require File.expand_path('factory_helper.rb', File.dirname(__FILE__))
-require File.expand_path('adapter_helper.rb', File.dirname(__FILE__))
-
-CONFIGURATIONS = {
-  :postgresql => {
-    :adapter => "postgresql",
-    :username => "root",
-    :password => "",
-    :database => "test_foreigner_gem",
-    :min_messages => "ERROR"
-  },
-  :postgresql_admin => {
-    :adapter => "postgresql",
-    :username => "root",
-    :password => "",
-    :database => "test",
-    :min_messages => "ERROR"
-  }, # :postgresql_admin is used to connect in; :postgresql is used to actually test the migrations
-  :mysql => {
-    :adapter => 'mysql',
-    :host => 'localhost',
-    :username => 'root',
-    :database => 'foreigner_test'
-
-  }, 
-  :sqlite3 => {
-    :adapter => "sqlite3",
-    :database => ":memory:"
-  }
-}
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.filter_run :focus => true
+  config.filter_run_excluding :external => true
+  config.run_all_when_everything_filtered = true
+end
+
+# CONFIGURATIONS defined in support/adapter_helper.rb
 
 # Turn this on for debugging
 ActiveRecord::Migration.verbose = false

data/spec/{adapter_helper.rb → support/adapter_helper.rb}

@@ -1,5 +1,30 @@
-
-# CONFIGURATIONS is defined in spec_helper
+CONFIGURATIONS = {
+  :postgresql => {
+    :adapter => "postgresql",
+    :username => "root",
+    :password => "",
+    :database => "test_foreigner_gem",
+    :min_messages => "ERROR"
+  },
+  :postgresql_admin => {
+    :adapter => "postgresql",
+    :username => "root",
+    :password => "",
+    :database => "test",
+    :min_messages => "ERROR"
+  }, # :postgresql_admin is used to connect in; :postgresql is used to actually test the migrations
+  :mysql => {
+    :adapter => 'mysql',
+    :host => 'localhost',
+    :username => 'root',
+    :database => 'foreigner_test'
+
+  }, 
+  :sqlite3 => {
+    :adapter => "sqlite3",
+    :database => ":memory:"
+  }
+}
 
 module AdapterHelper
   module AdapterTestHarness

data/spec/{factory_helper.rb → support/factory_helper.rb}

@@ -29,7 +29,9 @@ module MigrationFactory
     #   def self.up 
     #   end
     # end
-    migration.metaclass.class_eval do
+
+    # ActiveSupport 3.0 changed the name to singleton_class
+    (migration.respond_to?(:singleton_class) ? migration.singleton_class : migration.metaclass).class_eval do
       define_method(:up, &blk)
     end
     migration

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sparkfly-foreigner
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 0
-  version: 0.6.0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ho-Sheng Hsiao
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,7 +28,8 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.textile
 - Rakefile
@@ -40,8 +42,6 @@ files:
 - lib/foreigner/connection_adapters/sqlite3_adapter.rb
 - lib/foreigner/schema_dumper.rb
 - lib/foreigner/semantics/sql_2003.rb
-- spec/adapter_helper.rb
-- spec/factory_helper.rb
 - spec/mysql/schema_extractor_spec.rb
 - spec/mysql/schema_spec.rb
 - spec/mysql/semantics_spec.rb
@@ -51,46 +51,42 @@ files:
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.rb
 - spec/sqlite3/schema_spec.rb
+- spec/support/adapter_helper.rb
+- spec/support/factory_helper.rb
 - tasks/foreigner_tasks.rake
 has_rdoc: true
 homepage: http://github.com/hosh/foreigner
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Foreign keys for Rails migrations for PostgreSQL, MySQL and Sqlite3. Based on dwilkie-foreigner
-test_files: 
-- spec/schema_dumper_spec.rb
-- spec/spec_helper.rb
-- spec/sqlite3/schema_spec.rb
-- spec/postgresql/schema_extractor_spec.rb
-- spec/postgresql/schema_spec.rb
-- spec/postgresql/semantics_spec.rb
-- spec/adapter_helper.rb
-- spec/factory_helper.rb
-- spec/mysql/schema_extractor_spec.rb
-- spec/mysql/schema_spec.rb
-- spec/mysql/semantics_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-*.swp
-*gemspec
-pkg/*