mongoid 0.8.5 → 0.8.6

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/lib/mongoid/associations.rb

@@ -101,7 +101,7 @@ module Mongoid # :nodoc:
         end
         define_method("#{name}=") do |object|
           proxy = Associations::Accessor.set(type, self, object, options)
-          instance_variable_set("@#{name}", proxy)
+          remove_instance_variable("@#{name}") if instance_variable_defined?("@#{name}")
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Mongoid #:nodoc:
     module Date #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value.to_time unless value.blank?
+          value.to_date.at_midnight.to_time unless value.blank?
         end
         def get(value)
           value ? value.getlocal.to_date : value

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

@@ -3,8 +3,10 @@ module Mongoid #:nodoc:
     module Hash #:nodoc:
       module Accessors #:nodoc:
         def insert(key, attrs)
-          self[key] = attrs if key.singular?
-          if key.plural?
+          if key.singular?
+            self[key] = attrs unless self[key]
+            self[key] = self[key].merge(attrs) if self[key]
+          else
             if elements = self[key]
               elements.delete_if { |e| (e[:_id] == attrs[:_id]) } << attrs
             else

data/mongoid.gemspec

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

data/spec/unit/mongoid/document_spec.rb

@@ -551,6 +551,28 @@ describe Mongoid::Document do
 
     end
 
+    context "on a parent document" do
+
+      context "when the parent has a has many through a has one" do
+
+        before do
+          @owner = PetOwner.new(:title => "Mr")
+          @pet = Pet.new(:name => "Fido")
+          @owner.pet = @pet
+          @vet_visit = VetVisit.new(:date => Date.today)
+          @pet.vet_visits = [@vet_visit]
+        end
+
+        it "does not overwrite child attributes if not in the hash" do
+          @owner.write_attributes({ :pet => { :name => "Bingo" } })
+          @owner.pet.name.should == "Bingo"
+          @owner.pet.vet_visits.size.should == 1
+        end
+
+      end
+
+    end
+
     context "on a child document" do
 
       context "when child is part of a has one" do

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

@@ -10,8 +10,20 @@ describe Mongoid::Extensions::Date::Conversions do
 
     context "when string provided" do
 
-      it "returns a time from the string" do
-        Date.set(@time.utc.to_s).should == @time
+      context "when string is a utc time" do
+
+        it "returns a time from the string" do
+          Date.set(@time.utc.to_s).should == @time
+        end
+
+      end
+
+      context "when string is a date" do
+
+        it "returns a time from the string" do
+          Date.set("01/15/2007").should == Date.new(2007, 1, 15).at_midnight
+        end
+
       end
 
       context "when string is empty" do
@@ -54,6 +66,30 @@ describe Mongoid::Extensions::Date::Conversions do
 
     context "when value is not nil" do
 
+      context "when time is UTC" do
+
+        before do
+          @utc = Date.new(1974, 12, 1).to_time.utc
+        end
+
+        context "when time zone is not utc" do
+
+          before do
+            Time.zone = "Eastern Time (US & Canada)"
+          end
+
+          after do
+            Time.zone = "UTC"
+          end
+
+          it "converts to the proper date" do
+            Date.get(@utc).should == Date.new(1974, 12, 1)
+          end
+
+        end
+
+      end
+
       it "converts the time back to a date" do
         Date.get(@time).should == @time.to_date
       end

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

@@ -11,6 +11,11 @@ describe Mongoid::Extensions::Hash::Accessors do
         :name => {
           :_id => 2, :first_name => "Test", :last_name => "User"
         },
+        :pet => {
+          :_id => 6,
+          :name => "Fido",
+          :vet_visits => [ { :date => Date.new(2007, 1, 1) } ]
+        },
         :addresses => [
           { :_id => 3, :street => "First Street" },
           { :_id => 4, :street => "Second Street" }
@@ -18,6 +23,32 @@ describe Mongoid::Extensions::Hash::Accessors do
       }
     end
 
+    context "when writing to a hash with a child array" do
+
+      context "when child attributes not present" do
+
+        it "does nothing to the children" do
+          @hash.insert(:pet, { :name => "Bingo" })
+          @hash[:pet].should == {
+            :_id => 6,
+            :name => "Bingo",
+            :vet_visits => [ { :date => Date.new(2007, 1, 1) } ]
+          }
+        end
+
+      end
+
+      context "when child attributes present" do
+
+        it "overwrites the child attributes" do
+          @hash.insert(:pet, { :vet_visits => [ { :date => Date.new(2009, 11, 11) } ] })
+          @hash[:pet][:vet_visits].should == [ { :date => Date.new(2009, 11, 11) } ]
+        end
+
+      end
+
+    end
+
     context "when writing a single attribute" do
 
       context "when attribute exists" do

metadata

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