mongoid 0.4.5 → 0.4.7

data/lib/mongoid/extensions.rb

@@ -1,14 +1,29 @@
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
+require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/object/conversions"
 require "mongoid/extensions/object/parentization"
+require "mongoid/extensions/string/inflections"
+require "mongoid/extensions/symbol/inflections"
 
 class Array #:nodoc:
   include Mongoid::Extensions::Array::Conversions
   include Mongoid::Extensions::Array::Parentization
 end
 
+class Hash #:nodoc
+  include Mongoid::Extensions::Hash::Accessors
+end
+
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
   include Mongoid::Extensions::Object::Parentization
-end
+end
+
+class String #:nodoc
+  include Mongoid::Extensions::String::Inflections
+end
+
+class Symbol #:nodoc
+  include Mongoid::Extensions::Symbol::Inflections
+end

data/lib/mongoid/extensions/array/conversions.rb

@@ -10,4 +10,4 @@ module Mongoid #:nodoc:
       end
     end
   end
-end
+end

data/lib/mongoid/extensions/array/parentization.rb

@@ -3,10 +3,10 @@ module Mongoid #:nodoc:
     module Array #:nodoc:
       module Parentization #:nodoc:
         # Adds the parent document to each element in the array.
-        def parentize(parent)
-          each { |obj| obj.parentize(parent) }
+        def parentize(parent, association_name)
+          each { |obj| obj.parentize(parent, association_name) }
         end
       end
     end
   end
-end
+end

data/lib/mongoid/extensions/hash/accessors.rb

@@ -0,0 +1,21 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Hash #:nodoc:
+      module Accessors #:nodoc:
+        def insert(key, attrs)
+          # TODO: Refactor me.
+          store(key, attrs) if key.singular?
+          if key.plural?
+            if has_key?(key)
+              elements = fetch(key)
+              elements.delete_if { |e| (e[:_id] == attrs[:_id]) }
+              elements << attrs
+            else
+              store(key, [attrs])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/object/parentization.rb

@@ -3,10 +3,12 @@ module Mongoid #:nodoc:
     module Object #:nodoc:
       module Parentization #:nodoc:
         # Sets the parent object
-        def parentize(object)
+        def parentize(object, association_name)
           self.parent = object
+          self.association_name = association_name
+          add_observer(object)
         end
       end
     end
   end
-end
+end

data/lib/mongoid/extensions/string/inflections.rb

@@ -0,0 +1,14 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module String #:nodoc:
+      module Inflections #:nodoc:
+        def singular?
+          singularize == self
+        end
+        def plural?
+          pluralize == self
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/symbol/inflections.rb

@@ -0,0 +1,14 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module Symbol #:nodoc:
+      module Inflections #:nodoc:
+        def singular?
+          to_s.singular?
+        end
+        def plural?
+          to_s.plural?
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/timestamps.rb

@@ -0,0 +1,30 @@
+module Mongoid
+  module Timestamps
+
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+        field :created_at
+        field :modified_at
+        before_create :update_created_at, :update_modified_at
+        before_save :update_modified_at
+      end
+    end
+
+    module InstanceMethods
+
+      # Update the created_at field on the Document to the current time. This is
+      # only called on create.
+      def update_created_at
+        self.created_at = Time.now
+      end
+
+      # Update the last_modified field on the Document to the current time.
+      # This is only called on create and on save.
+      def update_modified_at
+        self.modified_at = Time.now
+      end
+    end
+
+  end
+end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.4.5"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-10-18}
+  s.date = %q{2009-10-25}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -40,9 +40,13 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions.rb",
      "lib/mongoid/extensions/array/conversions.rb",
      "lib/mongoid/extensions/array/parentization.rb",
+     "lib/mongoid/extensions/hash/accessors.rb",
      "lib/mongoid/extensions/object/conversions.rb",
      "lib/mongoid/extensions/object/parentization.rb",
+     "lib/mongoid/extensions/string/inflections.rb",
+     "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/field.rb",
+     "lib/mongoid/timestamps.rb",
      "mongoid.gemspec",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
@@ -52,6 +56,7 @@ Gem::Specification.new do |s|
      "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/associations_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",
@@ -63,9 +68,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",
-     "spec/unit/mongoid/field_spec.rb"
+     "spec/unit/mongoid/extensions/string/inflections_spec.rb",
+     "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
+     "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/timestamps_spec.rb"
   ]
   s.homepage = %q{http://github.com/durran/mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -80,6 +89,7 @@ Gem::Specification.new do |s|
      "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/associations_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",
@@ -91,9 +101,13 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/extensions/array/conversions_spec.rb",
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
+     "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/parentization_spec.rb",
-     "spec/unit/mongoid/field_spec.rb"
+     "spec/unit/mongoid/extensions/string/inflections_spec.rb",
+     "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
+     "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/timestamps_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/integration/mongoid/document_spec.rb

@@ -60,7 +60,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#group_by" do
+  describe "#group" do
 
     before do
       30.times do |num|
@@ -69,7 +69,7 @@ describe Mongoid::Document do
     end
 
     it "returns grouped documents" do
-      grouped = Person.group_by([:title], {})
+      grouped = Person.select(:title).group
       people = grouped.first["group"]
       person = people.first
       person.should be_a_kind_of(Person)

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ Spec::Runner.configure do |config|
 end
 
 class Person < Mongoid::Document
+  include Mongoid::Timestamps
   field :title
   field :terms
   field :age
@@ -37,10 +38,6 @@ class Name < Mongoid::Document
   belongs_to :person
 end
 
-class Tester < Mongoid::Document
-  has_timestamps
-end
-
 class Decorated
   include Mongoid::Associations::Decorator
 

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

@@ -8,7 +8,7 @@ describe Mongoid::Associations::HasManyAssociation do
     @attributes = { :addresses => [
       { :_id => @first_id, :street => "Street 1" },
       { :_id => @second_id, :street => "Street 2" } ] }
-    @document = stub(:attributes => @attributes)
+    @document = stub(:attributes => @attributes, :add_observer => true, :update => true)
   end
 
   describe "#[]" do

data/spec/unit/mongoid/associations_spec.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
+
+describe Mongoid::Associations do
+
+  before do
+    @collection = stub(:name => "people")
+    @database = stub(:collection => @collection)
+    Mongoid.stubs(:database).returns(@database)
+  end
+
+  after do
+    Person.instance_variable_set(:@collection, nil)
+    @database = nil
+    @collection = nil
+  end
+
+  describe "#association=" do
+
+    context "when child is a has one" do
+
+      before do
+        @person = Person.new(:title => "Sir", :age => 30)
+        @name = Name.new(:first_name => "Test", :last_name => "User")
+        @person.name = @name
+      end
+
+      it "parentizes the association" do
+        @name.parent.should == @person
+      end
+
+      it "sets the child attributes on the parent" do
+        @person.attributes[:name].should == { :first_name => "Test", :last_name => "User" }
+      end
+
+    end
+
+  end
+
+  describe "#belongs_to" do
+
+    it "creates a reader for the association" do
+      address = Address.new
+      address.should respond_to(:person)
+    end
+
+    it "creates a writer for the association" do
+      address = Address.new
+      address.should respond_to(:person=)
+    end
+
+  end
+
+  describe "#has_many" do
+
+    it "adds a new Association to the collection" do
+      person = Person.new
+      person.addresses.should_not be_nil
+    end
+
+    it "creates a reader for the association" do
+      person = Person.new
+      person.should respond_to(:addresses)
+    end
+
+    it "creates a writer for the association" do
+      person = Person.new
+      person.should respond_to(:addresses=)
+    end
+
+    context "when setting the association directly" do
+
+      before do
+        @attributes = { :title => "Sir",
+          :addresses => [
+            { :street => "Street 1" },
+            { :street => "Street 2" } ] }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the attributes for the association" do
+        address = Address.new(:street => "New Street")
+        @person.addresses = [address]
+        @person.addresses.first.street.should == "New Street"
+      end
+
+    end
+
+  end
+
+  describe "#has_one" do
+
+    it "adds a new Association to the collection" do
+      person = Person.new
+      person.name.should_not be_nil
+    end
+
+    it "creates a reader for the association" do
+      person = Person.new
+      person.should respond_to(:name)
+    end
+
+    it "creates a writer for the association" do
+      person = Person.new
+      person.should respond_to(:name=)
+    end
+
+    context "when setting the association directly" do
+
+      before do
+        @attributes = { :title => "Sir",
+          :name => { :first_name => "Test" } }
+        @person = Person.new(@attributes)
+      end
+
+      it "sets the attributes for the association" do
+        name = Name.new(:first_name => "New Name")
+        @person.name = name
+        @person.name.first_name.should == "New Name"
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/criteria_spec.rb

@@ -6,6 +6,41 @@ describe Mongoid::Criteria do
     @criteria = Mongoid::Criteria.new(:all)
   end
 
+  describe "#aggregate" do
+
+    context "when klass provided" do
+
+      before do
+        @reduce = "function(obj, prev) { prev.count++; }"
+        @criteria = Mongoid::Criteria.new(:all, Person)
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+      end
+
+      it "calls group on the collection with the aggregate js" do
+        @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
+        @criteria.select(:field1).aggregate
+      end
+
+    end
+
+    context "when klass not provided" do
+
+      before do
+        @reduce = "function(obj, prev) { prev.count++; }"
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+      end
+
+      it "calls group on the collection with the aggregate js" do
+        @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
+        @criteria.select(:field1).aggregate(Person)
+      end
+
+    end
+
+  end
+
   describe "#all" do
 
     it "adds the $all query to the selector" do
@@ -73,6 +108,45 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#group" do
+
+    before do
+      @grouping = [{ "title" => "Sir", "group" => [{ "title" => "Sir", "age" => 30 }] }]
+    end
+
+    context "when klass provided" do
+
+      before do
+        @reduce = "function(obj, prev) { prev.group.push(obj); }"
+        @criteria = Mongoid::Criteria.new(:all, Person)
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+      end
+
+      it "calls group on the collection with the aggregate js" do
+        @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
+        @criteria.select(:field1).group
+      end
+
+    end
+
+    context "when klass not provided" do
+
+      before do
+        @reduce = "function(obj, prev) { prev.group.push(obj); }"
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+      end
+
+      it "calls group on the collection with the aggregate js" do
+        @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
+        @criteria.select(:field1).group(Person)
+      end
+
+    end
+
+  end
+
   describe "#id" do
 
     it "adds the _id query to the selector" do
@@ -140,6 +214,53 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#offset" do
+
+    context "when the per_page option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all).extras({ :per_page => 20 })
+      end
+
+      it "returns the per_page option" do
+        @criteria.offset.should == 20
+      end
+
+      it "replaces per_page with skip in the options" do
+        @criteria.offset
+        @criteria.options[:per_page].should be_nil
+        @criteria.options[:skip].should == 20
+      end
+
+    end
+
+    context "when the skip option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all).extras({ :skip => 20 })
+      end
+
+      it "returns the skip option" do
+        @criteria.offset.should == 20
+      end
+
+    end
+
+    context "when no option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all)
+      end
+
+      it "adds the skip option to the options and returns it" do
+        @criteria.offset.should == 20
+        @criteria.options[:skip].should == 20
+      end
+
+    end
+
+  end
+
   describe "#order_by" do
 
     context "when field names and direction specified" do
@@ -157,6 +278,39 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#page" do
+
+    context "when the page option exists" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all).extras({ :page => 5 })
+      end
+
+      it "returns the page option" do
+        @criteria.page.should == 5
+      end
+
+      it "deletes the page option from the options" do
+        @criteria.page.should == 5
+        @criteria.options[:page].should be_nil
+      end
+
+    end
+
+    context "when the page option does not exist" do
+
+      before do
+        @criteria = Mongoid::Criteria.new(:all)
+      end
+
+      it "returns 1" do
+        @criteria.page.should == 1
+      end
+
+    end
+
+  end
+
   describe "#select" do
 
     it "adds the options for limiting by fields" do