mongo_mapper 0.7.0 → 0.7.1

data/test/functional/test_protected.rb

@@ -16,7 +16,7 @@ class ProtectedTest < Test::Unit::TestCase
     should 'have protected attributes class method' do
       @doc_class.protected_attributes.should == [:admin].to_set
     end
-    
+
     should "default protected attributes to nil" do
       Doc().protected_attributes.should be_nil
     end
@@ -46,7 +46,7 @@ class ProtectedTest < Test::Unit::TestCase
       doc = @doc_class.new(:name => 'John')
       doc.admin = true
       doc.save!
-      
+
       doc = @doc_class.first(:name => 'John')
       doc.admin.should be_true
       doc.name.should == 'John'
@@ -63,8 +63,14 @@ class ProtectedTest < Test::Unit::TestCase
       @doc.name.should == 'Stimpson J. Cat'
       @doc.admin.should be_false
     end
+
+    should 'be indifferent to whether the protected keys are strings or symbols' do
+      @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
+      @doc.name.should == 'Stimpson J. Cat'
+      @doc.admin.should be_false
+    end
   end
-  
+
   context "Single collection inherited protected attributes" do
     setup do
       class ::GrandParent
@@ -126,7 +132,7 @@ class ProtectedTest < Test::Unit::TestCase
     should 'have protected attributes class method' do
       @edoc_class.protected_attributes.should == [:admin].to_set
     end
-    
+
     should "default protected attributes to nil" do
       EDoc().protected_attributes.should be_nil
     end
@@ -152,4 +158,4 @@ class ProtectedTest < Test::Unit::TestCase
       @edoc.admin.should be_false
     end
   end
-end
+end

data/test/functional/test_timestamps.rb

@@ -0,0 +1,64 @@
+require 'test_helper'
+
+class TimestampsTest < Test::Unit::TestCase
+  context "timestamping" do
+    setup do
+      @klass = Doc do
+        set_collection_name 'users'
+
+        key :first_name, String
+        key :last_name, String
+        key :age, Integer
+        key :date, Date
+      end
+      @klass.timestamps!
+    end
+
+    should "set created_at and updated_at on create" do
+      doc = @klass.new(:first_name => 'John', :age => 27)
+      doc.created_at.should be(nil)
+      doc.updated_at.should be(nil)
+      doc.save
+      doc.created_at.should_not be(nil)
+      doc.updated_at.should_not be(nil)
+    end
+
+    should "not overwrite created_at if it already exists" do
+      original_created_at = 1.month.ago
+      doc = @klass.new(:first_name => 'John', :age => 27, :created_at => original_created_at)
+      doc.created_at.to_i.should == original_created_at.to_i
+      doc.updated_at.should be_nil
+      doc.save
+      doc.created_at.to_i.should == original_created_at.to_i
+      doc.updated_at.should_not be_nil
+    end
+
+    should "set updated_at on field 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
+      doc.first_name = 'Johnny'
+
+      Timecop.freeze(Time.now + 5.seconds) do
+        doc.save
+      end
+
+      doc.created_at.should == old_created_at
+      doc.updated_at.should_not == old_updated_at
+    end
+
+    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
+
+      Timecop.freeze(Time.now + 5.seconds) 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
+    end
+  end
+end

data/test/functional/test_userstamps.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class UserstampsTest < Test::Unit::TestCase
+  context "userstamping" do
+    setup do
+      @document = Doc do
+        set_collection_name 'users'
+        userstamps!
+      end
+    end
+
+    should "add creator_id key" do
+      @document.keys.keys.should include('creator_id')
+    end
+
+    should "add updater_id key" do
+      @document.keys.keys.should include('updater_id')
+    end
+
+    should "add belongs_to creator" do
+      @document.associations.keys.should include('creator')
+    end
+
+    should "add belongs_to updater" do
+      @document.associations.keys.should include('updater')
+    end
+  end
+end

data/test/support/timing.rb

@@ -5,7 +5,7 @@ class Test::Unit::TestCase
     end_time = Time.now
  
     duration = end_time - begin_time
-    threshold = 1.0
+    threshold = 5.0
     
     if duration > threshold
       puts "\nSLOW TEST: #{duration} - #{self.name}"

data/test/unit/serializers/test_json_serializer.rb

@@ -1,6 +1,14 @@
 require 'test_helper'
+require 'active_support/version'
 
 class JsonSerializationTest < Test::Unit::TestCase
+  
+  # Helper function in case things change in the future 
+  # - replacing all those to_json calls was a nightmare
+  def convert_to_json object, options = {}
+    ActiveSupport::JSON.encode(object, options)
+  end
+  
   class Tag
     include MongoMapper::EmbeddedDocument
     key :name, String
@@ -30,11 +38,11 @@ class JsonSerializationTest < Test::Unit::TestCase
   
   should "include demodulized root" do
     Contact.include_root_in_json = true
