better_ar 0.0.5 → 0.0.6

data/HISTORY.txt

@@ -1,3 +1,6 @@
+## 0.0.6
+  Moved methods as higher level module in ActiveRecord::Relation than ActiveRecord::FinderMethods. So the BetterAR modules take precedence.
+
 ## 0.0.5
   Implicit joins
 

data/README.markdown

@@ -25,8 +25,6 @@ is the same as
 
 While this may seem less concise the advantage is being able to dynamically construct the query with a single hash in code.
 
-This library completely removes the old .all, .first and .count class methods from ActiveRecord::Base. As these methods were just delegated to ActiveRecord::Base.scoped they can still be called.
-
 ### Legacy
 
 If the params contain :condition it will fall back to the legacy method.

data/better_ar.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'activerecord', ['>= 3.0.3']
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'activerecord', ['~> 3.0.3']
+  # s.add_development_dependency 'mocha'
+  # s.add_development_dependency 'yard'
 end

data/lib/better_ar.rb

@@ -1,30 +1,34 @@
 module BetterAr
-  module ClassMethods
 
-    # Breaks down the hash to do a {ActiveRecord::Relation} query
-    #
-    # 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)
-    #
-    # 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.
-    #
-    # Implicit joins are supported.
-    # example:
-    #  User.all(:records => {:name => 'test'})
-    #
-    # is the same as:
-    #  User.joins(:records).where(:records => {:name => 'test'})
-    #
-    # @param [Hash]
-    #   Optional
-    # @return [ActiveRecord::Relation]
-    def all(opts = {})
-      relation = scoped.clone
+  # Breaks down the hash to do a {ActiveRecord::Relation} query
+  #
+  # 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)
+  #
+  # 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.
+  #
+  # Implicit joins are supported.
+  # example:
+  #  User.all(:records => {:name => 'test'})
+  #
+  # is the same as:
+  #  User.joins(:records).where(:records => {:name => 'test'})
+  #
+  # @param [Hash]
+  #   Optional
+  # @return [ActiveRecord::Relation]
+  def all(opts = {})
+    if opts.empty?
+      super()
+    elsif opts.key?(:conditions)
+      super(opts)
+    else
+      relation = clone
 
       unless opts.key?(:conditions)
         unless opts.empty?
@@ -48,62 +52,56 @@ module BetterAr
         else
           relation.where(opts)
         end
-      else
-        relation.all(opts)
       end
     end
+  end
 
-    # Forces a limit of 1 on the collection
-    #
-    # example:
-    #  User.first(:age => 10, :name => 'Brian')
-    #
-    # 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}
-    # @return [ActiveRecord::Base]
-    def first(opts = {})
-      unless opts.key?(:conditions)
-        all(opts.merge(:limit! => 1)).first
-      else
-        scoped.first(opts)
-      end
+  # Forces a limit of 1 on the collection
+  #
+  # example:
+  #  User.first(:age => 10, :name => 'Brian')
+  #
+  # 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}
+  # @return [ActiveRecord::Base]
+  def first(opts = {})
+    if opts.empty?
+      super()
+    elsif opts.key?(:conditions)
+      super(opts)
+    else
+      all(opts.merge(:limit! => 1)).first
     end
+  end
 
-    # Does a count on the query
-    #
-    # example:
-    #  User.count(:age => 20)
-    #
-    # 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}
-    # @return [Integer]
-    def count(opts = {})
-      unless opts.key?(:conditions)
-        all(opts).count
-      else
-        scoped.count(opts)
-      end
+  # Does a count on the query
+  #
+  # example:
+  #  User.count(:age => 20)
+  #
+  # 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}
+  # @return [Integer]
+  def count(opts = {})
+    if opts.empty?
+      super()
+    elsif opts.key?(:conditions)
+      super(opts)
+    else
+      all(opts).count
     end
   end
 
 end
 
-ActiveRecord::Base.class_eval do
-  class << self
-    remove_method :all
-    remove_method :first
-    remove_method :count
-  end
-end
-
-ActiveRecord::Base.send(:extend, BetterAr::ClassMethods)
+ActiveRecord::Relation.send(:include, BetterAr)

data/lib/better_ar/version.rb

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

data/test/helper.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'ruby-debug'
 require 'minitest/autorun'
-require 'mocha'
+# require 'mocha'
+require 'active_support/core_ext'
 require 'active_record'
 require 'better_ar'
 

data/test/test_finder_methods.rb

@@ -6,12 +6,6 @@ describe 'Enhanced Finder Methods' do
   end
 
   describe '.all' do
-    it 'should return all records when no params' do
-      User.all.to_sql.must_be_like %{
-        SELECT "users".* FROM "users"
-      }
-    end
-
     it 'extracts the non-where scopes and applies' do
       test_sql = User.all(:limit! => 1, :offset! => 2, :order! => :name, :age => 10).to_sql
       expected_sql = User.where(:age => 10).limit(1).offset(2).order(:name).to_sql
@@ -44,19 +38,35 @@ describe 'Enhanced Finder Methods' do
   describe 'hash contains :conditions' do
     before do
       @expected = User.create(:name => 'test')
-      User.create(:name => 'no test')
+      @user = User.create(:name => 'no test')
     end
 
-    it 'falls back for .all' do
-      User.all(:conditions => "name = 'test'").must_equal [@expected]
-    end
+    describe 'with conditions' do
+      it 'falls back for .all' do
+        User.all(:conditions => "name = 'test'").must_equal [@expected]
+      end
 
-    it 'falls back for .first' do
-      User.first(:conditions => "name = 'test'").must_equal @expected
+      it 'falls back for .first' do
+        User.first(:conditions => "name = 'test'").must_equal @expected
+      end
+
+      it 'falls back for .count' do
+        User.count(:conditions => "name = 'test'").must_equal 1
+      end
     end
 
-    it 'falls back for .count' do
-      User.count(:conditions => "name = 'test'").must_equal 1
+    describe 'without conditions' do
+      it 'falls back for .all' do
+        User.all.must_equal [@expected, @user]
+      end
+
+      it 'falls back for .first' do
+        User.first.must_equal @expected
+      end
+
+      it 'falls back for .count' do
+        User.count.must_equal 2
+      end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Brian Cardarella
@@ -23,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -32,32 +32,6 @@ dependencies:
         version: 3.0.3
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 description: Better Active Record finders
 email: 
 - bcardarella@gmail.com