mongo_mapper 0.11.0 → 0.11.1

data/test/functional/test_querying.rb

@@ -482,6 +482,30 @@ class QueryingTesting < Test::Unit::TestCase
     end
   end
 
+  context ".size" do
+    should "return 0 if no documents" do
+      @document.count.should == 0
+    end
+
+    should "return the number of documents" do
+      @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
+      @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
+      @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
+      @document.count.should == 3
+    end
+  end
+
+  context ".empty?" do
+    should "be true if no documents" do
+      @document.empty?.should be_true
+    end
+
+    should "be false if documents present" do
+      @doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
+      @document.empty?.should be_false
+    end
+  end
+
   context ".exists?" do
     setup do
       @doc = @document.create(:first_name => "James", :age => 27)
@@ -505,6 +529,19 @@ class QueryingTesting < Test::Unit::TestCase
     end
   end
 
+  context "to_a" do
+    should "return an array" do
+      @document.to_a.class.should == Array
+    end
+
+    should "return everything" do
+      @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
+      @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
+      @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
+      @document.to_a.size.should == 3
+    end
+  end
+
   context ".where" do
     setup do
       @doc1 = @document.create(:first_name => 'John',  :last_name => 'Nunemaker', :age => '27')

data/test/functional/test_timestamps.rb

@@ -47,16 +47,16 @@ class TimestampsTest < Test::Unit::TestCase
 
     should "set updated_at on document update but leave created_at alone" do
       doc = @klass.create(:first_name => 'John', :age => 27)
-      old_created_at = doc.created_at
-      old_updated_at = doc.updated_at
+      old_created_at = doc.created_at.to_f
 
-      Timecop.freeze(Time.now + 5.seconds) do
+      new_updated_at = Time.now + 5.seconds
+      Timecop.freeze(new_updated_at) do
         @klass.update(doc._id, { :first_name => 'Johnny' })
       end
 
       doc = doc.reload
-      doc.created_at.should == old_created_at
-      doc.updated_at.should_not == old_updated_at
+      doc.created_at.to_f.should be_close(old_created_at, 0.001)
+      doc.updated_at.to_f.should be_close(new_updated_at.to_f, 0.001)
     end
   end
 end

data/test/functional/test_touch.rb

@@ -0,0 +1,125 @@
+require 'test_helper'
+
+class TouchTest < Test::Unit::TestCase
+  context "touch" do
+    context "document" do
+      setup do
+        @document = Doc { timestamps! }
+      end
+
+      should "update the updated_at timestamp" do
+        doc = @document.create
+        old_updated_at = doc.updated_at
+
+        Timecop.freeze(Time.now + 1.day) do
+          doc.touch
+        end
+
+        doc.reload
+        doc.updated_at.should_not == old_updated_at      
+      end
+    end
+
+    context "embedded document" do
+      should "update the updated_at timestamp" do
+        Doc = Doc("Document") { timestamps!}
+        Emdoc = EDoc("EmbeddedDocument") { timestamps! }
+        Doc.has_many :emdocs, :class => Emdoc
+
+        doc = Doc.create
+        emdoc = Emdoc.new
+        doc.emdocs << emdoc
+        doc.save
+
+        old_updated_at = emdoc.updated_at
+        document_old_updated_at = doc.updated_at
+
+        Timecop.freeze(Time.now + 1.day) do
+          emdoc.touch
+        end
+
+        doc.reload
+        emdoc.updated_at.should_not == old_updated_at
+        doc.updated_at.should_not == document_old_updated_at
+      end
+    end
+
+    context "association" do
+      setup do
+        @post_class = Doc("Post") do
+          key :touched_at, DateTime
+          timestamps!
+        end
+        @comment_class = Doc("Comment") do
+          key :post_id, ObjectId
+          key :text, String
+          timestamps!
+        end
+
+        @post_class.many :comments, :class => @comment_class
+      end
+
+      should 'not be true by default' do
+        @comment_class.belongs_to :post, :class => @post_class
+        @comment_class.associations[:post].touch?.should_not be_true
+      end
+
+      context 'touch the parent when true' do
+        setup do
+          @comment_class.belongs_to :post, :class => @post_class, :touch => true
+          @post = @post_class.create(:title => 'Hello, world!')
+          @comment = @post.comments.build
+        end
+
+        should "when the child is created" do
+          orig_updated_at = @post.updated_at
+          Timecop.freeze(Time.now + 1.day) do
+            @comment.save
+          end
+
+          @post.reload.updated_at.should_not == orig_updated_at
+        end
+        
+        should "when the child is updated" do
+          @comment.save
+          old_updated_at = @post.updated_at
+          Timecop.freeze(Time.now + 2.day) do
+            @comment.update_attributes(:text => "Something")
+          end
+          @post.reload.updated_at.should_not == old_updated_at
+        end
+        
+        should "when the child is touched" do
+          @comment.save
+          old_updated_at = @post.updated_at
+          Timecop.freeze(Time.now + 3.day) do
+            @comment.touch
+          end
+          @post.reload.updated_at.should_not == old_updated_at
+        end
+      end
+
+      context "when set to a symbol that is a key of parent" do
+        should "set that key on touch events" do
+          @comment_class.belongs_to :post, :class => @post_class, :touch => :touched_at
+          post = @post_class.create(:title => 'Hello, world!')
+          post.touched_at.should be_nil
+
+          comment = post.comments.build
+          comment.save
+          post.reload.touched_at.should_not be_nil
+        end
+      end
+
+      should 'not touch the parent when false' do
+        post = @post_class.create(:title => 'Hello, world!')
+        comment = post.comments.build
+        Timecop.freeze(Time.now + 1.day) do
+          comment.save
+        end
+      
+        post.reload.updated_at.should == post.created_at
+      end
+    end
+  end
+end

data/test/unit/associations/test_base.rb

@@ -133,4 +133,14 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
 
+  context "touch?" do
+    should "be true if touch" do
+      BelongsToAssociation.new(:car, :touch => true).touch?.should be_true
+    end
+
+    should "be false if not touch" do
+      BelongsToAssociation.new(:car).touch?.should be_false
+    end
+  end
+
 end

data/test/unit/test_extensions.rb

@@ -282,7 +282,7 @@ class SupportTest < Test::Unit::TestCase
     end
 
     should "be time to milliseconds if string" do
-      Time.to_mongo('2000-01-01 01:01:01.123456').to_f.should == Time.local(2000, 1, 1, 1, 1, 1, 0).utc.to_f
+      Time.to_mongo('2000-01-01 01:01:01.123456').to_f.should be_close(Time.local(2000, 1, 1, 1, 1, 1, 123456).utc.to_f, 0.0000001)
     end
 
     should "be time in utc if time" do
@@ -301,18 +301,18 @@ class SupportTest < Test::Unit::TestCase
   context "Time.to_mongo with Time.zone" do
     should "be time to milliseconds if time" do
       Time.zone = 'Hawaii'
-      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 0).to_f
+      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).to_f.should be_close(Time.utc(2009, 8, 16, 0, 0, 0, 123456).to_f, 0.0000001)
       Time.zone = nil
     end
 
     should "be time to milliseconds if string" do
       Time.zone = 'Hawaii'
-      Time.to_mongo('2009-08-15 14:00:00.123456').to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 0).to_f
+      Time.to_mongo('2009-08-15 14:00:00.123456').to_f.should be_close(Time.utc(2009, 8, 16, 0, 0, 0, 123456).to_f, 0.0000001)
       Time.zone = nil
     end
 
     should "not round up times at the end of the month" do
-      Time.to_mongo(Time.now.end_of_month).to_i.should == Time.now.end_of_month.utc.to_i
+      Time.to_mongo(Time.now.end_of_month).to_f.should be_close(Time.now.end_of_month.utc.to_f, 0.0000001)
     end
 
     should "be nil if blank string" do

data/test/unit/test_inspect.rb

@@ -23,5 +23,25 @@ class InspectTest < Test::Unit::TestCase
     should "include class name" do
       @doc.inspect.should =~ /^#<User/
     end
+    
+    should "include embedded documents" do
+      klass = Doc()
+      pets = EDoc()
+
+      klass.many :pets, :class => pets
+
+      doc = klass.new(:pets => [{:name => "Kitten"}])
+      doc.inspect.should =~ /_id:.*, pets: \[.*_id.*, name: "Kitten".*\]/
+    end
+    
+    should "include embedded document" do
+      klass = Doc()
+      pet = EDoc()
+
+      klass.one :pet, :class => pet
+
+      doc = klass.new(:pet => {:name => "Kitten"})
+      doc.inspect.should =~ /_id:.*, pet: .*_id.*, name: "Kitten".*/
+    end
   end
 end

data/test/unit/test_mongo_mapper.rb

@@ -56,6 +56,16 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.connect('development')
     end
 
+    should "work with sinatra environment symbol" do
+      MongoMapper.config = {
+        'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
+      }
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect(:development)
+    end
+
     should "work with options" do
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}

data/test/unit/test_time_zones.rb

@@ -9,6 +9,11 @@ class TimeZonesTest < Test::Unit::TestCase
       end
     end
 
+    should "preserve milliseconds" do
+      doc = @document.new(:created_at => '2011-02-12 16:01:02.543Z')
+      doc.created_at.should be_close(Time.parse('2011-02-12 16:01:02.543Z'), 0.0000001)
+    end
+
     should "work without Time.zone" do
       Time.zone = nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,13 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 -05:00
-default_executable: 
+date: 2012-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: activemodel
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +28,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  prerelease: false
   requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: activemodel
   type: :runtime
-  name: activesupport
-  prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +43,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  prerelease: false
   requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: activesupport
   type: :runtime
-  name: plucky
-  prerelease: false
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,7 +59,10 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
+  prerelease: false
   requirement: *id003
+  name: plucky
+  type: :runtime
 description: 
 email: 
 - nunemaker@gmail.com
@@ -161,6 +160,7 @@ files:
 - lib/mongo_mapper/plugins/scopes.rb
 - lib/mongo_mapper/plugins/serialization.rb
 - lib/mongo_mapper/plugins/timestamps.rb
+- lib/mongo_mapper/plugins/touch.rb
 - lib/mongo_mapper/plugins/userstamps.rb
 - lib/mongo_mapper/plugins/validations.rb
 - lib/mongo_mapper/plugins.rb
@@ -207,6 +207,7 @@ files:
 - test/functional/test_sci.rb
 - test/functional/test_scopes.rb
 - test/functional/test_timestamps.rb
+- test/functional/test_touch.rb
 - test/functional/test_userstamps.rb
 - test/functional/test_validations.rb
 - test/models.rb
@@ -247,7 +248,6 @@ files:
 - LICENSE
 - UPGRADES
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jnunemaker/mongomapper
 licenses: []
 
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Ruby Object Mapper for Mongo