sample_models 2.3.0 → 2.3.1

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/lib/sample_models/creation.rb

@@ -9,7 +9,8 @@ module SampleModels
     
     def belongs_to_assoc(column_name)
       model.belongs_to_associations.detect { |assoc|
-        assoc.foreign_key == column_name
+        assoc.foreign_key == column_name ||
+          assoc.foreign_type == column_name
       }
     end
     

data/lib/sample_models/model.rb

@@ -72,6 +72,14 @@ module SampleModels
           @assoc.primary_key_name
         end
       end
+
+      def foreign_type
+        if @assoc.respond_to?(:foreign_type)
+          @assoc.foreign_type
+        else
+          @assoc.instance_variable_get(:@options)[:foreign_type]
+        end
+      end
       
       def has_many?
         @assoc.macro == :has_many

data/sample_models.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sample_models"
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = "2012-03-10"
+  s.date = "2012-03-19"
   s.description = "\nA library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:\n\n* meet all your validations automatically\n* only make you specify the attributes you care about\n* give you a rich set of features so you can specify associated values as concisely as possible\n* do this with as little configuration as possible\n"
   s.email = "francis.hwang@profitably.com"
   s.extra_rdoc_files = [

data/test/unit/polymorphic_belongs_to_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
 
 class PolymorphicBelongsToTest < SampleModelsTestCase
   def test_fills_association_with_anything_from_another_class
@@ -12,6 +12,11 @@ class PolymorphicBelongsToTest < SampleModelsTestCase
     blog_post = BlogPost.sample
     bookmark = Bookmark.sample :bookmarkable => blog_post
     assert_equal blog_post, bookmark.bookmarkable
+    assert(
+      Bookmark.all(
+        :conditions => {:bookmarkable_type => 'BlogPost'}
+      ).include?(bookmark)
+    )
   end
   
   def test_can_specify_association_with_other_leading_associations

metadata

@@ -2,7 +2,7 @@
 name: sample_models
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - Francis Hwang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-10 00:00:00 Z
+date: 2012-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord