mongoid 0.2.7 → 0.3.0

data/README.textile

@@ -17,6 +17,7 @@
 
 <a href="http://www.pivotaltracker.com/projects/27482">Mongoid on Pivotal Tracker</a>
 <a href="http://groups.google.com/group/mongoid">Mongoid Google Group</a>
+<a href="http://ci.hshrckt.com:4891/">Mongoid on CI Joe</a>
 
 <h3>Compatibility</h3>
 

data/Rakefile

@@ -12,6 +12,8 @@ begin
     gem.email = "durran@gmail.com"
     gem.homepage = "http://github.com/durran/mongoid"
     gem.authors = ["Durran Jordan"]
+    gem.add_dependency "durran-validatable"
+    gem.add_dependency "mislav-will_paginate"
     gem.add_dependency "activesupport"
     gem.add_dependency "mongodb-mongo"
   end

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/lib/mongoid.rb

@@ -31,14 +31,8 @@ require "active_support/core_ext"
 require "delegate"
 require "will_paginate/collection"
 require "mongo"
-require "mongoid/associations/association_factory"
-require "mongoid/associations/belongs_to_association"
-require "mongoid/associations/has_many_association"
-require "mongoid/associations/has_one_association"
-require "mongoid/extensions/array/conversions"
-require "mongoid/extensions/object/conversions"
+require "mongoid/associations"
 require "mongoid/extensions"
-require "mongoid/finders"
 require "mongoid/document"
 
 module Mongoid

data/lib/mongoid/associations.rb

@@ -0,0 +1,5 @@
+require "mongoid/associations/decorator"
+require "mongoid/associations/factory"
+require "mongoid/associations/belongs_to_association"
+require "mongoid/associations/has_many_association"
+require "mongoid/associations/has_one_association"

data/lib/mongoid/associations/belongs_to_association.rb

@@ -1,6 +1,7 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class BelongsToAssociation #:nodoc:
+      include Decorator
 
       # Creates the new association by setting the internal 
       # document as the passed in Document. This should be the
@@ -10,12 +11,14 @@ module Mongoid #:nodoc:
       # to the internal document itself.
       def initialize(document)
         @document = document.parent
+        decorate!
       end
 
-      # All calls to this association will be delegated straight
-      # to the encapsulated document.
-      def method_missing(method, *args)
-        @document.send(method, *args)
+      # Returns the parent document. The id param is present for
+      # compatibility with rails, however this could be overwritten 
+      # in the future.
+      def find(id)
+        @document
       end
 
     end

data/lib/mongoid/associations/decorator.rb

@@ -0,0 +1,25 @@
+module Mongoid #:nodoc:
+  module Associations #:nodoc:
+    module Decorator #:nodoc:
+      def self.included(base)
+        base.class_eval do
+          attr_reader :document
+
+          # Grabs all the public methods on the document and adds them
+          # to the association class. This is preferred over method_missing
+          # since we can ask the class for its methods and get an
+          # accurate list.
+          def decorate!
+            document.public_methods(false).each do |method|
+              (class << self; self; end).class_eval do
+                define_method method do |*args|
+                  document.send method, *args
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/associations/{association_factory.rb → factory.rb}

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class AssociationFactory #:nodoc:
+    class Factory #:nodoc:
 
       # Creates a new association, based on the type provided and 
       # passes the name and document into the newly instantiated
@@ -18,4 +18,4 @@ module Mongoid #:nodoc:
 
     end
   end
-end
+end

data/lib/mongoid/associations/has_many_association.rb

@@ -31,6 +31,13 @@ module Mongoid #:nodoc:
         object
       end
 
+      # Finds a document in this association.
+      # If :all is passed, returns all the documents
+      # If an id is passed, will return the document for that id.
+      def find(param)
+        return @documents if param == :all
+        return detect { |document| document.id == param }
+      end
     end
   end
 end

data/lib/mongoid/associations/has_one_association.rb

@@ -1,8 +1,8 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasOneAssociation #:nodoc:
+      include Decorator
 
-      attr_reader :document
       delegate :valid?, :to => :document
 
       # Creates the new association by finding the attributes in 
@@ -19,17 +19,6 @@ module Mongoid #:nodoc:
         decorate!
       end
 
-      private
-      def decorate!
-        @document.public_methods(false).each do |method|
-          (class << self; self; end).class_eval do
-            define_method method do |*args|
-              @document.send method, *args
-            end
-          end
-        end
-      end
-
     end
   end
 end

data/lib/mongoid/document.rb

@@ -2,7 +2,9 @@ module Mongoid #:nodoc:
   class Document #:nodoc:
     include ActiveSupport::Callbacks
     include Validatable
-    extend Finders
+
+    AGGREGATE_REDUCE = "function(obj, prev) { prev.count++; }"
+    GROUP_BY_REDUCE = "function(obj, prev) { prev.group.push(obj); }"
 
     attr_reader :attributes, :parent
 
@@ -15,6 +17,12 @@ module Mongoid #:nodoc:
     class << self
 
       # Create an association to a parent Document.
+      # Get an aggregate count for the supplied group of fields and the
+      # selector that is provided.
+      def aggregate(fields, selector)
+        collection.group(fields, selector, { :count => 0 }, AGGREGATE_REDUCE)
+      end
+
       def belongs_to(association_name)
         add_association(:belongs_to, association_name.to_s.classify, association_name)
       end
@@ -36,6 +44,31 @@ module Mongoid #:nodoc:
         collection.drop
       end
 
+      # Find all Documents in several ways.
+      # Model.find(:first, :attribute => "value")
+      # Model.find(:all, :attribute => "value")
+      def find(*args)
+        type, selector = args[0], args[1]
+        conditions = selector[:conditions] if selector
+        case type
+        when :all then find_all(conditions)
+        when :first then find_first(conditions)
+        else find_first(Mongo::ObjectID.from_string(type.to_s))
+        end
+      end
+
+      # Find a single Document given the passed selector, which is a Hash of attributes that
+      # must match the Document in the database exactly.
+      def find_first(selector = nil)
+        new(collection.find_one(selector))
+      end
+
+      # Find all Documents given the passed selector, which is a Hash of attributes that
+      # must match the Document in the database exactly.
+      def find_all(selector = nil)
+        collection.find(selector).collect { |doc| new(doc) }
+      end
+
       # Defines all the fields that are accessable on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.
@@ -48,6 +81,14 @@ module Mongoid #:nodoc:
         end
       end
 
+      # Find all Documents given the supplied criteria, grouped by the fields
+      # provided.
+      def group_by(fields, selector)
+        collection.group(fields, selector, { :group => [] }, GROUP_BY_REDUCE).collect do |docs|
+          docs["group"] = docs["group"].collect { |attrs| new(attrs) }; docs
+        end
+      end
+
       # Create a one-to-many association between Documents.
       def has_many(association_name)
         add_association(:has_many, association_name.to_s.classify, association_name)
@@ -73,6 +114,19 @@ module Mongoid #:nodoc:
         collection.create_index(name, options)
       end
 
+      # Find all documents in paginated fashion given the supplied arguments.
+      # If no parameters are passed just default to offset 0 and limit 20.
+      def paginate(params = {})
+        WillPaginate::Collection.create(
+          params[:page] || 1,
+          params[:per_page] || 20,
+          0) do |pager|
+            results = collection.find(params[:conditions], { :limit => pager.per_page, :offset => pager.offset })
+            pager.total_entries = results.count
+            pager.replace(results.collect { |doc| new(doc) })
+        end
+      end
+
     end
 
     # Get the Mongo::Collection associated with this Document.
@@ -148,7 +202,7 @@ module Mongoid #:nodoc:
       # then adds the accessors for the association.
       def add_association(type, class_name, name)
         define_method(name) do
-          Mongoid::Associations::AssociationFactory.create(type, name, self)
+          Mongoid::Associations::Factory.create(type, name, self)
         end
         define_method("#{name}=") do |object|
           @attributes[name] = object.mongoidize

data/lib/mongoid/extensions.rb

@@ -1,3 +1,6 @@
+require "mongoid/extensions/array/conversions"
+require "mongoid/extensions/object/conversions"
+
 class Array #:nodoc:
   include Mongoid::Extensions::Array::Conversions
 end

data/mongoid.gemspec

@@ -5,44 +5,44 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.2.7"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-03}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
   ]
   s.files = [
     ".gitignore",
-     "History.txt",
      "MIT_LICENSE",
      "README.textile",
      "Rakefile",
      "VERSION",
      "lib/mongoid.rb",
-     "lib/mongoid/associations/association_factory.rb",
+     "lib/mongoid/associations.rb",
      "lib/mongoid/associations/belongs_to_association.rb",
+     "lib/mongoid/associations/decorator.rb",
+     "lib/mongoid/associations/factory.rb",
      "lib/mongoid/associations/has_many_association.rb",
      "lib/mongoid/associations/has_one_association.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/object/conversions.rb",
-     "lib/mongoid/finders.rb",
      "mongoid.gemspec",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/association_factory_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_association_spec.rb",
+     "spec/unit/mongoid/associations/decorator_spec.rb",
+     "spec/unit/mongoid/associations/factory_spec.rb",
      "spec/unit/mongoid/associations/has_many_association_spec.rb",
      "spec/unit/mongoid/associations/has_one_association_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/conversions_spec.rb",
-     "spec/unit/mongoid/finders_spec.rb"
+     "spec/unit/mongoid/extensions/object/conversions_spec.rb"
   ]
   s.homepage = %q{http://github.com/durran/mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -52,14 +52,14 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/integration/mongoid/document_spec.rb",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/association_factory_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_association_spec.rb",
+     "spec/unit/mongoid/associations/decorator_spec.rb",
+     "spec/unit/mongoid/associations/factory_spec.rb",
      "spec/unit/mongoid/associations/has_many_association_spec.rb",
      "spec/unit/mongoid/associations/has_one_association_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/conversions_spec.rb",
-     "spec/unit/mongoid/finders_spec.rb"
+     "spec/unit/mongoid/extensions/object/conversions_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -67,13 +67,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<durran-validatable>, [">= 0"])
+      s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<mongodb-mongo>, [">= 0"])
     else
+      s.add_dependency(%q<durran-validatable>, [">= 0"])
+      s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<mongodb-mongo>, [">= 0"])
     end
   else
+    s.add_dependency(%q<durran-validatable>, [">= 0"])
+    s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<mongodb-mongo>, [">= 0"])
   end

data/spec/spec_helper.rb

@@ -43,3 +43,11 @@ end
 class Tester < Mongoid::Document
   has_timestamps
 end
+
+class Decorated
+  include Mongoid::Associations::Decorator
+
+  def initialize(doc)
+    @document = doc
+  end
+end

data/spec/unit/mongoid/associations/belongs_to_association_spec.rb

@@ -7,7 +7,24 @@ describe Mongoid::Associations::BelongsToAssociation do
     @document = stub(:parent => @parent)
   end
 
-  describe "#method_missing" do
+  describe "#find" do
+
+    before do
+      @association = Mongoid::Associations::BelongsToAssociation.new(@document)
+    end
+
+    context "when finding by id" do
+
+      it "returns the document in the array with that id" do
+        name = @association.find(Mongo::ObjectID.new)
+        name.should == @parent
+      end
+
+    end
+
+  end
+
+  context "when decorating" do
 
     before do
       @association = Mongoid::Associations::BelongsToAssociation.new(@document)

data/spec/unit/mongoid/associations/decorator_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+
+describe Mongoid::Associations::Decorator do
+
+  describe "#included" do
+
+    before do
+      @person = Person.new
+      @decorated = Decorated.new(@person)
+    end
+
+    it "adds a document reader" do
+      @decorated.should respond_to(:document)
+    end
+
+    it "adds a decorate! instance method" do
+      @decorated.should respond_to(:decorate!)
+    end
+
+  end
+
+  describe "#decorate!" do
+
+    before do
+      @person = Person.new
+      @decorated = Decorated.new(@person)
+    end
+
+    it "adds all the documents public methods to the class" do
+      @decorated.decorate!
+      @decorated.should respond_to(:title, :terms, :age, :addresses, :name)
+    end
+
+  end
+
+end

data/spec/unit/mongoid/associations/{association_factory_spec.rb → factory_spec.rb}

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
 
-describe Mongoid::Associations::AssociationFactory do
+describe Mongoid::Associations::Factory do
 
   describe "#create" do
 
@@ -11,7 +11,7 @@ describe Mongoid::Associations::AssociationFactory do
     context "when type is has_many" do
 
       it "returns a HasManyAssociationProxy" do
-        association = Mongoid::Associations::AssociationFactory.create(:has_many, :addresses, @document)
+        association = Mongoid::Associations::Factory.create(:has_many, :addresses, @document)
         association.should be_a_kind_of(Mongoid::Associations::HasManyAssociation)
       end
 
@@ -20,7 +20,7 @@ describe Mongoid::Associations::AssociationFactory do
     context "when type is has_one" do
 
       it "returns a HashOneAssociationProxy" do
-        association = Mongoid::Associations::AssociationFactory.create(:has_one, :name, @document)
+        association = Mongoid::Associations::Factory.create(:has_one, :name, @document)
         association.should be_a_kind_of(Mongoid::Associations::HasOneAssociation)
       end
 
@@ -29,7 +29,7 @@ describe Mongoid::Associations::AssociationFactory do
     context "when type is belongs_to" do
 
       it "returns a BelongsToAssociationProxy" do
-        association = Mongoid::Associations::AssociationFactory.create(:belongs_to, :person, @document)
+        association = Mongoid::Associations::Factory.create(:belongs_to, :person, @document)
         association.should be_a_kind_of(Mongoid::Associations::BelongsToAssociation)
       end
 
@@ -37,12 +37,12 @@ describe Mongoid::Associations::AssociationFactory do
 
     context "when type is invalid" do
 
-      it "should raise a InvalidAssociationError" do
-        lambda { Mongoid::Associations::AssociationFactory.create(:something, :person, @document) }.should raise_error
+      it "raises an InvalidAssociationError" do
+        lambda { Mongoid::Associations::Factory.create(:something, :person, @document) }.should raise_error
       end
 
     end
 
   end
 
-end
+end

data/spec/unit/mongoid/associations/has_many_association_spec.rb

@@ -3,9 +3,11 @@ require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
 describe Mongoid::Associations::HasManyAssociation do
 
   before do
+    @first_id = Mongo::ObjectID.new
+    @second_id = Mongo::ObjectID.new
     @attributes = { :addresses => [
-      { :street => "Street 1", :document_class => "Address" },
-      { :street => "Street 2", :document_class => "Address" } ] }
+      { :_id => @first_id, :street => "Street 1", :document_class => "Address" },
+      { :_id => @second_id, :street => "Street 2", :document_class => "Address" } ] }
     @document = stub(:attributes => @attributes)
   end
 
@@ -68,6 +70,31 @@ describe Mongoid::Associations::HasManyAssociation do
 
   end
 
+  describe "#find" do
+
+    before do
+      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+    end
+
+    context "when finding all" do
+
+      it "returns all the documents" do
+        @association.find(:all).should == @association
+      end
+
+    end
+
+    context "when finding by id" do
+
+      it "returns the document in the array with that id" do
+        address = @association.find(@second_id)
+        address.id.should == @second_id
+      end
+
+    end
+
+  end
+
   describe "#first" do
 
     context "when there are elements in the array" do

data/spec/unit/mongoid/document_spec.rb

@@ -14,11 +14,6 @@ describe Mongoid::Document do
 
   describe "#belongs_to" do
 
-    it "adds a new Association to the collection" do
-      address = Address.new
-      address.person.should_not be_nil
-    end
-
     it "creates a reader for the association" do
       address = Address.new
       address.should respond_to(:person)
@@ -107,6 +102,122 @@ describe Mongoid::Document do
 
   end
 
+  describe "#find" do
+
+    before do
+      @attributes = { :document_class => "Person" }
+    end
+
+    context "when an id is passed in" do
+
+      before do
+        @id = Mongo::ObjectID.new
+      end
+
+      it "delegates to find_first" do
+        @collection.expects(:find_one).with(Mongo::ObjectID.from_string(@id.to_s)).returns(@attributes)
+        Person.find(@id.to_s)
+      end
+
+    end
+
+    context "when finding first" do
+
+      it "delegates to find_first" do
+        @collection.expects(:find_one).with(:test => "Test" ).returns(@attributes)
+        Person.find(:first, :conditions => { :test => "Test" })
+      end
+
+    end
+
+    context "when finding all" do
+
+      before do
+        @cursor = mock
+        @people = []
+      end
+
+      it "delegates to find_all" do
+        @collection.expects(:find).with(:test => "Test").returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find(:all, :conditions => { :test => "Test" })
+      end
+
+    end
+
+  end
+
+  describe "#find_first" do
+
+    before do
+      @attributes = { :document_class => "Person" }
+    end
+
+    context "when a selector is provided" do
+
+      it "finds the first document from the collection and instantiates it" do
+        @collection.expects(:find_one).with(:test => "Test").returns(@attributes)
+        Person.find_first(:test => "Test").attributes.should == @attributes
+      end
+
+    end
+
+    context "when a selector is not provided" do
+
+      it "finds the first document from the collection and instantiates it" do
+        @collection.expects(:find_one).with(nil).returns(@attributes)
+        Person.find_first.attributes.should == @attributes
+      end
+
+    end
+
+  end
+
+  describe "#find_all" do
+
+    before do
+      @cursor = mock
+      @people = []
+    end
+
+    context "when a selector is provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with(:test => "Test").returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find_all(:test => "Test")
+      end
+
+    end
+
+    context "when a selector is not provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with(nil).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find_all
+      end
+
+    end
+
+  end
+
+  describe "#group_by" do
+
+    before do
+      @reduce = "function(obj, prev) { prev.group.push(obj); }"
+    end
+
+    it "returns documents grouped by the supplied fields" do
+      results = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30 }] }]
+      @collection.expects(:group).with([:title], {}, { :group => [] }, @reduce).returns(results)
+      grouped = Person.group_by([:title], {})
+      people = grouped.first["group"]
+      people.first.should be_a_kind_of(Person)
+    end
+
+  end
+
   describe "#has_many" do
 
     it "adds a new Association to the collection" do
@@ -270,6 +381,32 @@ describe Mongoid::Document do
 
   end
 
+  describe "#paginate" do
+
+    before do
+      @cursor = stub(:count => 100, :collect => [])
+    end
+
+    context "when pagination parameters are passed" do
+
+      it "delegates to will paginate with the results" do
+        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 20}).returns(@cursor)
+        Person.paginate(:conditions => { :test => "Test" }, :page => 2, :per_page => 20)
+      end
+
+    end
+
+    context "when pagination parameters are not passed" do
+
+      it "delegates to will paginate with default values" do
+        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 0}).returns(@cursor)
+        Person.paginate(:conditions => { :test => "Test" })
+      end
+
+    end
+
+  end
+
   describe "#parent" do
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -04:00
+date: 2009-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: durran-validatable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mislav-will_paginate
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   type: :runtime
@@ -42,33 +62,33 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .gitignore
-- History.txt
 - MIT_LICENSE
 - README.textile
 - Rakefile
 - VERSION
 - lib/mongoid.rb
-- lib/mongoid/associations/association_factory.rb
+- lib/mongoid/associations.rb
 - lib/mongoid/associations/belongs_to_association.rb
+- lib/mongoid/associations/decorator.rb
+- lib/mongoid/associations/factory.rb
 - lib/mongoid/associations/has_many_association.rb
 - lib/mongoid/associations/has_one_association.rb
 - lib/mongoid/document.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/conversions.rb
 - lib/mongoid/extensions/object/conversions.rb
-- lib/mongoid/finders.rb
 - mongoid.gemspec
 - spec/integration/mongoid/document_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/unit/mongoid/associations/association_factory_spec.rb
 - spec/unit/mongoid/associations/belongs_to_association_spec.rb
+- spec/unit/mongoid/associations/decorator_spec.rb
+- spec/unit/mongoid/associations/factory_spec.rb
 - spec/unit/mongoid/associations/has_many_association_spec.rb
 - spec/unit/mongoid/associations/has_one_association_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
-- spec/unit/mongoid/finders_spec.rb
 has_rdoc: true
 homepage: http://github.com/durran/mongoid
 licenses: []
@@ -100,11 +120,11 @@ summary: Mongoid
 test_files: 
 - spec/integration/mongoid/document_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid/associations/association_factory_spec.rb
 - spec/unit/mongoid/associations/belongs_to_association_spec.rb
+- spec/unit/mongoid/associations/decorator_spec.rb
+- spec/unit/mongoid/associations/factory_spec.rb
 - spec/unit/mongoid/associations/has_many_association_spec.rb
 - spec/unit/mongoid/associations/has_one_association_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
-- spec/unit/mongoid/finders_spec.rb

data/History.txt

@@ -1,10 +0,0 @@
-0.2.7:
-- Added has_timestamps macro
-
-0.2.6:
-- Adding destroy_all to document
-- Adding before and after create callbacks
-- Document#paginate now only takes a single hash as an argument
-
-0.2.5:
-- Switching pagination over to will_paginate

data/lib/mongoid/finders.rb

@@ -1,60 +0,0 @@
-module Mongoid #:nodoc:
-  module Finders #:nodoc:
-
-    AGGREGATE_REDUCE = "function(obj, prev) { prev.count++; }"
-    GROUP_BY_REDUCE = "function(obj, prev) { prev.group.push(obj); }"
-
-    # Get an aggregate count for the supplied group of fields and the
-    # selector that is provided.
-    def aggregate(fields, selector)
-      collection.group(fields, selector, { :count => 0 }, AGGREGATE_REDUCE)
-    end
-
-    # Find all Documents in several ways.
-    # Model.find(:first, :attribute => "value")
-    # Model.find(:all, :attribute => "value")
-    def find(*args)
-      type, selector = args[0], args[1]
-      conditions = selector[:conditions] if selector
-      case type
-      when :all then find_all(conditions)
-      when :first then find_first(conditions)
-      else find_first(Mongo::ObjectID.from_string(type.to_s))
-      end
-    end
-
-    # Find a single Document given the passed selector, which is a Hash of attributes that
-    # must match the Document in the database exactly.
-    def find_first(selector = nil)
-      new(collection.find_one(selector))
-    end
-
-    # Find all Documents given the passed selector, which is a Hash of attributes that
-    # must match the Document in the database exactly.
-    def find_all(selector = nil)
-      collection.find(selector).collect { |doc| new(doc) }
-    end
-
-    # Find all Documents given the supplied criteria, grouped by the fields
-    # provided.
-    def group_by(fields, selector)
-      collection.group(fields, selector, { :group => [] }, GROUP_BY_REDUCE).collect do |docs|
-        docs["group"] = docs["group"].collect { |attrs| new(attrs) }; docs
-      end
-    end
-
-    # Find all documents in paginated fashion given the supplied arguments.
-    # If no parameters are passed just default to offset 0 and limit 20.
-    def paginate(params = {})
-      WillPaginate::Collection.create(
-        params[:page] || 1,
-        params[:per_page] || 20,
-        0) do |pager|
-          results = collection.find(params[:conditions], { :limit => pager.per_page, :offset => pager.offset })
-          pager.total_entries = results.count
-          pager.replace(results.collect { |doc| new(doc) })
-      end
-    end
-
-  end
-end

data/spec/unit/mongoid/finders_spec.rb

@@ -1,165 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-describe Mongoid::Finders do
-
-  before do
-    @collection = mock
-    @database = stub(:collection => @collection)
-    Mongoid.stubs(:database).returns(@database)
-  end
-
-  after do
-    Person.instance_variable_set(:@collection, nil)
-  end
-
-  describe "#find" do
-
-    before do
-      @attributes = { :document_class => "Person" }
-    end
-
-    context "when an id is passed in" do
-
-      before do
-        @id = Mongo::ObjectID.new
-      end
-
-      it "delegates to find_first" do
-        @collection.expects(:find_one).with(Mongo::ObjectID.from_string(@id.to_s)).returns(@attributes)
-        Person.find(@id.to_s)
-      end
-
-    end
-
-    context "when finding first" do
-
-      it "delegates to find_first" do
-        @collection.expects(:find_one).with(:test => "Test" ).returns(@attributes)
-        Person.find(:first, :conditions => { :test => "Test" })
-      end
-
-    end
-
-    context "when finding all" do
-
-      before do
-        @cursor = mock
-        @people = []
-      end
-
-      it "delegates to find_all" do
-        @collection.expects(:find).with(:test => "Test").returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.find(:all, :conditions => { :test => "Test" })
-      end
-
-    end
-
-  end
-
-  describe "#find_first" do
-
-    before do
-      @attributes = { :document_class => "Person" }
-    end
-
-    context "when a selector is provided" do
-
-      it "finds the first document from the collection and instantiates it" do
-        @collection.expects(:find_one).with(:test => "Test").returns(@attributes)
-        Person.find_first(:test => "Test").attributes.should == @attributes
-      end
-
-    end
-
-    context "when a selector is not provided" do
-
-      it "finds the first document from the collection and instantiates it" do
-        @collection.expects(:find_one).with(nil).returns(@attributes)
-        Person.find_first.attributes.should == @attributes
-      end
-
-    end
-
-  end
-
-  describe "#find_all" do
-
-    before do
-      @cursor = mock
-      @people = []
-    end
-
-    context "when a selector is provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with(:test => "Test").returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.find_all(:test => "Test")
-      end
-
-    end
-
-    context "when a selector is not provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with(nil).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.find_all
-      end
-
-    end
-
-  end
-
-  describe "#group_by" do
-
-    before do
-      @reduce = "function(obj, prev) { prev.group.push(obj); }"
-    end
-
-    it "returns documents grouped by the supplied fields" do
-      results = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30 }] }]
-      @collection.expects(:group).with([:title], {}, { :group => [] }, @reduce).returns(results)
-      grouped = Person.group_by([:title], {})
-      people = grouped.first["group"]
-      people.first.should be_a_kind_of(Person)
-    end
-
-  end
-
-  describe "#paginate" do
-
-    before do
-      @cursor = stub(:count => 100, :collect => [])
-    end
-
-    context "when pagination parameters are passed" do
-
-      it "delegates to will paginate with the results" do
-        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 20}).returns(@cursor)
-        Person.paginate(:conditions => { :test => "Test" }, :page => 2, :per_page => 20)
-      end
-
-    end
-
-    context "when pagination parameters are not passed" do
-
-      it "delegates to will paginate with default values" do
-        @collection.expects(:find).with({ :test => "Test" }, {:limit => 20, :offset => 0}).returns(@cursor)
-        Person.paginate(:conditions => { :test => "Test" })
-      end
-
-    end
-
-    context "when param keys are strings" do
-
-      it "converts the keys to symbols" do
-
-      end
-
-    end
-
-  end
-
-end