foreigner-matcher 0.2.0 → 0.2.1

data/.gitignore

@@ -7,3 +7,4 @@ doc/*
 spec/config/database.yml
 *.swp
 *.rbc
+.rbx

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+env:
+  - DB=mysql
+  - DB=postgres
+gemfile:
+  - Gemfile
+  - ci/gemfiles/rspec2_9_rails3_1.gemfile
+  - ci/gemfiles/rspec2_9_rails3_0.gemfile
+before_script:
+  - ci/script/create_db.sh
+  - bundle exec rake db:test:reset --trace
+script: bundle exec rspec -b

data/Gemfile

@@ -3,13 +3,20 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in foreigner-matcher.gemspec
 gemspec
 
-group :development do
-  gem "kramdown",     "~> 0.13.2"
-end
-
 group :test do
-  gem "rspec",        "~> 2.6.0"
-  gem "activerecord", "~> 3.0.0"
-  gem "railties",     "~> 3.0.0"
-  gem "mysql2",       "~> 0.2.7"
+  gem "rake"
+  gem "rspec",        "~> 2.9.0"
+  gem "mocha",        "~> 0.11.0"
+  gem "activerecord", "~> 3.2.0"
+  gem "railties",     "~> 3.2.0"
+
+  platforms :ruby do
+    gem "mysql2",     "~> 0.3.0"
+    gem "pg",         "~> 0.13.2"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter"
+  end
 end

data/Gemfile.lock

@@ -1,74 +1,104 @@
 PATH
   remote: .
   specs:
-    foreigner-matcher (0.2.0)
+    foreigner-matcher (0.2.1)
       foreigner (>= 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    foreigner (1.1.1)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcpostgresql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-postgres (>= 9.0, < 9.2)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    foreigner (1.1.6)
       activerecord (>= 3.0.0)
-    i18n (0.5.0)
-    kramdown (0.13.3)
-    mysql2 (0.2.13)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jdbc-mysql (5.1.13)
+    jdbc-postgres (9.1.901)
+    journey (1.0.3)
+    json (1.7.0)
+    json (1.7.0-java)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
+    mysql2 (0.3.11)
+    pg (0.13.2)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.9.3)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tzinfo (0.3.29)
+    tilt (1.3.3)
+    tzinfo (0.3.33)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
+  activerecord (~> 3.2.0)
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
   foreigner-matcher!
-  kramdown (~> 0.13.2)
-  mysql2 (~> 0.2.7)
-  railties (~> 3.0.0)
-  rspec (~> 2.6.0)
+  mocha (~> 0.11.0)
+  mysql2 (~> 0.3.0)
+  pg (~> 0.13.2)
+  railties (~> 3.2.0)
+  rake
+  rspec (~> 2.9.0)

data/README.md

@@ -1,20 +1,22 @@
 # foreigner-matcher
 
+[![Build Status](https://secure.travis-ci.org/yellow5/foreigner-matcher.png?branch=master)](http://travis-ci.org/yellow5/foreigner-matcher)
+
 RSpec matcher for the [Foreigner gem](https://github.com/matthuhiggins/foreigner), inspired by [Remarkable](https://github.com/remarkable/remarkable) ActiveRecord matchers.
 
 ## Version Information
 
-Note that the matcher is exactly the same between ~> 0.1 and ~> 0.2; all that changes is the Foreigner dependency. Why, you ask? Foreigner >= 1.0.0 is Rails 3 only!
+Note that the matcher is exactly the same between 0.1.1 and 0.2.0; all that changes is the Foreigner dependency. Why, you ask? Foreigner >= 1.0.0 is Rails 3.x only!
 
-**Rails 3**
+**Rails 3.x**
 
-Foreigner >= 1.0.0 use foreigner-matcher ~> 0.2
+Foreigner >= 1.0.0 use foreigner-matcher ~> 0.2.0
 
-Foreigner ~> 0.9 use foreigner-matcher ~> 0.1
+Foreigner ~> 0.9 use foreigner-matcher ~> 0.1.1
 
 **Rails 2.3**
 
-Use foreigner-matcher ~> 0.1
+Use foreigner-matcher ~> 0.1.1
 
 ## Installation
 
@@ -22,7 +24,7 @@ Use foreigner-matcher ~> 0.1
 
 For installation with bundler, add the following to the approrpriate group in your Gemfile:
 
-    gem "foreigner-matcher", "~> 0.2", :require => nil
+    gem "foreigner-matcher", "~> 0.2.0", :require => nil
 
 For installation without bundler in Rails 2.3, add the following to your config/environments/test.rb:
 
@@ -52,6 +54,18 @@ For example. Given these two models:
       belongs_to user
     end
 
+And given this migration for the foreign key:
+
+    class ChangeUserIdToForeignKeyOnUserLogins < ActiveRecord::Migration
+      def self.up
+        add_foreign_key :user_logins, :users
+      end
+
+      def self.down
+        remove_foreign_key :user_logins, :users
+      end
+    end
+
 The spec would look like this:
 
     describe UserLogin do
@@ -70,10 +84,13 @@ These examples will also work passing <tt>:user</tt> as the table name. Why? The
 
 ## My Testing Environment
 
-Specs have been run with [Ruby 1.9.2p290](http://www.ruby-lang.org/), [Ruby Enterprise Edition 2011.03](http://www.rubyenterpriseedition.com/), and [Rubinius](http://rubini.us/) with the following combinations:
+The project is tested on [Travis-CI](https://github.com/travis-ci/travis-ci). The rubies and databases that the matcher is regularly verified with can be seen in [.travis.yml](https://github.com/yellow5/foreigner-matcher/blob/master/.travis.yml)
+
+The current gems that are tested:
 
-* ActiveRecord ~> 3.0.0, Rspec ~> 2.6.0, Foreigner >= 1.0.0
-* ActiveRecord ~> 2.3.11, Rsepc ~> 1.3.2, Foreigner ~> 0.9.1
+* ActiveRecord ~> 3.2.0, Rspec ~> 2.9.0, Foreigner >= 1.00
+* ActiveRecord ~> 3.1.0, Rspec ~> 2.9.0, Foreigner >= 1.00
+* ActiveRecord ~> 3.0.0, Rspec ~> 2.9.0, Foreigner >= 1.00
 
 ## Copyright
 

data/Rakefile

@@ -1,5 +1,7 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+unless ENV['TRAVIS']
+  require 'bundler'
+  Bundler::GemHelper.install_tasks
+end
 
 namespace :db do
   namespace :test do
@@ -22,13 +24,20 @@ namespace :db do
       end
 
       puts "Establishing connection to test db..."
-      db_config = YAML::load(File.open("#{File.dirname(__FILE__)}/spec/config/database.yml"))
+      db_config_yml = File.dirname(__FILE__)
+      db_config_yml << (ENV['TRAVIS'] ? '/ci' : '/spec')
+      db_config_yml << '/config/database.yml'
+      db_configs = YAML::load(File.open(db_config_yml))
+      db_adapter = ENV['DB']
+      db_adapter = 'jdbc-' + db_adapter if RUBY_PLATFORM == 'java'
+      db_config  = db_configs[db_adapter]
+      ActiveRecord::Base.configurations = db_configs
       ActiveRecord::Base.establish_connection(db_config)
       conn = ActiveRecord::Base.connection
       puts "Connected to #{db_config['database']} via a #{db_config['adapter']} connector"
 
       puts "\nDropping test tables, if they exist"
-      %w( user_logins user_types comments searches special_user_records table_without_foreign_keys users ).each do |test_table|
+      %w( default_options user_logins user_types comments searches special_user_records table_without_foreign_keys users ).each do |test_table|
         print "\tDropping #{test_table}..."
         conn.execute("drop table if exists #{test_table}")
         print "done\n"
@@ -46,7 +55,7 @@ namespace :db do
           t.integer :special_user_id
         end
       end
-      [ :user_logins, :user_types, :comments, :searches, :table_without_foreign_keys ].each do |user_table|
+      [ :default_options, :user_logins, :user_types, :comments, :searches, :table_without_foreign_keys ].each do |user_table|
         print_table_creation(user_table) do
           conn.create_table(user_table) do |t|
             t.integer :user_id
@@ -54,16 +63,37 @@ namespace :db do
         end
       end
 
+      # Include ActiveRecordVersionHelpers
+      require "#{File.dirname(__FILE__)}/spec/support/active_record_version_helpers.rb"
+      include ActiveRecordVersionHelpers
+
       require 'foreigner'
-      foreigner_railtie = Foreigner::Railtie.new
-      foreigner_railtie.run_initializers(foreigner_railtie)
+      if active_record_version > 3.0
+        Foreigner::Railtie.instance.run_initializers
+      else
+        foreigner_railtie = Foreigner::Railtie.new
+        foreigner_railtie.run_initializers(foreigner_railtie)
+      end
 
       puts "\nCreating foreign keys"
-      print_foreign_key_creation('user_logins') { conn.add_foreign_key(:user_logins, :users, :dependent => :nullify) }
-      print_foreign_key_creation('user_types') { conn.add_foreign_key(:user_types, :users, :dependent => :restrict) }
-      print_foreign_key_creation('comments') { conn.add_foreign_key(:comments, :users, :dependent => :delete) }
-      print_foreign_key_creation('searches') { conn.add_foreign_key(:searches, :users, :name => "user_search_special_fk", :dependent => :delete) }
-      print_foreign_key_creation('special_user_records') { conn.add_foreign_key(:special_user_records, :users, :column => "special_user_id", :dependent => :delete) }
+      print_foreign_key_creation('default_options') do
+        conn.add_foreign_key(:default_options, :users)
+      end
+      print_foreign_key_creation('user_logins') do
+        conn.add_foreign_key(:user_logins, :users, :dependent => :nullify)
+      end
+      print_foreign_key_creation('user_types') do
+        conn.add_foreign_key(:user_types, :users, :dependent => :restrict)
+      end
+      print_foreign_key_creation('comments') do
+        conn.add_foreign_key(:comments, :users, :dependent => :delete)
+      end
+      print_foreign_key_creation('searches') do
+        conn.add_foreign_key(:searches, :users, :name => "user_search_special_fk", :dependent => :delete)
+      end
+      print_foreign_key_creation('special_user_records') do
+        conn.add_foreign_key(:special_user_records, :users, :column => "special_user_id", :dependent => :delete)
+      end
     end
   end
 end

data/ci/config/database.yml

@@ -0,0 +1,18 @@
+mysql:
+  adapter: mysql2
+  database: foreigner-matcher_test
+  username: root
+  encoding: utf8
+jdbc-mysql:
+  adapter: jdbcmysql
+  database: foreigner-matcher_test
+  username: root
+  encoding: utf8
+postgres:
+  adapter: postgresql
+  database: foreigner-matcher_test
+  username: postgres
+jdbc-postgres:
+  adapter: jdbcpostgresql
+  database: foreigner-matcher_test
+  username: postgres

data/ci/gemfiles/rspec2_9_rails3_0.gemfile

@@ -0,0 +1,22 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in foreigner-matcher.gemspec
+gemspec :path => '../../'
+
+group :test do
+  gem "rake"
+  gem "rspec",        "~> 2.9.0"
+  gem "mocha",        "~> 0.11.0"
+  gem "activerecord", "~> 3.0.0"
+  gem "railties",     "~> 3.0.0"
+
+  platforms :ruby do
+    gem "mysql2",     "~> 0.2.0"
+    gem "pg",         "~> 0.13.2"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter"
+  end
+end

data/ci/gemfiles/rspec2_9_rails3_0.gemfile.lock

@@ -0,0 +1,94 @@
+PATH
+  remote: /home/cameron/projects/my_stuff/foreigner-matcher
+  specs:
+    foreigner-matcher (0.2.1)
+      foreigner (>= 1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcpostgresql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-postgres (>= 9.0, < 9.2)
+    activesupport (3.0.12)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    foreigner (1.1.6)
+      activerecord (>= 3.0.0)
+    i18n (0.5.0)
+    jdbc-mysql (5.1.13)
+    jdbc-postgres (9.1.901)
+    json (1.7.0)
+    json (1.7.0-java)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    mysql2 (0.2.18)
+    pg (0.13.2)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.12)
+      actionpack (= 3.0.12)
+      activesupport (= 3.0.12)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    thor (0.14.6)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.0)
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
+  foreigner-matcher!
+  mocha (~> 0.11.0)
+  mysql2 (~> 0.2.0)
+  pg (~> 0.13.2)
+  railties (~> 3.0.0)
+  rake
+  rspec (~> 2.9.0)

data/ci/gemfiles/rspec2_9_rails3_1.gemfile

@@ -0,0 +1,22 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in foreigner-matcher.gemspec
+gemspec :path => '../../'
+
+group :test do
+  gem "rake"
+  gem "rspec",        "~> 2.9.0"
+  gem "mocha",        "~> 0.11.0"
+  gem "activerecord", "~> 3.1.0"
+  gem "railties",     "~> 3.1.0"
+
+  platforms :ruby do
+    gem "mysql2",     "~> 0.3.0"
+    gem "pg",         "~> 0.13.2"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter"
+    gem "activerecord-jdbcpostgresql-adapter"
+  end
+end

data/ci/gemfiles/rspec2_9_rails3_1.gemfile.lock

@@ -0,0 +1,106 @@
+PATH
+  remote: /home/cameron/projects/my_stuff/foreigner-matcher
+  specs:
+    foreigner-matcher (0.2.1)
+      foreigner (>= 1.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcpostgresql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-postgres (>= 9.0, < 9.2)
+    activesupport (3.1.4)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    foreigner (1.1.6)
+      activerecord (>= 3.0.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jdbc-mysql (5.1.13)
+    jdbc-postgres (9.1.901)
+    json (1.7.0)
+    json (1.7.0-java)
+    metaclass (0.0.1)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
+    mysql2 (0.3.11)
+    pg (0.13.2)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    railties (3.1.4)
+      actionpack (= 3.1.4)
+      activesupport (= 3.1.4)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1.0)
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcpostgresql-adapter
+  foreigner-matcher!
+  mocha (~> 0.11.0)
+  mysql2 (~> 0.3.0)
+  pg (~> 0.13.2)
+  railties (~> 3.1.0)
+  rake
+  rspec (~> 2.9.0)

data/ci/script/create_db.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case $DB in
+  'mysql')
+    mysql -e 'create database `foreigner-matcher_test`;'
+    ;;
+  'postgres')
+    psql -c 'create database "foreigner-matcher_test";' -U postgres
+    ;;
+esac

data/lib/foreigner-matcher.rb

@@ -28,9 +28,10 @@ module ForeignerMatcher # :nodoc:
     private
 
     def foreign_key_definition
-      defaults        = { :primary_key => "id", :column => "#{@parent.singularize}_id" }
-      defaults[:name] = "#{@child.class.table_name}_#{defaults[:column]}_fk"
-      full_options    = defaults.merge(@options)
+      defaults             = { :primary_key => "id", :column => "#{@parent.singularize}_id" }
+      defaults[:name]      = "#{@child.class.table_name}_#{defaults[:column]}_fk"
+      defaults[:dependent] = nil if postgresql_db?
+      full_options         = defaults.merge(@options)
       Foreigner::ConnectionAdapters::ForeignKeyDefinition.new(@child.class.table_name, @parent.pluralize, full_options)
     end
 
@@ -50,6 +51,10 @@ module ForeignerMatcher # :nodoc:
       fks = child_foreign_keys
       fks.empty? ? 'foreign keys' : fks
     end
+
+    def postgresql_db?
+      ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
+    end
   end
 
   # Ensures that parent table has foreign key

data/lib/foreigner-matcher/version.rb

@@ -1,5 +1,5 @@
 module Foreigner
   module Matcher
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/spec_helper.rb

@@ -5,12 +5,32 @@ require 'rails/railtie'
 require 'foreigner'
 
 # Open a database connection
-db_config = YAML::load(File.open("#{File.dirname(__FILE__)}/config/database.yml"))
+db_config_yml = File.dirname(__FILE__)
+db_config_yml << '/../ci' if ENV['TRAVIS']
+db_config_yml << '/config/database.yml'
+db_configs = YAML::load(File.open(db_config_yml))
+db_adapter = ENV['DB']
+db_adapter = 'jdbc-' + db_adapter if RUBY_PLATFORM == 'java'
+db_config  = db_configs[db_adapter]
+ActiveRecord::Base.configurations = db_configs
 ActiveRecord::Base.establish_connection(db_config)
 
-foreigner_railtie = Foreigner::Railtie.new
-foreigner_railtie.run_initializers(foreigner_railtie)
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+include ActiveRecordVersionHelpers
+if active_record_version > 3.0
+  Foreigner::Railtie.instance.run_initializers
+else
+  foreigner_railtie = Foreigner::Railtie.new
+  foreigner_railtie.run_initializers(foreigner_railtie)
+end
+
+# Configure rspec options
+RSpec.configure do |config|
+  config.mock_framework = :mocha
+
+  config.include(ConnectionHelpers)
+  config.include(ForeignKeyDefinitionHelpers)
+end

data/spec/support/active_record_version_helpers.rb

@@ -0,0 +1,8 @@
+module ActiveRecordVersionHelpers
+  def active_record_version
+    [
+      ActiveRecord::VERSION::MAJOR,
+      ActiveRecord::VERSION::MINOR
+    ].join('.').to_f
+  end
+end

data/spec/support/connection_helpers.rb

@@ -0,0 +1,9 @@
+module ConnectionHelpers
+  def foreign_keys_for(table_name)
+    ActiveRecord::Base.connection.foreign_keys(table_name)
+  end
+
+  def postgresql_db?
+    ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
+  end
+end

data/spec/support/foreign_key_definition_helpers.rb

@@ -0,0 +1,5 @@
+module ForeignKeyDefinitionHelpers
+  def stub_fkd_to_s_with(string_value='ForeignKeyDefinition.tos')
+    Foreigner::ConnectionAdapters::ForeignKeyDefinition.any_instance.stubs(:to_s).returns(string_value)
+  end
+end

data/spec/support/test_models.rb

@@ -1,7 +1,8 @@
-class User < ActiveRecord::Base ; end
-class UserLogin < ActiveRecord::Base ; end
-class UserType < ActiveRecord::Base ; end
-class Comment < ActiveRecord::Base ; end
-class Search < ActiveRecord::Base ; end
-class SpecialUserRecord < ActiveRecord::Base ; end
+class User < ActiveRecord::Base                   ; end
+class DefaultOption < ActiveRecord::Base          ; end
+class UserLogin < ActiveRecord::Base              ; end
+class UserType < ActiveRecord::Base               ; end
+class Comment < ActiveRecord::Base                ; end
+class Search < ActiveRecord::Base                 ; end
+class SpecialUserRecord < ActiveRecord::Base      ; end
 class TableWithoutForeignKey < ActiveRecord::Base ; end

data/spec/test_models/comment_spec.rb

@@ -8,15 +8,17 @@ describe Comment do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher = have_foreign_key_for(:comments)
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected #{subject.connection.foreign_keys('comments')} to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('comments', 'comments', :primary_key => 'id', :column => 'comment_id', :name => 'comments_comment_id_fk')}"
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('comments')} to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher = have_foreign_key_for(:users, :dependent => :delete)
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected #{subject.connection.foreign_keys('comments')} to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('comments', 'users', :primary_key => 'id', :column => 'user_id', :name => 'comments_user_id_fk', :dependent => :delete)}"
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('comments')} to exclude unexpected fk"
     end
   end
 

data/spec/test_models/default_option_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe DefaultOption do
+  describe 'messages' do
+    it 'should contain a description' do
+      matcher = have_foreign_key_for(:users)
+      matcher.description.should == 'have a foreign key for users'
+    end
+
+    it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
+      matcher = have_foreign_key_for(:default_options)
+      matcher.matches?(subject)
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('default_options')} to include expected fk"
+    end
+
+    it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
+      matcher = have_foreign_key_for(:users)
+      matcher.matches?(subject)
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('default_options')} to exclude unexpected fk"
+    end
+  end
+
+  describe 'matcher' do
+    class DefaultOptionTester
+      include ConnectionHelpers
+    end
+
+    it { should have_foreign_key_for(:user)  }
+    it { should have_foreign_key_for(:users) }
+
+    if DefaultOptionTester.new.postgresql_db?
+      context 'with :dependent => nil option' do
+        it { should have_foreign_key_for(:user,  :dependent => nil) }
+        it { should have_foreign_key_for(:users, :dependent => nil) }
+      end
+    end
+  end
+end

data/spec/test_models/search_spec.rb

@@ -8,15 +8,17 @@ describe Search do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher = have_foreign_key_for(:searches)
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected #{subject.connection.foreign_keys('searches')} to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('searches', 'searches', :primary_key => 'id', :column => 'search_id', :name => 'searches_search_id_fk')}"
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('searches')} to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher = have_foreign_key_for(:users, :name => 'user_search_special_fk', :dependent => :delete)
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected #{subject.connection.foreign_keys('searches')} to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('searches', 'users', :primary_key => 'id', :column => 'user_id', :name => 'user_search_special_fk', :dependent => :delete)}"
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('searches')} to exclude unexpected fk"
     end
   end
 

data/spec/test_models/special_user_record_spec.rb

@@ -8,15 +8,17 @@ describe SpecialUserRecord do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher = have_foreign_key_for(:special_user_records)
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected #{subject.connection.foreign_keys('special_user_records')} to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('special_user_records', 'special_user_records', :primary_key => 'id', :column => 'special_user_record_id', :name => 'special_user_records_special_user_record_id_fk')}"
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('special_user_records')} to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher = have_foreign_key_for(:users, :column => 'special_user_id', :name => 'special_user_records_special_user_id_fk', :dependent => :delete)
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected #{subject.connection.foreign_keys('special_user_records')} to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('special_user_records', 'users', :primary_key => 'id', :column => 'special_user_id', :name => 'special_user_records_special_user_id_fk', :dependent => :delete)}"
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('special_user_records')} to exclude unexpected fk"
     end
   end
 

data/spec/test_models/table_without_foreign_key_spec.rb

@@ -9,13 +9,15 @@ describe TableWithoutForeignKey do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected foreign keys to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
+      matcher.failure_message_for_should.should == "expected foreign keys to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected foreign keys to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('table_without_foreign_keys', 'users', :primary_key => 'id', :column => 'user_id', :name => 'table_without_foreign_keys_user_id_fk')}"
+      matcher.failure_message_for_should_not.should == "expected foreign keys to exclude unexpected fk"
     end
   end
 

data/spec/test_models/user_login_spec.rb

@@ -8,15 +8,17 @@ describe UserLogin do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher = have_foreign_key_for(:user_logins)
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected #{subject.connection.foreign_keys('user_logins')} to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('user_logins', 'user_logins', :primary_key => 'id', :column => 'user_login_id', :name => 'user_logins_user_login_id_fk')}"
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('user_logins')} to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher = have_foreign_key_for(:users, :dependent => :nullify)
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected #{subject.connection.foreign_keys('user_logins')} to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('user_logins', 'users', :primary_key => 'id', :column => 'user_id', :name => 'user_logins_user_id_fk', :dependent => :nullify)}"
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('user_logins')} to exclude unexpected fk"
     end
   end
 

data/spec/test_models/user_type_spec.rb

@@ -8,20 +8,26 @@ describe UserType do
     end
 
     it 'should set failure_message_for_should message' do
+      stub_fkd_to_s_with('expected fk')
       matcher = have_foreign_key_for(:user_types)
       matcher.matches?(subject)
-      matcher.failure_message_for_should.should == "expected #{subject.connection.foreign_keys('user_types')} to include #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('user_types', 'user_types', :primary_key => 'id', :column => 'user_type_id', :name => 'user_types_user_type_id_fk')}"
+      matcher.failure_message_for_should.should == "expected #{foreign_keys_for('user_types')} to include expected fk"
     end
 
     it 'should set failure_message_for_should_not message' do
+      stub_fkd_to_s_with('unexpected fk')
       matcher = have_foreign_key_for(:users)
       matcher.matches?(subject)
-      matcher.failure_message_for_should_not.should == "expected #{subject.connection.foreign_keys('user_types')} to exclude #{Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('user_types', 'users', :primary_key => 'id', :column => 'user_id', :name => 'user_types_user_id_fk')}"
+      matcher.failure_message_for_should_not.should == "expected #{foreign_keys_for('user_types')} to exclude unexpected fk"
     end
   end
 
   describe 'matcher' do
-    it { should have_foreign_key_for(:user) }
-    it { should have_foreign_key_for(:users) }
+    before do
+      @options = postgresql_db?  ? { :dependent => :restrict } : {}
+    end
+
+    it { should have_foreign_key_for(:user, @options) }
+    it { should have_foreign_key_for(:users, @options) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreigner-matcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &24508860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24508860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Adds rspec matcher to verify the presence of foreign keys generated by
   Foreigner in a table schema
 email:
@@ -31,19 +36,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- ci/config/database.yml
+- ci/gemfiles/rspec2_9_rails3_0.gemfile
+- ci/gemfiles/rspec2_9_rails3_0.gemfile.lock
+- ci/gemfiles/rspec2_9_rails3_1.gemfile
+- ci/gemfiles/rspec2_9_rails3_1.gemfile.lock
+- ci/script/create_db.sh
 - foreigner-matcher.gemspec
 - lib/foreigner-matcher.rb
 - lib/foreigner-matcher/version.rb
 - spec/config/database.yml.example
 - spec/foreigner_matcher_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record_version_helpers.rb
+- spec/support/connection_helpers.rb
+- spec/support/foreign_key_definition_helpers.rb
 - spec/support/test_models.rb
 - spec/test_models/comment_spec.rb
+- spec/test_models/default_option_spec.rb
 - spec/test_models/search_spec.rb
 - spec/test_models/special_user_record_spec.rb
 - spec/test_models/table_without_foreign_key_spec.rb
@@ -69,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: foreigner-matcher
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rspec matcher for testing the presence of foreign keys generated by Foreigner