mongoid 0.10.6 → 0.11.0

data/lib/mongoid/extensions.rb

@@ -18,7 +18,7 @@ require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/time/conversions"
 
-class Array #:nodoc:
+class Array #:nodoc
   include Mongoid::Extensions::Array::Accessors
   include Mongoid::Extensions::Array::Assimilation
   include Mongoid::Extensions::Array::Conversions
@@ -44,8 +44,8 @@ end
 class Hash #:nodoc
   include Mongoid::Extensions::Hash::Accessors
   include Mongoid::Extensions::Hash::Assimilation
-  extend Mongoid::Extensions::Hash::Conversions
   include Mongoid::Extensions::Hash::CriteriaHelpers
+  extend Mongoid::Extensions::Hash::Conversions
 end
 
 class Integer #:nodoc
@@ -57,8 +57,8 @@ class Object #:nodoc:
 end
 
 class String #:nodoc
-  extend Mongoid::Extensions::String::Conversions
   include Mongoid::Extensions::String::Inflections
+  extend Mongoid::Extensions::String::Conversions
 end
 
 class Symbol #:nodoc

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

@@ -17,9 +17,8 @@ module Mongoid #:nodoc:
         # <tt>{:first_name => "Hank", :last_name => "Moody"}.assimilate(name, options)</tt>
         #
         # Returns: The child +Document+.
-        def assimilate(parent, options)
-          klass = options.klass
-          child = klass.instantiate(self)
+        def assimilate(parent, options, type = nil)
+          child = type ? type.instantiate(self.merge(:_type => type.name)) : options.klass.instantiate(self)
           child.assimilate(parent, options)
         end
       end

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

@@ -7,6 +7,7 @@ module Mongoid #:nodoc:
         ActiveSupport::Inflector.inflections do |inflect|
           inflect.singular("address", "address")
           inflect.singular("addresses", "address")
+          inflect.irregular("canvas", "canvases")
         end
 
         REVERSALS = {

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.10.6"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-29}
+  s.date = %q{2010-01-02}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -73,9 +73,11 @@ Gem::Specification.new do |s|
      "mongoid.gemspec",
      "perf/benchmark.rb",
      "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
+     "spec/integration/mongoid/inheritance_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
@@ -123,16 +125,18 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/versioning_spec.rb",
      "spec/unit/mongoid_spec.rb"
   ]
-  s.homepage = %q{http://github.com/durran/mongoid}
+  s.homepage = %q{http://mongoid.org}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{ODM framework for MongoDB}
   s.test_files = [
     "spec/integration/mongoid/associations_spec.rb",
+     "spec/integration/mongoid/commands_spec.rb",
      "spec/integration/mongoid/criteria_spec.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/integration/mongoid/finders_spec.rb",
+     "spec/integration/mongoid/inheritance_spec.rb",
      "spec/spec_helper.rb",
      "spec/unit/mongoid/associations/belongs_to_related_spec.rb",
      "spec/unit/mongoid/associations/belongs_to_spec.rb",
@@ -186,16 +190,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.18.1"])
-      s.add_runtime_dependency(%q<mongo_ext>, [">= 0.18.1"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_runtime_dependency(%q<mongo_ext>, [">= 0.18.2"])
       s.add_runtime_dependency(%q<durran-validatable>, [">= 1.8.4"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_dependency(%q<mongo>, [">= 0.18.1"])
-      s.add_dependency(%q<mongo_ext>, [">= 0.18.1"])
+      s.add_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_dependency(%q<mongo_ext>, [">= 0.18.2"])
       s.add_dependency(%q<durran-validatable>, [">= 1.8.4"])
       s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -203,8 +207,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-    s.add_dependency(%q<mongo>, [">= 0.18.1"])
-    s.add_dependency(%q<mongo_ext>, [">= 0.18.1"])
+    s.add_dependency(%q<mongo>, [">= 0.18.2"])
+    s.add_dependency(%q<mongo_ext>, [">= 0.18.2"])
     s.add_dependency(%q<durran-validatable>, [">= 1.8.4"])
     s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/perf/benchmark.rb

@@ -2,7 +2,8 @@ require "rubygems"
 require "ruby-prof"
 require "mongoid"
 
-class Person < Mongoid::Document
+class Person
+  include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Versioning
   field :birth_date, :type => Date
@@ -11,7 +12,8 @@ class Person < Mongoid::Document
   has_many :phones
 end
 
-class Name < Mongoid::Document
+class Name
+  include Mongoid::Document
   include Mongoid::Timestamps
   field :given
   field :family
@@ -19,7 +21,8 @@ class Name < Mongoid::Document
   belongs_to :person, :inverse_of => :name
 end
 
-class Address < Mongoid::Document
+class Address
+  include Mongoid::Document
   include Mongoid::Timestamps
   field :street
   field :city
@@ -29,7 +32,8 @@ class Address < Mongoid::Document
   belongs_to :person, :inverse_of => :address
 end
 
-class Phone < Mongoid::Document
+class Phone
+  include Mongoid::Document
   include Mongoid::Timestamps
   field :country_code, :type => Integer
   field :number

data/spec/integration/mongoid/commands_spec.rb

@@ -0,0 +1,103 @@
+require "spec_helper"
+
+describe Mongoid::Commands do
+
+  before do
+    @person = Person.new(:title => "Sir")
+  end
+
+  after do
+    @person.delete
+  end
+
+  describe "#delete" do
+
+    before do
+      @person.save
+    end
+
+    it "deletes the document" do
+      @person.delete
+      lambda { Person.find(@person.id) }.should raise_error
+    end
+
+    it "returns true" do
+      @person.delete.should be_true
+    end
+
+  end
+
+  describe "#destroy" do
+
+    before do
+      @person.save
+    end
+
+    it "deletes the document" do
+      @person.destroy
+      lambda { Person.find(@person.id) }.should raise_error
+    end
+
+    it "returns true" do
+      @person.destroy.should be_true
+    end
+
+  end
+
+  describe "#save" do
+
+    context "when validation passes" do
+
+      it "returns true" do
+        @person.save.should be_true
+      end
+
+    end
+
+  end
+
+  describe "#update_attributes" do
+
+    context "when validation passes" do
+
+      it "returns true" do
+        @person.update_attributes(:title => "Blah").should be_true
+      end
+
+      it "saves the attributes" do
+        @person.update_attributes(:title => "Blah")
+        @from_db = Person.find(@person.id)
+        @from_db.title.should == "Blah"
+      end
+
+    end
+
+  end
+
+  describe ".create" do
+
+    it "saves and returns the document" do
+      person = Person.create(:title => "Sensei")
+      person.should be_a_kind_of(Person)
+      person.should_not be_a_new_record
+    end
+
+  end
+
+  describe ".delete_all" do
+
+    it "returns true" do
+      Person.delete_all.should be_true
+    end
+
+  end
+
+  describe ".destroy_all" do
+
+    it "returns true" do
+      Person.destroy_all.should be_true
+    end
+
+  end
+
+end

data/spec/integration/mongoid/document_spec.rb

@@ -6,6 +6,18 @@ describe Mongoid::Document do
     Mongoid.database.collection(:people).drop
   end
 
+  describe ".collection" do
+
+    context "on a subclass of a root document" do
+
+      it "returns the root document collection" do
+        Browser.collection.should == Canvas.collection
+      end
+
+    end
+
+  end
+
   describe "#new" do
 
     it "gets a new or current database connection" do
@@ -313,7 +325,7 @@ describe Mongoid::Document do
       end
 
       it "returns false" do
-        @comment.save.should_not be_valid
+        @comment.should_not be_valid
       end
 
     end

data/spec/integration/mongoid/inheritance_spec.rb

@@ -0,0 +1,105 @@
+require "spec_helper"
+
+describe Mongoid::Document do
+
+  context "when document is a subclass of a root class" do
+
+    before do
+      Browser.delete_all
+      @browser = Browser.create(:version => 3, :name => "Test")
+    end
+
+    it "saves in the same collection as the root" do
+      collection = Mongoid.database.collection("canvases")
+      attributes = collection.find({ :name => "Test"}, {}).first
+      attributes["version"].should == 3
+      attributes["name"].should == "Test"
+      attributes["_type"].should == "Browser"
+      attributes["_id"].should == @browser.id
+    end
+
+  end
+
+  context "when document is a subclass of a subclass" do
+
+    before do
+      Firefox.delete_all
+      @firefox = Firefox.create(:version => 2, :name => "Testy")
+    end
+
+    it "saves in the same collection as the root" do
+      collection = Mongoid.database.collection("canvases")
+      attributes = collection.find({ :name => "Testy"}, {}).first
+      attributes["version"].should == 2
+      attributes["name"].should == "Testy"
+      attributes["_type"].should == "Firefox"
+      attributes["_id"].should == @firefox.id
+    end
+
+  end
+
+  context "when document has associations" do
+
+    before do
+      Firefox.delete_all
+      @firefox = Firefox.new(:name => "firefox")
+      @writer = HtmlWriter.new(:speed => 100)
+      @circle = Circle.new(:radius => 50)
+      @square = Square.new(:width => 300, :height => 150)
+      @firefox.writer = @writer
+      @firefox.shapes << [ @circle, @square ]
+      @firefox.save
+    end
+
+    after do
+      Firefox.delete_all
+    end
+
+    it "properly saves a has one subclass" do
+      from_db = Firefox.find(@firefox.id)
+      from_db.should be_a_kind_of(Firefox)
+      from_db.writer.should be_a_kind_of(HtmlWriter)
+      from_db.writer.should == @writer
+    end
+
+    it "properly saves a has many subclass" do
+      from_db = Firefox.find(@firefox.id)
+      from_db.shapes.first.should == @circle
+      from_db.shapes.first.should be_a_kind_of(Circle)
+      from_db.shapes.last.should == @square
+      from_db.shapes.last.should be_a_kind_of(Square)
+    end
+
+    it "properly sets up the belongs to" do
+      from_db = Firefox.find(@firefox.id)
+      circle = from_db.shapes.first
+      circle.should == @circle
+      circle.canvas.should == @firefox
+    end
+
+  end
+
+  context "deleting subclasses" do
+
+    before do
+      @firefox = Firefox.create(:name => "firefox")
+      @browser = Browser.create(:name => "browser")
+      @canvas = Canvas.create(:name => "canvas")
+    end
+
+    after do
+      Firefox.delete_all
+      Browser.delete_all
+      Canvas.delete_all
+    end
+
+    it "deletes from the parent class collection" do
+      @firefox.delete
+      Firefox.count.should == 0
+      Browser.count.should == 1
+      Canvas.count.should == 1
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -181,7 +181,7 @@ end
 
 class Patient
   include Mongoid::Document
-  collection_name "population"
+  store_in :inpatient
 end
 
 if RUBY_VERSION == '1.8.6'
@@ -201,8 +201,9 @@ end
 # Inhertiance test models:
 class Canvas
   include Mongoid::Document
-  field :size, :type => Integer, :default => 0
+  field :name
   has_many :shapes
+  has_one :writer
 
   def render
     shapes.each { |shape| render }
@@ -210,18 +211,39 @@ class Canvas
 end
 
 class Browser < Canvas
+  field :version, :type => Integer
   def render; end
 end
 
 class Firefox < Browser
+  field :user_agent
   def render; end
 end
 
+class Writer
+  include Mongoid::Document
+  field :speed, :type => Integer, :default => 0
+
+  belongs_to :canvas, :inverse_of => :writer
+
+  def write; end
+end
+
+class HtmlWriter < Writer
+  def write; end
+end
+
+class PdfWriter < Writer
+  def write; end
+end
+
 class Shape
   include Mongoid::Document
   field :x, :type => Integer, :default => 0
   field :y, :type => Integer, :default => 0
 
+  belongs_to :canvas, :inverse_of => :shapes
+
   def render; end
 end