mongoid 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/mongoid/associations/belongs_to_association.rb

@@ -21,10 +21,6 @@ module Mongoid #:nodoc:
         @document
       end
 
-      # Delegate equality to the parent document.
-      def ==(other)
-        @document == other
-      end
     end
   end
 end

data/lib/mongoid/associations/decorator.rb

@@ -1,6 +1,8 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     module Decorator #:nodoc:
+      EXTRAS = [:save, :save!, :==]
+
       def self.included(base)
         base.class_eval do
           attr_reader :document
@@ -10,7 +12,8 @@ module Mongoid #:nodoc:
           # since we can ask the class for its methods and get an
           # accurate list.
           def decorate!
-            document.public_methods(false).each do |method|
+            meths = document.public_methods(false) + EXTRAS
+            meths.each do |method|
               (class << self; self; end).class_eval do
                 define_method method do |*args|
                   document.send method, *args

data/lib/mongoid/associations/has_one_association.rb

@@ -20,10 +20,6 @@ module Mongoid #:nodoc:
         decorate!
       end
 
-      # Equality delegates to the document.
-      def ==(other)
-        @document == other
-      end
     end
   end
 end

data/lib/mongoid/document.rb

@@ -117,6 +117,11 @@ module Mongoid #:nodoc:
         before_save :generate_key
       end
 
+      # Find the last +Document+ in the collection by reverse id
+      def last
+        find(:first, :conditions => {}, :sort => [[:_id, :asc]])
+      end
+
       # Returns the primary key field of the +Document+
       def primary_key
         @primary_key
@@ -217,7 +222,7 @@ module Mongoid #:nodoc:
 
     # Reloads the +Document+ attributes from the database.
     def reload
-      @attributes = HashWithIndifferentAccess.new(collection.find_one(id))
+      @attributes = HashWithIndifferentAccess.new(collection.find_one(:_id => id))
     end
 
     # Returns the id of the Document
@@ -252,7 +257,7 @@ module Mongoid #:nodoc:
         values = primary_key.collect { |key| @attributes[key] }
         @attributes[:_id] = values.join(" ").parameterize.to_s
       else
-        @attributes[:_id] = Mongo::ObjectID.new unless id
+        @attributes[:_id] = Mongo::ObjectID.new.to_s unless id
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Mongoid #:nodoc:
     module Boolean #:nodoc:
       module Conversions #:nodoc:
         def set(value)
-          value == "true"
+          value.to_s == "true"
         end
         def get(value)
           value

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

@@ -6,7 +6,7 @@ module Mongoid #:nodoc:
           value.to_time.utc
         end
         def get(value)
-          value.to_date
+          value ? value.to_date : value
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Mongoid #:nodoc:
 
         module ClassMethods
           def set(value)
-            value.attributes
+            value.respond_to?(:attributes) ? value.attributes : value
           end
 
           def get(value)

data/lib/mongoid/field.rb

@@ -26,7 +26,7 @@ module Mongoid #:nodoc:
     # Used for setting an object in the attributes hash. If nil is provided the
     # default will get returned if it exists.
     def set(object)
-      object ? type.set(object) : default
+      object.nil? ? default : type.set(object)
     end
 
     # Used for retrieving the object out of the attributes hash.

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   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

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

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

@@ -23,7 +23,7 @@ describe Mongoid::Associations::BelongsToAssociation do
     context "when finding by id" do
 
       it "returns the document in the array with that id" do
-        name = @association.find(Mongo::ObjectID.new)
+        name = @association.find(Mongo::ObjectID.new.to_s)
         name.should == @parent
       end
 

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

@@ -55,9 +55,9 @@ describe Mongoid::Associations::Decorator do
       @decorated = Decorated.new(@person)
     end
 
-    it "adds all the documents public methods to the class" do
+    it "adds all the documents methods to the class" do
       @decorated.decorate!
-      @decorated.should respond_to(:title, :terms, :age, :addresses, :name)
+      @decorated.should respond_to(:title, :terms, :age, :addresses, :name, :save)
     end
 
   end

