schema_associations 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70205c74f75ca21daa67a8f61fe2d1d929c31190
-  data.tar.gz: 361d1fad6225d77f2a3c082a07ab455275c1c9d5
+  metadata.gz: d3b9c45613e71564c85a31fe61dbe4a568568a23
+  data.tar.gz: c45c59c0dab8f9e87e396ef90199c6d4f5f6f852
 SHA512:
-  metadata.gz: 4404428e7c93f5afe933a10ff82dbed3c4b9dafb3bb9b9540559d24517c5e8bad1fd5a8299ef82f8e5a0f275ae11af617b0bb39051349470a42fa61cac196005
-  data.tar.gz: 6fc59f166f9732dfd794b844e631cf037c1afb8e944b308b2cba25df2538866a260598238239e9c8eb93f4d11c6d72fa470048a90b82d3a60f43631cef5f0fcc
+  metadata.gz: febbd2e3214f1bd063d68f0e9f93c0a12da75acbe7aefec616892015992cdb2afc4a5a7c31db8bb17200a49032a4daf2f2f10d14247f0018f1f10ee56a101513
+  data.tar.gz: 7e83f3bf6be38cd776896fa58b1ff21f39cbb1c5b20bff219c9b1dc3fa181ba5a5bcaa36d38acf7f09ed287a8ae8310b7d175a39f5189d8c1963c98311aa47b3

data/.travis.yml

@@ -1,9 +1,10 @@
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.1.2
 gemfile:
   - gemfiles/Gemfile.rails-3.2
   - gemfiles/Gemfile.rails-4.0
+  - gemfiles/Gemfile.rails-4.1
 notifications:
   recipients:
     - michal.lomnicki@gmail.com

data/README.md

@@ -317,10 +317,10 @@ use cases that you logged).
 
 ## Compatibility
 
-SchemaAssociations supports all combinations of:
+SchemaAssociations is tested on all combinations of:
 
-*   Rails 3.2 or rails 4.0
-*   MRI ruby 1.9.3 or 2.0.0
+*   Rails 3.2, 4.0, or 4.1
+*   MRI ruby 1.9.3 or 2.1.2
 
 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.
 
@@ -353,6 +353,11 @@ Code coverage results will be in coverage/index.html -- it should be at 100% cov
 
 ## Release notes:
 
+### 1.2.1
+
+* Works with Rails 4.1
+* Test against MRI ruby 2.1.2
+
 ### 1.2.0
 
 * Works with Rails 4, thanks to [@tovodeverett](https://github.com/tovodeverett)
@@ -386,3 +391,7 @@ 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/gemfiles/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => File.expand_path('..', __FILE__)
+
+gem "byebug" if RUBY_VERSION > "2"

data/gemfiles/Gemfile.rails-3.2

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+eval File.read File.expand_path('../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../..', __FILE__)
 gem "rails", "~> 3.2.0"

data/gemfiles/Gemfile.rails-4.0

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+eval File.read File.expand_path('../Gemfile.base', __FILE__)
 
-gemspec :path => File.expand_path('../..', __FILE__)
 gem "rails", "~> 4.0.0"

data/gemfiles/Gemfile.rails-4.1

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

data/lib/schema_associations/active_record/associations.rb

@@ -18,6 +18,7 @@ module SchemaAssociations
       def self.extended(base) #:nodoc:
         class << base
           alias_method_chain :reflect_on_association, :schema_associations
+          alias_method_chain :_reflect_on_association, :schema_associations if method_defined? :_reflect_on_association
           alias_method_chain :reflect_on_all_associations, :schema_associations
         end
         ::ActiveRecord::Relation.send :include, Relation if defined? ::ActiveRecord::Relation
@@ -28,6 +29,12 @@ module SchemaAssociations
         reflect_on_association_without_schema_associations(*args)
       end
 
+      # introduced in rails 4.1
+      def _reflect_on_association_with_schema_associations(*args) #:nodoc:
+        _load_schema_associations_associations
+        _reflect_on_association_without_schema_associations(*args)
+      end
+
       def reflect_on_all_associations_with_schema_associations(*args) #:nodoc:
         _load_schema_associations_associations
         reflect_on_all_associations_without_schema_associations(*args)

data/lib/schema_associations/version.rb

@@ -1,3 +1,3 @@
 module SchemaAssociations
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/runspecs

@@ -5,8 +5,8 @@ require 'ostruct'
 require 'shellwords'
 require 'tempfile'
 
-RUBY_VERSIONS = %W[1.9.3 2.0.0]
-RAILS_VERSIONS = %W[3.2 4.0]
+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
@@ -62,10 +62,16 @@ if system("which -s rvm")
         "rvm #{ruby} do"
     end
 else
-    # using rbenv.  remove current version from path and current gem path
-    # so that forked shell will respect RBENV_VERSION variable
-    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/rbenv/versions/}}.join(':')
-    ENV['GEM_PATH'] = nil
+    # 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
@@ -100,7 +106,7 @@ combos.each_with_index do |combo, n|
     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/).any?
