mongo_mapper 0.6.8 → 0.6.9

data/test/functional/test_modifiers.rb

@@ -0,0 +1,242 @@
+require 'test_helper'
+
+class ModifierTest < Test::Unit::TestCase
+  def setup
+    @page_class = Class.new do
+      include MongoMapper::Document
+      
+      key :title, String
+      key :day_count, Integer, :default => 0
+      key :week_count, Integer, :default => 0
+      key :month_count, Integer, :default => 0
+      key :tags, Array
+    end
+    
+    @page_class.collection.remove
+  end
+  
+  def assert_page_counts(page, day_count, week_count, month_count)
+    page.reload
+    page.day_count.should == day_count
+    page.week_count.should == week_count
+    page.month_count.should == month_count
+  end
+  
+  should "be able to increment with criteria and modifier hashes" do
+    page = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.increment({:title => 'Home'}, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 1, 2, 3
+    assert_page_counts page2, 1, 2, 3
+  end
+  
+  should "be able to increment with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.increment(page.id, page2.id, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 1, 2, 3
+    assert_page_counts page2, 1, 2, 3
+  end
+  
+  should "be able to decrement with criteria and modifier hashes" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement({:title => 'Home'}, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "be able to decrement with ids and modifier hash" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement(page.id, page2.id, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "always decrement when decrement is called whether number is positive or negative" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement(page.id, page2.id, {
+      :day_count => -1, :week_count => 2, :month_count => -3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "be able to set with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.set({:title => 'Home'}, :title => 'Home Revised')
+    
+    page.reload
+    page.title.should == 'Home Revised'
+    
+    page2.reload
+    page2.title.should == 'Home Revised'
+  end
+  
+  should "be able to set with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.set(page.id, page2.id, :title => 'Home Revised')
+    
+    page.reload
+    page.title.should == 'Home Revised'
+    
+    page2.reload
+    page2.title.should == 'Home Revised'
+  end
+  
+  should "be able to push with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+  
+  should "be able to push with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+
+  should "be able to push all with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    tags = %w(foo bar)
+    
+    @page_class.push_all({:title => 'Home'}, :tags => tags)
+    
+    page.reload
+    page.tags.should == tags
+    
+    page2.reload
+    page.tags.should == tags
+  end
+  
+  should "be able to push all with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    tags = %w(foo bar)
+    
+    @page_class.push_all(page.id, page2.id, :tags => tags)
+    
+    page.reload
+    page.tags.should == tags
+    
+    page2.reload
+    page.tags.should == tags
+  end
+  
+  should "be able to pull with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    
+    @page_class.pull({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(bar)
+    
+    page2.reload
+    page.tags.should == %w(bar)
+  end
+  
+  should "be able to pull with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    
+    @page_class.pull(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(bar)
+    
+    page2.reload
+    page.tags.should == %w(bar)
+  end
+
+  should "be able to pull all with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    
+    @page_class.pull_all({:title => 'Home'}, :tags => %w(foo bar))
+    
+    page.reload
+    page.tags.should == %w(baz)
+    
+    page2.reload
+    page.tags.should == %w(baz)
+  end
+  
+  should "be able to pull all with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    
+    @page_class.pull_all(page.id, page2.id, :tags => %w(foo bar))
+    
+    page.reload
+    page.tags.should == %w(baz)
+    
+    page2.reload
+    page.tags.should == %w(baz)
+  end
+
+  should "be able to push uniq with criteria and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => 'foo')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push_uniq({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+  
+  should "be able to push uniq with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => 'foo')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push_uniq(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+end

data/test/functional/test_validations.rb

@@ -25,23 +25,6 @@ class ValidationsTest < Test::Unit::TestCase
     end
   end
 
-  context "Skipping validations when saving" do
-    setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        key :name, String, :required => true
-      end
-      @document.collection.remove
-    end
-
-    should "insert document" do
-      doc = @document.new
-      doc.save(false)
-      @document.count.should == 1
-    end
-  end
-
   context "Saving a document that is invalid (destructive)" do
     setup do
       @document = Class.new do

data/test/models.rb

@@ -100,7 +100,7 @@ class Account
   
   belongs_to :room
 end
-class User < Account; end
+class AccountUser < Account; end
 class Bot < Account; end
 
 class Answer

data/test/support/timing.rb

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

data/test/unit/associations/test_base.rb

@@ -50,23 +50,17 @@ class AssociationBaseTest < Test::Unit::TestCase
     
     should "be false if not many" do
       Base.new(:belongs_to, :foo).many?.should be_false
+      Base.new(:one, :foo).many?.should be_false
     end
   end
   
-  context "finder_options" do
-    should "default to empty hash" do
-      base = Base.new(:many, :foos)
-      base.finder_options.should == {}
+  context "one?" do
+    should "be true if one" do
+      Base.new(:one, :foo).one?.should be_true
     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'}
+    should "be false if not one" do
+      Base.new(:many, :foo).one?.should be_false
     end
   end
   
@@ -90,6 +84,43 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
+  context "as?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :as => :commentable).as?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).as?.should be_false
+    end
+  end
+  
+  context "in_array?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :in => :list_ids).in_array?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).in_array?.should be_false
+    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 "type_key_name" do
     should "be _type for many" do
       Base.new(:many, :foos).type_key_name.should == '_type'
@@ -101,7 +132,7 @@ class AssociationBaseTest < Test::Unit::TestCase
   end
   
   context "foreign_key" do
-    should "default to assocation_name_id" do
+    should "default to assocation name _id for belongs to" do
       base = Base.new(:belongs_to, :foo)
       base.foreign_key.should == 'foo_id'
     end
@@ -161,6 +192,16 @@ class AssociationBaseTest < Test::Unit::TestCase
       base = Base.new(:belongs_to, :target, :polymorphic => true)
       base.proxy_class.should == BelongsToPolymorphicProxy
     end
+    
+    should "be OneProxy for one" do
+      base = Base.new(:one, :target, :polymorphic => true)
+      base.proxy_class.should == OneProxy
+    end
+    
+    should "be InArrayProxy for many with :in option" do
+      base = Base.new(:many, :messages, :in => :message_ids)
+      base.proxy_class.should == InArrayProxy
+    end
   end
   
 end

data/test/unit/test_document.rb

@@ -72,6 +72,38 @@ class DocumentTest < Test::Unit::TestCase
       @document.collection.should be_instance_of(Mongo::Collection)
       @document.collection.name.should == 'foobar'
     end
+
+    should 'allow extensions to Document to be appended' do
+      module Extension; def test_this_extension; end end
+      MongoMapper::Document.append_extensions(Extension)
+      article = Class.new { include MongoMapper::Document }
+      
+      article.should respond_to(:test_this_extension)
+    end
+
+    should 'add appended extensions to classes that include Document before they are added' do
+      module Extension; def test_this_extension; end end
+      article = Class.new { include MongoMapper::Document }
+      MongoMapper::Document.append_extensions(Extension)
+      
+      article.should respond_to(:test_this_extension)
+    end
+
+    should 'allow inclusions to Document to be appended' do
+      module Inclusion; def test_this_inclusion; end end
+      MongoMapper::Document.append_inclusions(Inclusion)
+      article = Class.new { include MongoMapper::Document }
+      
+      article.new.should respond_to(:test_this_inclusion)
+    end
+
+    should 'add appended inclusions to classes that include Document before they are added' do
+      module Inclusion; def test_this_inclusion; end end
+      article = Class.new { include MongoMapper::Document }
+      MongoMapper::Document.append_inclusions(Inclusion)
+      
+      article.new.should respond_to(:test_this_inclusion)
+    end
   end # Document class
   
   context "Documents that inherit from other documents" do

data/test/unit/test_embedded_document.rb

@@ -580,15 +580,6 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         doc.instance_variable_get("@foo").should == []
       end
       
-      should "not set instance variable if frozen" do
-        @document.key :foo, Array
-        doc = @document.new
-        doc.instance_variable_get("@foo").should be_nil
-        doc.freeze
-        doc.foo
-        doc.instance_variable_get("@foo").should be_nil
-      end
-      
       should "be overrideable by modules" do
         @document = Class.new do
           include MongoMapper::Document

data/test/unit/test_finder_options.rb

@@ -30,6 +30,13 @@ class FinderOptionsTest < Test::Unit::TestCase
       }
     end
     
+    should "automatically add _type to query if model is single collection inherited" do
+      FinderOptions.new(Enter, :foo => 'bar').criteria.should == {
+        :foo => 'bar',
+        :_type => 'Enter'
+      }
+    end
+    
     %w{gt lt gte lte ne in nin mod size where exists}.each do |operator|
       should "convert #{operator} conditions" do
         FinderOptions.new(Room, :age.send(operator) => 21).criteria.should == {
@@ -38,13 +45,6 @@ class FinderOptionsTest < Test::Unit::TestCase
       end
     end
     
-    should "automatically add _type to query if model is single collection inherited" do
-      FinderOptions.new(Enter, :foo => 'bar').criteria.should == {
-        :foo => 'bar',
-        :_type => 'Enter'
-      }
-    end
-    
     should "work with simple criteria" do
       FinderOptions.new(Room, :foo => 'bar').criteria.should == {
         :foo => 'bar'
@@ -61,6 +61,13 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(Room, :id => id).criteria.should == {:_id => id}
     end
     
+    should "convert id with symbol operator to _id with modifier" do
+      id = Mongo::ObjectID.new
+      FinderOptions.new(Room, :id.ne => id).criteria.should == {
+        :_id => {'$ne' => id}
+      }
+    end
+    
     should "make sure that _id's are object ids" do
       id = Mongo::ObjectID.new
       FinderOptions.new(Room, :_id => id.to_s).criteria.should == {:_id => id}
@@ -81,6 +88,19 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(Message, :room_id => id).criteria.should == {:room_id => id}
     end
     
+    should "convert times to utc if they aren't already" do
+      time = Time.now.in_time_zone('Indiana (East)')
+      criteria = FinderOptions.new(Room, :created_at => time).criteria
+      criteria[:created_at].utc?.should be_true
+    end
+    
+    should "not funk with times already in utc" do
+      time = Time.now.utc
+      criteria = FinderOptions.new(Room, :created_at => time).criteria
+      criteria[:created_at].utc?.should be_true
+      criteria[:created_at].should == time
+    end
+    
     should "use $in for arrays" do
       FinderOptions.new(Room, :foo => [1,2,3]).criteria.should == {
         :foo => {'$in' => [1,2,3]}
@@ -121,6 +141,15 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(Room, :order => 'foo DESC').options[:sort].should == sort
     end
     
+    should "convert order operators to mongo sort" do
+      FinderOptions.new(Room, :order => :foo.asc).options[:sort].should == [['foo', 1]]
+      FinderOptions.new(Room, :order => :foo.desc).options[:sort].should == [['foo', -1]]
+    end
+    
+    should "convert array of order operators to mongo sort" do
+      FinderOptions.new(Room, :order => [:foo.asc, :bar.desc]).options[:sort].should == [['foo', 1], ['bar', -1]]
+    end
+    
     should "convert field without direction to ascending" do
       sort = [['foo', 1]]
       FinderOptions.new(Room, :order => 'foo').options[:sort].should == sort

data/test/unit/test_pagination.rb

@@ -62,6 +62,12 @@ class PaginationTest < Test::Unit::TestCase
     should "alias offset to skip" do
       PaginationProxy.new(25, 2, 10).offset.should == 10
     end
+    
+    should "return true for === Array" do
+      collection = PaginationProxy.new(25, 2, 10)
+      collection.subject = [1, 2]
+      collection.should === Array
+    end
         
     context "previous_page" do
       should "be nil if current page 1" do

data/test/unit/test_rails_compatibility.rb

@@ -22,7 +22,10 @@ class TestRailsCompatibility < Test::Unit::TestCase
   context "EmbeddedDocument" do    
     should "alias many to has_many" do
       FirstItem.should respond_to(:has_many)
-      FirstItem.method(:has_many).should == FirstItem.method(:many)
+    end
+    
+    should "alias one to has_one" do
+      FirstItem.should respond_to(:has_one)
     end
     
     should "have column names" do

data/test/unit/test_support.rb

@@ -167,6 +167,10 @@ class SupportTest < Test::Unit::TestCase
       ObjectId.to_mongo(nil).should be_nil
     end
     
+    should "return nil if blank string" do
+      ObjectId.to_mongo('').should be_nil
+    end
+    
     should "return value if object id" do
       id = Mongo::ObjectID.new
       ObjectId.to_mongo(id).should be(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -05:00
+date: 2010-01-01 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
+        version: 0.18.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -104,11 +104,13 @@ files:
 - lib/mongo_mapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongo_mapper/associations/belongs_to_proxy.rb
 - lib/mongo_mapper/associations/collection.rb
+- lib/mongo_mapper/associations/in_array_proxy.rb
 - lib/mongo_mapper/associations/many_documents_as_proxy.rb
 - lib/mongo_mapper/associations/many_documents_proxy.rb
 - lib/mongo_mapper/associations/many_embedded_polymorphic_proxy.rb
 - lib/mongo_mapper/associations/many_embedded_proxy.rb
 - lib/mongo_mapper/associations/many_polymorphic_proxy.rb
+- lib/mongo_mapper/associations/one_proxy.rb
 - lib/mongo_mapper/associations/proxy.rb
 - lib/mongo_mapper/callbacks.rb
 - lib/mongo_mapper/dirty.rb
@@ -117,7 +119,7 @@ files:
 - lib/mongo_mapper/embedded_document.rb
 - lib/mongo_mapper/finder_options.rb
 - lib/mongo_mapper/key.rb
-- lib/mongo_mapper/observing.rb
+- lib/mongo_mapper/mongo_mapper.rb
 - lib/mongo_mapper/pagination.rb
 - lib/mongo_mapper/rails_compatibility/document.rb
 - lib/mongo_mapper/rails_compatibility/embedded_document.rb
@@ -130,11 +132,13 @@ files:
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_in_array_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
+- test/functional/associations/test_one_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -142,6 +146,7 @@ files:
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_logger.rb
+- test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_string_id_compatibility.rb
@@ -159,7 +164,6 @@ files:
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
 - test/unit/test_mongo_mapper.rb
-- test/unit/test_observing.rb
 - test/unit/test_pagination.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_serializations.rb
@@ -197,11 +201,13 @@ summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_in_array_proxy.rb
 - test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_documents_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
+- test/functional/associations/test_one_proxy.rb
 - test/functional/test_associations.rb
 - test/functional/test_binary.rb
 - test/functional/test_callbacks.rb
@@ -209,6 +215,7 @@ test_files:
 - test/functional/test_document.rb
 - test/functional/test_embedded_document.rb
 - test/functional/test_logger.rb
+- test/functional/test_modifiers.rb
 - test/functional/test_pagination.rb
 - test/functional/test_rails_compatibility.rb
 - test/functional/test_string_id_compatibility.rb
@@ -226,7 +233,6 @@ test_files:
 - test/unit/test_finder_options.rb
 - test/unit/test_key.rb
 - test/unit/test_mongo_mapper.rb
-- test/unit/test_observing.rb
 - test/unit/test_pagination.rb
 - test/unit/test_rails_compatibility.rb
 - test/unit/test_serializations.rb