schema_associations 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395a9d8c36949f31bba7558d51be3dda54be2bfb
-  data.tar.gz: c6807a2b495005257d0d749de2216625e5332899
+  metadata.gz: 6ab213fbc881aef8d05e0b3714f3a63a5de3bc39
+  data.tar.gz: c927672d92cc4b0107a7d81af6471a3dae77b146
 SHA512:
-  metadata.gz: d4535711d17dc740000c135b41a42816d3dc5be8c0ad616c292870c43e2948b96132e914fd43a964ac3f6646aeb61e58f78c879b8d06353eafaf8638b12eb568
-  data.tar.gz: 112912f68d8a1f3b20151ac5799fd7f997d63b32ad2386c9464158105a2292fd9cf7b7bf3df924a838378b32739a135ebb7405daa047a193b75ec8034e7bc685
+  metadata.gz: c4a53470cb35f36d599e27ff8387ff123cbfd97932b5ab0361f0da13fe1d861d813e2a56739f823b8e7cda2782bd4298adb3759ace20cccdcf55cad621de7522
+  data.tar.gz: d700a6e564e723158fe0ea474820dc54467314dadd90e2fc0c0a4c2dd326b1e3af59d46b39463d451b03457597130ce03b6a4e22d5203188346eb95c32b1824e

data/.gitignore

@@ -21,7 +21,7 @@ pkg
 ## PROJECT::SPECIFIC
 .rvmrc
 *.log
-*.sqlite3
+tmp/
 Gemfile.lock
 gemfiles/*.lock
 gemfiles/**/*.lock

data/.travis.yml

@@ -1,12 +1,22 @@
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.1.2
+- 2.1.5
 gemfile:
-  - gemfiles/Gemfile.rails-3.2
-  - gemfiles/Gemfile.rails-4.0
-  - gemfiles/Gemfile.rails-4.1
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
+env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+addons:
+  postgresql: '9.4'
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
+script: bundle exec rake travis
 notifications:
-  recipients:
-    - michal.lomnicki@gmail.com
-    - ronen@barzel.org
-    - toby@ovod-everett.org
+  email:
+  - toby@ovod-everett.org
+  - ronen@barzel.org

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/README.md

@@ -4,9 +4,11 @@ SchemaAssociations is an ActiveRecord extension that keeps your model class
 definitions simpler and more DRY, by automatically defining associations based
 on the database schema.
 
