mongoid 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/mongoid/associations.rb

@@ -21,7 +21,7 @@ module Mongoid # :nodoc:
 
     module ClassMethods
       def associations
-        @associations ||= HashWithIndifferentAccess.new
+        @associations ||= {}.with_indifferent_access
       end
       # Adds the association back to the parent document. This macro is
       # necessary to set the references from the child back to the parent

data/lib/mongoid/associations/belongs_to.rb

@@ -28,8 +28,11 @@ module Mongoid #:nodoc:
         def update(parent, child, name, options = {})
           name = child.class.name.demodulize.downcase
           has_one = parent.associations[name]
-          child.parentize(parent, name) if has_one
-          child.parentize(parent, name.tableize) unless has_one
+          if has_one
+            child.parentize(parent, name)
+          else
+            child.parentize(parent, name.tableize)
+          end
           child.notify
           parent
         end

data/lib/mongoid/associations/has_many.rb

@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
         @klass = class_name ? class_name.constantize : @association_name.to_s.classify.constantize
         attributes = document.attributes[@association_name]
         @documents = attributes ? attributes.collect do |attribute|
-          child = @klass.new(attribute)
+          child = @klass.instantiate(attribute)
           child.parentize(@parent, @association_name)
           child
         end : []
@@ -79,7 +79,12 @@ module Mongoid #:nodoc:
         # and setting up the parentization.
         def update(children, parent, name, options = {})
           parent.attributes.delete(name)
+          class_name = options[:class_name]
+          klass = class_name ? class_name.constantize : name.to_s.classify.constantize
           children.each do |child|
+            unless child.respond_to?(:parentize)
+              child = klass.new(child)
+            end
             child.parentize(parent, name)
             child.notify
           end

data/lib/mongoid/associations/has_one.rb

@@ -15,7 +15,7 @@ module Mongoid #:nodoc:
         class_name = options[:class_name]
         klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
         attributes = document.attributes[name]
-        @document = klass.new(attributes)
+        @document = klass.instantiate(attributes || {})
         @document.parentize(document, name)
         decorate!
       end
@@ -24,6 +24,11 @@ module Mongoid #:nodoc:
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting the has_one to the supplied child.
         def update(child, parent, name, options = {})
+          unless child.respond_to?(:parentize)
+            class_name = options[:class_name]
+            klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
+            child = klass.new(child)
+          end
           child.parentize(parent, name)
           child.notify
           child

data/lib/mongoid/attributes.rb

@@ -2,10 +2,10 @@ module Mongoid #:nodoc:
   module Attributes #:nodoc:
     # Process the provided attributes casting them to their proper values if a
     # field exists for them on the +Document+.
-    def process(params)
-      @attributes = HashWithIndifferentAccess.new(params)
+    def process(params = nil)
+      @attributes = (params || {}).with_indifferent_access
       process_fields
-      process_associations
+      process_attributes
     end
 
     protected
@@ -16,9 +16,9 @@ module Mongoid #:nodoc:
       end
     end
 
-    def process_associations
+    def process_attributes
       @attributes.each_pair do |key, value|
-        @attributes[key] = send("#{key}=", value) if value.is_a?(Document)
+        send("#{key}=", value)
       end
     end
 

data/lib/mongoid/criteria.rb

@@ -102,10 +102,10 @@ module Mongoid #:nodoc:
       @klass = klass if klass
       if type == :first
         attributes = klass.collection.find_one(@selector, @options)
-        attributes ? @klass.new(attributes) : nil
+        attributes ? @klass.instantiate(attributes) : nil
       else
         attributes = @klass.collection.find(@selector, @options)
-        attributes ? attributes.collect { |doc| @klass.new(doc) } : []
+        attributes ? attributes.collect { |doc| @klass.instantiate(doc) } : []
       end
     end
 
@@ -142,7 +142,7 @@ module Mongoid #:nodoc:
         { :group => [] },
         GROUP_REDUCE
       ).collect do |docs|
-        docs["group"] = docs["group"].collect { |attrs| @klass.new(attrs) }; docs
+        docs["group"] = docs["group"].collect { |attrs| @klass.instantiate(attrs) }; docs
       end
     end
 

data/lib/mongoid/document.rb

@@ -68,7 +68,7 @@ module Mongoid #:nodoc:
       #
       # <tt>field :score, :default => 0</tt>
       def field(name, options = {})