data/spec/unit/mongoid/associations_spec.rb

@@ -2,6 +2,7 @@ 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

data/spec/unit/mongoid/commands_spec.rb

@@ -154,4 +154,4 @@ describe Mongoid::Commands do
 
   end
 
-end
+end

data/spec/unit/mongoid/criteria_spec.rb

@@ -195,13 +195,13 @@ describe Mongoid::Criteria do
   describe "#id" do
 
     it "adds the _id query to the selector" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       @criteria.id(id)
       @criteria.selector.should == { :_id => id }
     end
 
     it "returns self" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       @criteria.id(id.to_s).should == @criteria
     end
 
@@ -413,7 +413,7 @@ describe Mongoid::Criteria do
     context "with a single argument" do
 
       it "creates a criteria for an object id" do
-        id = Mongo::ObjectID.new
+        id = Mongo::ObjectID.new.to_s
         criteria = Mongoid::Criteria.translate(id)
         criteria.selector.should == { :_id => id }
       end

data/spec/unit/mongoid/document_spec.rb

@@ -208,7 +208,7 @@ describe Mongoid::Document do
     context "when an id is passed in" do
 
       before do
-        @id = Mongo::ObjectID.new
+        @id = Mongo::ObjectID.new.to_s
       end
 
       it "delegates to criteria" do
@@ -344,6 +344,19 @@ describe Mongoid::Document do
 
   end
 
+  describe "#last" do
+
+    before do
+      @attributes = { :_id => 1, :title => "Sir" }
+      @collection.expects(:find_one).with({}, :sort => [[:_id, :asc]]).returns(@attributes)
+    end
+
+    it "finds the last document by the id" do
+      Person.last.should == Person.new(@attributes)
+    end
+
+  end
+
   describe "#new" do
 
     context "with no attributes" do
@@ -513,8 +526,8 @@ describe Mongoid::Document do
 
     before do
       @attributes = { "title" => "Herr" }
-      @person = Person.new(:_id => Mongo::ObjectID.new)
-      @collection.expects(:find_one).with(@person.id).returns(@attributes)
+      @person = Person.new(:_id => Mongo::ObjectID.new.to_s)
+      @collection.expects(:find_one).with(:_id => @person.id).returns(@attributes)
     end
 
     it "reloads the object attribtues from the database" do
@@ -536,7 +549,7 @@ describe Mongoid::Document do
   describe "#to_param" do
 
     it "returns the id" do
-      id = Mongo::ObjectID.new
+      id = Mongo::ObjectID.new.to_s
       Person.new(:_id => id).to_param.should == id.to_s
     end
 
@@ -557,6 +570,19 @@ describe Mongoid::Document do
 
     end
 
+    context "when field has a default value" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "should allow overwriting of the default value" do
+        @person.terms = true
+        @person.terms.should be_true
+      end
+
+    end
+
   end
 
   describe "#write_attributes" do

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

@@ -36,8 +36,20 @@ describe Mongoid::Extensions::Date::Conversions do
 
   describe "#get" do
 
-    it "converts the time back to a date" do
-      Date.get(@time).should == @time.to_date
+    context "when value is nil" do
+
+      it "returns nil" do
+        Date.get(nil).should be_nil
+      end
+
+    end
+
+    context "when value is not nil" do
+
+      it "converts the time back to a date" do
+        Date.get(@time).should == @time.to_date
+      end
+
     end
 
   end

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

@@ -30,13 +30,17 @@ describe Mongoid::Extensions::Object::Conversions do
 
   describe "#set" do
 
-    before do
-      @attributes = { "_id" => "test", "title" => "Sir", "age" => 100 }
-      @person = Person.new(@attributes)
-    end
+    context "when object has attributes" do
+
+      before do
+        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100 }
+        @person = Person.new(@attributes)
+      end
+
+      it "converts the object to a hash" do
+        Person.set(@person).should == @attributes
+      end
 
-    it "converts the object to a hash" do
-      Person.set(@person).should == @attributes
     end
 
   end

metadata

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