mongoid 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/lib/mongoid.rb

@@ -27,6 +27,7 @@ gem "will_paginate", "2.3.11"
 
 require "delegate"
 require "observer"
+require "time"
 require "validatable"
 require "active_support/callbacks"
 require "active_support/core_ext"

data/lib/mongoid/associations/has_many.rb

@@ -38,7 +38,7 @@ module Mongoid #:nodoc:
       #
       # Returns the newly created object.
       def build(attributes)
-        object = @klass.new(attributes)
+        object = @klass.instantiate(attributes)
         object.parentize(@parent, @association_name)
         push(object)
         object

data/lib/mongoid/attributes.rb

@@ -4,18 +4,10 @@ module Mongoid #:nodoc:
     # field exists for them on the +Document+.
     def process(params = nil)
       @attributes = (params || {}).with_indifferent_access
-      process_fields
       process_attributes
     end
 
     protected
-    def process_fields
-      fields.values.each do |field|
-        value = field.set(@attributes[field.name])
-        @attributes[field.name] = value if value
-      end
-    end
-
     def process_attributes
       @attributes.each_pair do |key, value|
         send("#{key}=", value)

data/lib/mongoid/document.rb

@@ -50,6 +50,11 @@ module Mongoid #:nodoc:
         Criteria.translate(*args).count(self)
       end
 
+      # Returns a hash of all the default values
+      def defaults
+        @defaults
+      end
+
       # return true if the +Document+ is embedded in another +Documnet+.
       def embedded?
         @embedded == true
@@ -69,7 +74,9 @@ module Mongoid #:nodoc:
       # <tt>field :score, :default => 0</tt>
       def field(name, options = {})
         @fields ||= {}.with_indifferent_access
+        @defaults ||= {}.with_indifferent_access
         @fields[name.to_s] = Field.new(name.to_s, options)
+        @defaults[name.to_s] = options[:default] if options[:default]
         define_method(name) { read_attribute(name) }
         define_method("#{name}=") { |value| write_attribute(name, value) }
       end
@@ -188,7 +195,7 @@ module Mongoid #:nodoc:
 
     # Performs equality checking on the attributes.
     def ==(other)
-      raise TypeMismatchError unless other.is_a?(Document)
+      return false unless other.is_a?(Document)
       @attributes.except(:modified_at).except(:created_at) ==
         other.attributes.except(:modified_at).except(:created_at)
     end
@@ -198,6 +205,11 @@ module Mongoid #:nodoc:
       self.class.collection
     end
 
+    # Returns the class defaults
+    def defaults
+      self.class.defaults
+    end
+
     # Return true if the +Document+ is embedded in another +Document+.
     def embedded?
       self.class.embedded?
@@ -225,7 +237,7 @@ module Mongoid #:nodoc:
     # Instantiate a new Document, setting the Document's attributes if given.
     # If no attributes are provided, they will be initialized with an empty Hash.
     def initialize(attrs = {})
-      process(attrs)
+      process(defaults.merge(attrs))
       @new_record = true if id.nil?
       generate_key
     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.utc
+          value.to_time.utc unless value.blank?
         end
         def get(value)
           value ? value.to_date : value

data/mongoid.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-12}
+  s.date = %q{2009-11-14}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
+     "perf/benchmark.rb",
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -163,3 +164,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongo_ext>, ["= 0.16"])
   end
 end
+

data/perf/benchmark.rb

@@ -0,0 +1,66 @@
+require "rubygems"
+require "ruby-prof"
+require "mongoid"
+
+class Person < Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Versioning
+  field :birth_date, :type => Date
+  has_one :name
+  has_many :addresses
+  has_many :phones
+end
+
+class Name < Mongoid::Document
+  include Mongoid::Timestamps
+  field :given
+  field :family
+  field :middle
+  belongs_to :person
+end
+
+class Address < Mongoid::Document
+  include Mongoid::Timestamps
+  field :street
+  field :city
+  field :state
+  field :post_code
+  field :type
+  belongs_to :person
+end
+
+class Phone < Mongoid::Document
+  include Mongoid::Timestamps
+  field :country_code, :type => Integer
+  field :number
+  field :type
+  belongs_to :person
+end
+
+Mongoid.connect_to("mongoid_performance")
+
+Mongoid.database.collection("people").drop
+
+RubyProf.start
+
+1000.times do |n|
+  person = Person.new(:birth_date => Date.new(1970, 1, 1))
+  name = Name.new(:given => "James", :family => "Kirk", :middle => "Tiberius")
+  address = Address.new(
+    :street => "1 Starfleet Command Way",
+    :city => "San Francisco",
+    :state => "CA",
+    :post_code => "94133",
+    :type => "Work"
+  )
+  phone = Phone.new(:country_code => 1, :number => "415-555-1212", :type => "Mobile")
+  person.name = name
+  person.addresses << address
+  person.phones << phone
+  person.save
+  puts "Saved person #{n}"
+end
+
+result = RubyProf.stop
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT, 0)

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ class Person < Mongoid::Document
   field :dob, :type => Date
   field :mixed_drink, :type => MixedDrink
   field :employer_id
+  field :lunch_time, :type => Time
   has_many :addresses
   has_many :phone_numbers, :class_name => "Phone"
   has_one :name
@@ -117,3 +118,8 @@ class Post < Mongoid::Document
   include Mongoid::Versioning
   field :title
 end
+
+class Game < Mongoid::Document
+  field :high_score, :default => 500
+  field :score, :default => 0
+end

data/spec/unit/mongoid/document_spec.rb

@@ -48,8 +48,8 @@ describe Mongoid::Document do
 
     context "when other object is not a Document" do
 
-      it "raises an exception" do
-        lambda { Person.new.==("Test") }.should raise_error
+      it "returns false" do
+        Person.new.==("Test").should be_false
       end
 
     end
@@ -134,6 +134,26 @@ describe Mongoid::Document do
 
   end
 
+  describe ".defaults" do
+
+    it "returns a hash of all the default values" do
+      Game.defaults.should == { "high_score" => 500, "score" => 0 }
+    end
+
+  end
+
+  describe "#defaults" do
+
+    before do
+      @game = Game.new
+    end
+
+    it "returns the class defaults" do
+      @game.defaults.should == { "high_score" => 500, "score" => 0 }
+    end
+
+  end
+
   describe ".embedded?" do
 
     context "when the document is embedded" do

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

@@ -14,6 +14,14 @@ describe Mongoid::Extensions::Date::Conversions do
         Date.set(@time.utc.to_s).should == @time
       end
 
+      context "when string is empty" do
+
+        it "returns nil" do
+          Date.set("").should == nil
+        end
+
+      end
+
     end
 
     context "when time provided" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -05:00
+date: 2009-11-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
+- perf/benchmark.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb