finders.rb in mongoid-0.9.0

- old
+ new

@@ -6,21 +6,30 @@
     #
     # args: A +Hash+ with a conditions key and other options
     #
     # <tt>Person.all(:conditions => { :attribute => "value" })</tt>
     def all(*args)
-      find(:all, *args)
+      find(*args)
     end
 
     # Returns a count of matching records in the database based on the
     # provided arguments.
     #
     # <tt>Person.count(:first, :conditions => { :attribute => "value" })</tt>
     def count(*args)
-      Criteria.translate(*args).count(self)
+      Criteria.translate(self, *args).count
     end
 
+    # Helper to initialize a new +Criteria+ object for this class.
+    #
+    # Example:
+    #
+    # <tt>Person.criteria</tt>
+    def criteria
+      Criteria.new(self)
+    end
+
     # Find a +Document+ in several different ways.
     #
     # If a +String+ is provided, it will be assumed that it is a
     # representation of a Mongo::ObjectID and will attempt to find a single
     # +Document+ based on that id. If a +Symbol+ and +Hash+ is provided then
@@ -31,34 +40,40 @@
     #
     # <tt>Person.find(:all, :conditions => { :attribute => "value" })</tt>
     #
     # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
     def find(*args)
-      Criteria.translate(*args).execute(self)
+      type = args.delete_at(0) if args[0].is_a?(Symbol)
+      criteria = Criteria.translate(self, *args)
+      case type
+      when :first then return criteria.one
+      when :last then return criteria.last
+      else
+        return criteria
+      end
     end
 
     # Find the first +Document+ given the conditions.
     #
     # Options:
     #
     # args: A +Hash+ with a conditions key and other options
     #
     # <tt>Person.first(:conditions => { :attribute => "value" })</tt>
     def first(*args)
-      find(:first, *args)
+      find(*args).one
     end
 
     # Find the last +Document+ given the conditions.
     #
     # Options:
     #
     # args: A +Hash+ with a conditions key and other options
     #
     # <tt>Person.last(:conditions => { :attribute => "value" })</tt>
     def last(*args)
-      return find(:last, :conditions => {}, :sort => [[:_id, :desc]]) if args.empty?
-      return find(:last, *args) unless args.empty?
+      find(*args).last
     end
 
     # Will execute a +Criteria+ based on the +DynamicFinder+ that gets
     # generated.
     #
@@ -71,11 +86,11 @@
     #
     # <tt>Person.find_all_by_title_and_age("Sir", 30)</tt>
     def method_missing(name, *args)
       dyna = DynamicFinder.new(name, *args)
       finder, conditions = dyna.finder, dyna.conditions
-      results = Criteria.translate(finder, :conditions => conditions).execute(self)
+      results = find(finder, :conditions => conditions)
       results ? results : dyna.create(self)
     end
 
     # Find all documents in paginated fashion given the supplied arguments.
     # If no parameters are passed just default to offset 0 and limit 20.
@@ -89,11 +104,11 @@
     # <tt>Person.paginate(:conditions => { :field => "Test" }, :page => 1,
     # :per_page => 20)</tt>
     #
     # Returns paginated array of docs.
     def paginate(params = {})
-      Criteria.translate(:all, params).paginate(self)
+      Criteria.translate(self, params).paginate
     end
 
     # Entry point for creating a new criteria from a Document. This will
     # instantiate a new +Criteria+ object with the supplied select criterion
     # already added to it.
@@ -106,10 +121,10 @@
     #
     # <tt>Person.select(:field1, :field2, :field3)</tt>
     #
     # Returns: <tt>Criteria</tt>
     def select(*args)
-      Criteria.new(:all, self).select(*args)
+      Criteria.new(self).select(*args)
     end
 
   end
 end