mongoid 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/mongoid/associations.rb

@@ -94,10 +94,15 @@ module Mongoid # :nodoc:
       def add_association(type, class_name, name, options = {})
         associations[name] = type
         define_method(name) do
-          Associations::Accessor.get(type, name, self, options)
+          if instance_variable_defined?("@#{name}")
+            return instance_variable_get("@#{name}")
+          end
+          proxy = Associations::Accessor.get(type, name, self, options)
+          instance_variable_set("@#{name}", proxy)
         end
         define_method("#{name}=") do |object|
-          Associations::Accessor.set(type, name, self, object, options)
+          proxy = Associations::Accessor.set(type, name, self, object, options)
+          instance_variable_set("@#{name}", proxy)
         end
       end
     end

data/lib/mongoid/associations/accessor.rb

@@ -9,9 +9,12 @@ module Mongoid #:nodoc:
         # If the type is invalid a InvalidAssociationError will be thrown.
         def get(type, name, document, options = {})
           case type
-            when :belongs_to then BelongsTo.new(document)
-            when :has_many then HasMany.new(name, document, options)
-            when :has_one then HasOne.new(name, document, options)
+            when :belongs_to
+              BelongsTo.new(document)
+            when :has_many
+              HasMany.new(name, document, options)
+            when :has_one
+              document ? HasOne.new(name, document, options) : nil
             else raise InvalidAssociationError
           end
         end

data/lib/mongoid/associations/has_one.rb

@@ -26,6 +26,7 @@ module Mongoid #:nodoc:
         def update(child, parent, name)
           child.parentize(parent, name)
           child.notify
+          child
         end
       end
 

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/document_spec.rb

@@ -1,52 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  include Mongoid::Timestamps
-  field :title
-  field :terms, :type => Boolean
-  field :age, :type => Integer, :default => 100
-  field :dob, :type => Date
-  has_many :addresses
-  has_one :name
-end
-
-class PetOwner < Mongoid::Document
-  field :title
-  has_one :pet
-end
-
-class Pet < Mongoid::Document
-  field :name
-  field :weight, :type => Float, :default => 0.0
-  has_many :vet_visits
-  belongs_to :pet_owner
-end
-
-class VetVisit < Mongoid::Document
-  field :date, :type => Date
-  belongs_to :pet
-end
-
-class Address < Mongoid::Document
-  field :street
-  field :city
-  field :state
-  field :comment_code
-  key :street
-  belongs_to :person
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-class Comment < Mongoid::Document
-  include Mongoid::Versioning
-  field :text
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Document do
 

data/spec/spec_helper.rb

@@ -14,3 +14,95 @@ Spec::Runner.configure do |config|
   config.mock_with :mocha
   Mocha::Configuration.prevent(:stubbing_non_existent_method)
 end
+
+class MixedDrink < Mongoid::Document
+  field :name
+end
+
+class Person < Mongoid::Document
+  include Mongoid::Timestamps
+  field :title
+  field :terms, :type => Boolean
+  field :age, :type => Integer, :default => 100
+  field :dob, :type => Date
+  field :mixed_drink, :type => MixedDrink
+  has_many :addresses
+  has_many :phone_numbers, :class_name => "Phone"
+  has_one :name
+  has_one :pet, :class_name => "Animal"
+
+  def update_addresses
+    addresses.each_with_index do |address, i|
+      address.street = "Updated #{i}"
+    end
+  end
+end
+
+class CountryCode < Mongoid::Document
+  field :code, :type => Integer
+  key :code
+  belongs_to :phone_number
+end
+
+class Phone < Mongoid::Document
+  field :number
+  key :number
+  belongs_to :person
+  has_one :country_code
+end
+
+class Animal < Mongoid::Document
+  field :name
+  key :name
+  belongs_to :person
+end
+
+class PetOwner < Mongoid::Document
+  field :title
+  has_one :pet
+end
+
+class Pet < Mongoid::Document
+  field :name
+  field :weight, :type => Float, :default => 0.0
+  has_many :vet_visits
+  belongs_to :pet_owner
+end
+
+class VetVisit < Mongoid::Document
+  field :date, :type => Date
+  belongs_to :pet
+end
+
+class Address < Mongoid::Document
+  field :street
+  field :city
+  field :state
+  field :comment_code
+  key :street
+  belongs_to :person
+end
+
+class Name < Mongoid::Document
+  field :first_name
+  field :last_name
+  key :first_name, :last_name
+  belongs_to :person
+end
+
+class Comment < Mongoid::Document
+  include Mongoid::Versioning
+  field :text
+end
+
+class Decorated
+  include Mongoid::Associations::Decorator
+  def initialize(doc)
+    @document = doc
+  end
+end
+
+class Post < Mongoid::Document
+  include Mongoid::Versioning
+  field :title
+end

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

@@ -1,23 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  has_many :addresses
-  has_one :name
-end
-
-class Address < Mongoid::Document
-  field :street
-  key :street
-  belongs_to :person
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Associations::Accessor do
 
@@ -39,9 +20,22 @@ describe Mongoid::Associations::Accessor do
 
     context "when type is has_one" do
 
-      it "returns a HasOne" do
-        association = Mongoid::Associations::Accessor.get(:has_one, :name, @document)
-        association.should be_a_kind_of(Mongoid::Associations::HasOne)
+      context "when document is not nil" do
+
+        it "returns a HasOne" do
+          association = Mongoid::Associations::Accessor.get(:has_one, :name, @document)
+          association.should be_a_kind_of(Mongoid::Associations::HasOne)
+        end
+
+      end
+
+      context "when document is nil" do
+
+        it "returns nil" do
+          association = Mongoid::Associations::Accessor.get(:has_one, :name, nil)
+          association.should be_nil
+        end
+
       end
 
     end

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

@@ -1,22 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  has_one :name
-  has_many :addresses
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-class Address < Mongoid::Document
-  field :street
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Associations::BelongsTo do
 

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

@@ -1,33 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  field :terms, :type => Boolean
-  field :age, :type => Integer, :default => 100
-  field :dob, :type => Date
-  has_many :addresses
-  has_one :name
-end
-
-class Address < Mongoid::Document
-  field :street
-  key :street
-  belongs_to :person
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-class Decorated
-  include Mongoid::Associations::Decorator
-  def initialize(doc)
-    @document = doc
-  end
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Associations::Decorator do
 

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

@@ -1,15 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  has_many :addresses
-end
-
-class Address < Mongoid::Document
-  field :street
-  key :street
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Associations::HasMany do
 

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

@@ -1,19 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class MixedDrink < Mongoid::Document
-  field :name
-end
-
-class Person < Mongoid::Document
-  field :title
-  has_one :name
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  key :first_name
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Associations::HasOne do
 

data/spec/unit/mongoid/associations_spec.rb

@@ -1,48 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  field :terms, :type => Boolean, :default => false
-  has_many :addresses
-  has_many :phone_numbers, :class_name => "Phone"
-  has_one :name
-  has_one :pet, :class_name => "Animal"
-end
-
-class Animal < Mongoid::Document
-  field :name
-  key :name
-  belongs_to :person
-end
-
-class CountryCode < Mongoid::Document
-  field :code, :type => Integer
-  key :code
-  belongs_to :phone_number
-end
-
-class Address < Mongoid::Document
-  field :street
-  field :city
-  field :state
-  field :post_code
-  key :street
-  belongs_to :person
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-class Phone < Mongoid::Document
-  field :number
-  key :number
-  belongs_to :person
-  has_one :country_code
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Associations do
 
@@ -171,6 +127,21 @@ describe Mongoid::Associations do
 
     end
 
+    context "when updating objects internally" do
+
+      before do
+        @address = Address.new(:street => "Bourke Street")
+        @person = Person.new(:title => "Sir")
+        @person.addresses << @address
+        @person.update_addresses
+      end
+
+      it "retains its references to the original objects" do
+        @address.street.should == "Updated 0"
+      end
+
+    end
+
   end
 
   describe "#has_one" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -1,9 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :terms, :type => Boolean
-  field :age, :type => Integer, :default => 100
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Attributes do
 

data/spec/unit/mongoid/commands/create_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::Create do
 

data/spec/unit/mongoid/commands/delete_all_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::DeleteAll do
 

data/spec/unit/mongoid/commands/delete_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::Delete do
 

data/spec/unit/mongoid/commands/destroy_all_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::DestroyAll do
 

data/spec/unit/mongoid/commands/destroy_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::Destroy do
 

data/spec/unit/mongoid/commands/save_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../spec_helper.rb"))
 
 describe Mongoid::Commands::Save do
 

data/spec/unit/mongoid/commands_spec.rb

@@ -1,8 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Commands do
 

data/spec/unit/mongoid/criteria_spec.rb

@@ -1,8 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Criteria do
 

data/spec/unit/mongoid/document_spec.rb

@@ -1,30 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class MixedDrink < Mongoid::Document
-  field :name
-end
-
-class Person < Mongoid::Document
-  field :title
-  field :terms, :type => Boolean
-  field :age, :type => Integer, :default => 100
-  field :mixed_drink, :type => MixedDrink
-  has_many :addresses
-  has_one :name
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-class Address < Mongoid::Document
-  field :street
-  key :street
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Document do
 

data/spec/unit/mongoid/extensions/array/conversions_spec.rb

@@ -1,9 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  field :age, :type => Integer, :default => 100
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Array::Conversions do
 

data/spec/unit/mongoid/extensions/array/parentization_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Array::Parentization do
 

data/spec/unit/mongoid/extensions/boolean/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Boolean::Conversions do
 

data/spec/unit/mongoid/extensions/date/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Date::Conversions do
 

data/spec/unit/mongoid/extensions/float/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Float::Conversions do
 

data/spec/unit/mongoid/extensions/hash/accessors_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Hash::Accessors do
 

data/spec/unit/mongoid/extensions/hash/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Hash::Conversions do
 

data/spec/unit/mongoid/extensions/integer/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Integer::Conversions do
 

data/spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -1,9 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  field :age, :type => Integer, :default => 100
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Object::Conversions do
 

data/spec/unit/mongoid/extensions/object/parentization_spec.rb

@@ -1,16 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  has_one :name
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Object::Parentization do
 

data/spec/unit/mongoid/extensions/string/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::String::Conversions do
 

data/spec/unit/mongoid/extensions/string/inflections_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::String::Inflections do
 

data/spec/unit/mongoid/extensions/symbol/inflections_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Symbol::Inflections do
 

data/spec/unit/mongoid/extensions/time/conversions_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
 
 describe Mongoid::Extensions::Time::Conversions do
 

data/spec/unit/mongoid/field_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Field do
 

data/spec/unit/mongoid/timestamps_spec.rb

@@ -1,8 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  include Mongoid::Timestamps
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Timestamps do
 

data/spec/unit/mongoid/versioning_spec.rb

@@ -1,9 +1,4 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper.rb")
-
-class Post < Mongoid::Document
-  include Mongoid::Versioning
-  field :title
-end
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
 
 describe Mongoid::Versioning do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Durran Jordan