mongo_mapper-unstable 2010.2.27 → 2010.2.28

data/VERSION

@@ -1 +1 @@
-2010.02.27
+2010.02.28

data/lib/mongo_mapper/document.rb

@@ -23,7 +23,7 @@ module MongoMapper
         plugin Plugins::Serialization
         plugin Plugins::Validations
         plugin Plugins::Callbacks # for now callbacks needs to be after validations
-        
+
         extend Plugins::Validations::DocumentMacros
       end
 
@@ -200,7 +200,7 @@ module MongoMapper
       def set_database_name(name)
         @database_name = name
       end
-      
+
       def database_name
         @database_name
       end
@@ -374,9 +374,14 @@ module MongoMapper
       end
 
       def delete
+        @_destroyed = true
         self.class.delete(id) unless new?
       end
 
+      def destroyed?
+        @_destroyed == true
+      end
+
       def reload
         if attrs = collection.find_one({:_id => _id})
           self.class.associations.each { |name, assoc| send(name).reset if respond_to?(name) }
@@ -387,6 +392,12 @@ module MongoMapper
         end
       end
 
+      # Used by embedded docs to find root easily without if/respond_to? stuff.
+      # Documents are always root documents.
+      def _root_document
+        self
+      end
+
     private
       def create_or_update(options={})
         result = new? ? create(options) : update(options)

data/lib/mongo_mapper/embedded_document.rb

@@ -20,7 +20,7 @@ module MongoMapper
         plugin Plugins::Serialization
         plugin Plugins::Validations
 
-        attr_accessor :_root_document, :_parent_document
+        attr_reader :_root_document, :_parent_document
       end
 
       super
@@ -50,6 +50,11 @@ module MongoMapper
         end
         result
       end
+      
+      def _parent_document=(value)
+        @_root_document   = value._root_document
+        @_parent_document = value
+      end
     end # InstanceMethods
   end # EmbeddedDocument
 end # MongoMapper

data/lib/mongo_mapper/plugins/associations/embedded_collection.rb

@@ -30,19 +30,8 @@ module MongoMapper
         alias_method :concat, :<<
 
         private
-          def _root_document
-            if owner.respond_to?(:_root_document)
-              owner._root_document
-            else
-              owner
-            end
-          end
-
           def assign_references(*docs)
-            docs.each do |doc|
-              doc._root_document = _root_document
-              doc._parent_document = owner
-            end
+            docs.each { |doc| doc._parent_document = owner }
           end
       end
     end

data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb

@@ -112,7 +112,7 @@ module MongoMapper
           end
 
           def foreign_key
-            options[:foreign_key] || owner.class.name.underscore.gsub("/", "_") + "_id"
+            options[:foreign_key] || owner.class.name.to_s.underscore.gsub("/", "_") + "_id"
           end
       end
     end

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -1,22 +1,50 @@
+# Almost all of this callback stuff is pulled directly from ActiveSupport
+# in the interest of support rails 2 and 3 at the same time and is the
+# same copyright as rails.
 module MongoMapper
   module Plugins
     module Callbacks
       def self.configure(model)
         model.class_eval do
-          include ActiveSupport::Callbacks
-
           define_callbacks(
-            :before_save, :after_save, 
-            :before_create, :after_create, 
-            :before_update, :after_update, 
-            :before_validation, :after_validation, 
-            :before_validation_on_create, :after_validation_on_create, 
-            :before_validation_on_update, :after_validation_on_update, 
-            :before_destroy, :after_destroy
+            :before_save,                 :after_save,
+            :before_create,               :after_create,
+            :before_update,               :after_update,
+            :before_validation,           :after_validation,
+            :before_validation_on_create, :after_validation_on_create,
+            :before_validation_on_update, :after_validation_on_update,
+            :before_destroy,              :after_destroy
           )
         end
       end
-      
+
+      module ClassMethods
+        def define_callbacks(*callbacks)
+          callbacks.each do |callback|
+            class_eval <<-"end_eval"
+              def self.#{callback}(*methods, &block)
+                callbacks = CallbackChain.build(:#{callback}, *methods, &block)
+                @#{callback}_callbacks ||= CallbackChain.new
+                @#{callback}_callbacks.concat callbacks
+              end
+
+              def self.#{callback}_callback_chain
+                @#{callback}_callbacks ||= CallbackChain.new
+
+                if superclass.respond_to?(:#{callback}_callback_chain)
+                  CallbackChain.new(
+                    superclass.#{callback}_callback_chain +
+                    @#{callback}_callbacks
+                  )
+                else
+                  @#{callback}_callbacks
+                end
+              end
+            end_eval
+          end
+        end
+      end
+
       module InstanceMethods
         def valid?
           action = new? ? 'create' : 'update'
@@ -37,6 +65,10 @@ module MongoMapper
           result
         end
 
+        def run_callbacks(kind, options = {}, &block)
+          self.class.send("#{kind}_callback_chain").run(self, options, &block)
+        end
+
         private
           def create_or_update(*args)
             run_callbacks(:before_save)
@@ -60,6 +92,127 @@ module MongoMapper
             result
           end
       end
+
+      class CallbackChain < Array
+        def self.build(kind, *methods, &block)
+          methods, options = extract_options(*methods, &block)
+          methods.map! { |method| Callback.new(kind, method, options) }
+          new(methods)
+        end
+
+        def run(object, options = {}, &terminator)
+          enumerator = options[:enumerator] || :each
+
+          unless block_given?
+            send(enumerator) { |callback| callback.call(object) }
+          else
+            send(enumerator) do |callback|
+              result = callback.call(object)
+              break result if terminator.call(result, object)
+            end
+          end
+        end
+
+        # TODO: Decompose into more Array like behavior
+        def replace_or_append!(chain)
+          if index = index(chain)
+            self[index] = chain
+          else
+            self << chain
+          end
+          self
+        end
+
+        def find(callback, &block)
+          select { |c| c == callback && (!block_given? || yield(c)) }.first
+        end
+
+        def delete(callback)
+          super(callback.is_a?(Callback) ? callback : find(callback))
+        end
+
+        private
+          def self.extract_options(*methods, &block)
+            methods.flatten!
+            options = methods.extract_options!
+            methods << block if block_given?
+            return methods, options
+          end
+
+          def extract_options(*methods, &block)
+            self.class.extract_options(*methods, &block)
+          end
+      end
+
+      class Callback
+        attr_reader :kind, :method, :identifier, :options
+
+        def initialize(kind, method, options = {})
+          @kind       = kind
+          @method     = method
+          @identifier = options[:identifier]
+          @options    = options
+        end
+
+        def ==(other)
+          case other
+          when Callback
+            (self.identifier && self.identifier == other.identifier) || self.method == other.method
+          else
+            (self.identifier && self.identifier == other) || self.method == other
+          end
+        end
+
+        def eql?(other)
+          self == other
+        end
+
+        def dup
+          self.class.new(@kind, @method, @options.dup)
+        end
+
+        def hash
+          if @identifier
+            @identifier.hash
+          else
+            @method.hash
+          end
+        end
+
+        def call(*args, &block)
+          evaluate_method(method, *args, &block) if should_run_callback?(*args)
+        rescue LocalJumpError
+          raise ArgumentError,
+            "Cannot yield from a Proc type filter. The Proc must take two " +
+            "arguments and execute #call on the second argument."
+        end
+
+        private
+          def evaluate_method(method, *args, &block)
+            case method
+              when Symbol
+                object = args.shift
+                object.send(method, *args, &block)
+              when String
+                eval(method, args.first.instance_eval { binding })
+              when Proc, Method
+                method.call(*args, &block)
+              else
+                if method.respond_to?(kind)
+                  method.send(kind, *args, &block)
+                else
+                  raise ArgumentError,
+                    "Callbacks must be a symbol denoting the method to call, a string to be evaluated, " +
+                    "a block to be invoked, or an object responding to the callback method."
+                end
+            end
+          end
+
+          def should_run_callback?(*args)
+            [options[:if]].flatten.compact.all? { |a| evaluate_method(a, *args) } &&
+            ![options[:unless]].flatten.compact.any? { |a| evaluate_method(a, *args) }
+          end
+      end
     end
   end
 end

data/lib/mongo_mapper/plugins/keys.rb

@@ -175,6 +175,9 @@ module MongoMapper
             writer_method = "#{name}="
 
             if respond_to?(writer_method)
+              if writer_method == '_root_document='
+                puts "_root_document= #{value.inspect}"
+              end
               self.send(writer_method, value)
             else
               self[name.to_s] = value
@@ -309,7 +312,11 @@ module MongoMapper
 
         def get(value)
           if value.nil? && !default_value.nil?
-            return default_value
+            if default_value.respond_to?(:call)
+              return default_value.call
+            else
+              return default_value
+            end
           end
 
           type.from_mongo(value)

data/lib/mongo_mapper/plugins/pagination/proxy.rb

@@ -2,8 +2,8 @@ module MongoMapper
   module Plugins
     module Pagination
       class Proxy
-        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
-
+        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|respond_to\?|proxy_|^object_id$)/ }
+                
         attr_accessor :subject
         attr_reader :total_entries, :per_page, :current_page
         alias limit per_page
