aub-record_filter 0.9.2 → 0.9.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 2
+:patch: 3

data/lib/record_filter/table.rb

@@ -80,7 +80,7 @@ module RecordFilter
       join_predicate =
         case association.macro
         when :belongs_to
-          [{ association.options[:foreign_key] || association.association_foreign_key.to_sym => @model_class.primary_key }]
+          [{ association.options[:foreign_key] || association.primary_key_name.to_sym => @model_class.primary_key }]
         when :has_many, :has_one
           [{ association.options[:primary_key] || @model_class.primary_key => association.primary_key_name.to_sym }]
         end

data/spec/active_record_spec.rb

@@ -105,6 +105,20 @@ describe 'active record options' do
       end
     end
 
+    describe 'using class_name when the association has a different name than the class name' do
+      before do
+        AssetAttachment.filter { having(:from).with(:id).gt(1) }.inspect
+      end
+
+      it 'should create the correct condition' do
+        AssetAttachment.last_find[:conditions].should == [%q(asset_attachments__from.id > ?), 1] 
+      end
+
+      it 'should create the correct join' do
+        AssetAttachment.last_find[:joins].should == [%q(INNER JOIN "assets" AS asset_attachments__from ON "asset_attachments".from_id = asset_attachments__from.id)]
+      end
+    end
+
     describe 'using foreign_key' do
       before do
         Post.filter do

data/spec/models.rb

@@ -10,6 +10,19 @@ class Article < ActiveRecord::Base
 end
 
 
+class Asset < ActiveRecord::Base
+  extend TestModel
+  has_many :asset_attachments
+end
+
+
+class AssetAttachment < ActiveRecord::Base
+  extend TestModel
+  belongs_to :to, :polymorphic => true
+  belongs_to :from, :class_name => 'Asset'
+end
+
+
 class Author < ActiveRecord::Base
   extend TestModel
   belongs_to :user
@@ -56,7 +69,7 @@ end
 class Post < ActiveRecord::Base
   extend TestModel
   belongs_to :blog
-  belongs_to :publication, :class_name => 'Blog'
+  belongs_to :publication, :class_name => 'Blog', :foreign_key => 'blog_id'
   belongs_to :special_blog, :class_name => 'Blog', :foreign_key => :special_blog_id
   has_many :comments
   has_many :bad_comments, :conditions => { :offensive => true }, :class_name => 'Comment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Aubrey Holland