mongo_mapper-unstable 2010.3.8 → 2010.06.23

data/test/functional/test_validations.rb

@@ -1,19 +1,19 @@
 require 'test_helper'
 
-class ValidationsTest < Test::Unit::TestCase  
+class ValidationsTest < Test::Unit::TestCase
   context "Saving a new document that is invalid" do
     setup do
       @document = Doc do
         key :name, String, :required => true
       end
     end
-    
+
     should "not insert document" do
       doc = @document.new
       doc.save
       @document.count.should == 0
     end
-    
+
     should "populate document's errors" do
       doc = @document.new
       doc.errors.size.should == 0
@@ -28,7 +28,7 @@ class ValidationsTest < Test::Unit::TestCase
         key :name, String, :required => true
       end
     end
-    
+
     should "raise error" do
       doc = @document.new
       lambda { doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
@@ -41,7 +41,7 @@ class ValidationsTest < Test::Unit::TestCase
         key :name, String, :required => true
       end
     end
-    
+
     should "raise error" do
       lambda { @document.create! }.should raise_error(MongoMapper::DocumentNotValid)
     end
@@ -51,29 +51,29 @@ class ValidationsTest < Test::Unit::TestCase
       instance.new_record?.should be_false
     end
   end
-  
+
   context "Saving an existing document that is invalid" do
     setup do
       @document = Doc do
         key :name, String, :required => true
       end
-      
+
       @doc = @document.create(:name => 'John Nunemaker')
     end
-    
+
     should "not update document" do
       @doc.name = nil
       @doc.save
       @doc.reload.name.should == 'John Nunemaker'
     end
-    
+
     should "populate document's errors" do
       @doc.name = nil
       @doc.save
       @doc.errors.full_messages.should == ["Name can't be empty"]
     end
   end
-  
+
   context "Adding validation errors" do
     setup do
       @document = Doc do
@@ -83,38 +83,38 @@ class ValidationsTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     should "work with validate_on_create callback" do
       @document.validate_on_create :action_present
-      
+
       doc = @document.new
       doc.action = nil
       doc.should have_error_on(:action)
-      
+
       doc.action = 'kick'
       doc.should_not have_error_on(:action)
       doc.save
-      
+
       doc.action = nil
       doc.should_not have_error_on(:action)
     end
-    
+
     should "work with validate_on_update callback" do
       @document.validate_on_update :action_present
-      
+
       doc = @document.new
       doc.action = nil
       doc.should_not have_error_on(:action)
       doc.save
-      
+
       doc.action = nil
       doc.should have_error_on(:action)
-      
+
       doc.action = 'kick'
       doc.should_not have_error_on(:action)
     end
   end
-  
+
   context "validating uniqueness of" do
     setup do
       @document = Doc do
@@ -167,13 +167,13 @@ class ValidationsTest < Test::Unit::TestCase
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
     end
-    
+
     should "allow multiple blank entries if :allow_blank => true" do
       document = Doc do
         key :name
         validates_uniqueness_of :name, :allow_blank => :true
       end
-      
+
       doc = document.new("name" => "")
       doc.save.should be_true
 
@@ -219,7 +219,7 @@ class ValidationsTest < Test::Unit::TestCase
           validates_uniqueness_of :name, :case_sensitive => false
         end
       end
-      
+
       should "fail on entries that differ only in case" do
         doc = @document.new("name" => "BLAMMO")
         doc.save.should be_true
@@ -232,6 +232,19 @@ class ValidationsTest < Test::Unit::TestCase
         doc = @document.new("name" => nil)
         lambda { doc.valid? }.should_not raise_error
       end
+
+      should "not raise an error if special Regexp characters used" do
+        doc = @document.new("name" => '?')
+        lambda { doc.valid? }.should_not raise_error
+      end
+
+      should "check for uniqueness using entire string" do
+        doc = @document.new("name" => "John Doe")
+        doc.save.should be_true
+
+        doc2 = @document.new("name" => "John")
+        doc2.valid?.should be_true
+      end
     end
 
     context "scoped by a single attribute" do
@@ -246,7 +259,7 @@ class ValidationsTest < Test::Unit::TestCase
       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(:first) \
           .with(:name => 'joe', :scope => "one") \
@@ -279,11 +292,11 @@ class ValidationsTest < Test::Unit::TestCase
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
       end
-      
+
       should "fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_true
-        
+
         @document \
           .stubs(:first) \
           .with(:name => 'joe', :first_scope => 'one', :second_scope => 'two') \
@@ -292,11 +305,11 @@ class ValidationsTest < Test::Unit::TestCase
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc2.should have_error_on(:name)
       end
-      
+
       should "pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_true
-        
+
         @document \
           .stubs(:first) \
           .with(:name => 'joe', :first_scope => 'one', :second_scope => 'one') \
@@ -307,21 +320,21 @@ class ValidationsTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "validates uniqueness of with :unique shortcut" do
     should "work" do
       @document = Doc do
         key :name, String, :unique => true
       end
-      
+
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)
-      
+
       @document \
         .stubs(:first) \
         .with(:name => 'John') \
         .returns(doc)
-      
+
       second_john = @document.create(:name => 'John')
       second_john.should have_error_on(:name, 'has already been taken')
     end

data/test/models.rb

@@ -1,23 +1,23 @@
 # custom type
 class WindowSize
   attr_reader :width, :height
-  
+
   def self.to_mongo(value)
     value.to_a
   end
-  
+
   def self.from_mongo(value)
     value.is_a?(self) ? value : WindowSize.new(value)
   end
-  
+
   def initialize(*args)
     @width, @height = args.flatten
   end
-  
+
   def to_a
     [width, height]
   end