@@ -50,7 +50,11 @@ module MongoMapper
         def method_missing(name, *args, &block)
           @subject.send(name, *args, &block)
         end
-
+        
+        def respond_to?(name, *args, &block)
+          super || @subject.respond_to?(name, *args, &block)
+        end
+        
         private
           def per_page=(value)
             value = 25 if value.blank?

data/lib/mongo_mapper/query.rb

@@ -93,7 +93,7 @@ module MongoMapper
       def to_order(field, direction=nil)
         direction ||= 'ASC'
         direction = direction.upcase == 'ASC' ? 1 : -1
-        [field.to_s, direction]
+        [normalized_key(field).to_s, direction]
       end
 
       def normalized_key(field)

data/lib/mongo_mapper.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'uri'
 
 # if Gem is defined i'll assume you are using rubygems and lock specific versions
 # call me crazy but a plain old require will just get the latest version you have installed
@@ -10,7 +11,7 @@ if self.class.const_defined?(:Gem)
   gem 'jnunemaker-validatable', '1.8.1'
 end
 
-require 'active_support'
+require 'active_support/all'
 require 'mongo'
 require 'validatable'
 
@@ -24,6 +25,9 @@ module MongoMapper
   # raised when document expected but not found
   class DocumentNotFound < MongoMapperError; end
 
+  # raised when trying to connect using uri with incorrect scheme
+  class InvalidScheme < MongoMapperError; end
+
   # raised when document not valid and using !
   class DocumentNotValid < MongoMapperError
     def initialize(document)
@@ -70,13 +74,28 @@ module MongoMapper
     @@config
   end
 
+  # @api private
+  def self.config_for_environment(environment)
+    env = config[environment]
+    return env if env['uri'].blank?
+    
+    uri = URI.parse(env['uri'])
+    raise InvalidScheme.new('must be mongodb') unless uri.scheme == 'mongodb'
+    {
+      'host'     => uri.host,
+      'port'     => uri.port,
+      'database' => uri.path.gsub(/^\//, ''),
+      'username' => uri.user,
+      'password' => uri.password,
+    }
+  end
+
   def self.connect(environment, options={})
     raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
-    MongoMapper.connection = Mongo::Connection.new(config[environment]['host'], config[environment]['port'], options)
-    MongoMapper.database = config[environment]['database']
-    if config[environment]['username'].present? && config[environment]['password'].present?
-      MongoMapper.database.authenticate(config[environment]['username'], config[environment]['password'])
-    end
+    env = config_for_environment(environment)
+    MongoMapper.connection = Mongo::Connection.new(env['host'], env['port'], options)
+    MongoMapper.database = env['database']
+    MongoMapper.database.authenticate(env['username'], env['password']) if env['username'] && env['password']
   end
 
   def self.setup(config, environment, options={})
@@ -108,11 +127,11 @@ module MongoMapper
   def self.normalize_object_id(value)
     value.is_a?(String) ? Mongo::ObjectID.from_string(value) : value
   end
-  
+
   autoload :Query,            'mongo_mapper/query'
   autoload :Document,         'mongo_mapper/document'
   autoload :EmbeddedDocument, 'mongo_mapper/embedded_document'
 end
 
 require 'mongo_mapper/support'
-require 'mongo_mapper/plugins'
+require 'mongo_mapper/plugins'

data/test/functional/test_document.rb

@@ -12,7 +12,7 @@ class DocumentTest < Test::Unit::TestCase
       key :date, Date
     end
   end
-  
+
   context "array key" do
     setup do
       @document.key :tags, Array
@@ -115,6 +115,23 @@ class DocumentTest < Test::Unit::TestCase
     end
   end
 
+  context "key with proc default value" do
+    setup do
+      @document.key :proc_default, String, :default => lambda { return 'string' }
+    end
+
+    should "detect and run proc default" do
+      doc = @document.new
+      doc.proc_default.should == 'string'
+    end
+
+    should "save and load from mongo" do
+      doc = @document.create
+      doc = doc.reload
+      doc.proc_default.should == 'string'
+    end
+  end
+
   context "ClassMethods#create (single document)" do
     setup do
       @doc_instance = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
@@ -139,7 +156,7 @@ class DocumentTest < Test::Unit::TestCase
       @doc_instance.last_name.should == 'Nunemaker'
       @doc_instance.age.should == 27
     end
-    
+
     should "not fail if no attributes provided" do
       document = Doc()
       lambda { document.create }.should change { document.count }.by(1)
@@ -183,12 +200,12 @@ class DocumentTest < Test::Unit::TestCase
     should "not create new document" do
       @document.count.should == 1
     end
-    
+
     should "raise error if not provided id" do
       doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       lambda { @document.update }.should raise_error(ArgumentError)
     end
-    
+
     should "raise error if not provided attributes" do
       doc = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       lambda { @document.update(doc._id) }.should raise_error(ArgumentError)
@@ -221,7 +238,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.find(@doc1._id).age.should == 30
       @document.find(@doc2._id).age.should == 30
     end
-    
+
     should "raise error if not a hash" do
       lambda { @document.update([1, 2]) }.should raise_error(ArgumentError)
     end
@@ -243,7 +260,7 @@ class DocumentTest < Test::Unit::TestCase
         @document.find!
       end
     end
-    
+
     should "raise error if trying to find with :all, :first, or :last" do
       [:all, :first, :last].each do |m|
         assert_raises(ArgumentError) { @document.find(m) }
@@ -525,7 +542,7 @@ class DocumentTest < Test::Unit::TestCase
       @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
       @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
       @document.destroy(@doc1._id, @doc2._id)
-      
+
       @document.count.should == 1
     end
 
@@ -596,11 +613,11 @@ class DocumentTest < Test::Unit::TestCase
       @document.count(:age => [26, 27]).should == 2
     end
   end
-  
+
   should "have instance method for collection" do
     @document.new.collection.name.should == @document.collection.name
   end
-  
+
   should "have instance method for database" do
     @document.new.database.should == @document.database
   end
@@ -672,7 +689,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.new.update_attributes({}).should be_false
     end
   end
-  
+
   context "#save (new document)" do
     setup do
       @doc = @document.new(:first_name => 'John', :age => '27')
@@ -710,12 +727,12 @@ class DocumentTest < Test::Unit::TestCase
     should "allow to use custom methods to assign properties" do
       klass = Doc do
         key :name, String
-        
+
         def realname=(value)
           self.name = value
         end
       end
-      
+
       person = klass.new(:realname => 'David')
       person.save
       person.reload.name.should == 'David'
@@ -723,7 +740,7 @@ class DocumentTest < Test::Unit::TestCase
 
     context "with key of type date" do
       should "save the date value as a Time object" do
-        doc = @document.new(:first_name => 'John', :age => '27', :date => "12/01/2009")
+        doc = @document.new(:first_name => 'John', :age => '27', :date => "2009-12-01")
         doc.save
         doc.date.should == Date.new(2009, 12, 1)
       end
@@ -775,7 +792,7 @@ class DocumentTest < Test::Unit::TestCase
       @document.count.should == 1
     end
   end
-  
+
   context "#save (with options)" do
     setup do
       @document = Doc do
@@ -799,7 +816,7 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "#save! (with options)" do
     setup do
       @document = Doc do
@@ -840,37 +857,57 @@ class DocumentTest < Test::Unit::TestCase
       @document.count.should == 0
     end
   end
-  
+
   context "#delete" do
     setup do
-      @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
-      @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})
-      
+      @doc1 = @document.create(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
+      @doc2 = @document.create(:first_name => 'Steve', :last_name => 'Smith', :age => '28')
+
       @document.class_eval do
         before_destroy :before_destroy_callback
         after_destroy :after_destroy_callback
-        
+
         def history; @history ||= [] end
         def before_destroy_callback; history << :after_destroy end
         def after_destroy_callback;  history << :after_destroy end
       end
-      
+
       @doc1.delete
     end
 
     should "remove document from collection" do
       @document.count.should == 1
     end
-    
+
     should "not remove other documents" do
       @document.find(@doc2.id).should_not be(nil)
     end
-    
+
     should "not call before/after destroy callbacks" do
       @doc1.history.should == []
     end
   end
 
+  context "#destroyed?" do
+    setup do
+      @doc1 = @document.create(:first_name => 'John', :last_name => 'Nunemaker', :age => '27')
+    end
+
+    should "be true if deleted" do
+      @doc1.delete
+      assert @doc1.destroyed?
+    end
+
+    should "be true if destroyed" do
+      @doc1.destroy
+      assert @doc1.destroyed?
+    end
+
+    should "be false if not deleted or destroyed" do
+      assert ! @doc1.destroyed?
+    end
+  end
+
   context "Single collection inheritance" do
     setup do
       class ::DocParent
@@ -883,7 +920,7 @@ class DocumentTest < Test::Unit::TestCase
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
       class ::DocGrandSon < ::DocSon; end
-      
+
       DocSon.many :children, :class_name => 'DocGrandSon'
 
       @parent = DocParent.new({:name => "Daddy Warbucks"})
@@ -939,7 +976,7 @@ class DocumentTest < Test::Unit::TestCase
       DocDaughter.all(:order => 'name').should  == [carrie, steph]
       DocParent.all(:order => 'name').should    == [carrie, john, steph, steve]
     end
-    
+
     should "work with nested hash conditions" do
       john = DocSon.create(:name => 'John')
       steve = DocSon.create(:name => 'Steve')
@@ -1023,7 +1060,7 @@ class DocumentTest < Test::Unit::TestCase
         DocParent.delete_all
       }.should change { DocParent.count }.by(-2)
     end
-    
+
     should "be able to reload parent inherited class" do
       brian = DocParent.create(:name => 'Brian')
       brian.name = 'B-Dawg'
@@ -1053,7 +1090,7 @@ class DocumentTest < Test::Unit::TestCase
       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)
@@ -1097,19 +1134,19 @@ class DocumentTest < Test::Unit::TestCase
     setup do
       @document.userstamps!
     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
@@ -1143,14 +1180,14 @@ class DocumentTest < Test::Unit::TestCase
       @foo_class = Doc do
         key :name
       end
-      
+
       @bar_class = EDoc do
         key :name
       end
-      
+
       @document.many :foos, :class => @foo_class
       @document.many :bars, :class => @bar_class
-      
+
       @instance = @document.create({
         :age => 39,
         :foos => [@foo_class.new(:name => '1')],
@@ -1164,22 +1201,22 @@ class DocumentTest < Test::Unit::TestCase
       @instance.reload
       @instance.age.should == 39
     end
-    
+
     should "reset all associations" do
       @instance.foos.expects(:reset).at_least_once
       @instance.bars.expects(:reset).at_least_once
       @instance.reload
     end
-    
+
     should "reinstantiate embedded associations" do
       @instance.reload
       @instance.bars.first.name.should == '1'
     end
-    
+
     should "return self" do
       @instance.reload.object_id.should == @instance.object_id
     end
-    
+
     should "raise DocumentNotFound if not found" do
       @instance.destroy
       assert_raises(MongoMapper::DocumentNotFound) { @instance.reload }
@@ -1226,7 +1263,7 @@ class DocumentTest < Test::Unit::TestCase
 
     should "allow creating index on multiple keys" do
       @document.ensure_index [[:first_name, 1], [:last_name, -1]]
-      
+
       # order is different for different versions of ruby so instead of
       # just checking have_index('first_name_1_last_name_-1') I'm checking
       # the values of the indexes to make sure the index creation was successful

data/test/functional/test_embedded_document.rb

@@ -7,27 +7,27 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       key :first_name, String
       key :last_name, String
     end
-    
+
     @pet_klass = EDoc do
       key :name, String
     end
-    
+
     @klass.many :pets, :class => @pet_klass
-    
+
     @address_class = EDoc do
       key :city, String
       key :state, String
     end
   end
-    
-  context "Saving a document with an embedded document" do
+
+  context "Saving a document with a key that is an embedded document" do
     setup do
       @klass.key :foo, @address_class
-      
+
       @address = @address_class.new(:city => 'South Bend', :state => 'IN')
       @doc = @klass.new(:foo => @address)
     end
-    
+
     should "embed embedded document" do
       @doc.save
       @doc.foo.city.should == 'South Bend'
@@ -38,16 +38,16 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       doc.foo.state.should == 'IN'
     end
   end
-  
+
   should "correctly instantiate single collection inherited embedded documents" do
     document = Doc('Foo') do
       key :message, Message
     end
-    
+
     doc1 = document.create(:message => Enter.new)
     doc1.reload.message.class.should be(Enter)
   end
-  
+
   context "new?" do
     setup do
       @klass.key :foo, @address_class
@@ -58,65 +58,65 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       doc = @klass.new(:foo => address)
       address.new?.should == true
     end
-    
+
     should "not be new after document is saved" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
       doc.foo.new?.should == false
     end
-    
+
     should "not be new when document is read back" do
       address = @address_class.new(:city => 'South Bend', :state => 'IN')
       doc = @klass.new(:foo => address)
       doc.save
-      
+
       doc = doc.reload
       doc.foo.new?.should == false
     end
   end
-  
+
   should "be able to save" do
     person = @klass.create
-    
+
     pet = @pet_klass.new(:name => 'sparky')
     person.pets << pet
     pet.should be_new
     pet.save
     pet.should_not be_new
-    
+
     person.reload
     person.pets.first.should == pet
   end
-  
+
   should "be able to dynamically add new keys and save" do
     person = @klass.create
-    
+
     pet = @pet_klass.new(:name => 'sparky', :crazy_key => 'crazy')
     person.pets << pet
     pet.save
-    
+
     person.reload
     person.pets.first.crazy_key.should == 'crazy'
   end
-  
+
   should "be able to update_attributes" do
     pet = @pet_klass.new(:name => 'sparky')
     person = @klass.create(:pets => [pet])
     person.reload
     pet = person.pets.first
-    
+
     pet.update_attributes(:name => 'koda').should be_true
     person.reload
     person.pets.first._id.should == pet._id
     person.pets.first.name.should == 'koda'
   end
-  
+
   should "be able to update_attributes!" do
     person = @klass.create(:pets => [@pet_klass.new(:name => 'sparky')])
     person.reload
     pet = person.pets.first
-    
+
     attributes = {:name => 'koda'}
     pet.expects(:attributes=).with(attributes)
     pet.expects(:save!)

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 = 3.0
     
     if duration > threshold
       puts "\nSLOW TEST: #{duration} - #{self.name}"

data/test/test_helper.rb

@@ -11,6 +11,10 @@ require 'timecop'
 require 'mocha'
 require 'pp'
 
+if RUBY_VERSION.to_f < 1.9
+  require 'leftright' rescue nil
+end
+
 require 'support/custom_matchers'
 require 'support/timing'
 

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

data/test/unit/test_mongo_mapper.rb

@@ -31,7 +31,6 @@ class MongoMapperTest < Test::Unit::TestCase
       'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'},
       'production'  => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test-prod'}
     }
-
     MongoMapper.config = config
     MongoMapper.config.should == config
   end
@@ -41,7 +40,16 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
+      MongoMapper.expects(:database=).with('test')
+      Mongo::DB.any_instance.expects(:authenticate).never
+      MongoMapper.connect('development')
+    end
 
+    should "work without authentication using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
+      }
       Mongo::Connection.expects(:new).with('127.0.0.1', 27017, {})
       MongoMapper.expects(:database=).with('test')
       Mongo::DB.any_instance.expects(:authenticate).never
@@ -52,7 +60,15 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
+      connection, logger = mock('connection'), mock('logger')
+      Mongo::Connection.expects(:new).with('127.0.0.1', 27017, :logger => logger)
+      MongoMapper.connect('development', :logger => logger)
+    end
 
+    should "work with options using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
+      }
       connection, logger = mock('connection'), mock('logger')
       Mongo::Connection.expects(:new).with('127.0.0.1', 27017, :logger => logger)
       MongoMapper.connect('development', :logger => logger)
@@ -62,10 +78,24 @@ class MongoMapperTest < Test::Unit::TestCase
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'username' => 'john', 'password' => 'secret'}
       }
+      Mongo::DB.any_instance.expects(:authenticate).with('john', 'secret')
+      MongoMapper.connect('development')
+    end
 
+    should "work with authentication using uri" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mongodb://john:secret@127.0.0.1:27017/test'}
+      }
       Mongo::DB.any_instance.expects(:authenticate).with('john', 'secret')
       MongoMapper.connect('development')
     end
+    
+    should "raise error for invalid scheme" do
+      MongoMapper.config = {
+        'development' => {'uri' => 'mysql://127.0.0.1:5336/foo'}
+      }
+      assert_raises(MongoMapper::InvalidScheme) { MongoMapper.connect('development') }
+    end
   end
 
   context "setup" do

data/test/unit/test_pagination.rb

@@ -12,6 +12,29 @@ class PaginationTest < Test::Unit::TestCase
   context "Pagination proxy" do
     include MongoMapper::Plugins::Pagination
     
+    should "respond_to? correctly on proxy readers" do
+      proxy = Proxy.new(25, 10, 4)
+      proxy.respond_to?(:subject).should be_true
+      proxy.respond_to?(:total_entries).should be_true
+      proxy.respond_to?(:per_page).should be_true
+      proxy.respond_to?(:current_page).should be_true
+      proxy.respond_to?(:limit).should be_true
+      proxy.respond_to?(:total_pages).should be_true
+      proxy.respond_to?(:out_of_bounds?).should be_true
+      proxy.respond_to?(:previous_page).should be_true
+      proxy.respond_to?(:next_page).should be_true
+      proxy.respond_to?(:skip).should be_true
+      proxy.respond_to?(:offset).should be_true
+      
+      # make sure it doesnt respond true to everything
+      proxy.respond_to?(:blahblahblah).should be_false
+    end
+    
+    should "respond_to? correctly on proxy writers" do
+      proxy = Proxy.new(25, 10, 4)
+      proxy.respond_to?(:subject=).should be_true
+    end
+    
     should "should have accessors for subject" do
       subject = [1,2,3,4,5]
       collection = Proxy.new(25, 2)
@@ -31,6 +54,16 @@ class PaginationTest < Test::Unit::TestCase
       collection.class.should == Array
     end
     
+    should "should respond_to? correctly for methods defined on the subject" do
+      subject = [1,2,3,4,5]
+      def subject.blahblah
+        "BLAHBLAH"
+      end
+      collection = Proxy.new(25, 2, 10)
+      collection.subject = subject
+      collection.respond_to?(:blahblah).should be_true
+    end
+    
     should "return correct value for total_entries" do
       Proxy.new(25, 2, 10).total_entries.should == 25
       Proxy.new('25', 2, 10).total_entries.should == 25

data/test/unit/test_query.rb

@@ -38,6 +38,8 @@ class QueryTest < Test::Unit::TestCase
     end
     
     %w{gt lt gte lte ne in nin mod all size where exists}.each do |operator|
+      next if operator == 'size' && RUBY_VERSION >= '1.9.1' # 1.9 defines Symbol#size
+
       should "convert #{operator} conditions" do
         Query.new(Room, :age.send(operator) => 21).criteria.should == {
           :age => {"$#{operator}" => 21}
@@ -176,6 +178,10 @@ class QueryTest < Test::Unit::TestCase
       Query.new(Room, :sort => sort, :order => 'foo asc').options[:sort].should == sort
     end
     
+    should "normalize id to _id" do
+      Query.new(Room, :order => :id.asc).options[:sort].should == [['_id', 1]]
+    end
+    
     should "convert natural in order to proper" do
       sort = [['$natural', 1]]
       Query.new(Room, :order => '$natural asc').options[:sort].should == sort

data/test/unit/test_support.rb

@@ -78,7 +78,7 @@ class SupportTest < Test::Unit::TestCase
   
   context "Date#to_mongo" do
     should "be time if string" do
-      date = Date.to_mongo('10/1/2009')
+      date = Date.to_mongo('2009-10-01')
       date.should == Time.utc(2009, 10, 1)
       date.should == date
       date.month.should == 10
@@ -276,8 +276,12 @@ class SupportTest < Test::Unit::TestCase
   end
   
   context "Time#to_mongo without Time.zone" do
+    setup do
+      Time.zone = nil
+    end
+
     should "be time to milliseconds if string" do
-      Time.to_mongo('2000-01-01 01:01:01.123456').should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc
+      Time.to_mongo('2000-01-01 01:01:01.123456').to_f.should == Time.local(2000, 1, 1, 1, 1, 1, 123000).utc.to_f
     end
     
     should "be time in utc if time" do
@@ -296,13 +300,13 @@ class SupportTest < Test::Unit::TestCase
   context "Time#to_mongo with Time.zone" do
     should "be time to milliseconds if time" do
       Time.zone = 'Hawaii'
-      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
+      Time.to_mongo(Time.zone.local(2009, 8, 15, 14, 0, 0, 123456)).to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 123000).to_f
       Time.zone = nil
     end
 
     should "be time to milliseconds if string" do
       Time.zone = 'Hawaii'
-      Time.to_mongo('2009-08-15 14:00:00.123456').should == Time.utc(2009, 8, 16, 0, 0, 0, 123000)
+      Time.to_mongo('2009-08-15 14:00:00.123456').to_f.should == Time.utc(2009, 8, 16, 0, 0, 0, 123000).to_f
       Time.zone = nil
     end
     
@@ -359,4 +363,4 @@ class SupportTest < Test::Unit::TestCase
       id.original_to_json.should == %Q({"$oid": "#{id}"})
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.2.27
+  version: 2010.2.28
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 -05:00
+date: 2010-02-28 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency