record_filter 0.9.12 → 0.9.13

data/Rakefile

@@ -22,6 +22,7 @@ begin
   Jeweler::RubyforgeTasks.new do |rubyforge|
     rubyforge.doc_task = 'rdoc'
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 9
-:patch: 12
 :major: 0
+:minor: 9
+:patch: 13

data/lib/record_filter/table.rb

@@ -122,7 +122,10 @@ module RecordFilter
       join_predicate =
         case association.macro
         when :belongs_to
-          [{ association.options[:foreign_key] || association.primary_key_name.to_sym => @model_class.primary_key }]
+          [{ 
+            (association.options[:foreign_key] || association.primary_key_name.to_sym) => 
+            (association.options[:primary_key] || @model_class.primary_key)
+          }]
         when :has_many, :has_one
           [{ association.options[:primary_key] || @model_class.primary_key => association.primary_key_name.to_sym }]
         else raise InvalidJoinException.new("I don't know how to do a simple join on an association of type #{association.macro}.")

data/record_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.12"
+  s.version = "0.9.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland", "Mat Brown"]
-  s.date = %q{2009-09-13}
+  s.date = %q{2009-11-10}
   s.description = %q{RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{record-filter}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An ActiveRecord query API for replacing SQL with awesome}
   s.test_files = [
     "spec/active_record_spec.rb",

data/spec/implicit_join_spec.rb

@@ -400,4 +400,16 @@ describe 'implicit joins' do
       Post.last_find[:joins].should == [%q(INNER JOIN "comments" AS arghs ON "posts".id = arghs.post_id)]
     end
   end
+
+  describe 'with nonstandard primary and foreign keys' do
+    it 'should join with the correct key on belongs_to' do
+      Subscription.filter { having(:user).with(:first_name, 'Bob') }.inspect
+      Subscription.last_find[:joins].should == [%q(INNER JOIN "users" AS subscriptions__user ON "subscriptions".email = subscriptions__user.email_address)]
+    end
+
+    it 'should join to the correct key on has_many' do
+      User.filter { having(:subscriptions).with(:created_at).gt(3.weeks.ago.utc) }.inspect
+      User.last_find[:joins].should == [%q(INNER JOIN "subscriptions" AS users__subscriptions ON "users".email_address = users__subscriptions.email)]
+    end
+  end
 end

data/spec/models.rb

@@ -96,6 +96,12 @@ class NewsStory < ActiveRecord::Base
 end
 
 
+class Subscription < ActiveRecord::Base
+  extend TestModel
+  belongs_to :user, :primary_key => :email_address, :foreign_key => :email
+end
+
+
 class Tag < ActiveRecord::Base
   has_and_belongs_to_many :posts
 end
@@ -105,5 +111,6 @@ class User < ActiveRecord::Base
   extend TestModel
   has_one :author
   has_many :comments
+  has_many :subscriptions, :primary_key => :email_address, :foreign_key => :email
 end
 

data/tasks/db.rake

@@ -92,6 +92,11 @@ namespace :db do
           t.integer :stars_count
         end
 
+        create_table :subscriptions do |t|
+          t.string :email
+          t.timestamps
+        end
+
         create_table :tags do |t|
           t.string :name
         end
@@ -99,6 +104,7 @@ namespace :db do
         create_table :users do |t|
           t.string :first_name
           t.string :last_name
+          t.string :email_address
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -04:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: record-filter
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord query API for replacing SQL with awesome