-        @fields ||= HashWithIndifferentAccess.new
+        @fields ||= {}.with_indifferent_access
         @fields[name.to_s] = Field.new(name.to_s, options)
         define_method(name) { read_attribute(name) }
         define_method("#{name}=") { |value| write_attribute(name, value) }
@@ -118,6 +118,13 @@ module Mongoid #:nodoc:
         collection.create_index(name, options)
       end
 
+      # Instantiate a new object, only when loaded from the database.
+      def instantiate(attributes = {})
+        document = allocate
+        document.instance_variable_set(:@attributes, attributes.with_indifferent_access)
+        document
+      end
+
       # Defines the field that will be used for the id of this +Document+. This
       # set the id of this +Document+ before save to a parameterized version of
       # the field that was supplied. This is good for use for readable URLS in
@@ -207,7 +214,13 @@ module Mongoid #:nodoc:
       @attributes[:_id]
     end
 
+    # Set the id
+    def id=(new_id)
+      @attributes[:_id] = new_id
+    end
+
     alias :_id :id
+    alias :_id= :id=
 
     # Instantiate a new Document, setting the Document's attributes if given.
     # If no attributes are provided, they will be initialized with an empty Hash.
@@ -237,6 +250,13 @@ module Mongoid #:nodoc:
       notify_observers(self)
     end
 
+    # Sets the parent object
+    def parentize(object, association_name)
+      self.parent = object
+      self.association_name = association_name
+      add_observer(object)
+    end
+
     # Read from the attributes hash.
     def read_attribute(name)
       fields[name].get(@attributes[name])
@@ -244,7 +264,7 @@ module Mongoid #:nodoc:
 
     # Reloads the +Document+ attributes from the database.
     def reload
-      @attributes = HashWithIndifferentAccess.new(collection.find_one(:_id => id))
+      @attributes = collection.find_one(:_id => id).with_indifferent_access
     end
 
     # Return the root +Document+ in the object graph.

data/lib/mongoid/extensions.rb

@@ -7,7 +7,6 @@ require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/hash/conversions"
 require "mongoid/extensions/integer/conversions"
 require "mongoid/extensions/object/conversions"
-require "mongoid/extensions/object/parentization"
 require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
@@ -41,7 +40,6 @@ end
 
 class Object #:nodoc:
   include Mongoid::Extensions::Object::Conversions
-  include Mongoid::Extensions::Object::Parentization
 end
 
 class String #:nodoc

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2009-11-12}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -50,7 +50,6 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/integer/conversions.rb",
      "lib/mongoid/extensions/object/casting.rb",
      "lib/mongoid/extensions/object/conversions.rb",
-     "lib/mongoid/extensions/object/parentization.rb",
      "lib/mongoid/extensions/string/conversions.rb",
      "lib/mongoid/extensions/string/inflections.rb",
      "lib/mongoid/extensions/symbol/inflections.rb",
@@ -88,7 +87,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/parentization_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
@@ -131,7 +129,6 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
      "spec/unit/mongoid/extensions/integer/conversions_spec.rb",
      "spec/unit/mongoid/extensions/object/conversions_spec.rb",
-     "spec/unit/mongoid/extensions/object/parentization_spec.rb",
      "spec/unit/mongoid/extensions/string/conversions_spec.rb",
      "spec/unit/mongoid/extensions/string/inflections_spec.rb",
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",

data/spec/integration/mongoid/document_spec.rb

@@ -30,9 +30,9 @@ describe Mongoid::Document do
   describe "#create" do
 
     it "persists a new record to the database" do
-      person = Person.create(:test => "Test")
+      person = Person.create(:title => "Test")
       person.id.should be_a_kind_of(String)
-      person.attributes[:test].should == "Test"
+      person.attributes[:title].should == "Test"
     end
 
   end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ class Person < Mongoid::Document
   field :age, :type => Integer, :default => 100
   field :dob, :type => Date
   field :mixed_drink, :type => MixedDrink
+  field :employer_id
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"
   has_one :name
@@ -36,6 +37,16 @@ class Person < Mongoid::Document
       address.street = "Updated #{i}"
     end
   end
+
+  def employer=(emp)
+    self.employer_id = emp.id
+  end
+end
+
+class Employer
+  def id
+    "1"
+  end
 end
 
 class CountryCode < Mongoid::Document
@@ -78,7 +89,7 @@ class Address < Mongoid::Document
   field :street
   field :city
   field :state
-  field :comment_code
+  field :post_code
   key :street
   belongs_to :addressable
 end

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

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

data/spec/unit/mongoid/attributes_spec.rb

@@ -64,6 +64,20 @@ describe Mongoid::Attributes do
 
     end
 
+    context "when non-associations provided in the attributes" do
+
+      before do
+        @employer = Employer.new
+        @attributes = { :employer => @employer, :title => "Sir" }
+        @person = Person.new(@attributes)
+      end
+
+      it "calls the setter for the association" do
+        @person.employer_id.should == "1"
+      end
+
+    end
+
   end
 
 end

data/spec/unit/mongoid/document_spec.rb

@@ -292,7 +292,7 @@ describe Mongoid::Document do
   describe "#first" do
 
     before do
-      @attributes = { "age" => 100, "version" => 1 }
+      @attributes = { "age" => 100 }
     end
 
     context "when a selector is provided" do
@@ -349,6 +349,19 @@ describe Mongoid::Document do
 
   end
 
+  describe "#instantiate" do
+
+    before do
+      @attributes = { :_id => "1", :title => "Sir", :age => 30 }
+      @person = Person.new(@attributes)
+    end
+
+    it "sets the attributes directly" do
+      Person.instantiate(@attributes).should == @person
+    end
+
+  end
+
   describe "#key" do
 
     context "when key is single field" do
@@ -370,8 +383,8 @@ describe Mongoid::Document do
     context "when key is composite" do
 
       before do
-        Address.key :street, :zip
-        @address = Address.new(:street => "Testing Street Name", :zip => "94123")
+        Address.key :street, :post_code
+        @address = Address.new(:street => "Testing Street Name", :post_code => "94123")
         @address.expects(:collection).returns(@collection)
         @collection.expects(:save)
       end
@@ -393,7 +406,7 @@ describe Mongoid::Document do
     end
 
     it "finds the last document by the id" do
-      Person.last.should == Person.new(@attributes)
+      Person.last.should == Person.instantiate(@attributes)
     end
 
   end
@@ -547,6 +560,20 @@ describe Mongoid::Document do
 
   end
 
+  describe "#parentize" do
+
+    before do
+      @parent = Person.new
+      @child = Name.new
+    end
+
+    it "sets the parent on each element" do
+      @child.parentize(@parent, :child)
+      @child.parent.should == @parent
+    end
+
+  end
+
   describe "#read_attribute" do
 
     context "when attribute does not exist" do

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

@@ -11,9 +11,7 @@ describe Mongoid::Extensions::Array::Parentization do
     end
 
     it "sets the parent on each element" do
-      @child.expects(:add_observer).with(@parent)
-      @child.expects(:parent=).with(@parent)
-      @child.expects(:association_name=).with(:child)
+      @child.expects(:parentize).with(@parent, :child)
       @array.parentize(@parent, :child)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-11-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,6 @@ files:
 - lib/mongoid/extensions/integer/conversions.rb
 - lib/mongoid/extensions/object/casting.rb
 - lib/mongoid/extensions/object/conversions.rb
-- lib/mongoid/extensions/object/parentization.rb
 - lib/mongoid/extensions/string/conversions.rb
 - lib/mongoid/extensions/string/inflections.rb
 - lib/mongoid/extensions/symbol/inflections.rb
@@ -144,7 +143,6 @@ files:
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
-- spec/unit/mongoid/extensions/object/parentization_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
@@ -209,7 +207,6 @@ test_files:
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
 - spec/unit/mongoid/extensions/integer/conversions_spec.rb
 - spec/unit/mongoid/extensions/object/conversions_spec.rb
-- spec/unit/mongoid/extensions/object/parentization_spec.rb
 - spec/unit/mongoid/extensions/string/conversions_spec.rb
 - spec/unit/mongoid/extensions/string/inflections_spec.rb
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb

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

@@ -1,14 +0,0 @@
-module Mongoid #:nodoc:
-  module Extensions #:nodoc:
-    module Object #:nodoc:
-      module Parentization #:nodoc:
-        # Sets the parent object
-        def parentize(object, association_name)
-          self.parent = object
-          self.association_name = association_name
-          add_observer(object)
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
-
-describe Mongoid::Extensions::Object::Parentization do
-
-  describe "#parentize" do
-
-    before do
-      @parent = Person.new
-      @child = Name.new
-    end
-
-    it "sets the parent on each element" do
-      @child.parentize(@parent, :child)
-      @child.parent.should == @parent
-    end
-
-  end
-
-end