-[![Gem Version](https://badge.fury.io/rb/schema_associations.png)](http://badge.fury.io/rb/schema_associations)
-[![Build Status](https://secure.travis-ci.org/lomba/schema_associations.png)](http://travis-ci.org/lomba/schema_associations)
-[![Dependency Status](https://gemnasium.com/lomba/schema_associations.png)](https://gemnasium.com/lomba/schema_associations)
+[![Gem Version](https://badge.fury.io/rb/schema_associations.svg)](http://badge.fury.io/rb/schema_associations)
+[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_associations.svg)](http://travis-ci.org/SchemaPlus/schema_associations)
+[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_associations.svg)](https://coveralls.io/r/SchemaPlus/schema_associations?branch=master)
+[![Dependency Status](https://gemnasium.com/lomba/schema_associations.svg)](https://gemnasium.com/lomba/schema_associations)
+
 
 ## Overview
 
@@ -156,7 +158,7 @@ referencing table, suffixed with "as" the relationship name.  An example
 should make this clear...
 
 Suppose your company hires interns, and each intern is assigned a manager and
-a mentor, who are regular employees. 
+a mentor, who are regular employees.
 
     create_table :interns do |t|
         t.integer :manager_id,      :references => :employees
@@ -253,7 +255,7 @@ turn off concise names globally or per-model, see [SchemaAssociations::Config](h
 ### Ordering `has_many` using `position`
 
 If the target of a `has_many` association has a column named `position`,
-SchemaAssociations will specify `:order => :position` for the association. 
+SchemaAssociations will specify `:order => :position` for the association.
 That is,
 
     create_table :comments do |t|
@@ -266,13 +268,13 @@ leads to
     class Post < ActiveRecord::Base
       has_many :comments, :order => :position
     end
-    
+
 ## Table names and model class names
 
-SchemaAssociations determins the mode class name from the table name using the same convention (and helpers) that ActiveRecord uses.  But sometimes you might be doing things differently.  For example, in an engine you might have a prefix that goes in front of all table names, and the models might all be in a namespace.  
+SchemaAssociations determins the mode class name from the table name using the same convention (and helpers) that ActiveRecord uses.  But sometimes you might be doing things differently.  For example, in an engine you might have a prefix that goes in front of all table names, and the models might all be in a namespace.
 
 To that end, SchemaAssociations lets you configure mappings from a table name prefix to a model class name prefix to use instead.  For example, suppose your database had tables:
-      
+
       hpy_campers
       hpy_go_lucky
 
@@ -280,12 +282,12 @@ The default model class names would be
 
 	  HpyCampers
 	  HpyGoLucky
-	 
+	
 But if instead you wanted
 
 	  Happy::Campers
 	  Happy::GoLucky
-	  
+	
 You could set up this mapping in `config/initializers/schema_associations.rb`:
 
       SchemaPlus.setup do |config|
@@ -294,7 +296,7 @@ You could set up this mapping in `config/initializers/schema_associations.rb`:
 
 Tables names that don't start with `hpy_` will continue to use the default determination.
 
-You can set up multiple mappings.  E.g. if you're using several engines they can each set up the mapping for their own moduels.  
+You can set up multiple mappings.  E.g. if you're using several engines they can each set up the mapping for their own moduels.
 
 You can set up a mapping from or to the empty string, in order to unconditionally add or remove prefixes from all model class names.
 
@@ -303,7 +305,7 @@ You can set up a mapping from or to the empty string, in order to unconditionall
 
 If you're curious (or dubious) about what associations SchemaAssociations
 defines, you can check the log file.  For every assocation that
-SchemaAssociations defines, it generates an info entry such as
+SchemaAssociations defines, it generates a debug entry such as
 
     [schema_associations] Post.has_many :comments, :class_name "Comment", :foreign_key "comment_id"
 
@@ -319,10 +321,17 @@ use cases that you logged).
 
 SchemaAssociations is tested on all combinations of:
 
-*   Rails 3.2, 4.0, or 4.1
-*   MRI ruby 1.9.3 or 2.1.2
+<!-- SCHEMA_DEV: MATRIX - begin -->
+<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
+* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
+
+<!-- SCHEMA_DEV: MATRIX - end -->
+    
+Notes:
 
-Note: As of version 1.0.0, ruby 1.8.7 and rails < 3.2 are no longer supported.  As of version 1.2.0, ruby 1.9.2 is no longer supported.
+* As of version 1.2.3, rails < 4.1 and ruby < 2.1 are no longer supported
+* As of version 1.2.0, ruby 1.9.2 is no longer supported.
+* As of version 1.0.0, ruby 1.8.7 and rails < 3.2 are no longer supported.
 
 ## Installation
 
@@ -336,23 +345,25 @@ or in a Gemfile
 
 ## Testing
 
-SchemaAssociations is tested using rspec, sqlite3, and rvm, with some hackery
-to test against multiple versions of rails and ruby.  To run the full combo of
-tests, after you've forked & cloned: 
+SchemaAssociations is tested against the matrix of combinations.  To run the full combo of
+tests, after you've forked & cloned:
 
     $ cd schema_associations
-    $ ./runspecs --install  # do this once to install gem dependencies for all versions (slow)
-    $ ./runspecs # as many times as you like
+    $ schema_dev bundle install
+    $ schema_dev rspec
 
-See `./runspecs --help` for more options.  In particular, to run rspec on a
-specific file or example (rather than running the full suite) you can do, e.g.
-
-    $ ./runspecs [other options] --rspec -- spec/association_spec.rb -e 'base'
+For more info, see [schema_dev](https://github.com/SchemaPlus/schema_dev)
 
 Code coverage results will be in coverage/index.html -- it should be at 100% coverage.
 
 ## Release notes:
 
+### 1.2.3
+
+* Use schema_plus_foreign_keys rather than all of schema_plus, to eliminate unneeded dependancies.  That limits us to AR >= 4.1 and ruby >= 2.1
+* Fix deprecations
+* Logging is now at `debug` level rather than `info` level
+
 ### 1.2.2
 
 * Bug fix (Rails workaround) for STI: propagate associations to subclasses, since Rails might not, depending on the load order.
@@ -373,7 +384,7 @@ Code coverage results will be in coverage/index.html -- it should be at 100% cov
 
 ### 1.0.1
 
-*   Bug fix: use singular :inverse_of for :belongs_to of a :has_one 
+*   Bug fix: use singular :inverse_of for :belongs_to of a :has_one
 
 
 ### 1.0.0
@@ -395,7 +406,3 @@ Code coverage results will be in coverage/index.html -- it should be at 100% cov
 ## License
 
 This gem is released under the MIT license.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/lomba/schema_associations/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/Rakefile

@@ -2,9 +2,9 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = '-Ispec'
-end
+RSpec::Core::RakeTask.new(:spec)
+
+require 'schema_dev/tasks'
 
 
 task :default => :spec
@@ -18,42 +18,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-namespace :postgresql do
-  desc 'Build the PostgreSQL test databases'
-  task :build_databases do
-    %x( createdb -E UTF8 schema_associations_unittest )
-  end
-
-  desc 'Drop the PostgreSQL test databases'
-  task :drop_databases do
-    %x( dropdb schema_associations_unittest )
-  end
-
-  desc 'Rebuild the PostgreSQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
-end
-
-task :build_postgresql_databases => 'postgresql:build_databases'
-task :drop_postgresql_databases => 'postgresql:drop_databases'
-task :rebuild_postgresql_databases => 'postgresql:rebuild_databases'
-
-MYSQL_DB_USER = 'schema_assoc'
-namespace :mysql do
-  desc 'Build the MySQL test databases'
-  task :build_databases do
-    %x( echo "create DATABASE schema_associations_unittest DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{MYSQL_DB_USER})
-  end
-
-  desc 'Drop the MySQL test databases' 
-  task :drop_databases do
-    %x( mysqladmin --user=#{MYSQL_DB_USER} -f drop schema_associations_unittest )
-  end
-
-  desc 'Rebuild the MySQL test databases'
-  task :rebuild_databases => [:drop_databases, :build_databases]
-end
-
-task :build_mysql_databases => 'mysql:build_databases'
-task :drop_mysql_databases => 'mysql:drop_databases'
-task :rebuild_mysql_databases => 'mysql:rebuild_databases'

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-gem "byebug" if RUBY_VERSION > "2"
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-4.2/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 4.2.0"

data/gemfiles/activerecord-4.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-4.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-4.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_associations.rb

@@ -1,4 +1,4 @@
-require 'schema_plus'
+require 'schema_plus_foreign_keys'
 require 'valuable'
 
 require 'schema_associations/version'

data/lib/schema_associations/active_record/associations.rb

@@ -83,9 +83,9 @@ module SchemaAssociations
         return unless schema_associations_config.auto_create?
 
         reverse_foreign_keys.each do | foreign_key |
-          if foreign_key.table_name =~ /^#{table_name}_(.*)$/ || foreign_key.table_name =~ /^(.*)_#{table_name}$/
+          if foreign_key.from_table =~ /^#{table_name}_(.*)$/ || foreign_key.from_table =~ /^(.*)_#{table_name}$/
             other_table = $1
-            if other_table == other_table.pluralize and connection.columns(foreign_key.table_name).any?{|col| col.name == "#{other_table.singularize}_id"}
+            if other_table == other_table.pluralize and connection.columns(foreign_key.from_table).any?{|col| col.name == "#{other_table.singularize}_id"}
               _define_association(:has_and_belongs_to_many, foreign_key, other_table)
             else
               _define_association(:has_one_or_many, foreign_key)
@@ -101,12 +101,13 @@ module SchemaAssociations
       end
 
       def _define_association(macro, fk, referencing_table_name = nil) #:nodoc:
-        return unless fk.column_names.size == 1
+        column_names = Array.wrap(fk.column)
+        return unless column_names.size == 1
 
-        referencing_table_name ||= fk.table_name
-        column_name = fk.column_names.first
+        referencing_table_name ||= fk.from_table
+        column_name = column_names.first
 
-        references_name = fk.references_table_name.singularize
+        references_name = fk.to_table.singularize
         referencing_name = referencing_table_name.singularize
 
         referencing_class_name = _get_class_name(referencing_name)
@@ -120,7 +121,7 @@ module SchemaAssociations
         case macro
         when :has_and_belongs_to_many
           name = names[:has_many]
-          opts = {:class_name => referencing_class_name, :join_table => fk.table_name, :foreign_key => column_name}
+          opts = {:class_name => referencing_class_name, :join_table => fk.from_table, :foreign_key => column_name}
         when :belongs_to
           name = names[:belongs_to]
           opts = {:class_name => references_class_name, :foreign_key => column_name}
@@ -144,31 +145,22 @@ module SchemaAssociations
             macro = :has_many
             name = names[:has_many]
             if connection.columns(referencing_table_name).any?{ |col| col.name == 'position' }
-              if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-                opts[:order] = :position
-              else
-                scope_block = lambda { order :position }
-                argstr += "-> { order :position }, "
-              end
+              scope_block = lambda { order :position }
+              argstr += "-> { order :position }, "
             end
           end
         end
         argstr += opts.inspect[1...-1]
         if (_filter_association(macro, name) && !_method_exists?(name))
-          if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-            _create_association(macro, name, argstr, opts.dup)
-          else
-            _create_association(macro, name, argstr, scope_block, opts.dup)
-          end
+          _create_association(macro, name, argstr, scope_block, opts.dup)
         end
       end
 
       def _create_association(macro, name, argstr, *args)
-        logger.info "[schema_associations] #{self.name || self.table_name.classify}.#{macro} #{name.inspect}, #{argstr}"
+        logger.debug "[schema_associations] #{self.name || self.from_table.classify}.#{macro} #{name.inspect}, #{argstr}"
         send macro, name, *args
-        case 
+        case
         when respond_to?(:subclasses) then subclasses
-        when respond_to?(:descendants) then descendants
         end.each do |subclass|
           subclass.send :_create_association, macro, name, argstr, *args
         end

data/lib/schema_associations/railtie.rb

@@ -1,4 +1,4 @@
-module SchemaAssociations 
+module SchemaAssociations
   class Railtie < Rails::Railtie #:nodoc:
 
     initializer 'schema_associations.insert', :after => :load_config_initializers do

data/lib/schema_associations/version.rb

@@ -1,3 +1,3 @@
 module SchemaAssociations
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/schema_associations.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ronen Barzel", "Michał Łomnicki"]
   s.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
-  s.homepage    = "https://github.com/lomba/schema_associations"
+  s.homepage    = "https://github.com/SchemaPlus/schema_associations"
   s.summary     = "ActiveRecord extension that automatically (DRY) creates associations based on the schema"
   s.description = "SchemaAssociations extends ActiveRecord to automatically create associations by inspecting the database schema.  This is more more DRY than the standard behavior, for which in addition to specifying the foreign key in the migration, you must also specify complementary associations in two model files (e.g. a :belongs_to and a :has_many)."
 
@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("schema_plus", ">= 1.2.0")
+  s.add_dependency("schema_plus_foreign_keys", "~> 0.1")
 
+  s.add_development_dependency("schema_dev", "~> 3.5")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("rspec")
-  s.add_development_dependency("sqlite3")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("simplecov-gem-profile")
 end

data/schema_dev.yml

@@ -0,0 +1,11 @@
+ruby:
+  - 2.1.5
+activerecord:
+  - 4.2
+db:
+  - mysql2
+  - postgresql
+  - sqlite3
+notify:
+ - toby@ovod-everett.org
+ - ronen@barzel.org

data/spec/association_spec.rb

@@ -11,7 +11,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {} }
+        "comments", {}, { :post_id => {foreign_key: true} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -72,11 +72,11 @@ describe ActiveRecord::Base do
         "owners", {}, {},
         "colors", {}, {},
         "widgets", {}, {
-          :owner_id => {},
+          :owner_id => { foreign_key: true },
         },
-        "parts", {}, { :widget_id => {} },
-        "manifests", {}, { :widget_id => { :index => {:unique => true}} },
-        "colors_widgets", {:id => false}, { :widget_id => {}, :color_id => {} }
+        "parts", {}, { :widget_id => { foreign_key: true } },
+        "manifests", {}, { :widget_id => { foreign_key: true, :index => {:unique => true}} },
+        "colors_widgets", {:id => false}, { :widget_id => { foreign_key: true}, :color_id => { foreign_key: true} }
       )
     end
 
@@ -95,70 +95,70 @@ describe ActiveRecord::Base do
       check_reflections(:owner => true, :colors => true, :parts => true, :manifest => true)
     end
 
-    it "should respect :only" do 
+    it "should respect :only" do
       class Widget < ActiveRecord::Base
         schema_associations :only => :owner
       end
       check_reflections(:owner => true, :colors => false, :parts => false, :manifest => false)
     end
 
-    it "should respect :except" do 
+    it "should respect :except" do
       class Widget < ActiveRecord::Base
         schema_associations :except => :owner
       end
       check_reflections(:owner => false, :colors => true, :parts => true, :manifest => true)
     end
 
-    it "should respect :only_type :belongs_to" do 
+    it "should respect :only_type :belongs_to" do
       class Widget < ActiveRecord::Base
         schema_associations :only_type => :belongs_to
       end
       check_reflections(:owner => true, :colors => false, :parts => false, :manifest => false)
     end
 
-    it "should respect :except_type :belongs_to" do 
+    it "should respect :except_type :belongs_to" do
       class Widget < ActiveRecord::Base
         schema_associations :except_type => :belongs_to
       end
       check_reflections(:owner => false, :colors => true, :parts => true, :manifest => true)
     end
 
-    it "should respect :only_type :has_many" do 
+    it "should respect :only_type :has_many" do
       class Widget < ActiveRecord::Base
         schema_associations :only_type => :has_many
       end
       check_reflections(:owner => false, :colors => false, :parts => true, :manifest => false)
     end
 
-    it "should respect :except_type :has_many" do 
+    it "should respect :except_type :has_many" do
       class Widget < ActiveRecord::Base
         schema_associations :except_type => :has_many
       end
       check_reflections(:owner => true, :colors => true, :parts => false, :manifest => true)
     end
 
-    it "should respect :only_type :has_one" do 
+    it "should respect :only_type :has_one" do
       class Widget < ActiveRecord::Base
         schema_associations :only_type => :has_one
       end
       check_reflections(:owner => false, :colors => false, :parts => false, :manifest => true)
     end
 
-    it "should respect :except_type :has_one" do 
+    it "should respect :except_type :has_one" do
       class Widget < ActiveRecord::Base
         schema_associations :except_type => :has_one
       end
       check_reflections(:owner => true, :colors => true, :parts => true, :manifest => false)
     end
 
-    it "should respect :only_type :has_and_belongs_to_many" do 
+    it "should respect :only_type :has_and_belongs_to_many" do
       class Widget < ActiveRecord::Base
         schema_associations :only_type => :has_and_belongs_to_many
       end
       check_reflections(:owner => false, :colors => true, :parts => false, :manifest => false)
     end
 
-    it "should respect :except_type :has_and_belongs_to_many" do 
+    it "should respect :except_type :has_and_belongs_to_many" do
       class Widget < ActiveRecord::Base
         schema_associations :except_type => :has_and_belongs_to_many
       end
@@ -172,7 +172,7 @@ describe ActiveRecord::Base do
       with_associations_auto_create(true) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {} }
+          "comments", {}, { :post_id => {foreign_key: true} }
         )
         class Post < ActiveRecord::Base
           schema_associations :auto_create => false
@@ -188,7 +188,7 @@ describe ActiveRecord::Base do
       with_associations_auto_create(false) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {} }
+          "comments", {}, { :post_id => {foreign_key: true} }
         )
         class Post < ActiveRecord::Base
           schema_associations :auto_create => true
@@ -203,7 +203,7 @@ describe ActiveRecord::Base do
       with_associations_auto_create(false) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {} }
+          "comments", {}, { :post_id => {foreign_key: true} }
         )
         class Post < ActiveRecord::Base
           schema_associations
@@ -220,7 +220,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {:index => { :unique => true} } }
+        "comments", {}, { :post_id => {foreign_key: true, :index => { :unique => true} } }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -247,7 +247,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :subject_post_id => { :references => :posts} }
+        "comments", {}, { :subject_post_id => { foreign_key: { references: "posts" }} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -275,7 +275,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_cited => { :references => :posts} }
+        "comments", {}, { :post_cited => { foreign_key: {references: "posts" }} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -303,7 +303,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :subject => {:references => :posts} }
+        "comments", {}, { :subject => {foreign_key: { references: "posts" }} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -331,7 +331,7 @@ describe ActiveRecord::Base do
     with_associations_config(:table_prefix_map => { "wooga_" => "Happy"} ) do
       create_tables(
         "wooga_posts", {}, {},
-        "wooga_comments", {}, { :wooga_post_id => { :references => :wooga_posts} }
+        "wooga_comments", {}, { :wooga_post_id => { foreign_key: true} }
       )
       class HappyPost < ActiveRecord::Base ; self.table_name = 'wooga_posts' ; end
       class HappyComment < ActiveRecord::Base ; self.table_name = 'wooga_comments' ; end
@@ -345,7 +345,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {} }
+        "comments", {}, { :post_id => { foreign_key: true} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -369,7 +369,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {}, :position => {} }
+        "comments", {}, { :post_id => {foreign_key: true}, :position => {} }
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -432,7 +432,7 @@ describe ActiveRecord::Base do
 
     before(:each) do
       create_tables(
-        "nodes", {:foreign_keys => {:auto_index => false}}, { :parent_id => {} }
+        "nodes", {}, { :parent_id => { foreign_key: true} }
       )
     end
 
@@ -458,7 +458,7 @@ describe ActiveRecord::Base do
     def prefix_one
       create_tables(
         "posts", {}, {},
-        "post_comments", {}, { :post_id => {} }
+        "post_comments", {}, { :post_id => { foreign_key: true} }
       )
       Object.const_set(:Post, Class.new(ActiveRecord::Base))
       Object.const_set(:PostComment, Class.new(ActiveRecord::Base))
@@ -467,7 +467,7 @@ describe ActiveRecord::Base do
     def suffix_one
       create_tables(
         "posts", {}, {},
-        "comment_posts", {}, { :post_id => {} }
+        "comment_posts", {}, { :post_id => { foreign_key: true} }
       )
       Object.const_set(:Post, Class.new(ActiveRecord::Base))
       Object.const_set(:CommentPost, Class.new(ActiveRecord::Base))
@@ -476,7 +476,7 @@ describe ActiveRecord::Base do
     def prefix_both
       create_tables(
         "blog_page_posts", {}, {},
-        "blog_page_comments", {}, { :blog_page_post_id => {} }
+        "blog_page_comments", {}, { :blog_page_post_id => { foreign_key: true} }
       )
       Object.const_set(:BlogPagePost, Class.new(ActiveRecord::Base))
       Object.const_set(:BlogPageComment, Class.new(ActiveRecord::Base))
@@ -554,7 +554,7 @@ describe ActiveRecord::Base do
       create_tables(
         "posts", {}, {},
         "tags", {}, {},
-        "posts_tags", {:id => false}, { :post_id => {}, :tag_id => {}}
+        "posts_tags", {:id => false}, { :post_id => { foreign_key: true}, :tag_id => { foreign_key: true}}
       )
       class Post < ActiveRecord::Base ; end
       class Tag < ActiveRecord::Base ; end
@@ -572,7 +572,7 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "types", {}, {},
-        "posts", {}, {:type_id => {}}
+        "posts", {}, {:type_id => { foreign_key: true}}
       )
     end
     it "should define association normally if no existing method is defined" do
@@ -614,9 +614,9 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {}, :type => {coltype: :string} },
+        "comments", {}, { :post_id => { foreign_key: true}, :type => {coltype: :string} },
         "citers", {}, {},
-        "citations", {}, { :comment_id => {}, :citer_id => {}}
+        "citations", {}, { :comment_id => { foreign_key: true}, :citer_id => { foreign_key: true}}
       )
       class Post < ActiveRecord::Base ; end
       class Comment < ActiveRecord::Base ; end
@@ -643,7 +643,7 @@ describe ActiveRecord::Base do
       before(:each) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {} }
+          "comments", {}, { :post_id => { foreign_key: true} }
         )
         class Post < ActiveRecord::Base ; end
         class Comment < ActiveRecord::Base ; end
@@ -676,7 +676,7 @@ describe ActiveRecord::Base do
   def create_tables(*table_defs)
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Base.connection.tables.each do |table|
-        ActiveRecord::Migration.drop_table table
+        ActiveRecord::Migration.drop_table table, force: :cascade
       end
       table_defs.each_slice(3) do |table_name, opts, columns_with_options|
         ActiveRecord::Migration.create_table table_name, opts do |t|

data/spec/spec_helper.rb

@@ -9,9 +9,9 @@ require 'rspec'
 require 'active_record'
 require 'schema_associations'
 require 'logger'
-require 'connection'
+require 'schema_dev/rspec'
 
-ActiveRecord::Base.logger = Logger.new(File.open("spec.log", "w"))
+SchemaDev::Rspec::setup_db
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,38 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: schema_plus
+  name: schema_plus_foreign_keys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: schema_dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,24 +123,26 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-4.0
-- gemfiles/Gemfile.rails-4.1
+- gemfiles/activerecord-4.2/Gemfile.base
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 - init.rb
 - lib/schema_associations.rb
 - lib/schema_associations/active_record/associations.rb
 - lib/schema_associations/railtie.rb
 - lib/schema_associations/version.rb
-- runspecs
 - schema_associations.gemspec
+- schema_dev.yml
 - spec/association_spec.rb
-- spec/connection.rb
+- spec/schema_associations.sqlite3
 - spec/spec_helper.rb
-homepage: https://github.com/lomba/schema_associations
+homepage: https://github.com/SchemaPlus/schema_associations
 licenses: []
 metadata: {}
 post_install_message: 
@@ -166,6 +168,5 @@ summary: ActiveRecord extension that automatically (DRY) creates associations ba
   on the schema
 test_files:
 - spec/association_spec.rb
-- spec/connection.rb
+- spec/schema_associations.sqlite3
 - spec/spec_helper.rb
-has_rdoc: 

data/gemfiles/Gemfile.rails-3.2

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../Gemfile.base', __FILE__)
-
-gem "rails", "~> 3.2.0"

data/gemfiles/Gemfile.rails-4.0

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../Gemfile.base', __FILE__)
-
-gem "rails", "~> 4.0.0"

data/gemfiles/Gemfile.rails-4.1

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../Gemfile.base', __FILE__)
-
-gem "rails", "~> 4.1.0"

data/runspecs

@@ -1,113 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'ostruct'
-require 'shellwords'
-require 'tempfile'
-
-RUBY_VERSIONS = %W[1.9.3 2.1.2]
-RAILS_VERSIONS = %W[3.2 4.0 4.1]
-
-o = OpenStruct.new
-o.ruby_versions = RUBY_VERSIONS
-o.rails_versions = RAILS_VERSIONS
-
-OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} [options]"
-
-    opts.on("-n", "--dry-run", "Do a dry run without executing actions") do |v|
-        o.dry_run = true
-    end
-
-    opts.on("--update", "Update gem dependencies") do |v|
-        o.update = v
-    end
-
-    opts.on("--install", "Install gem dependencies") do |v|
-        o.install = v
-    end
-
-    opts.on("--ruby version", String, "Choose which version(s) of ruby to run.  Default is: #{o.ruby_versions.join(' ')}") do |ruby|
-        o.ruby_versions = ruby.split(' ')
-    end
-
-    opts.on("--rails version", String, "Choose which version(s) of rails to run.  Default is: #{o.rails_versions.join(' ')}") do |rails|
-        o.rails_versions = rails.split(' ')
-    end
-
-    opts.on("--quick", "quick run ruby #{RUBY_VERSIONS.last} and rails #{RAILS_VERSIONS.last}") do
-      o.ruby_versions  = [RUBY_VERSIONS.last]
-      o.rails_versions = [RAILS_VERSIONS.last]
-    end
-
-    opts.on("--rspec", "run rspec rather than rake") do |v|
-        o.rspec = v
-    end
-
-end.parse!
-
-
-Combo = Struct.new(:ruby, :rails)
-
-combos = o.ruby_versions.product(o.rails_versions).map{|product| Combo.new(*product)}.select {|combo|
-    case
-    when combo.rails >= "3.2" && combo.ruby <= "1.8.7" then false  # no longer happens, just keeping it as an example
-    else true
-    end
-}
-
-if system("which -s rvm")
-    # using rvm
-    def ruby_version_selector(ruby)
-        "rvm #{ruby} do"
-    end
-else
-    # using rbenv.
-    #
-    # because we're running within a ruby program that was launched by
-    # rbenv, we already have various environment variables set up.  need
-    # strip those out so that the forked shell can run a diifferent ruby
-    # version than the one we're in now.
-    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv/(?!shims)}}.join(':')
-    ENV['GEM_PATH'] = ENV['GEM_PATH'].split(':').reject{|dir| dir =~ %r{/\.?rbenv}}.join(':') unless ENV['GEM_PATH'].nil?
-    ENV['RBENV_DIR'] = nil
-    ENV['RBENV_HOOK_PATH'] = nil
-
-    def ruby_version_selector(ruby)
-        @versions ||= `rbenv versions --bare`.split
-        version = @versions.select{|v| v.start_with? ruby}.last || abort("no ruby version '#{ruby}' installed in rbenv")
-        "RBENV_VERSION=#{version}"
-    end
-end
-
-GEMFILES_DIR = File.expand_path('../gemfiles', __FILE__)
-errs = []
-combos.each_with_index do |combo, n|
-    ruby = combo.ruby
-    rails = combo.rails
-
-    cmd = case
-          when o.update
-              "bundle update"
-          when o.install
-              "bundle install"
-          when o.rspec
-              "bundle exec rspec"
-          else
-              "bundle exec rake spec"
-          end
-
-    command = %Q{BUNDLE_GEMFILE="#{File.join(GEMFILES_DIR, "Gemfile.rails-#{rails}")}" #{ruby_version_selector(ruby)} #{cmd} #{Shellwords.join(ARGV)}}
-
-    puts "\n\n*** ruby version #{ruby} - rails version #{rails}  [#{n+1} of #{combos.size}]\n\n#{command}"
-
-        next if o.dry_run
-
-    Tempfile.open('runspecs') do |file|
-        system("(#{command}) 2>&1 | tee #{file.path}")
-        file.rewind
-        errs << "ruby #{ruby}, rails #{rails}" if file.readlines.grep(/(^Failed examples)|(rake aborted)/).any?
-    end
-end
-puts errs.any? ?  "\n*** #{errs.size} failures:\n\t#{errs.join("\n\t")}" : "\n*** #{combos.size > 1 ? 'all versions' : 'spec'} succeeded ***" unless o.dry_run
-exit !errs.any?

data/spec/connection.rb

@@ -1,11 +0,0 @@
-
-ActiveRecord::Base.configurations = {
-  'schema_associations' => {
-    :adapter => 'sqlite3',
-    :database => File.expand_path('schema_associations.sqlite3', File.dirname(__FILE__)),
-  }
-
-}
-
-ActiveRecord::Base.establish_connection :schema_associations
-ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"