+        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

data/schema_associations.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec")
   s.add_development_dependency("sqlite3")
   s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-adapter")
+  s.add_development_dependency("simplecov-gem-profile")
 end
 

data/spec/association_spec.rb

@@ -19,41 +19,47 @@ describe ActiveRecord::Base do
 
     it "should create belongs_to association when reflecting on it" do
       reflection = Comment.reflect_on_association(:post)
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :comments
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:comments)
     end
 
     it "should create association when reflecting on all associations" do
       reflection = Comment.reflect_on_all_associations.first
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :comments
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:comments)
+    end
+
+    it "should create association when accepts_nested_attributes_for is called" do
+      expect {
+        Post.class_eval { accepts_nested_attributes_for :comments }
+      }.to_not raise_error
     end
 
     it "should create association when accessing it" do
       post = Post.create
       comment = Comment.create(:post_id => post.id)
-      comment.post.id.should == post.id
+      expect(comment.post.id).to eq(post.id)
     end
 
     it "should create association when creating record" do
       post = Post.create
       comment = Comment.create(:post => post)
-      comment.reload.post.id.should == post.id
+      expect(comment.reload.post.id).to eq(post.id)
     end
 
     it "should create has_many association" do
       reflection = Post.reflect_on_association(:comments)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :post
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:post)
     end
     it "shouldn't raise an exception when model is instantiated" do
       expect { Post.new }.to_not raise_error
@@ -78,8 +84,8 @@ describe ActiveRecord::Base do
       hash.each do |key, val|
         reflection = Widget.reflect_on_association(key)
         case val
-        when true then reflection.should_not be_nil
-        else           reflection.should be_nil
+        when true then expect(reflection).not_to be_nil
+        else           expect(reflection).to be_nil
         end
       end
     end
@@ -172,8 +178,8 @@ describe ActiveRecord::Base do
           schema_associations :auto_create => false
         end
         class Comment < ActiveRecord::Base ; end
-        Post.reflect_on_association(:comments).should be_nil
-        Comment.reflect_on_association(:post).should_not be_nil
+        expect(Post.reflect_on_association(:comments)).to be_nil
+        expect(Comment.reflect_on_association(:post)).not_to be_nil
       end
     end
 
@@ -188,8 +194,8 @@ describe ActiveRecord::Base do
           schema_associations :auto_create => true
         end
         class Comment < ActiveRecord::Base ; end
-        Post.reflect_on_association(:comments).should_not be_nil
-        Comment.reflect_on_association(:post).should be_nil
+        expect(Post.reflect_on_association(:comments)).not_to be_nil
+        expect(Comment.reflect_on_association(:post)).to be_nil
       end
     end
 
@@ -203,8 +209,8 @@ describe ActiveRecord::Base do
           schema_associations
         end
         class Comment < ActiveRecord::Base ; end
-        Post.reflect_on_association(:comments).should_not be_nil
-        Comment.reflect_on_association(:post).should be_nil
+        expect(Post.reflect_on_association(:comments)).not_to be_nil
+        expect(Comment.reflect_on_association(:post)).to be_nil
       end
     end
   end
@@ -221,19 +227,19 @@ describe ActiveRecord::Base do
     end
     it "should create has_one association" do
       reflection = Post.reflect_on_association(:comment)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_one
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :post
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_one)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:post)
     end
     it "should create belongs_to association with singular inverse" do
       reflection = Comment.reflect_on_association(:post)
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :comment
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:comment)
     end
   end
 
@@ -248,20 +254,20 @@ describe ActiveRecord::Base do
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:subject_post)
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "subject_post_id"
-      reflection.options[:inverse_of].should == :comments_as_subject
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("subject_post_id")
+      expect(reflection.options[:inverse_of]).to eq(:comments_as_subject)
     end
 
     it "should name has_many using 'as column'" do
       reflection = Post.reflect_on_association(:comments_as_subject)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "subject_post_id"
-      reflection.options[:inverse_of].should == :subject_post
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("subject_post_id")
+      expect(reflection.options[:inverse_of]).to eq(:subject_post)
     end
   end
 
@@ -276,20 +282,20 @@ describe ActiveRecord::Base do
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:post_cited)
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "post_cited"
-      reflection.options[:inverse_of].should == :comments_as_cited
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("post_cited")
+      expect(reflection.options[:inverse_of]).to eq(:comments_as_cited)
     end
 
     it "should name has_many using 'as column'" do
       reflection = Post.reflect_on_association(:comments_as_cited)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "post_cited"
-      reflection.options[:inverse_of].should == :post_cited
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("post_cited")
+      expect(reflection.options[:inverse_of]).to eq(:post_cited)
     end
   end
 
@@ -304,20 +310,20 @@ describe ActiveRecord::Base do
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:subject)
-      reflection.should_not be_nil
-      reflection.macro.should == :belongs_to
-      reflection.options[:class_name].should == "Post"
-      reflection.options[:foreign_key].should == "subject"
-      reflection.options[:inverse_of].should == :comments_as_subject
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:belongs_to)
+      expect(reflection.options[:class_name]).to eq("Post")
+      expect(reflection.options[:foreign_key]).to eq("subject")
+      expect(reflection.options[:inverse_of]).to eq(:comments_as_subject)
     end
 
     it "should name has_many using 'as column'" do
       reflection = Post.reflect_on_association(:comments_as_subject)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "subject"
-      reflection.options[:inverse_of].should == :subject
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("subject")
+      expect(reflection.options[:inverse_of]).to eq(:subject)
     end
   end
 
@@ -330,8 +336,8 @@ describe ActiveRecord::Base do
       class HappyPost < ActiveRecord::Base ; self.table_name = 'wooga_posts' ; end
       class HappyComment < ActiveRecord::Base ; self.table_name = 'wooga_comments' ; end
       # Kernel.warn HappyPost.reflect_on_all_associations.inspect
-      HappyComment.reflect_on_association(:post).class_name.should == "HappyPost"
-      HappyPost.reflect_on_association(:comments).class_name.should == "HappyComment"
+      expect(HappyComment.reflect_on_association(:post).class_name).to eq("HappyPost")
+      expect(HappyPost.reflect_on_association(:comments).class_name).to eq("HappyComment")
     end
   end
 
@@ -346,15 +352,15 @@ describe ActiveRecord::Base do
     end
     it "should create unordered has_many association" do
       reflection = Post.reflect_on_association(:comments)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :post
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:post)
       if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-        reflection.options[:order].should be_nil
+        expect(reflection.options[:order]).to be_nil
       else
-        reflection.scope.should be_nil
+        expect(reflection.scope).to be_nil
       end
     end
   end
@@ -370,15 +376,15 @@ describe ActiveRecord::Base do
     end
     it "should create ordered has_many association" do
       reflection = Post.reflect_on_association(:comments)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_many
-      reflection.options[:class_name].should == "Comment"
-      reflection.options[:foreign_key].should == "post_id"
-      reflection.options[:inverse_of].should == :post
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_many)
+      expect(reflection.options[:class_name]).to eq("Comment")
+      expect(reflection.options[:foreign_key]).to eq("post_id")
+      expect(reflection.options[:inverse_of]).to eq(:post)
       if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-        reflection.options[:order].to_s.should == "position"
+        expect(reflection.options[:order].to_s).to eq("position")
       else
-        reflection.scope.should_not be_nil
+        expect(reflection.scope).not_to be_nil
         scope_tester = Object.new
         expect(scope_tester).to receive(:order).with(:position)
         scope_tester.instance_exec(&reflection.scope)
@@ -433,7 +439,7 @@ describe ActiveRecord::Base do
     it "should use children as the inverse of parent" do
       class Node < ActiveRecord::Base ; end
       reflection = Node.reflect_on_association(:children)
-      reflection.should_not be_nil
+      expect(reflection).not_to be_nil
     end
 
     it "should use child as the singular inverse of parent" do
@@ -442,7 +448,7 @@ describe ActiveRecord::Base do
       end
       class Node < ActiveRecord::Base ; end
       reflection = Node.reflect_on_association(:child)
-      reflection.should_not be_nil
+      expect(reflection).not_to be_nil
     end
   end
 
@@ -480,11 +486,11 @@ describe ActiveRecord::Base do
       with_associations_config(:auto_create => true, :concise_names => true) do
         prefix_one
         reflection = Post.reflect_on_association(:comments)
-        reflection.should_not be_nil
-        reflection.macro.should == :has_many
-        reflection.options[:class_name].should == "PostComment"
-        reflection.options[:foreign_key].should == "post_id"
-        reflection.options[:inverse_of].should == :post
+        expect(reflection).not_to be_nil
+        expect(reflection.macro).to eq(:has_many)
+        expect(reflection.options[:class_name]).to eq("PostComment")
+        expect(reflection.options[:foreign_key]).to eq("post_id")
+        expect(reflection.options[:inverse_of]).to eq(:post)
       end
     end
 
@@ -492,11 +498,11 @@ describe ActiveRecord::Base do
       with_associations_config(:auto_create => true, :concise_names => true) do
         suffix_one
         reflection = Post.reflect_on_association(:comments)
-        reflection.should_not be_nil
-        reflection.macro.should == :has_many
-        reflection.options[:class_name].should == "CommentPost"
-        reflection.options[:foreign_key].should == "post_id"
-        reflection.options[:inverse_of].should == :post
+        expect(reflection).not_to be_nil
+        expect(reflection.macro).to eq(:has_many)
+        expect(reflection.options[:class_name]).to eq("CommentPost")
+        expect(reflection.options[:foreign_key]).to eq("post_id")
+        expect(reflection.options[:inverse_of]).to eq(:post)
       end
     end
 
@@ -504,11 +510,11 @@ describe ActiveRecord::Base do
       with_associations_config(:auto_create => true, :concise_names => true) do
         prefix_both
         reflection = BlogPagePost.reflect_on_association(:comments)
-        reflection.should_not be_nil
-        reflection.macro.should == :has_many
-        reflection.options[:class_name].should == "BlogPageComment"
-        reflection.options[:foreign_key].should == "blog_page_post_id"
-        reflection.options[:inverse_of].should == :post
+        expect(reflection).not_to be_nil
+        expect(reflection.macro).to eq(:has_many)
+        expect(reflection.options[:class_name]).to eq("BlogPageComment")
+        expect(reflection.options[:foreign_key]).to eq("blog_page_post_id")
+        expect(reflection.options[:inverse_of]).to eq(:post)
       end
     end
 
@@ -516,13 +522,13 @@ describe ActiveRecord::Base do
       with_associations_config(:auto_create => true, :concise_names => false) do
         prefix_one
         reflection = Post.reflect_on_association(:post_comments)
-        reflection.should_not be_nil
-        reflection.macro.should == :has_many
-        reflection.options[:class_name].should == "PostComment"
-        reflection.options[:foreign_key].should == "post_id"
-        reflection.options[:inverse_of].should == :post
+        expect(reflection).not_to be_nil
+        expect(reflection.macro).to eq(:has_many)
+        expect(reflection.options[:class_name]).to eq("PostComment")
+        expect(reflection.options[:foreign_key]).to eq("post_id")
+        expect(reflection.options[:inverse_of]).to eq(:post)
         reflection = Post.reflect_on_association(:comments)
-        reflection.should be_nil
+        expect(reflection).to be_nil
       end
     end
 
@@ -530,13 +536,13 @@ describe ActiveRecord::Base do
       with_associations_config(:auto_create => true, :concise_names => true) do
         prefix_one
         reflection = Post.reflect_on_association(:comments)
-        reflection.should_not be_nil
-        reflection.macro.should == :has_many
-        reflection.options[:class_name].should == "PostComment"
-        reflection.options[:foreign_key].should == "post_id"
-        reflection.options[:inverse_of].should == :post
+        expect(reflection).not_to be_nil
+        expect(reflection.macro).to eq(:has_many)
+        expect(reflection.options[:class_name]).to eq("PostComment")
+        expect(reflection.options[:foreign_key]).to eq("post_id")
+        expect(reflection.options[:inverse_of]).to eq(:post)
         reflection = Post.reflect_on_association(:post_comments)
-        reflection.should be_nil
+        expect(reflection).to be_nil
       end
     end
 
@@ -555,10 +561,10 @@ describe ActiveRecord::Base do
     end
     it "should create has_and_belongs_to_many association" do
       reflection = Post.reflect_on_association(:tags)
-      reflection.should_not be_nil
-      reflection.macro.should == :has_and_belongs_to_many
-      reflection.options[:class_name].should == "Tag"
-      reflection.options[:join_table].should == "posts_tags"
+      expect(reflection).not_to be_nil
+      expect(reflection.macro).to eq(:has_and_belongs_to_many)
+      expect(reflection.options[:class_name]).to eq("Tag")
+      expect(reflection.options[:join_table]).to eq("posts_tags")
     end
   end
 
@@ -571,7 +577,7 @@ describe ActiveRecord::Base do
     end
     it "should define association normally if no existing method is defined" do
       class Type < ActiveRecord::Base ; end
-      Type.reflect_on_association(:posts).should_not be_nil # sanity check for this context
+      expect(Type.reflect_on_association(:posts)).not_to be_nil # sanity check for this context
     end
     it "should not define association over existing public method" do
       class Type < ActiveRecord::Base
@@ -579,7 +585,7 @@ describe ActiveRecord::Base do
           :existing
         end
       end
-      Type.reflect_on_association(:posts).should be_nil
+      expect(Type.reflect_on_association(:posts)).to be_nil
     end
     it "should not define association over existing private method" do
       class Type < ActiveRecord::Base
@@ -588,11 +594,11 @@ describe ActiveRecord::Base do
           :existing
         end
       end
-      Type.reflect_on_association(:posts).should be_nil
+      expect(Type.reflect_on_association(:posts)).to be_nil
     end
     it "should define association :type over (deprecated) kernel method" do
       class Post < ActiveRecord::Base ; end
-      Post.reflect_on_association(:type).should_not be_nil
+      expect(Post.reflect_on_association(:type)).not_to be_nil
     end
     it "should not define association :type over model method" do
       class Post < ActiveRecord::Base
@@ -600,10 +606,27 @@ describe ActiveRecord::Base do
           :existing
         end
       end
-      Post.reflect_on_association(:type).should be_nil
+      expect(Post.reflect_on_association(:type)).to be_nil
+    end
+  end
+
+  context "regarding STI" do
+    before(:each) do
+      create_tables(
+        "posts", {}, {},
+        "comments", {}, { :post_id => {}, :type => {coltype: :string} }
+      )
+      class Post < ActiveRecord::Base ; end
+      class Comment < ActiveRecord::Base ; end
+      class SubComment < Comment ; end
+    end
+
+    it "defines association for subclass" do
+      expect(SubComment.reflect_on_association(:post)).not_to be_nil
     end
   end
 
+
   if defined? ::ActiveRecord::Relation
 
     context "regarding relations" do
@@ -648,7 +671,8 @@ describe ActiveRecord::Base do
       table_defs.each_slice(3) do |table_name, opts, columns_with_options|
         ActiveRecord::Migration.create_table table_name, opts do |t|
           columns_with_options.each_pair do |column, options|
-            t.integer column, options
+            coltype = options.delete(:coltype) || :integer
+            t.send coltype, column, options
           end
         end
       end

data/spec/connection.rb

@@ -7,5 +7,5 @@ ActiveRecord::Base.configurations = {
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_associations'
+ActiveRecord::Base.establish_connection :schema_associations
 ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'simplecov'
-require 'simplecov-gem-adapter'
+require 'simplecov-gem-profile'
 SimpleCov.start "gem"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-gem-adapter
+  name: simplecov-gem-profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: SchemaAssociations extends ActiveRecord to automatically create associations
@@ -121,13 +121,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - MIT-LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.base
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
+- gemfiles/Gemfile.rails-4.1
 - init.rb
 - lib/schema_associations.rb
 - lib/schema_associations/active_record/associations.rb
@@ -147,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: schema_associations
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension that automatically (DRY) creates associations based