djsun-mongo_mapper 0.5.2.1 → 0.5.3.1

data/README.rdoc

@@ -2,11 +2,7 @@
 
 Awesome gem for modeling your domain and storing it in mongo.
 
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
-
-* rake gemspec
-* gem build mongo_mapper.gemspec
-* gem install the gem that was built
+Releases are tagged on github and released on gemcutter. Master is pushed to whenever I add a patch or a new feature, but I do not release a new gem version each time I push.
 
 == Note on Patches/Pull Requests
 
@@ -16,10 +12,25 @@ Releases are tagged on github and also released as gems on github and rubyforge.
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Install
+
+MongoMapper is only released on gemcutter. To install, you can setup gemcutter as your default gem source.
+
+ $ gem install gemcutter
+ $ gem tumble
+ 
+Then you can install MM:
+ 
+ $ gem install mongo_mapper
+
+You can also just declare the source:
+
+ $ gem install mongo_mapper -s http://gemcutter.org
+
 == Dependencies
 
-* ActiveSupport (activesupport)
-* Mongo Ruby Driver (mongodb-mongo)
+* ActiveSupport (typically the latest version)
+* Mongo Ruby Driver (mongo)
 * My fork of the validatable gem (jnunemaker-validatable)
 
 == Documentation

data/Rakefile

@@ -13,7 +13,7 @@ begin
     
     gem.add_dependency('activesupport')
     gem.add_dependency('mongo', '0.15.1')
-    gem.add_dependency('jnunemaker-validatable', '1.7.3')
+    gem.add_dependency('jnunemaker-validatable', '1.7.4')
     
     gem.add_development_dependency('mocha', '0.9.4')
     gem.add_development_dependency('jnunemaker-matchy', '0.4.0')

data/VERSION

@@ -1 +1 @@
-0.5.2.1
+0.5.3.1

data/djsun-mongo_mapper.gemspec

