tpitale-mongo_mapper 0.6.9 → 0.6.10

data/test/unit/associations/test_proxy.rb

@@ -53,6 +53,7 @@ class ProxyTest < Test::Unit::TestCase
   context "blank?" do
     should "be true if blank" do
       @blank_proxy.blank?.should be_true
+      @nil_proxy.blank?.should be_true
     end
     
     should "be false if not blank" do
@@ -60,6 +61,17 @@ class ProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "present?" do
+    should "be true if present" do
+      @proxy.present?.should be_true
+    end
+    
+    should "be false if not present" do
+      @blank_proxy.present?.should be_false
+      @nil_proxy.present?.should be_false
+    end
+  end
+  
   should "delegate respond_to? to target" do
     @proxy.respond_to?(:each).should be_true
     @proxy.respond_to?(:size).should be_true

data/test/unit/test_document.rb

@@ -4,11 +4,7 @@ require 'models'
 class DocumentTest < Test::Unit::TestCase
   context "The Document Class" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
-      @document.collection.remove
+      @document = Doc()
     end
     
     should "have logger method" do
@@ -40,10 +36,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.database_name.should == 'test2'
       @document.database.name.should == 'test2'
 
-      another_document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-      end
+      another_document = Doc()
       another_document.database.should == MongoMapper.database
     end
     
@@ -72,6 +65,34 @@ 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 = Doc()
+      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 = Doc()
+      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 = Doc()
+      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 = Doc()
+      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
@@ -96,14 +117,10 @@ class DocumentTest < Test::Unit::TestCase
 
   context "An instance of a document" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-
+      @document = Doc do
         key :name, String
         key :age, Integer
       end
-      @document.collection.remove
     end
     
     should "have access to logger" do
@@ -137,13 +154,9 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "set self to the root document on embedded documents" do        
-        klass = Class.new do
-          include MongoMapper::Document
-        end
+        klass = Doc()
+        pets = EDoc()
         
-        pets = Class.new do
-          include MongoMapper::EmbeddedDocument
-        end
         klass.many :pets, :class => pets
         
         doc = klass.new(:pets => [{}])
@@ -183,6 +196,7 @@ class DocumentTest < Test::Unit::TestCase
       setup do
         @oid = Mongo::ObjectID.new
       end
+      
       should "be equal if id and class are the same" do
         (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
       end
@@ -192,12 +206,8 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-        end
-
-        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
+        another_document = Doc()
+        (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be(false)
       end
     end
   end # instance of a document

data/test/unit/test_embedded_document.rb

@@ -35,9 +35,7 @@ end
 class EmbeddedDocumentTest < Test::Unit::TestCase 
   context "Including MongoMapper::EmbeddedDocument in a class" do
     setup do
-      @klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
+      @klass = EDoc()
     end
     
     should "give class access to logger" do
@@ -89,29 +87,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
-  context "looking up type constants" do
-    should "not raise an error" do
-      klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-        key :file, Binary
-      end
-    end
-  end
-  
   context "parent_model" do
     should "be nil if none of parents ancestors include EmbeddedDocument" do
       parent = Class.new
-      document = Class.new(parent) do
-        include MongoMapper::EmbeddedDocument
-      end
+      document = Class.new(parent) { include MongoMapper::EmbeddedDocument }
       document.parent_model.should be_nil
     end
 
     should "work when other modules have been included" do
       grandparent = Class.new
-      parent = Class.new grandparent do
-        include MongoMapper::EmbeddedDocument
-      end
+      parent = Class.new(grandparent) { include MongoMapper::EmbeddedDocument }
       
       example_module = Module.new
       document = Class.new(parent) do
@@ -130,9 +115,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   
   context "defining a key" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
+      @document = EDoc()
     end
     
     should "work with name" do
@@ -226,8 +209,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
   context "#inspect" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
+      @document = Doc do
         key :animals
       end
     end
@@ -252,9 +234,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
   
   context "Applying default values for keys" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-        
+      @document = EDoc do
         key :name,      String,   :default => 'foo'
         key :age,       Integer,  :default => 20
         key :net_worth, Float,    :default => 100.00
@@ -299,9 +279,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
 
   context "An instance of an embedded document" do
     setup do
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
-
+      @document = EDoc do
         key :name, String
         key :age, Integer
       end
@@ -398,8 +376,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     
     context "initialized when _type key present" do
       setup do
-        ::FooBar = Class.new do
-          include MongoMapper::EmbeddedDocument
+        ::FooBar = EDoc do
           key :_type, String
         end
       end
@@ -580,18 +557,8 @@ 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
+        @document = Doc do
           key :other_child, String
         end
         
@@ -665,8 +632,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
       
       should "be overrideable by modules" do
-        @document = Class.new do
-          include MongoMapper::Document
+        @document = Doc do
           key :other_child, String
         end
         
@@ -699,19 +665,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         @oid = Mongo::ObjectID.new
       end
       should "be equal if id and class are the same" do
-        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be(true)
+        (@document.new('_id' => @oid) == @document.new('_id' => @oid)).should be_true
       end
 
       should "not be equal if class same but id different" do
-        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be(false)
+        (@document.new('_id' => @oid) == @document.new('_id' => Mongo::ObjectID.new)).should be_false
       end
 
       should "not be equal if id same but class different" do
-        @another_document = Class.new do
-          include MongoMapper::Document
-        end
-
-        (@document.new('_id' => @oid) == @another_document.new('_id' => @oid)).should be(false)
+        another_document = Doc()
+        (@document.new('_id' => @oid) == another_document.new('_id' => @oid)).should be_false
       end
     end
   end # instance of a embedded 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_key.rb

@@ -82,10 +82,7 @@ class KeyTest < Test::Unit::TestCase
     end
     
     should "know if it is a embedded_document" do
-      klass = Class.new do
-        include MongoMapper::EmbeddedDocument
-      end
-      Key.new(:name, klass).embeddable?.should be_true
+      Key.new(:name, EDoc()).embeddable?.should be_true
     end
 
     should "know if it is not a embedded_document" do

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_serializations.rb

@@ -2,8 +2,7 @@ require 'test_helper'
 
 class SerializationTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::EmbeddedDocument
+    @document = EDoc do
       key :name, String
       key :age, Integer
       key :awesome, Boolean

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)

data/test/unit/test_time_zones.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class TimeZonesTest < Test::Unit::TestCase
   context "An instance of an embedded document" do
     setup do      
-      @document = Class.new do
-        include MongoMapper::EmbeddedDocument
+      @document = EDoc do
         key :name, String
         key :created_at, Time
       end

data/test/unit/test_validations.rb

@@ -2,14 +2,9 @@ require 'test_helper'
 
 class ValidationsTest < Test::Unit::TestCase
   context "Validations" do
-    
     context "on a Document" do
-    
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-        end
+        @document = Doc()
       end
 
       context "Validating acceptance of" do
@@ -240,11 +235,8 @@ class ValidationsTest < Test::Unit::TestCase
     end # End on a Document
     
     context "On an EmbeddedDocument" do
-
       setup do
-        @embedded_doc = Class.new do
-          include MongoMapper::EmbeddedDocument
-        end
+        @embedded_doc = EDoc()
       end
 
       context "Validating acceptance of" do
@@ -478,10 +470,7 @@ class ValidationsTest < Test::Unit::TestCase
    
   context "Adding validation errors" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :action, String
         def action_present
           errors.add(:action, 'is invalid') if action.blank?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpitale-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 -05:00
+date: 2010-01-04 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

data/lib/mongo_mapper/observing.rb

@@ -1,50 +0,0 @@
-require 'observer'
-require 'singleton'
-require 'set'
-
-module MongoMapper
-  module Observing #:nodoc:
-    def self.included(model)
-      model.class_eval do
-        extend Observable
-      end      
-    end
-  end
-
-  class Observer
-    include Singleton
-
-    class << self
-      def observe(*models)
-        models.flatten!
-        models.collect! { |model| model.is_a?(Symbol) ? model.to_s.camelize.constantize : model }
-        define_method(:observed_classes) { Set.new(models) }
-      end
-
-      def observed_class
-        if observed_class_name = name[/(.*)Observer/, 1]
-          observed_class_name.constantize
-        else
-          nil
-        end
-      end
-    end
-
-    def initialize
-      Set.new(observed_classes).each { |klass| add_observer! klass }
-    end
-
-    def update(observed_method, object) #:nodoc:
-      send(observed_method, object) if respond_to?(observed_method)
-    end
-
-    protected
-      def observed_classes
-        Set.new([self.class.observed_class].compact.flatten)
-      end
-      
-      def add_observer!(klass)
-        klass.add_observer(self)
-      end
-  end
-end