mongoid 0.3.0 → 0.3.1

data/Rakefile

@@ -12,12 +12,12 @@ 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"
+    gem.add_dependency("durran-validatable", "1.7.5")
+    gem.add_dependency("mislav-will_paginate", "2.3.11")
+    gem.add_dependency("activesupport", "2.3.4")
+    gem.add_dependency("mongodb-mongo", "0.14.1")
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/mongoid/document.rb

@@ -19,7 +19,8 @@ module Mongoid #:nodoc:
       # 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)
+      def aggregate(fields, params = {})
+        selector = params[:conditions]
         collection.group(fields, selector, { :count => 0 }, AGGREGATE_REDUCE)
       end
 
@@ -48,25 +49,28 @@ module Mongoid #:nodoc:
       # Model.find(:first, :attribute => "value")
       # Model.find(:all, :attribute => "value")
       def find(*args)
-        type, selector = args[0], args[1]
-        conditions = selector[:conditions] if selector
+        type, params = args[0], args[1]
         case type
-        when :all then find_all(conditions)
-        when :first then find_first(conditions)
+        when :all then find_all(params)
+        when :first then find_first(params)
         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))
+      def find_first(params = {})
+        case params
+        when Hash then new(collection.find_one(params[:conditions]))
+        else new(collection.find_one(params))
+        end
       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) }
+      def find_all(params = {})
+        selector = params.delete(:conditions)
+        collection.find(selector, params).collect { |doc| new(doc) }
       end
 
       # Defines all the fields that are accessable on the Document
@@ -83,7 +87,8 @@ module Mongoid #:nodoc:
 
       # Find all Documents given the supplied criteria, grouped by the fields
       # provided.
-      def group_by(fields, selector)
+      def group_by(fields, params = {})
+        selector = params[:condition]
         collection.group(fields, selector, { :group => [] }, GROUP_BY_REDUCE).collect do |docs|
           docs["group"] = docs["group"].collect { |attrs| new(attrs) }; docs
         end
@@ -102,7 +107,7 @@ module Mongoid #:nodoc:
       # Adds timestamps on the Document in the form of the fields 'created_on'
       # and 'last_modified'
       def has_timestamps
-        fields :created_on, :last_modified
+        fields :created_at, :last_modified
         class_eval do
           before_save :update_timestamps
         end
@@ -117,11 +122,12 @@ module Mongoid #:nodoc:
       # 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 = {})
+        selector = params[:conditions]
         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 })
+            results = collection.find(selector, { :limit => pager.per_page, :offset => pager.offset })
             pager.total_entries = results.count
             pager.replace(results.collect { |doc| new(doc) })
         end
@@ -189,11 +195,6 @@ module Mongoid #:nodoc:
       @attributes = attributes.symbolize_keys!; save; true
     end
 
-    def update_timestamps
-      self.created_on = Time.now
-      self.last_modified = Time.now
-    end
-
     private
 
     class << self
@@ -216,6 +217,12 @@ module Mongoid #:nodoc:
       @attributes[name.to_sym]
     end
 
+    # Update the timestamps on this document.
+    def update_timestamps
+      self.created_at = Time.now
+      self.last_modified = Time.now
+    end
+
     # Write to the attributes hash.
     def write_attribute(name, value)
       @attributes[name.to_sym] = value

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -67,20 +67,20 @@ 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"])
+      s.add_runtime_dependency(%q<durran-validatable>, ["= 1.7.5"])
+      s.add_runtime_dependency(%q<mislav-will_paginate>, ["= 2.3.11"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.4"])
+      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.14.1"])
     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"])
+      s.add_dependency(%q<durran-validatable>, ["= 1.7.5"])
+      s.add_dependency(%q<mislav-will_paginate>, ["= 2.3.11"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.4"])
+      s.add_dependency(%q<mongodb-mongo>, ["= 0.14.1"])
     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"])
+    s.add_dependency(%q<durran-validatable>, ["= 1.7.5"])
+    s.add_dependency(%q<mislav-will_paginate>, ["= 2.3.11"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.4"])
+    s.add_dependency(%q<mongodb-mongo>, ["= 0.14.1"])
   end
 end

data/spec/integration/mongoid/document_spec.rb

@@ -34,7 +34,7 @@ describe Mongoid::Document do
     context "finding all documents" do
 
       it "returns an array of documents based on the selector provided" do
-        documents = Person.find(:all, :title => "Test")
+        documents = Person.find(:all, :conditions => { :title => "Test"})
         documents[0].title.should == "Test"
       end
 

data/spec/unit/mongoid/document_spec.rb

@@ -12,6 +12,21 @@ describe Mongoid::Document do
     Person.instance_variable_set(:@collection, nil)
   end
 
+  describe "#aggregate" do
+
+    before do
+      @reduce = "function(obj, prev) { prev.count++; }"
+    end
+
+    it "returns documents grouped by the supplied fields" do
+      results = [{ "title" => "Sir", "count" => 30 }]
+      @collection.expects(:group).with([:title], nil, {:count => 0}, @reduce).returns(results)
+      grouped = Person.aggregate([:title], {})
+      grouped.first["count"].should == 30
+    end
+
+  end
+
   describe "#belongs_to" do
 
     it "creates a reader for the association" do
@@ -138,13 +153,27 @@ describe Mongoid::Document do
       end
 
       it "delegates to find_all" do
-        @collection.expects(:find).with(:test => "Test").returns(@cursor)
+        @collection.expects(:find).with({:test => "Test"}, {}).returns(@cursor)
         @cursor.expects(:collect).returns(@people)
         Person.find(:all, :conditions => { :test => "Test" })
       end
 
     end
 
+    context "when sorting" do
+
+      before do
+        @cursor = mock
+        @people = []
+      end
+
+      it "adds the sort parameters for the collection call" do
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1 }}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find(:all, :conditions => { :test => "Test" }, :sort => { :test => -1 })
+      end
+    end
+
   end
 
   describe "#find_first" do
@@ -157,7 +186,7 @@ describe Mongoid::Document 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
+        Person.find_first(:conditions => {:test => "Test"}).attributes.should == @attributes
       end
 
     end
@@ -183,9 +212,9 @@ describe Mongoid::Document do
     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)
+        @collection.expects(:find).with({ :test => "Test" }, {}).returns(@cursor)
         @cursor.expects(:collect).returns(@people)
-        Person.find_all(:test => "Test")
+        Person.find_all(:conditions => {:test => "Test"})
       end
 
     end
@@ -193,7 +222,7 @@ describe Mongoid::Document do
     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)
+        @collection.expects(:find).with(nil, {}).returns(@cursor)
         @cursor.expects(:collect).returns(@people)
         Person.find_all
       end
@@ -210,7 +239,7 @@ describe Mongoid::Document do
 
     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)
+      @collection.expects(:group).with([:title], nil, { :group => [] }, @reduce).returns(results)
       grouped = Person.group_by([:title], {})
       people = grouped.first["group"]
       people.first.should be_a_kind_of(Person)
@@ -299,7 +328,7 @@ describe Mongoid::Document do
     it "adds created_on and last_modified to the document" do
       @collection.expects(:save).with(@tester.attributes)
       @tester.save
-      @tester.created_on.should_not be_nil
+      @tester.created_at.should_not be_nil
       @tester.last_modified.should_not be_nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.7.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: mislav-will_paginate
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -38,9 +38,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongodb-mongo
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.14.1
     version: 
 description: 
 email: durran@gmail.com