mongoid 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/mongoid/associations/has_one_association.rb

@@ -13,7 +13,7 @@ module Mongoid #:nodoc:
       # to the internal document itself.
       def initialize(name, document, options = {})
         class_name = options[:class_name]
-        klass = class_name ? class_name.constantize : name.to_s.titleize.constantize
+        klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
         attributes = document.attributes[name]
         @document = klass.new(attributes)
         @document.parent = document

data/lib/mongoid/document.rb

@@ -5,15 +5,17 @@ module Mongoid #:nodoc:
     extend Associations
 
     attr_accessor :association_name, :parent
-    attr_reader :attributes
+    attr_reader :attributes, :new_record
 
     define_callbacks \
       :after_create,
       :after_destroy,
       :after_save,
+      :after_update,
       :before_create,
       :before_destroy,
-      :before_save
+      :before_save,
+      :before_update
 
     class << self
 
@@ -188,6 +190,7 @@ module Mongoid #:nodoc:
     # If no attributes are provided, they will be initialized with an empty Hash.
     def initialize(attributes = {})
       @attributes = process(fields, attributes)
+      @new_record = true if id.nil?
       generate_key
     end
 
@@ -198,7 +201,7 @@ module Mongoid #:nodoc:
 
     # Returns true is the Document has not been persisted to the database, false if it has.
     def new_record?
-      @attributes[:_id].nil?
+      @new_record == true
     end
 
     # Notify observers that this Document has changed.
@@ -225,7 +228,9 @@ module Mongoid #:nodoc:
 
     # Write to the attributes hash.
     def write_attribute(name, value)
+      run_callbacks(:before_update)
       @attributes[name] = fields[name].set(value)
+      run_callbacks(:after_update)
       notify
     end
 
@@ -241,6 +246,8 @@ module Mongoid #:nodoc:
       if primary_key
         values = primary_key.collect { |key| @attributes[key] }
         @attributes[:_id] = values.join(" ").parameterize.to_s
+      else
+        @attributes[:_id] = Mongo::ObjectID.new unless id
       end
     end
   end

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

@@ -7,6 +7,21 @@ module Mongoid #:nodoc:
         def mongoidize
           collect { |obj| obj.attributes }
         end
+
+        def self.included(base)
+          base.class_eval do
+            extend ClassMethods
+          end
+        end
+
+        module ClassMethods
+          def get(value)
+            value
+          end
+          def set(value)
+            value
+          end
+        end
       end
     end
   end

data/mongoid.gemspec

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

data/spec/spec_helper.rb

@@ -27,6 +27,10 @@ class Person < Mongoid::Document
   has_one :pet, :class_name => "Animal"
 end
 
+class MixedDrink < Mongoid::Document
+  field :name
+end
+
 class Address < Mongoid::Document
   field :street
   field :city

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

@@ -3,20 +3,20 @@ require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
 describe Mongoid::Associations::HasOneAssociation do
 
   before do
-    @attributes = { :name => { :first_name => "Drexel" } }
+    @attributes = { :mixed_drink => { :name => "Jack and Coke" } }
     @document = stub(:attributes => @attributes)
   end
 
   describe "#decorate!" do
 
     before do
-      @association = Mongoid::Associations::HasOneAssociation.new(:name, @document)
+      @association = Mongoid::Associations::HasOneAssociation.new(:mixed_drink, @document)
     end
 
     context "when getting values" do
 
       it "delegates to the document" do
-        @association.first_name.should == "Drexel"
+        @association.name.should == "Jack and Coke"
       end
 
     end
@@ -24,12 +24,12 @@ describe Mongoid::Associations::HasOneAssociation do
     context "when setting values" do
 
       it "delegates to the document" do
-        @association.first_name = "Test"
-        @association.first_name.should == "Test"
+        @association.name = "Jack and Coke"
+        @association.name.should == "Jack and Coke"
       end
 
     end
 
   end
 
-end
+end

data/spec/unit/mongoid/document_spec.rb

@@ -21,8 +21,8 @@ describe Mongoid::Document do
       context "when attributes are equal" do
 
         before do
-          @document = Person.new(:title => "Sir")
-          @other = Person.new(:title => "Sir")
+          @document = Person.new(:_id => 1, :title => "Sir")
+          @other = Person.new(:_id => 1, :title => "Sir")
         end
 
         it "returns true" do
@@ -219,7 +219,7 @@ describe Mongoid::Document do
 
       it "finds the first document from the collection and instantiates it" do
         @collection.expects(:find_one).with({ :test => "Test" }, {}).returns(@attributes)
-        Person.first(:conditions => {:test => "Test"}).attributes.should == @attributes
+        Person.first(:conditions => {:test => "Test"}).attributes.except(:_id).should == @attributes
       end
 
     end
@@ -228,7 +228,7 @@ describe Mongoid::Document do
 
       it "finds the first document from the collection and instantiates it" do
         @collection.expects(:find_one).with(nil, {}).returns(@attributes)
-        Person.first.attributes.should == @attributes
+        Person.first.attributes.except(:_id).should == @attributes
       end
 
     end

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

@@ -5,10 +5,29 @@ describe Mongoid::Extensions::Array::Conversions do
   describe "#mongoidize" do
 
     it "collects each of its attributes" do
-      array = [Person.new(:title => "Sir"), Person.new(:title => "Madam")]
+      array = [
+        Person.new(:_id => 1, :title => "Sir"),
+        Person.new(:_id => 2, :title => "Madam")
+      ]
       array.mongoidize.should ==
-        [HashWithIndifferentAccess.new({ :title => "Sir", :age => 100 }),
-         HashWithIndifferentAccess.new({ :title => "Madam", :age => 100 })]
+        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100 }),
+          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100 }) ]
+    end
+
+  end
+
+  describe "#get" do
+
+    it "returns the array" do
+      Array.get(["test"]).should == ["test"]
+    end
+
+  end
+
+  describe "#set" do
+
+    it "returns the array" do
+      Array.set(["test"]).should == ["test"]
     end
 
   end

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

@@ -5,8 +5,8 @@ describe Mongoid::Extensions::Object::Conversions do
   describe "#mongoidize" do
 
     it "returns its attributes" do
-      Person.new(:title => "Sir").mongoidize.should ==
-        HashWithIndifferentAccess.new({ :title => "Sir", :age => 100 })
+      Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
+        HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100 })
     end
 
   end

metadata

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