better_ar 0.0.7 → 0.0.8

data/HISTORY.txt

@@ -1,3 +1,6 @@
+## 0.0.8
+  Don't extract joins for values of ActiveRecord::Base
+
 ## 0.0.7
   Added support for association collections
   Moved ActiveRecord::Relation included methods into proper modules

data/TODO

@@ -0,0 +1 @@
+* Nested joins

data/lib/better_ar/finder_methods.rb

@@ -29,30 +29,9 @@ module BetterAr
         super(opts)
       else
         relation = clone
-
-        unless opts.key?(:conditions)
-          unless opts.empty?
-            opts.keys.select { |key| key.to_s =~ /!$/ }.each do |predicate|
-              if value = opts.delete(predicate)
-                relation = relation.send(predicate.to_s.sub('!',''), value)
-              end
-            end
-
-            reflect_on_all_associations.map(&:name).each do |name|
-              if opts.key?(name)
-                relation = relation.joins(name)
-              end
-            end
-
-            relation.where(opts)
-          end
-
-          if opts.empty?
-            relation
-          else
-            relation.where(opts)
-          end
-        end
+        relation = better_ar_apply_sql_clauses(relation, opts)
+        relation = better_ar_apply_associations(relation, opts)
+        relation.where(opts)
       end
     end
 
@@ -78,6 +57,31 @@ module BetterAr
         all(opts.merge(:limit! => 1)).first
       end
     end
+
+    private
+
+    def better_ar_apply_sql_clauses(relation, opts = {})
+      opts.keys.select { |key| key.to_s =~ /!$/ }.each do |clause|
+        if value = opts.delete(clause)
+          relation = relation.send(clause.to_s.sub('!',''), value)
+        end
+      end
+
+      relation
+    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)
+      end
+
+      relation
+    end
+
+    def better_ar_join_keys(opts = {})
+      opts.keys.select { |key| !opts[key].kind_of?(ActiveRecord::Base) }
+    end
+
   end
 end
 

data/lib/better_ar/version.rb

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

data/test/test_finder_methods.rb

@@ -17,6 +17,13 @@ describe 'ActiveRecord::Relation Finder Methods' do
       expected_sql = User.joins(:records).where(:records => { :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
   end
 
   describe '.first' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - MIT-LICENSE.txt
 - README.markdown
 - Rakefile
+- TODO
 - better_ar.gemspec
 - lib/better_ar.rb
 - lib/better_ar/association_collection.rb