@@ -1,15 +1,15 @@
-# Generated by jeweler"
-# DO NOT EDIT THIS FILE"
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`"
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{djsun-mongo_mapper}
-  s.version = "0.5.2.1"
+  s.version = "0.5.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-09}
+  s.date = %q{2009-10-11}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -143,22 +143,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
       s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
   end
 end
-

data/lib/mongo_mapper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 gem 'activesupport'
 gem 'mongo', '0.15.1'
-gem 'jnunemaker-validatable', '1.7.3'
+gem 'jnunemaker-validatable', '1.7.4'
 
 require 'activesupport'
 require 'mongo'
@@ -42,6 +42,21 @@ module MongoMapper
     @@database ||= MongoMapper.connection.db(@@database_name)
   end
   
+  def self.ensured_indexes
+    @@ensured_indexes ||= []
+  end
+  
+  def self.ensure_index(klass, keys, options={})
+    ensured_indexes << {:klass => klass, :keys => keys, :options => options}
+  end
+  
+  def self.ensure_indexes!
+    ensured_indexes.each do |index|
+      unique = index[:options].delete(:unique)
+      index[:klass].collection.create_index(index[:keys], unique)
+    end
+  end
+  
   module Finders
     def dynamic_find(finder, args)
       attributes = {}

data/lib/mongo_mapper/document.rb

@@ -28,6 +28,22 @@ module MongoMapper
     end
 
     module ClassMethods
+      def key(*args)
+        key = super
+        create_indexes_for(key)
+        key
+      end
+      
+      def ensure_index(name_or_array, options={})
+        keys_to_index = if name_or_array.is_a?(Array)
+          name_or_array.map { |pair| [pair[0], pair[1]] }
+        else
+          name_or_array
+        end
+        
+        MongoMapper.ensure_index(self, keys_to_index, options)
+      end
+      
       def find(*args)
         options = args.extract_options!
         case args.first
@@ -90,6 +106,10 @@ module MongoMapper
         collection.find(FinderOptions.to_mongo_criteria(conditions)).count
       end
 
+      def exists?(conditions={})
+        !count(conditions).zero?
+      end
+
       def create(*docs)
         instances = []
         docs = [{}] if docs.blank?
@@ -187,9 +207,20 @@ module MongoMapper
         end
 
       private
+        def create_indexes_for(key)
+          ensure_index key.name if key.options[:index]
+        end
+        
         def find_every(options)
           criteria, options = FinderOptions.new(options).to_a
-          collection.find(criteria, options).to_a.map { |doc| new(doc) }
+          collection.find(criteria, options).to_a.map do |doc|
+            begin
+              klass = doc['_type'].present? ? doc['_type'].constantize : self
+              klass.new(doc)
+            rescue NameError
+              new(doc)
+            end
+          end
         end
 
         def invert_order_clause(order)
@@ -244,7 +275,7 @@ module MongoMapper
         end
     end
 
-    module InstanceMethods
+    module InstanceMethods      
       def collection
         self.class.collection
       end

data/lib/mongo_mapper/embedded_document.rb

@@ -22,6 +22,10 @@ module MongoMapper
     end
 
     module ClassMethods
+      def logger
+        MongoMapper.logger
+      end
+      
       def inherited(subclass)
         unless subclass.embeddable?
           subclass.set_collection_name(collection_name)
@@ -49,30 +53,13 @@ module MongoMapper
           keys[key.name] = key
 
           create_accessors_for(key)
-          add_to_subclasses(*args)
-          apply_validations_for(key)
-          create_indexes_for(key)
-
+          create_key_in_subclasses(*args)
+          create_validations_for(key)
+          
           key
         end
-      end
-
-      def add_to_subclasses(*args)
-        return if subclasses.blank?
-
-        subclasses.each do |subclass|
-          subclass.key(*args)
-        end
-      end
-
-      def ensure_index(name_or_array, options={})
-        keys_to_index = if name_or_array.is_a?(Array)
-          name_or_array.map { |pair| [pair[0], pair[1]] }
-        else
-          name_or_array
-        end
-
-        collection.create_index(keys_to_index, options.delete(:unique))
+        
+        key
       end
 
       def embeddable?
@@ -129,12 +116,16 @@ module MongoMapper
         end_eval
         include accessors_module
       end
+      
+      def create_key_in_subclasses(*args)
+        return if subclasses.blank?
 
-      def create_indexes_for(key)
-        ensure_index key.name if key.options[:index]
+        subclasses.each do |subclass|
+          subclass.key(*args)
+        end
       end
 
-      def apply_validations_for(key)
+      def create_validations_for(key)
         attribute = key.name.to_sym
 
         if key.options[:required]
@@ -169,6 +160,10 @@ module MongoMapper
     end
 
     module InstanceMethods
+      def logger
+        self.class.logger
+      end
+      
       def initialize(attrs={})
         unless attrs.nil?
           self.class.associations.each_pair do |name, association|

data/lib/mongo_mapper/finder_options.rb

@@ -42,10 +42,21 @@ module MongoMapper
       end
     end
     
+    OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
+    
     def initialize(options)
       raise ArgumentError, "FinderOptions must be a hash" unless options.is_a?(Hash)
-      @options = options.symbolize_keys
-      @conditions = @options.delete(:conditions) || {}
+      
+      options = options.symbolize_keys
+      @options, @conditions = {}, options.delete(:conditions) || {}
+      
+      options.each_pair do |key, value|
+        if OptionKeys.include?(key)
+          @options[key] = value
+        else
+          @conditions[key] = value
+        end
+      end
     end
     
     def criteria

data/lib/mongo_mapper/support.rb

@@ -131,7 +131,11 @@ end
 
 class Time
   def self.to_mongo(value)
-    to_utc_time(value)
+    if value.nil? || value == ''
+      nil
+    else
+      to_utc_time(value)
+    end
   end
   
   def self.from_mongo(value)

data/mongo_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-11}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -142,20 +142,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
       s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.3"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
   end

data/test/custom_matchers.rb

@@ -45,4 +45,11 @@ module CustomMatchers
       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

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -9,7 +9,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
   
   should "default to nil" do
     status = Status.new
-    status.target.nil?.should == true
+    status.target.nil?.should be_true
     status.target.inspect.should == "nil"
   end
 
@@ -20,7 +20,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     status.save.should be_true
 
     from_db = Status.find(status.id)
-    from_db.target.nil?.should == false
+    from_db.target.nil?.should be_false
     from_db.target_id.should == project.id
     from_db.target_type.should == "Project"
     from_db.target.name.should == "mongomapper"
@@ -34,9 +34,9 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
 
     from_db = Status.find(status.id)
     from_db.target = nil
-    from_db.target_type.nil?.should == true
-    from_db.target_id.nil?.should == true
-    from_db.target.nil?.should == true
+    from_db.target_type.nil?.should be_true
+    from_db.target_id.nil?.should be_true
+    from_db.target.nil?.should be_true
   end
   
   context "association id set but document not found" do
@@ -49,7 +49,7 @@ class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
     end
 
     should "return nil instead of raising error" do
-      @status.target.nil?.should == true
+      @status.target.nil?.should be_true
     end
   end
 end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -10,7 +10,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
   should "default to nil" do
     status = Status.new
     status.project.nil?.should == true
-    status.project.inspect.should == "nil"
+    status.project.inspect.should == 'nil'
   end
   
   should "be able to replace the association" do
@@ -20,7 +20,7 @@ class BelongsToProxyTest < Test::Unit::TestCase
     status.save.should be_true
     
     from_db = Status.find(status.id)
-    from_db.project.should_not be_nil
+    from_db.project.nil?.should be_false
     from_db.project.name.should == "mongomapper"
   end
   
@@ -32,8 +32,8 @@ class BelongsToProxyTest < Test::Unit::TestCase
     
     from_db = Status.find(status.id)
     from_db.project = nil
-    from_db.project.nil?.should == true
-    from_db.project.inspect.should == "nil"
+    from_db.project.nil?.should be_true
+    from_db.project.inspect.should == 'nil'
   end
   
   context "association id set but document not found" do
@@ -42,8 +42,8 @@ class BelongsToProxyTest < Test::Unit::TestCase
     end
 
     should "return nil instead of raising error" do
-      @status.project.nil?.should == true
-      @status.project.inspect.should == "nil"
+      @status.project.nil?.should be_true
+      @status.project.inspect.should == 'nil'
     end
   end
 end

data/test/functional/test_document.rb

@@ -142,6 +142,27 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
     
+    context "Using key with custom type with default" do
+      setup do
+        @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
+      end
+
+      should "default to default" do
+        doc = @document.new
+        doc.window.should == WindowSize.new(600, 480)
+        
+      end
+      
+      should "save and load from mongo" do
+        doc = @document.new
+        doc.save
+        
+        from_db = @document.find(doc.id)
+        from_db.window.should == WindowSize.new(600, 480)
+      end
+    end
+    
+    
     context "Creating a single document" do
       setup do
         @doc_instance = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
@@ -295,7 +316,12 @@ class DocumentTest < Test::Unit::TestCase
           @document.find([@doc1.id]).should == [@doc1]
         end
       end
-
+      
+      should "be able to find using condition auto-detection" do
+        @document.first(:first_name => 'John').should == @doc1
+        @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
+      end
+      
       context "with :all" do
         should "find all documents" do
           @document.find(:all, :order => 'first_name').should == [@doc1, @doc3, @doc2]
@@ -694,39 +720,31 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "allow creating index for a key" do
-        index_name = nil
-        lambda {
-          index_name = @document.ensure_index :first_name
-        }.should change { @document.collection.index_information.size }.by(1)
-
-        index_name.should == 'first_name_1'
-        index = @document.collection.index_information[index_name]
-        index.should_not be_nil
-        index.should include(['first_name', 1])
+        @document.ensure_index :first_name
+        MongoMapper.ensure_indexes!
+        
+        @document.should have_index('first_name_1')        
       end
 
       should "allow creating unique index for a key" do
-        @document.collection.expects(:create_index).with(:first_name, true)
         @document.ensure_index :first_name, :unique => true
+        MongoMapper.ensure_indexes!
+        
+        @document.should have_index('first_name_1')
       end
 
       should "allow creating index on multiple keys" do
-        index_name = nil
-        lambda {
-          index_name = @document.ensure_index [[:first_name, 1], [:last_name, -1]]
-        }.should change { @document.collection.index_information.size }.by(1)
-
-        [ 'first_name_1_last_name_-1', 'last_name_-1_first_name_1' ].should include(index_name)
-
-        index = @document.collection.index_information[index_name]
-        index.should_not be_nil
-        index.should include(['first_name', 1])
-        index.should include(['last_name', -1])
+        @document.ensure_index [[:first_name, 1], [:last_name, -1]]
+        MongoMapper.ensure_indexes!
+        
+        @document.should have_index('last_name_-1_first_name_1')        
       end
 
       should "work with :index shortcut when defining key" do
-        @document.expects(:ensure_index).with('father').returns(nil)
         @document.key :father, String, :index => true
+        MongoMapper.ensure_indexes!
+        
+        @document.should have_index('father_1')
       end
     end
   end # Document Class Methods
@@ -923,6 +941,57 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "Single collection inheritance" do
+    setup do
+      class ::DocParent
+        include MongoMapper::Document
+        key :_type, String
+      end
+      
+      class ::DocChild < ::DocParent; end
+      DocParent.collection.clear
+      
+      @parent = DocParent.new({:name => "Daddy Warbucks"})
+      @child = DocChild.new({:name => "Little Orphan Annie"})
+    end
+
+    teardown do
+      Object.send :remove_const, 'DocParent' if defined?(::DocParent)
+      Object.send :remove_const, 'DocChild' if defined?(::DocChild)
+    end
+
+    should "use the same collection in the subclass" do
+      DocChild.collection.name.should == DocParent.collection.name
+    end
+
+    should "assign the class name into the _type property" do
+      @parent._type.should == 'DocParent'
+      @child._type.should == 'DocChild'
+    end
+
+    should "load the document with the assigned type" do
+      @parent.save
+      @child.save
+
+      collection = DocParent.find(:all)
+      collection.size.should == 2
+      collection.first.should be_kind_of(DocParent)
+      collection.first.name.should == "Daddy Warbucks"
+      collection.last.should be_kind_of(DocChild)
+      collection.last.name.should == "Little Orphan Annie"
+    end
+    
+    should "gracefully handle when the type can't be constantized" do
+      doc = DocParent.new(:name => 'Nunes')
+      doc._type = 'FoobarBaz'
+      doc.save
+      
+      collection = DocParent.all
+      collection.last.should == doc
+      collection.last.should be_kind_of(DocParent)
+    end
+  end
 
   context "timestamping" do
     setup do
@@ -961,4 +1030,27 @@ class DocumentTest < Test::Unit::TestCase
       from_db.updated_at.to_i.should_not == old_updated_at.to_i
     end
   end
+
+  context "#exist?" do
+    setup do
+      @doc = @document.create(:first_name => "James", :age => 27)
+    end
+
+    should "be true when at least one document exists" do
+      @document.exists?.should == true
+    end
+
+    should "be false when no documents exist" do
+      @doc.destroy
+      @document.exists?.should == false
+    end
+
+    should "be true when at least one document exists that matches the conditions" do
+      @document.exists?(:first_name => "James").should == true
+    end
+
+    should "be false when no documents exist with the provided conditions" do
+      @document.exists?(:first_name => "Jean").should == false
+    end
+  end
 end

data/test/functional/test_embedded_document.rb

@@ -12,7 +12,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
     @document.collection.clear
   end
-  
+    
   context "Saving a document with an embedded document" do
     setup do
       @document.class_eval do

data/test/models.rb

@@ -1,3 +1,29 @@
+# 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
+end
+
+
 class Post
   include MongoMapper::Document
 

data/test/unit/test_document.rb

@@ -8,8 +8,14 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
         set_collection_name 'test'
       end
+      @document.collection.clear
     end
-
+    
+    should "have logger method" do
+      @document.logger.should == MongoMapper.logger
+      @document.logger.should be_instance_of(Logger)
+    end
+    
     should "track its descendants" do
       MongoMapper::Document.descendants.should include(@document)
     end
@@ -87,6 +93,12 @@ class DocumentTest < Test::Unit::TestCase
       end
       @document.collection.clear
     end
+    
+    should "have access to logger" do
+      doc = @document.new
+      doc.logger.should == @document.logger
+      doc.logger.should be_instance_of(Logger)
+    end
 
     should "have access to the class's collection" do
       doc = @document.new
@@ -99,6 +111,13 @@ class DocumentTest < Test::Unit::TestCase
       @document.new.active.should be_true
       @document.new(:active => false).active.should be_false
     end
+    
+    should "use default values if defined even when custom data type" do
+      @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
+      
+      doc = @document.new
+      doc.window.should == WindowSize.new(600, 480)
+    end
 
     context "root document" do
       should "have a nil _root_document" do

data/test/unit/test_embedded_document.rb

@@ -40,6 +40,11 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
+    should "give class access to logger" do
+      @klass.logger.should == MongoMapper.logger
+      @klass.logger.should be_instance_of(Logger)
+    end
+    
     should "add _id key" do
       @klass.keys['_id'].should_not be_nil
     end
@@ -284,6 +289,12 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       end
     end
     
+    should "have access to class logger" do
+      doc = @document.new
+      doc.logger.should == @document.logger
+      doc.logger.should be_instance_of(Logger)
+    end
+    
     should "automatically have an _id key" do
       @document.keys.keys.should include('_id')
     end

data/test/unit/test_finder_options.rb

@@ -8,7 +8,7 @@ class FinderOptionsTest < Test::Unit::TestCase
     lambda { FinderOptions.new(1) }.should raise_error(ArgumentError)
   end
   
-  should "have symbolize the keys of the hash provided" do
+  should "symbolize the keys of the hash provided" do
     FinderOptions.new('offset' => 1).options.keys.map do |key|
       key.should be_instance_of(Symbol)
     end
@@ -179,4 +179,83 @@ class FinderOptionsTest < Test::Unit::TestCase
       FinderOptions.new(:select => %w(a b)).options[:fields].should == %w(a b)
     end
   end
+  
+  context "Condition auto-detection" do
+    should "know :conditions are criteria" do
+      finder = FinderOptions.new(:conditions => {:foo => 'bar'})
+      finder.criteria.should == {:foo => 'bar'}
+      finder.options.keys.should_not include(:conditions)
+    end
+    
+    should "know fields is an option" do
+      finder = FinderOptions.new(:fields => ['foo'])
+      finder.options[:fields].should == ['foo']
+      finder.criteria.keys.should_not include(:fields)
+    end
+    
+    # select gets converted to fields so just checking keys
+    should "know select is an option" do
+      finder = FinderOptions.new(:select => 'foo')
+      finder.options.keys.should include(:sort)
+      finder.criteria.keys.should_not include(:select)
+      finder.criteria.keys.should_not include(:fields)
+    end
+    
+    should "know skip is an option" do
+      finder = FinderOptions.new(:skip => 10)
+      finder.options[:skip].should == 10
+      finder.criteria.keys.should_not include(:skip)
+    end
+    
+    # offset gets converted to skip so just checking keys
+    should "know offset is an option" do
+      finder = FinderOptions.new(:offset => 10)
+      finder.options.keys.should include(:skip)
+      finder.criteria.keys.should_not include(:skip)
+      finder.criteria.keys.should_not include(:offset)
+    end
+
+    should "know limit is an option" do
+      finder = FinderOptions.new(:limit => 10)
+      finder.options[:limit].should == 10
+      finder.criteria.keys.should_not include(:limit)
+    end
+
+    should "know sort is an option" do
+      finder = FinderOptions.new(:sort => [['foo', 1]])
+      finder.options[:sort].should == [['foo', 1]]
+      finder.criteria.keys.should_not include(:sort)
+    end
+
+    # order gets converted to sort so just checking keys
+    should "know order is an option" do
+      finder = FinderOptions.new(:order => 'foo')
+      finder.options.keys.should include(:sort)
+      finder.criteria.keys.should_not include(:sort)
+    end
+        
+    should "work with full range of things" do
+      finder_options = FinderOptions.new({
+        :foo => 'bar',
+        :baz => true,
+        :sort => [['foo', 1]],
+        :fields => ['foo', 'baz'],
+        :limit => 10,
+        :skip => 10,
+      })
+      
+      finder_options.criteria.should == {
+        :foo => 'bar',
+        :baz => true,
+      }
+      
+      finder_options.options.should == {
+        :sort => [['foo', 1]],
+        :fields => ['foo', 'baz'],
+        :limit => 10,
+        :skip => 10,
+      }
+    end
+  end
+  
 end # FinderOptionsTest

data/test/unit/test_support.rb

@@ -225,9 +225,12 @@ class SupportTest < Test::Unit::TestCase
       Time.to_mongo(Time.local(2009, 8, 15, 0, 0, 0)).zone.should == 'UTC'
     end
     
+    should "be nil if blank string" do
+      Time.to_mongo('').should be_nil
+    end
+    
     should "not be nil if nil" do
-      # Time.parse actually returns like right now
-      Time.to_mongo(nil).should_not be_nil
+      Time.to_mongo(nil).should be_nil
     end
   end
   
@@ -244,6 +247,12 @@ class SupportTest < Test::Unit::TestCase
       Time.zone = nil
     end
     
+    should "be nil if blank string" do
+      Time.zone = 'Hawaii'
+      Time.to_mongo('').should be_nil
+      Time.zone = nil
+    end
+    
     should "be nil if nil" do
       Time.zone = 'Hawaii'
       Time.to_mongo(nil).should be_nil
@@ -256,6 +265,10 @@ class SupportTest < Test::Unit::TestCase
       time = Time.now
       Time.from_mongo(time).should == time
     end
+    
+    should "be nil if nil" do
+      Time.from_mongo(nil).should be_nil
+    end
   end
   
   context "Time#from_mongo with Time.zone" do
@@ -268,5 +281,11 @@ class SupportTest < Test::Unit::TestCase
       
       Time.zone = nil
     end
+    
+    should "be nil if nil" do
+      Time.zone = 'Hawaii'
+      Time.from_mongo(nil).should be_nil
+      Time.zone = nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.5.2.1
+  version: 0.5.3.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-11 00:00:00 -04:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.3
+        version: 1.7.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha