mongo_mapper-unstable 2009.10.16 → 2009.10.31

data/test/functional/test_validations.rb

@@ -8,7 +8,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "not insert document" do
@@ -32,7 +32,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -48,7 +48,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -68,7 +68,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       @doc = @document.create(:name => 'John Nunemaker')
     end
@@ -97,7 +97,7 @@ class ValidationsTest < Test::Unit::TestCase
           errors.add(:action, 'is invalid') if action.blank?
         end
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "work with validate_on_create callback" do
@@ -140,7 +140,7 @@ class ValidationsTest < Test::Unit::TestCase
         key :name, String
         validates_uniqueness_of :name
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "not fail if object is new" do
@@ -170,8 +170,8 @@ class ValidationsTest < Test::Unit::TestCase
       doc.save.should be_true
 
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'joe') \
         .returns(doc)
 
       doc.name = "joe"
@@ -184,14 +184,67 @@ class ValidationsTest < Test::Unit::TestCase
       doc.save.should be_true
 
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'joe') \
         .returns(doc)
 
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
     end
     
+    should "allow multiple blank entries if :allow_blank => true" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+        
+        key :name
+        validates_uniqueness_of :name, :allow_blank => :true
+      end
+      
+      doc = document.new("name" => "")
+      doc.save.should be_true
+
+      document \
+        .stubs(:first) \
+        .with(:name => '') \
+        .returns(doc)
+
+      doc2 = document.new("name" => "")
+      doc2.should_not have_error_on(:name)
+    end
+
+    should "allow entries that differ only in case by default" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+
+        key :name
+        validates_uniqueness_of :name
+      end
+
+      doc = document.new("name" => "BLAMMO")
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "blammo")
+      doc2.should_not have_error_on(:name)
+    end
+
+    should "fail on entries that differ only in case if :case_sensitive => false" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+
+        key :name
+        validates_uniqueness_of :name, :case_sensitive => false
+      end
+
+      doc = document.new("name" => "BLAMMO")
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "blammo")
+      doc2.should have_error_on(:name)
+    end
+
     context "scoped by a single attribute" do
       setup do
         @document = Class.new do
@@ -202,36 +255,36 @@ class ValidationsTest < Test::Unit::TestCase
           key :scope, String
           validates_uniqueness_of :name, :scope => :scope
         end
-        @document.collection.clear
+        @document.collection.remove
       end
-      
+
       should "fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :scope => "one"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :scope => "one") \
           .returns(doc)
 
         doc2 = @document.new("name" => "joe", "scope" => "one")
         doc2.should have_error_on(:name)
       end
-      
+
       should "pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
-        
+
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :scope => "two"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :scope => 'two') \
           .returns(nil)
 
         doc2 = @document.new("name" => "joe", "scope" => "two")
         doc2.should_not have_error_on(:name)
       end
     end
-    
+
     context "scoped by a multiple attributes" do
       setup do
         @document = Class.new do
@@ -243,7 +296,7 @@ class ValidationsTest < Test::Unit::TestCase
           key :second_scope, String
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
-        @document.collection.clear
+        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -251,8 +304,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :first_scope => "one", :second_scope => "two"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'two') \
           .returns(doc)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
@@ -264,8 +317,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :first_scope => "one", :second_scope => "one"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'one') \
           .returns(nil)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "one")
@@ -282,14 +335,14 @@ class ValidationsTest < Test::Unit::TestCase
         
         key :name, String, :unique => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)
       
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'John'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'John') \
         .returns(doc)
       
       second_john = @document.create(:name => 'John')

data/test/models.rb

@@ -23,14 +23,13 @@ class WindowSize
   end
 end
 
-
 class Post
   include MongoMapper::Document
 
   key :title, String
   key :body, String
 
-  has_many :comments, :as => :commentable, :class_name => 'PostComment'
+  many :comments, :as => :commentable, :class_name => 'PostComment'
 
   timestamps!
 end
@@ -68,29 +67,87 @@ class Message
   belongs_to :room
 end
 
-class Answer
-  include MongoMapper::Document
-
-  key :body, String
-end
-
 class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
+module AccountsExtensions
+  def inactive
+    all(:last_logged_in => nil)
+  end
+end
+
+class Account
+  include MongoMapper::Document
+  
+  key :_type, String
+  key :room_id, String
+  key :last_logged_in, Time
+  
+  belongs_to :room
+end
+class User < Account; end
+class Bot < Account; end
+
 class Room
   include MongoMapper::Document
 
   key :name, String
-  many :messages, :polymorphic => true
+  many :messages, :polymorphic => true do
+    def older
+      all(:position => {'$gt' => 5})
+    end
+  end
+  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
+  
+  many :accounts, :polymorphic => true, :extend => AccountsExtensions
+end
+
+class Answer
+  include MongoMapper::Document
+
+  key :body, String
+end
+
+module PeopleExtensions
+  def find_by_name(name)
+    detect { |p| p.name == name }
+  end
+end
+
+module CollaboratorsExtensions
+  def top
+    first
+  end
 end
 
 class Project
   include MongoMapper::Document
 
   key :name, String
-  many :statuses
-  many :addresses
+  
+  many :people, :extend => PeopleExtensions
+  many :collaborators, :extend => CollaboratorsExtensions
+  
+  many :statuses, :order => 'position' do
+    def open
+      all(:name => %w(New Assigned))
+    end
+  end
+  
+  many :addresses do
+    def find_all_by_state(state)
+      # can't use select here for some reason
+      find_all { |a| a.state == state }
+    end
+  end
+end
+
+class Collaborator
+  include MongoMapper::Document
+  key :project_id, String
+  key :name, String
+  belongs_to :project
 end
 
 class Status
@@ -99,7 +156,7 @@ class Status
   key :project_id, String
   key :target_id, String
   key :target_type, String
-  key :name, String
+  key :name, String, :required => true
   key :position, Integer
 
   belongs_to :project
@@ -109,9 +166,13 @@ end
 class RealPerson
   include MongoMapper::Document
 
-  many :pets
+  key :room_id, String
   key :name, String
-
+  
+  belongs_to :room
+  
+  many :pets
+  
   def realname=(n)
     self.name = n
   end
@@ -138,6 +199,8 @@ class Media
 
   key :_type, String
   key :file, String
+  
+  key :visible, Boolean
 end
 
 class Video < Media
@@ -155,8 +218,13 @@ end
 
 class Catalog
   include MongoMapper::Document
-
-  many :medias, :polymorphic => true
+  
+  many :medias, :polymorphic => true do
+    def visible
+      # for some reason we can't use select here
+      find_all { |m| m.visible? }
+    end
+  end
 end
 
 module TrModels
@@ -165,6 +233,7 @@ module TrModels
 
     key :_type, String
     key :license_plate, String
+    key :purchased_on, Date
   end
 
   class Car < TrModels::Transport
@@ -189,7 +258,14 @@ module TrModels
   class Fleet
     include MongoMapper::Document
 
-    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
+    module TransportsExtension
+      def to_be_replaced
+        # for some reason we can't use select
+        find_all { |t| t.purchased_on < 2.years.ago.to_date }
+      end
+    end
+    
+    many :transports, :polymorphic => true, :class_name => "TrModels::Transport", :extend => TransportsExtension
     key :name, String
   end
 end

data/test/support/{test_timing.rb → timing.rb}

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

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper'))
+require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
 
 gem 'jnunemaker-matchy', '0.4.0'
 gem 'shoulda', '2.10.2'
@@ -12,19 +12,16 @@ require 'mocha'
 require 'pp'
 
 require 'support/custom_matchers'
-require 'support/test_timing'
+require 'support/timing'
 
 class Test::Unit::TestCase
   include CustomMatchers
-  
-  def clear_all_collections
-    MongoMapper::Document.descendants.map { |d| d.collection.clear }
-  end
 end
 
-DefaultDatabase = 'test' unless defined?(DefaultDatabase)
-AlternateDatabase = 'test2' unless defined?(AlternateDatabase)
+test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')
+FileUtils.mkdir_p(test_dir) unless File.exist?(test_dir)
 
-logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../tmp/test.log'))
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
-MongoMapper.database = DefaultDatabase
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, {
+  :logger => Logger.new(test_dir + '/test.log')
+})
+MongoMapper.database = 'test'

data/test/unit/test_association_base.rb

@@ -33,9 +33,14 @@ class AssociationBaseTest < Test::Unit::TestCase
   end
   
   context "klass" do
-    should "be class_name constantized" do
+    should "default to class_name constantized" do
       Base.new(:belongs_to, :foo_monster).klass.should == FooMonster
     end
+    
+    should "be the specified class" do
+      anonnymous_class = Class.new
+      Base.new(:belongs_to, :foo_monster, :class => anonnymous_class).klass.should == anonnymous_class
+    end
   end
   
   context "many?" do
@@ -48,6 +53,23 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
+  context "finder_options" do
+    should "default to empty hash" do
+      base = Base.new(:many, :foos)
+      base.finder_options.should == {}
+    end
+    
+    should "work with order" do
+      base = Base.new(:many, :foos, :order => 'position')
+      base.finder_options.should == {:order => 'position'}
+    end
+    
+    should "correctly parse from options" do
+      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
+      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
+    end
+  end
+  
   context "belongs_to?" do
     should "be true if belongs_to" do
       Base.new(:belongs_to, :foo).belongs_to?.should be_true

data/test/unit/test_document.rb

@@ -8,7 +8,7 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
         set_collection_name 'test'
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have logger method" do
@@ -36,8 +36,9 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "allow setting a different database without affecting the default" do
-      @document.database AlternateDatabase
-      @document.database.name.should == AlternateDatabase
+      @document.set_database_name 'test2'
+      @document.database_name.should == 'test2'
+      @document.database.name.should == 'test2'
 
       another_document = Class.new do
         include MongoMapper::Document
@@ -47,13 +48,24 @@ class DocumentTest < Test::Unit::TestCase
     end
     
     should "default collection name to class name tableized" do
-      class Item
+      class ::Item
         include MongoMapper::Document
       end
       
       Item.collection.should be_instance_of(Mongo::Collection)
       Item.collection.name.should == 'items'
     end
+    
+    should "default collection name of namespaced class to tableized with dot separation" do
+      module ::BloggyPoo
+        class Post
+          include MongoMapper::Document
+        end
+      end
+
+      BloggyPoo::Post.collection.should be_instance_of(Mongo::Collection)
+      BloggyPoo::Post.collection.name.should == 'bloggy_poo.posts'
+    end
 
     should "allow setting the collection name" do
       @document.set_collection_name('foobar')
@@ -91,7 +103,7 @@ class DocumentTest < Test::Unit::TestCase
         key :name, String
         key :age, Integer
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "have access to logger" do
@@ -102,7 +114,7 @@ class DocumentTest < Test::Unit::TestCase
 
     should "have access to the class's collection" do
       doc = @document.new
-      doc.collection.should == @document.collection
+      doc.collection.name.should == @document.collection.name
     end
 
     should "use default values if defined for keys" do
@@ -124,13 +136,18 @@ class DocumentTest < Test::Unit::TestCase
         @document.new._root_document.should be_nil
       end
 
-      should "set self to the root document on embedded documents" do
-        document = Class.new(RealPerson) do
-          many :pets
+      should "set self to the root document on embedded documents" do        
+        klass = Class.new do
+          include MongoMapper::Document
         end
-
-        doc = document.new 'pets' => [{}]
-        doc.pets.first._root_document.should == doc
+        
+        pets = Class.new do
+          include MongoMapper::EmbeddedDocument
+        end
+        klass.many :pets, :class => pets
+        
+        doc = klass.new(:pets => [{}])
+        doc.pets.first._root_document.should == doc        
       end
     end
 

data/test/unit/test_embedded_document.rb

@@ -465,11 +465,20 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         clone.age.should == 27
       end
     end
-
+    
     context "key shorcut access" do
-      should "be able to read key with []" do
-        doc = @document.new(:name => 'string')
-        doc[:name].should == 'string'
+      context "[]" do
+        should "work when key found" do
+          doc = @document.new(:name => 'string')
+          doc[:name].should == 'string'
+        end
+        
+        should "raise exception when key not found" do
+          doc = @document.new(:name => 'string')
+          lambda {
+            doc[:not_here]
+          }.should raise_error(MongoMapper::KeyNotFound)
+        end
       end
       
       context "[]=" do