-    assert_match %r{^\{"contact": \{}, @contact.to_json
+    assert_match %r{^\{"contact":\s?\{}, convert_to_json(@contact)
   end
   
   should "encode all encodable attributes" do
-    json = @contact.to_json
+    json = convert_to_json(@contact)
 
     assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
@@ -45,7 +53,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
   
   should "allow attribute filtering with only" do
-    json = @contact.to_json(:only => [:name, :age])
+    json = convert_to_json(@contact, :only => [:name, :age])
 
     assert_no_match %r{"_id"}, json
     assert_match %r{"name":"Konata Izumi"}, json
@@ -56,7 +64,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   end
   
   should "allow attribute filtering with except" do
-    json = @contact.to_json(:except => [:name, :age])
+    json = convert_to_json(@contact, :except => [:name, :age])
 
     assert_no_match %r{"_id"}, json
     assert_no_match %r{"name"}, json
@@ -68,12 +76,12 @@ class JsonSerializationTest < Test::Unit::TestCase
   
   context "_id key" do
     should "not be included by default" do
-      json = @contact.to_json
+      json = convert_to_json(@contact)
       assert_no_match %r{"_id":}, json
     end
     
     should "not be included even if :except is used" do
-      json = @contact.to_json(:except => :name)
+      json = convert_to_json(@contact, :except => :name)
       assert_no_match %r{"_id":}, json
     end
   end
@@ -85,12 +93,12 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "be included by default" do
-      json = @contact.to_json
+      json = convert_to_json(@contact)
       assert_match %r{"id"}, json
     end
     
     should "be included when single method included" do
-      json = @contact.to_json(:methods => :label)
+      json = convert_to_json(@contact, :methods => :label)
       assert_match %r{"id"}, json
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"name":"Konata Izumi"}, json
@@ -98,7 +106,7 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "be included when multiple methods included" do
-      json = @contact.to_json(:methods => [:label, :favorite_quote])
+      json = convert_to_json(@contact, :methods => [:label, :favorite_quote])
       assert_match %r{"id"}, json
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"favorite_quote":"Constraints are liberating"}, json
@@ -106,9 +114,14 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "not be included if :only is present" do
-      json = @contact.to_json(:only => :name)
+      json = convert_to_json(@contact, :only => :name)
       assert_no_match %r{"id":}, json
     end
+    
+    should "be represented by a string" do
+      json = convert_to_json(@contact)
+      assert_match %r{"id":"}, json
+    end      
   end  
   
   context "including methods" do
@@ -118,12 +131,12 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
     
     should "include single method" do
-      json = @contact.to_json(:methods => :label)
+      json = convert_to_json(@contact, :methods => :label)
       assert_match %r{"label":"Has cheezburger"}, json
     end
     
     should "include multiple methods" do
-      json = @contact.to_json(:only => :name, :methods => [:label, :favorite_quote])
+      json = convert_to_json(@contact, :only => :name, :methods => [:label, :favorite_quote])
       assert_match %r{"label":"Has cheezburger"}, json
       assert_match %r{"favorite_quote":"Constraints are liberating"}, json
       assert_match %r{"name":"Konata Izumi"}, json
@@ -143,13 +156,13 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
 
     should "allow attribute filtering with only" do
-      json = @contacts.to_json(:only => :name)
+      json =convert_to_json(@contacts, :only => :name)
       assert_match %r{\{"name":"David"\}}, json
       assert_match %r{\{"name":"Mary"\}}, json
     end
     
     should "allow attribute filtering with except" do
-      json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
+      json = convert_to_json(@contacts, :except => [:name, :preferences, :awesome, :created_at, :updated_at])
       assert_match %r{"age":39},          json
       assert_match %r{"age":14},          json
       assert_no_match %r{"name":},        json
@@ -165,7 +178,7 @@ class JsonSerializationTest < Test::Unit::TestCase
       1 => Contact.new(:name => 'David', :age => 39),
       2 => Contact.new(:name => 'Mary', :age => 14)
     }
-    json = contacts.to_json(:only => [1, :name])
+    json = convert_to_json(contacts, :only => [1, :name])
     assert_match %r{"1":},               json
     assert_match %r{\{"name":"David"\}}, json
     assert_no_match %r{"2":},            json
@@ -174,7 +187,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "include embedded attributes" do
     contact = Contact.new(:name => 'John', :age => 27)
     contact.tags = [Tag.new(:name => 'awesome'), Tag.new(:name => 'ruby')]
-    json = contact.to_json
+    json = convert_to_json(contact)
     assert_match %r{"tags":}, json
     assert_match %r{"name":"awesome"}, json
     assert_match %r{"name":"ruby"}, json
@@ -183,7 +196,7 @@ class JsonSerializationTest < Test::Unit::TestCase
   should "include dynamic attributes" do
     contact = Contact.new(:name => 'John', :age => 27, :foo => 'bar')
     contact['smell'] = 'stinky'
-    json = contact.to_json
+    json = convert_to_json(contact)
     assert_match %r{"smell":"stinky"}, json
   end
 end

data/test/unit/test_embedded_document.rb

@@ -42,7 +42,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       Object.send :remove_const, 'Child'       if defined?(::Child)
       Object.send :remove_const, 'OtherChild'  if defined?(::OtherChild)
     end
-    
+
     context "Including MongoMapper::EmbeddedDocument in a class" do
       setup do
         @klass = EDoc()
@@ -249,34 +249,34 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
       should "convert string object id to mongo object id when assigning id with _id object id type" do
         id = Mongo::ObjectID.new
-
         doc = @document.new(:id => id.to_s)
         doc._id.should == id
-        doc.id.should == id
-
+        doc.id.should  == id
         doc = @document.new(:_id => id.to_s)
         doc._id.should == id
-        doc.id.should == id
+        doc.id.should  == id
       end
 
-      context "_root_document" do
+      context "_parent_document" do
         should "default to nil" do
+          @document.new._parent_document.should be_nil
           @document.new._root_document.should be_nil
         end
 
-        should "allow setting when initialized" do
+        should "set _root_document when setting _parent_document" do
           root = Doc().new
-          doc  = @document.new :_root_document => root
-
+          doc  = @document.new(:_parent_document => root)
+          doc._parent_document.should be(root)
           doc._root_document.should be(root)
         end
 
-        should "also be set on many embedded documents" do
-          root  = Doc().new
-          klass = EDoc { many :children }
-          doc   = klass.new(:_root_document => root, :children => [{}])
-
-          doc.children.first._root_document.should == root
+        should "set _root_document when setting _parent_document on embedded many" do
+          root   = Doc().new
+          klass  = EDoc { many :children }
+          parent = klass.new(:_parent_document => root, :children => [{}])
+          child  = parent.children.first
+          child._parent_document.should be(parent)
+          child._root_document.should   be(root)
         end
       end
 

data/test/unit/test_keys.rb

@@ -42,25 +42,25 @@ class KeyTest < Test::Unit::TestCase
     should "symbolize option keys" do
       Key.new(:foo, Integer, 'required' => true).options[:required].should be(true)
     end
-    
+
     should "work with just name" do
       key = Key.new(:foo)
       key.name.should == 'foo'
     end
-    
+
     should "work with name and type" do
       key = Key.new(:foo, String)
       key.name.should == 'foo'
       key.type.should == String
     end
-    
+
     should "work with name, type, and options" do
       key = Key.new(:foo, String, :required => true)
       key.name.should == 'foo'
       key.type.should == String
       key.options[:required].should be_true
     end
-    
+
     should "work with name and options" do
       key = Key.new(:foo, :required => true)
       key.name.should == 'foo'
@@ -80,7 +80,7 @@ class KeyTest < Test::Unit::TestCase
     should "not be equal to another key with different type" do
       Key.new(:name, String).should_not == Key.new(:name, Integer)
     end
-    
+
     should "know if it is a embedded_document" do
       Key.new(:name, EDoc()).embeddable?.should be_true
     end
@@ -88,12 +88,12 @@ class KeyTest < Test::Unit::TestCase
     should "know if it is not a embedded_document" do
       Key.new(:name, String).embeddable?.should be_false
     end
-    
+
     should "know if it is a number" do
       Key.new(:age, Integer).number?.should be_true
       Key.new(:age, Float).number?.should be_true
     end
-    
+
     should "know if it is not a number" do
       Key.new(:age, String).number?.should be_false
     end
@@ -110,7 +110,7 @@ class KeyTest < Test::Unit::TestCase
       key.set(FooType.new('something')).should == 'to_mongo'
     end
   end
-  
+
   context "getting a value with a custom type" do
     should "use #from_mongo to convert back to custom type" do
       key = Key.new(:foo, FooType)
@@ -123,7 +123,7 @@ class KeyTest < Test::Unit::TestCase
       key = Key.new(:foo, String)
       key.get('bar').should == 'bar'
     end
-    
+
     should "work without type" do
       key = Key.new(:foo)
       key.get([1, '2']).should == [1, '2']
@@ -144,7 +144,7 @@ class KeyTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "getting a value with a default set" do
     setup do
       @key = Key.new(:foo, String, :default => 'baz')
@@ -157,7 +157,7 @@ class KeyTest < Test::Unit::TestCase
     should "return value if not blank" do
       @key.get('foobar').should == 'foobar'
     end
-    
+
     should "work with Boolean type and false value" do
       Key.new(:active, Boolean, :default => false).get(nil).should be_false
     end
@@ -165,5 +165,9 @@ class KeyTest < Test::Unit::TestCase
     should "work with Boolean type and true value" do
       Key.new(:active, Boolean, :default => true).get(nil).should be_true
     end
+
+    should "work with procs" do
+       Key.new(:foo, String, :default => lambda { return 'hello world' }).get(nil).should == "hello world"
+    end
   end
 end # KeyTest