mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/spec/integration/mongoid/document_spec.rb

@@ -121,12 +121,6 @@ describe Mongoid::Document do
         lambda { Person.find(@person.id) }.should raise_error
       end
 
-      it "marks the document as destroyed" do
-        @person.should_not be_destroyed
-        @person.destroy
-        @person.should be_destroyed
-      end
-
     end
 
     context "on an embedded document" do
@@ -250,7 +244,7 @@ describe Mongoid::Document do
 
     before do
       5.times do |num|
-        Person.create(:title => "Sir", :age => num, :ssn => num)
+        Person.create(:title => "Sir", :age => num)
       end
     end
 
@@ -291,7 +285,7 @@ describe Mongoid::Document do
     end
 
     it "returns a pretty string of class name and attributes" do
-      attrs = Person.fields.map { |name, field| "#{name}: #{@person.attributes[name].nil? ? 'nil' : @person.attributes[name]}" } * ", "
+      attrs = Person.fields.map { |name, field| "#{name}: #{@person.attributes[name] || 'nil'}" } * ", "
       @person.inspect.should == "#<Person _id: #{@person.id}, #{attrs}>"
     end
 
@@ -331,10 +325,6 @@ describe Mongoid::Document do
       @person.age.should == 35
     end
 
-    it "reload should return self" do
-      @person.reload.should == @from_db
-    end
-
   end
 
   describe "#save" do
@@ -427,7 +417,7 @@ describe Mongoid::Document do
       @person.addresses << @business
     end
 
-    it "allows adding multiples on an embeds_many in a row" do
+    it "allows adding multiples on a has_many in a row" do
       @person.addresses.length.should == 2
     end
 
@@ -444,13 +434,13 @@ describe Mongoid::Document do
 
     end
 
-    context "when saving on an embeds_many" do
+    context "when saving on a has_many" do
 
       before do
         @home.save
       end
 
-      it "saves the entire graph up from the embeds_many" do
+      it "saves the entire graph up from the has_many" do
         person = Person.first(:conditions => { :title => "Sir" })
         person.should == @person
       end
@@ -501,63 +491,6 @@ describe Mongoid::Document do
     end
 
   end
-  
-  describe "#as_json" do
-
-    before do
-      @person = Person.new(:title => "Sir", :age => 30)
-      @address = Address.new(:street => "Nan Jing Dong Lu")
-      @person.addresses << @address
-    end
-
-    context "on a new document" do
-
-      it "returns the attributes" do
-        @person.as_json.should == @person.attributes
-      end
-
-    end
-
-    context "on a persisted document" do
-
-      it "returns the attributes" do
-        @person.save
-        from_db = Person.find(@person.id)
-        from_db.as_json.should == from_db.attributes
-      end
-
-    end
-
-  end
-  
-  describe "#encode_json" do
-
-    before do
-      @person = Person.new(:title => "Sir", :age => 30)
-      @address = Address.new(:street => "Nan Jing Dong Lu")
-      @person.addresses << @address
-      @encoder = Array.new
-    end
-
-    context "on a new document" do
-
-      it "returns the attributes" do
-        @person.encode_json(@encoder).should == @person.attributes
-      end
-
-    end
-
-    context "on a persisted document" do
-
-      it "returns the attributes" do
-        @person.save
-        from_db = Person.find(@person.id)
-        from_db.encode_json(@encoder).should == from_db.attributes
-      end
-
-    end
-
-  end
 
   context "typecasting" do
 

data/spec/integration/mongoid/finders_spec.rb

@@ -4,116 +4,59 @@ describe Mongoid::Finders do
 
   describe "#find" do
 
-    context "using string ids" do
-
-      before do
-        @documents = []
-        @document = Person.create(:title => "Mrs.", :ssn => "another")
-        3.times do |n|
-          @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
-        end
+    before do
+      @documents = []
+      @document = Person.create(:title => "Mrs.", :ssn => "another")
+      3.times do |n|
+        @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
       end
+    end
 
-      after do
-        Person.delete_all
-      end
-
-      context "with an id as an argument" do
-
-        context "when the document is found" do
-
-          it "returns the document" do
-            Person.find(@document.id).should == @document
-          end
-
-        end
+    after do
+      Person.delete_all
+    end
 
-        context "when the document is not found" do
+    context "with an id as an argument" do
 
-          it "raises an error" do
-            lambda { Person.find("5") }.should raise_error
-          end
+      context "when the document is found" do
 
+        it "returns the document" do
+          Person.find(@document.id).should == @document
         end
 
       end
 
-      context "with an array of ids as args" do
-
-        context "when the documents are found" do
-
-          it "returns an array of the documents" do
-            @people = Person.find(@documents.map(&:id))
-            @people.should == @documents
-          end
+      context "when the document is not found" do
 
+        it "raises an error" do
+          lambda { Person.find("5") }.should raise_error
         end
 
-        context "when no documents found" do
-
-          it "raises an error" do
-            lambda { Person.find(["11", "21", "31"]) }.should raise_error
-          end
-
-        end
       end
-    end
 
-    context "using object ids" do
-
-      before do
-        Mongoid.use_object_ids = true
-        @documents = []
-        @document = Person.create(:title => "Mrs.", :ssn => "another")
-        3.times do |n|
-          @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
-        end
-      end
-
-      after do
-        Mongoid.use_object_ids = false
-        Person.delete_all
-      end
-
-      context "with an id as an argument" do
-
-        context "when the document is found" do
-
-          it "returns the document" do
-            Person.find(@document.id).should == @document
-          end
-
-        end
+    end
 
-        context "when the document is not found" do
+    context "with an array of ids as args" do
 
-          it "raises an error" do
-            lambda { Person.find("5") }.should raise_error
-          end
+      context "when the documents are found" do
 
+        it "returns an array of the documents" do
+          @people = Person.find(@documents.map(&:id))
+          @people.should == @documents
         end
 
       end
 
-      context "with an array of ids as args" do
-
-        context "when the documents are found" do
-
-          it "returns an array of the documents" do
-            @people = Person.find(@documents.map(&:id))
-            @people.should == @documents
-          end
+      context "when no documents found" do
 
+        it "raises an error" do
+          lambda { Person.find(["11", "21", "31"]) }.should raise_error
         end
 
-        context "when no documents found" do
-
-          it "raises an error" do
-            lambda { Person.find(["11", "21", "31"]) }.should raise_error
-          end
-
-        end
       end
+
     end
+
   end
+
 end

data/spec/models/address.rb

@@ -9,9 +9,9 @@ class Address
   field :parent_title
   field :services, :type => Array
   key :street
-  embeds_many :locations
+  has_many :locations
 
-  embedded_in :addressable, :inverse_of => :addresses do
+  belongs_to :addressable, :inverse_of => :addresses do
     def extension
       "Testing"
     end
@@ -36,4 +36,4 @@ class Address
     end
 
   end
-end
+end

data/spec/models/animal.rb

@@ -2,5 +2,5 @@ class Animal
   include Mongoid::Document
   field :name
   key :name
-  embedded_in :person, :inverse_of => :pet
-end
+  belongs_to :person, :inverse_of => :pet
+end

data/spec/models/country_code.rb

@@ -2,5 +2,5 @@ class CountryCode
   include Mongoid::Document
   field :code, :type => Integer
   key :code
-  embedded_in :phone_number, :inverse_of => :country_codes
-end
+  belongs_to :phone_number, :inverse_of => :country_codes
+end

data/spec/models/game.rb

@@ -3,5 +3,4 @@ class Game
   field :high_score, :default => 500
   field :score, :type => Integer, :default => 0
   belongs_to_related :person
-  enslave and cache
-end
+end

data/spec/models/inheritance.rb

@@ -1,8 +1,8 @@
 class Canvas
   include Mongoid::Document
   field :name
-  embeds_many :shapes
-  embeds_one :writer
+  has_many :shapes
+  has_one :writer
 
   def render
     shapes.each { |shape| render }
@@ -24,7 +24,7 @@ class Shape
   field :x, :type => Integer, :default => 0
   field :y, :type => Integer, :default => 0
 
-  embedded_in :canvas, :inverse_of => :shapes
+  belongs_to :canvas, :inverse_of => :shapes
 
   def render; end
 end
@@ -42,7 +42,7 @@ class Writer
   include Mongoid::Document
   field :speed, :type => Integer, :default => 0
 
-  embedded_in :canvas, :inverse_of => :writer
+  belongs_to :canvas, :inverse_of => :writer
 
   def write; end
 end
@@ -53,4 +53,4 @@ end
 
 class PdfWriter < Writer
   def write; end
-end
+end

data/spec/models/location.rb

@@ -1,5 +1,5 @@
 class Location
   include Mongoid::Document
   field :name
-  embedded_in :address, :inverse_of => :locations
-end
+  belongs_to :address, :inverse_of => :locations
+end

data/spec/models/name.rb

@@ -4,10 +4,10 @@ class Name
   field :last_name
   field :parent_title
   key :first_name, :last_name
-  embeds_many :translations
-  embedded_in :person, :inverse_of => :name
+  has_many :translations
+  belongs_to :person, :inverse_of => :name
 
   def set_parent=(set = false)
     self.parent_title = person.title if set
   end
-end
+end

data/spec/models/namespacing.rb

@@ -2,10 +2,10 @@ module Medical
   class Patient
     include Mongoid::Document
     field :name
-    embeds_many :prescriptions, :class_name => "Medical::Prescription"
+    has_many :prescriptions, :class_name => "Medical::Prescription"
   end
   class Prescription
     include Mongoid::Document
     field :name
   end
-end
+end

data/spec/models/patient.rb

@@ -1,6 +1,4 @@
 class Patient
   include Mongoid::Document
-  field :title
   store_in :inpatient
-  embeds_many :addresses
 end

data/spec/models/person.rb

@@ -4,7 +4,6 @@ class Person
 
   field :title
   field :terms, :type => Boolean
-  field :pets, :type => Boolean, :default => false
   field :age, :type => Integer, :default => 100
   field :dob, :type => Date
   field :mixed_drink, :type => MixedDrink
@@ -15,7 +14,6 @@ class Person
   field :score, :type => Integer
   field :blood_alcohol_content, :type => Float, :default => lambda{ 0.0 }
   field :ssn
-  field :owner_id, :accessible => false, :type => Integer
 
   index :age
   index :addresses
@@ -26,7 +24,7 @@ class Person
 
   attr_reader :rescored
 
-  embeds_many :addresses do
+  has_many :addresses do
     def extension
       "Testing"
     end
@@ -35,9 +33,9 @@ class Person
     end
   end
 
-  embeds_many :phone_numbers, :class_name => "Phone"
+  has_many :phone_numbers, :class_name => "Phone"
 
-  embeds_one :name do
+  has_one :name do
     def extension
       "Testing"
     end
@@ -46,7 +44,7 @@ class Person
     end
   end
 
-  embeds_one :pet, :class_name => "Animal"
+  has_one :pet, :class_name => "Animal"
 
   accepts_nested_attributes_for :addresses, :reject_if => lambda { |attrs| attrs["street"].blank? }
   accepts_nested_attributes_for :name

data/spec/models/pet.rb

@@ -2,6 +2,6 @@ class Pet
   include Mongoid::Document
   field :name
   field :weight, :type => Float, :default => 0.0
-  embeds_many :vet_visits
-  embedded_in :pet_owner, :inverse_of => :pet
-end
+  has_many :vet_visits
+  belongs_to :pet_owner, :inverse_of => :pet
+end

data/spec/models/pet_owner.rb

@@ -1,6 +1,6 @@
 class PetOwner
   include Mongoid::Document
   field :title
-  embeds_one :pet
-  embeds_one :address
-end
+  has_one :pet
+  has_one :address
+end

data/spec/models/phone.rb

@@ -2,6 +2,6 @@ class Phone
   include Mongoid::Document
   field :number
   key :number
-  embeds_one :country_code
-  embedded_in :person, :inverse_of => :phone_numbers
-end
+  belongs_to :person, :inverse_of => :phone_numbers
+  has_one :country_code
+end

data/spec/models/post.rb

@@ -12,4 +12,4 @@ class Post
       where(:created_at => { "$lt" => 30.days.ago })
     end
   end
-end
+end

data/spec/models/translation.rb

@@ -1,5 +1,5 @@
 class Translation
   include Mongoid::Document
   field :language
-  embedded_in :name, :inverse_of => :translations
-end
+  belongs_to :name, :inverse_of => :translations
+end

data/spec/models/vet_visit.rb

@@ -1,5 +1,5 @@
 class VetVisit
   include Mongoid::Document
   field :date, :type => Date
-  embedded_in :pet, :inverse_of => :vet_visits
-end
+  belongs_to :pet, :inverse_of => :vet_visits
+end

data/spec/spec_helper.rb

@@ -8,8 +8,8 @@ require 'rubygems'
 
 gem "mocha", ">= 0.9.8"
 
-require "mongoid"
 require "mocha"
+require "mongoid"
 require "spec"
 
 Mongoid.configure do |config|
@@ -28,4 +28,4 @@ Spec::Runner.configure do |config|
   config.after :suite do
     Mongoid.master.collections.each(&:drop)
   end
-end
+end

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

@@ -134,10 +134,6 @@ describe Mongoid::Associations::BelongsToRelated do
         Mongoid::Associations::BelongsToRelated.update(nil, @child, @options).should be_nil
       end
 
-      it "removes the association" do
-        Mongoid::Associations::BelongsToRelated.update(nil, @child, @options)
-        @child.person.should be_nil
-      end
     end
 
   end

data/spec/unit/mongoid/associations/{embedded_in_spec.rb → belongs_to_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Associations::EmbeddedIn do
+describe Mongoid::Associations::BelongsTo do
 
   let(:child) do
     Name.new(:first_name => "Drexel", :last_name => "Spivey")
@@ -21,7 +21,7 @@ describe Mongoid::Associations::EmbeddedIn do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::EmbeddedIn.new(target, options)
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
     end
 
     context "when finding by id" do
@@ -37,7 +37,7 @@ describe Mongoid::Associations::EmbeddedIn do
   describe "#initialize" do
 
     before do
-      @association = Mongoid::Associations::EmbeddedIn.new(target, options)
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
     end
 
     it "sets the target" do
@@ -62,7 +62,7 @@ describe Mongoid::Associations::EmbeddedIn do
         end
       }
       @options = Mongoid::Associations::Options.new(:name => :person, :extend => @block)
-      @association = Mongoid::Associations::EmbeddedIn.new(@parent, @options)
+      @association = Mongoid::Associations::BelongsTo.new(@parent, @options)
     end
 
     context "when the options have an extension" do
@@ -82,7 +82,7 @@ describe Mongoid::Associations::EmbeddedIn do
       before do
         @parent = stub
         @target = stub(:_parent => @parent)
-        @association = Mongoid::Associations::EmbeddedIn.instantiate(@target, options)
+        @association = Mongoid::Associations::BelongsTo.instantiate(@target, options)
       end
 
       it "sets the parent to the target" do
@@ -98,7 +98,7 @@ describe Mongoid::Associations::EmbeddedIn do
       end
 
       it "returns nil" do
-        Mongoid::Associations::EmbeddedIn.instantiate(@document, options).should be_nil
+        Mongoid::Associations::BelongsTo.instantiate(@document, options).should be_nil
       end
 
     end
@@ -107,8 +107,8 @@ describe Mongoid::Associations::EmbeddedIn do
 
   describe ".macro" do
 
-    it "returns :embedded_in" do
-      Mongoid::Associations::EmbeddedIn.macro.should == :embedded_in
+    it "returns :belongs_to" do
+      Mongoid::Associations::BelongsTo.macro.should == :belongs_to
     end
 
   end
@@ -116,7 +116,7 @@ describe Mongoid::Associations::EmbeddedIn do
   describe "#method_missing" do
 
     before do
-      @association = Mongoid::Associations::EmbeddedIn.new(target, options)
+      @association = Mongoid::Associations::BelongsTo.new(target, options)
     end
 
     context "when method is a getter" do
@@ -156,7 +156,7 @@ describe Mongoid::Associations::EmbeddedIn do
       before do
         @name = Name.new(:first_name => "Test", :last_name => "User")
         @person = Person.new(:title => "Mrs")
-        @association = Mongoid::Associations::EmbeddedIn.update(@person, @name, options)
+        @association = Mongoid::Associations::BelongsTo.update(@person, @name, options)
       end
 
       it "updates the parent document" do
@@ -179,7 +179,7 @@ describe Mongoid::Associations::EmbeddedIn do
       before do
         @address = Address.new(:street => "Broadway")
         @person = Person.new(:title => "Mrs")
-        Mongoid::Associations::EmbeddedIn.update(@person, @address, has_many_options)
+        Mongoid::Associations::BelongsTo.update(@person, @address, has_many_options)
       end
 
       it "updates the parent document" do