-  
+
   def ==(other)
     other.is_a?(self.class) && other.width == width && other.height == height
   end
@@ -67,7 +67,6 @@ class Message
 
   key :body, String
   key :position, Integer
-  key :_type, String
   key :room_id, ObjectId
 
   belongs_to :room
@@ -87,17 +86,16 @@ class Room
     end
   end
   many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
-  
+
   many :accounts, :polymorphic => true, :extend => AccountsExtensions
 end
 
 class Account
   include MongoMapper::Document
-  
-  key :_type, String
+
   key :room_id, ObjectId
   key :last_logged_in, Time
-  
+
   belongs_to :room
 end
 class AccountUser < Account; end
@@ -119,14 +117,14 @@ class Project
   include MongoMapper::Document
 
   key :name, String
-  
+
   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
@@ -145,6 +143,12 @@ end
 class Status
   include MongoMapper::Document
 
+  scope :complete, where(:name => 'Complete')
+
+  def self.by_position(position)
+    where(:position => position)
+  end
+
   key :project_id, ObjectId
   key :target_id, ObjectId
   key :target_type, String
@@ -158,9 +162,7 @@ end
 class Media
   include MongoMapper::EmbeddedDocument
 
-  key :_type, String
   key :file, String
-  
   key :visible, Boolean
 end
 
@@ -179,7 +181,7 @@ end
 
 class Catalog
   include MongoMapper::Document
-  
+
   many :medias, :polymorphic => true do
     def visible
       # for some reason we can't use select here
@@ -192,7 +194,6 @@ module TrModels
   class Transport
     include MongoMapper::EmbeddedDocument
 
-    key :_type, String
     key :license_plate, String
     key :purchased_on, Date
   end
@@ -225,7 +226,7 @@ module TrModels
         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

data/test/{active_model_lint_test.rb → test_active_model_lint.rb}

@@ -1,10 +1,12 @@
 require 'test_helper'
+# For testing against edge rails also.
+# $:.unshift '/Users/jnunemaker/dev/ruby/rails/activemodel/lib'
 require 'active_model'
 require 'models'
 
 class ActiveModelLintTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests
-  
+
   def setup
     @model = Post.new
   end

data/test/test_helper.rb

@@ -1,26 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + '/../lib/mongo_mapper')
+require 'rubygems'
+gem 'activesupport',     ENV['ACTIVE_SUPPORT_VERSION']
+gem 'json',              '~> 1.2.3'
+gem 'jnunemaker-matchy', '~> 0.4.0'
+gem 'shoulda',           '~> 2.10.2'
+gem 'timecop',           '~> 0.3.1'
+gem 'mocha',             '~> 0.9.8'
 
-gem 'jnunemaker-matchy', '0.4.0'
-gem 'shoulda', '2.10.2'
-gem 'timecop', '0.3.1'
-gem 'mocha', '0.9.8'
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'mongo_mapper'
+require 'fileutils'
+require 'ostruct'
+require 'pp'
 
+require 'active_support/version'
+require 'json'
 require 'matchy'
 require 'shoulda'
 require 'timecop'
 require 'mocha'
-require 'pp'
-
-require 'support/custom_matchers'
-require 'support/timing'
 
 class Test::Unit::TestCase
-  include CustomMatchers
-
   def Doc(name=nil, &block)
     klass = Class.new do
       include MongoMapper::Document
-      set_collection_name "test#{rand(20)}"
+      set_collection_name :test
 
       if name
         class_eval "def self.name; '#{name}' end"
@@ -52,10 +55,50 @@ class Test::Unit::TestCase
       klass.collection.drop_indexes
     end
   end
+  
+  custom_matcher :be_true do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
+    receiver.eql?(true)
+  end
+
+  custom_matcher :be_false do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be false but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be false but it was"
+    receiver.eql?(false)
+  end
+
+  custom_matcher :have_error_on do |receiver, matcher, args|
+    receiver.valid?
+    attribute = args[0]
+    expected_message = args[1]
+
+    if expected_message.nil?
+      matcher.positive_failure_message = "#{receiver} had no errors on #{attribute}"
+      matcher.negative_failure_message = "#{receiver} had errors on #{attribute} #{receiver.errors.inspect}"
+      !receiver.errors.on(attribute).blank?
+    else
+      actual = receiver.errors.on(attribute)
+      matcher.positive_failure_message = %Q(Expected error on #{attribute} to be "#{expected_message}" but was "#{actual}")
+      matcher.negative_failure_message = %Q(Expected error on #{attribute} not to be "#{expected_message}" but was "#{actual}")
+      actual == expected_message
+    end
+  end
+
+  custom_matcher :have_index do |receiver, matcher, args|
+    index_name = args[0]
+    matcher.positive_failure_message = "#{receiver} does not have index named #{index_name}, but should"
+    matcher.negative_failure_message = "#{receiver} does have index named #{index_name}, but should not"
+    !receiver.collection.index_information.detect { |index| index[0] == index_name }.nil?
+  end
 end
 
-test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')
-FileUtils.mkdir_p(test_dir) unless File.exist?(test_dir)
+log_dir = File.expand_path('../../log', __FILE__)
+FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
+logger = Logger.new(log_dir + '/test.log')
+
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, :logger => logger)
+MongoMapper.database = "mm-test-#{RUBY_VERSION.gsub('.', '-')}"
+MongoMapper.database.collections.each { |c| c.drop_indexes }
 
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, {:logger => Logger.new(test_dir + '/test.log')})
-MongoMapper.database = 'test'
+puts "\n--- Active Support Version: #{ActiveSupport::VERSION::STRING} ---\n"