better_ar 0.0.4 → 0.0.5

data/HISTORY.txt

@@ -1,3 +1,6 @@
+## 0.0.5
+  Implicit joins
+
 ## 0.0.4
   SQL operator keys must now end with '!'
 

data/README.markdown

@@ -15,13 +15,13 @@ Command line:
 
 ## Usage
 
-Now a single hash can be passed to ActiveRecord::Base.all that contains not only the where values but also other scopes like 'limit' and 'order'
+Now a single hash can be passed to ActiveRecord::Base.all that contains not only the where values but also other scopes like 'limit' and 'order' and also implicit joins
 
-    User.all(:age => 10, :limit! => 5, :offset! => 10, :order! => :name)
+    User.all(:age => 10, :limit! => 5, :offset! => 10, :order! => :name, :records => {:name => 'test'})
 
 is the same as
 
-    User.where(:age => 10).limit(5).offset(10).order(:name)
+    User.joins(:records).where(:age => 10, :records => {:name => 'test'}).limit(5).offset(10).order(:name)
 
 While this may seem less concise the advantage is being able to dynamically construct the query with a single hash in code.
 

data/lib/better_ar.rb

@@ -1,15 +1,24 @@
 module BetterAr
   module ClassMethods
 
-    # Breaks down the hash to do a ActiveRecord::Relation query
+    # Breaks down the hash to do a {ActiveRecord::Relation} query
     #
-    # example: User.all(:age => 10, :limit! => 2, :offset! => 3, :order! => :name)
+    # example:
+    #  User.all(:age => 10, :limit! => 2, :offset! => 3, :order! => :name)
     #
-    # is the same as: User.where(:age => 10).limit(2).offset(3).order(:name)
+    # is the same as:
+    #  User.where(:age => 10).limit(2).offset(3).order(:name)
     #
     # if the key :conditions is present it will fall back to legacy
     #
-    # any key with the '!' at the end will be assumed to be a sql operator. The key should match either an ActiveRecord::Relation instance method or an ARel predicate.
+    # any key with the '!' at the end will be assumed to be a sql operator. The key should match either an {ActiveRecord::Relation} instance method or an ARel predicate.
+    #
+    # Implicit joins are supported.
+    # example:
+    #  User.all(:records => {:name => 'test'})
+    #
+    # is the same as:
+    #  User.joins(:records).where(:records => {:name => 'test'})
     #
     # @param [Hash]
     #   Optional
@@ -24,6 +33,13 @@ module BetterAr
               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
 
@@ -35,19 +51,20 @@ module BetterAr
       else
         relation.all(opts)
       end
-      
     end
 
     # Forces a limit of 1 on the collection
     #
-    # example: User.first(:age => 10, :name => 'Brian')
+    # example:
+    #  User.first(:age => 10, :name => 'Brian')
     #
-    # is the same as: User.where(:age => 10, :name => 'Brian').limit(1).first
+    # is the same as:
+    #  User.where(:age => 10, :name => 'Brian').limit(1).first
     #
     # if the key :conditions is present it will fall back to legacy
     #
     # @param [Hash]
-    #   Optional follows same convention as .all
+    #   Optional follows same convention as {#all}
     # @return [ActiveRecord::Base]
     def first(opts = {})
       unless opts.key?(:conditions)
@@ -59,14 +76,16 @@ module BetterAr
 
     # Does a count on the query
     #
-    # example: User.count(:age => 20)
+    # example:
+    #  User.count(:age => 20)
     #
-    # is the same as: User.where(:age => 20).count
+    # is the same as:
+    #  User.where(:age => 20).count
     #
     # if the key :conditions is present it will fall back to legacy
     #
     # @param [Hash]
-    #   Optional follows same convention as .all
+    #   Optional follows same convention as {#all}
     # @return [Integer]
     def count(opts = {})
       unless opts.key?(:conditions)

data/lib/better_ar/version.rb

@@ -1,3 +1,3 @@
 module BetterAr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/helper.rb

@@ -17,7 +17,15 @@ ActiveRecord::Base.establish_connection(
 )
 
 users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT);}
+records_table = %{CREATE TABLE records (id INTEGER PRIMARY KEY, user_id INTEGER, name TEXT);}
 ActiveRecord::Base.connection.execute(users_table)
+ActiveRecord::Base.connection.execute(records_table)
 
-class User < ActiveRecord::Base; end
+class User < ActiveRecord::Base
+  has_many :records
+end
+
+class Record < ActiveRecord::Base
+  belongs_to :user
+end
 

data/test/test_finder_methods.rb

@@ -17,6 +17,12 @@ describe 'Enhanced Finder Methods' do
       expected_sql = User.where(:age => 10).limit(1).offset(2).order(:name).to_sql
       test_sql.must_be_like expected_sql
     end
+
+    it 'finds implicit joins by reflection' do
+      test_sql = User.all(:records => { :name => 'test' }).to_sql
+      expected_sql = User.joins(:records).where(:records => { :name => 'test' }).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
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -05:00
+date: 2011-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency