better_ar 0.0.8 → 0.0.11

data/HISTORY.txt

@@ -1,3 +1,12 @@
+## 0.0.11
+  Ignore polymorphic associations for implcit joins
+
+## 0.0.10
+  Fix for inplicit joins
+
+## 0.0.9
+  Fix for Arel objects being passed to .all
+
 ## 0.0.8
   Don't extract joins for values of ActiveRecord::Base
 

data/better_ar.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'activerecord', ['~> 3.0.3']
+  s.add_development_dependency 'sqlite3'
 end

data/lib/better_ar/finder_methods.rb

@@ -23,14 +23,19 @@ module BetterAr
     #   Optional
     # @return [ActiveRecord::Relation]
     def all(opts = {})
-      if opts.empty?
-        super()
-      elsif opts.key?(:conditions)
-        super(opts)
+      if opts.is_a?(Hash)
+        if opts.empty?
+          super()
+        elsif opts.key?(:conditions)
+          super(opts)
+        else
+          relation = clone
+          relation = better_ar_apply_sql_clauses(relation, opts)
+          relation = better_ar_apply_associations(relation, opts)
+          relation.where(opts)
+        end
       else
         relation = clone
-        relation = better_ar_apply_sql_clauses(relation, opts)
-        relation = better_ar_apply_associations(relation, opts)
         relation.where(opts)
       end
     end
@@ -71,8 +76,11 @@ module BetterAr
     end
 
     def better_ar_apply_associations(relation, opts = {})
-      (reflect_on_all_associations.map(&:name) & better_ar_join_keys(opts)).each do |name|
-        relation = relation.joins(name)
+      reflect_on_all_associations.select do |association|
+        !association.options[:polymorphic] &&
+          better_ar_join_keys(opts).include?(association.table_name.to_sym)
+      end.each do |association|
+        relation = relation.joins(association.name)
       end
 
       relation

data/lib/better_ar/version.rb

@@ -1,3 +1,3 @@
 module BetterAr
-  VERSION = "0.0.8"
+  VERSION = "0.0.11"
 end

data/test/helper.rb

@@ -16,7 +16,7 @@ ActiveRecord::Base.establish_connection(
   :database => ':memory:'
 )
 
-users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT);}
+users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, object_type TEXT, object_id INTEGER);}
 records_table = %{CREATE TABLE records (id INTEGER PRIMARY KEY, user_id INTEGER, name TEXT);}
 reports_table = %{CREATE TABLE reports (id INTEGER PRIMARY KEY, record_id INTEGER, name TEXT);}
 ActiveRecord::Base.connection.execute(users_table)
@@ -25,6 +25,7 @@ ActiveRecord::Base.connection.execute(reports_table)
 
 class User < ActiveRecord::Base
   has_many :records
+  belongs_to :object, :polymorphic => true
 end
 
 class Record < ActiveRecord::Base

data/test/test_finder_methods.rb

@@ -18,12 +18,26 @@ describe 'ActiveRecord::Relation Finder Methods' do
       test_sql.must_be_like expected_sql
     end
 
+    it 'finds implicit joins by reflection with singular association name' do
+      test_sql = Record.all(:users => { :name => 'test' }).to_sql
+      expected_sql = Record.joins(:user).where(:users => { :name => 'test' }).to_sql
+      test_sql.must_be_like expected_sql
+    end
+
     it 'will ignore implicit joins if value is an instance of ActiveRecord::Base' do
       user = User.create
       test_sql = Record.all(:user => user).to_sql
       expected_sql = Record.where(:user => user).to_sql
       test_sql.must_be_like expected_sql
     end
+
+    it 'still allows arel objects' do
+      user = User.create
+      relation = Record.arel_table[:user_id].eq(user.id)
+      test_sql = Record.all(relation).to_sql
+      expected_sql = Record.where(:user_id => user.id).to_sql
+      test_sql.must_be_like expected_sql
+    end
   end
 
   describe '.first' do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: better_ar
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,13 +21,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
         version: 3.0.3
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Better Active Record finders
 email: 
 - bcardarella@gmail.com
@@ -72,21 +75,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: better_ar
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Better Active Record finders