mongo_mapper 0.11.0 → 0.11.1

data/lib/mongo_mapper.rb

@@ -56,6 +56,7 @@ module MongoMapper
     autoload :Timestamps,         'mongo_mapper/plugins/timestamps'
     autoload :Userstamps,         'mongo_mapper/plugins/userstamps'
     autoload :Validations,        'mongo_mapper/plugins/validations'
+    autoload :Touch,              'mongo_mapper/plugins/touch'
 
     module Associations
       autoload :Base,                         'mongo_mapper/plugins/associations/base'

data/lib/mongo_mapper/connection.rb

@@ -3,6 +3,11 @@ require 'uri'
 
 module MongoMapper
   module Connection
+    @@connection    = nil
+    @@database      = nil
+    @@database_name = nil
+    @@config        = nil
+
     # @api public
     def connection
       @@connection ||= Mongo::Connection.new
@@ -26,9 +31,7 @@ module MongoMapper
 
     # @api public
     def database
-      if @@database_name.blank?
-        raise 'You forgot to set the default database name: MongoMapper.database = "foobar"'
-      end
+      return nil if @@database_name.blank?
 
       @@database ||= MongoMapper.connection.db(@@database_name)
     end
@@ -44,7 +47,7 @@ module MongoMapper
 
     # @api private
     def config_for_environment(environment)
-      env = config[environment] || {}
+      env = config[environment.to_s] || {}
       return env if env['uri'].blank?
 
       uri = URI.parse(env['uri'])

data/lib/mongo_mapper/document.rb

@@ -29,6 +29,7 @@ module MongoMapper
     include Plugins::Serialization
     include Plugins::Timestamps
     include Plugins::Userstamps
+    include Plugins::Touch
     include Plugins::Validations
     include Plugins::EmbeddedCallbacks
     include Plugins::Callbacks # for now callbacks needs to be after validations

data/lib/mongo_mapper/embedded_document.rb

@@ -22,6 +22,7 @@ module MongoMapper
     include Plugins::Timestamps
     include Plugins::Validations
     include Plugins::EmbeddedCallbacks
+    include Plugins::Touch
 
     included do
       extend Plugins

data/lib/mongo_mapper/extensions/time.rb

@@ -8,8 +8,7 @@ module MongoMapper
         else
           time_class = ::Time.try(:zone).present? ? ::Time.zone : ::Time
           time = value.is_a?(::Time) ? value : time_class.parse(value.to_s)
-          # strip milliseconds as Ruby does micro and bson does milli and rounding rounded wrong
-          at(time.to_i).utc if time
+          at(time.to_f).utc if time # ensure milliseconds are preserved with to_f (issue #308)
         end
       end
 

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

@@ -6,7 +6,7 @@ module MongoMapper
         attr_reader :name, :options, :query_options
 
         # Options that should not be considered MongoDB query options/criteria
-        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave]
+        AssociationOptions = [:as, :class, :class_name, :dependent, :extend, :foreign_key, :in, :polymorphic, :autosave, :touch]
 
         def initialize(name, options={}, &extension)
           @name, @options, @query_options, @original_options = name.to_sym, {}, {}, options
@@ -39,6 +39,10 @@ module MongoMapper
           klass.embeddable?
         end
 
+        def touch?
+          !!@options[:touch]
+        end
+
         def type_key_name
           "_type"
         end

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

@@ -18,12 +18,36 @@ module MongoMapper
         def setup(model)
           model.key foreign_key, ObjectId unless model.key?(foreign_key)
           super
+          add_touch_callbacks if touch?
         end
 
         def autosave?
           options.fetch(:autosave, false)
         end
+
+        def add_touch_callbacks
+          name        = self.name
+          method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
+          touch       = options.fetch(:touch)
+
+          @model.send(:define_method, method_name) do
+            record = send(name)
+
+            unless record.nil?
+              if touch == true
+                record.touch
+              else
+                record.touch(touch)
+              end
+            end
+          end
+
+          @model.after_save(method_name)
+          @model.after_touch(method_name)
+          @model.after_destroy(method_name)
+
+        end
       end
     end
   end
-end
+end

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

@@ -4,6 +4,7 @@ module MongoMapper
     module Associations
       class SingleAssociation < Base
         def setup(model)
+          @model = model
           model.associations_module.module_eval <<-end_eval
             def #{name}
               proxy = get_proxy(associations[#{name.inspect}])

data/lib/mongo_mapper/plugins/callbacks.rb

@@ -7,6 +7,10 @@ module MongoMapper
       def destroy
         run_callbacks(:destroy) { super }
       end
+      
+      def touch(*)
+        run_callbacks(:touch) { super }
+      end
 
     private
       def create_or_update(*)

data/lib/mongo_mapper/plugins/embedded_callbacks.rb

@@ -8,6 +8,7 @@ module MongoMapper
         extend  ::ActiveModel::Callbacks
 
         define_model_callbacks :save, :create, :update, :destroy, :only => [:before, :after]
+        define_model_callbacks :touch, :only => [:after]
       end
 
       def run_callbacks(callback, *args, &block)

data/lib/mongo_mapper/plugins/inspect.rb

@@ -7,7 +7,7 @@ module MongoMapper
       def inspect(include_nil = false)
         keys = include_nil ? key_names : attributes.keys
         attributes_as_nice_string = keys.sort.collect do |name|
-          "#{name}: #{self[name].inspect}"
+          "#{name}: #{self.send(:"#{name}").inspect}"
         end.join(", ")
         "#<#{self.class} #{attributes_as_nice_string}>"
       end

data/lib/mongo_mapper/plugins/modifiers.rb

@@ -10,14 +10,14 @@ module MongoMapper
         end
 
         def decrement(*args)
-          criteria, keys = criteria_and_keys_from_args(args)
+          criteria, keys, options = criteria_and_keys_from_args(args)
           values, to_decrement = keys.values, {}
           keys.keys.each_with_index { |k, i| to_decrement[k] = -values[i].abs }
           collection.update(criteria, {'$inc' => to_decrement}, :multi => true)
         end
 
         def set(*args)
-          criteria, updates = criteria_and_keys_from_args(args)
+          criteria, updates, options = criteria_and_keys_from_args(args)
           updates.each do |key, value|
             updates[key] = keys[key.to_s].set(value) if key?(key)
           end
@@ -64,14 +64,26 @@ module MongoMapper
 
         private
           def modifier_update(modifier, args)
-            criteria, updates = criteria_and_keys_from_args(args)
-            collection.update(criteria, {modifier => updates}, :multi => true)
+            criteria, updates, options = criteria_and_keys_from_args(args)
+            if options
+              collection.update(criteria, {modifier => updates}, options.merge(:multi => true))
+            else
+              collection.update(criteria, {modifier => updates}, :multi => true)
+            end    
           end
 
           def criteria_and_keys_from_args(args)
-            keys     = args.pop
-            criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
-            [criteria_hash(criteria).to_hash, keys]
+            if args[0].is_a?(Hash)
+              criteria = args[0]
+              updates = args[1]
+              options = args[2]
+            else
+              split_args = args.partition{|a| a.is_a?(BSON::ObjectId)}
+              criteria = {:id => split_args[0]}
+              updates = split_args[1].first
+              options = split_args[1].last
+            end    
+            [criteria_hash(criteria).to_hash, updates, options]
           end
       end
 
@@ -79,41 +91,41 @@ module MongoMapper
         self.class.unset(id, *keys)
       end
 
-      def increment(hash)
-        self.class.increment(id, hash)
+      def increment(hash, options=nil)
+        self.class.increment(id, hash, options)
       end
 
-      def decrement(hash)
-        self.class.decrement(id, hash)
+      def decrement(hash, options=nil)
+        self.class.decrement(id, hash, options)
       end
 
-      def set(hash)
-        self.class.set(id, hash)
+      def set(hash, options=nil)
+        self.class.set(id, hash, options)
       end
 
-      def push(hash)
-        self.class.push(id, hash)
+      def push(hash, options=nil)
+        self.class.push(id, hash, options)
       end
 
-      def push_all(hash)
-        self.class.push_all(id, hash)
+      def push_all(hash, options=nil)
+        self.class.push_all(id, hash, options)
       end
 
-      def pull(hash)
-        self.class.pull(id, hash)
+      def pull(hash, options=nil)
+        self.class.pull(id, hash, options)
       end
 
-      def pull_all(hash)
-        self.class.pull_all(id, hash)
+      def pull_all(hash, options=nil)
+        self.class.pull_all(id, hash, options)
       end
 
-      def add_to_set(hash)
-        self.class.push_uniq(id, hash)
+      def add_to_set(hash, options=nil)
+        self.class.push_uniq(id, hash, options)
       end
       alias push_uniq add_to_set
 
-      def pop(hash)
-        self.class.pop(id, hash)
+      def pop(hash, options=nil)
+        self.class.pop(id, hash, options)
       end
     end
   end

data/lib/mongo_mapper/plugins/querying.rb

@@ -8,8 +8,11 @@ module MongoMapper
       extend ActiveSupport::Concern
 
       module ClassMethods
+        extend Forwardable
         include PluckyMethods
 
+        def_delegators :query,  :to_a, :size, :empty?
+
         def find_each(opts={})
           super(opts).each { |doc| yield(doc) }
         end
@@ -81,7 +84,7 @@ module MongoMapper
 
           def find_some(ids, options={})
             query = query(options).amend(:_id => ids.flatten.compact.uniq)
-            find_many(query.to_hash).compact
+            query.all
           end
 
           def find_some!(ids, options={})
@@ -95,16 +98,6 @@ module MongoMapper
             docs
           end
 
-          # All query methods that load documents pass through find_one or find_many
-          def find_one(options={})
-            query(options).first
-          end
-
-          # All query methods that load documents pass through find_one or find_many
-          def find_many(options)
-            query(options).all
-          end
-
           def initialize_each(*docs)
             instances = []
             docs = [{}] if docs.blank?

data/lib/mongo_mapper/plugins/querying/plucky_methods.rb

@@ -6,9 +6,15 @@ module MongoMapper
     module Querying
       module PluckyMethods
         extend Forwardable
-        def_delegators :query,  :where, :fields, :limit, :skip, :sort,
-                                :count, :last, :first, :all, :paginate,
-                                :find, :find!, :exists?, :exist?, :find_each
+        def_delegators :query,  :where, :filter,
+                                :fields, :ignore, :only,
+                                :limit, :paginate, :per_page, :skip, :offset,
+                                :sort, :order, :reverse,
+                                :count,
+                                :distinct,
+                                :last, :first, :find_one, :all, :find_each,
+                                :find, :find!,
+                                :exists?, :exist?
       end
     end
   end

data/lib/mongo_mapper/plugins/touch.rb

@@ -0,0 +1,18 @@
+module MongoMapper
+  module Plugins
+    module Touch
+      extend ActiveSupport::Concern
+
+      def touch(key = :updated_at) 
+        raise ArgumentError, "Invalid key named #{key}" unless self.key_names.include?(key.to_s)
+        if self.class.embeddable?
+          self.write_attribute(key, Time.now.utc)
+          self._parent_document.touch
+        else
+          self.set(key => Time.now.utc)
+        end
+        true
+      end
+    end
+  end
+end

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.11.0'
+  Version = '0.11.1'
 end

data/test/functional/associations/test_many_documents_proxy.rb

@@ -393,6 +393,49 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
 
       project.statuses.count(:name => 'Foo').should == 1
     end
+
+    should "ignore unpersisted documents" do
+      project = Project.create
+      project.statuses.build(:name => 'Foo')
+      project.statuses.count.should == 0
+    end
+  end
+
+  context "size" do
+    should "reflect both persisted and new documents" do
+      project = Project.create
+      3.times { project.statuses.create(:name => 'Foo!') }
+      2.times { project.statuses.build(:name => 'Foo!') }
+      project.statuses.size.should == 5
+    end
+  end
+
+  context "empty?" do
+    should "be true with no associated docs" do
+      project = Project.create
+      project.statuses.empty?.should be_true
+    end
+
+    should "be false if a document is built" do
+      project = Project.create
+      project.statuses.build(:name => 'Foo!')
+      project.statuses.empty?.should be_false
+    end
+
+    should "be false if a document is created" do
+      project = Project.create
+      project.statuses.create(:name => 'Foo!')
+      project.statuses.empty?.should be_false
+    end
+  end
+
+  context "to_a" do
+    should "include persisted and new documents" do
+      project = Project.create
+      3.times { project.statuses.create(:name => 'Foo!') }
+      2.times { project.statuses.build(:name => 'Foo!') }
+      project.statuses.to_a.size.should == 5
+    end
   end
 
   context "to_json" do
@@ -801,4 +844,23 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       article.paper_id.should == @paper.id
     end
   end
+
+  context "criteria" do
+    setup do
+      News::Paper.many :articles, :class_name => 'News::Article'
+      News::Article.belongs_to :paper, :class_name => 'News::Paper'
+
+      @paper = News::Paper.create
+    end
+
+    should "should find associated instances by an object ID" do
+      article = News::Article.create(:paper_id => @paper.id)
+      @paper.articles.should include(article)
+    end
+
+    should "should find associated instances by a string" do
+      article = News::Article.create(:paper_id => @paper.id.to_s)
+      @paper.articles.should include(article)
+    end
+  end
 end

data/test/functional/test_modifiers.rb

@@ -31,298 +31,323 @@ class ModifierTest < Test::Unit::TestCase
         @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "work with criteria and keys" do
         @page_class.unset({:title => 'Home'}, :title, :tags)
         assert_keys_removed @page, :title, :tags
         assert_keys_removed @page2, :title, :tags
       end
-
+      
       should "work with ids and keys" do
         @page_class.unset(@page.id, @page2.id, :title, :tags)
         assert_keys_removed @page, :title, :tags
         assert_keys_removed @page2, :title, :tags
       end
     end
-
+    
     context "increment" do
       setup do
         @page  = @page_class.create(:title => 'Home')
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "work with criteria and modifier hashes" do
         @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 "work with ids and modifier hash" do
         @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
     end
-
+    
     context "decrement" do
       setup 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)
       end
-
+    
       should "work with criteria and modifier hashes" do
         @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 "work with ids and modifier hash" do
         @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 "decrement with positive or negative numbers" do
         @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
     end
-
+    
     context "set" do
       setup do
         @page  = @page_class.create(:title => 'Home')
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "work with criteria and modifier hashes" do
         @page_class.set({:title => 'Home'}, :title => 'Home Revised')
-
+    
         @page.reload
         @page.title.should == 'Home Revised'
-
+    
         @page2.reload
         @page2.title.should == 'Home Revised'
       end
-
+    
       should "work with ids and modifier hash" do
         @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 "typecast values before querying" do
         @page_class.key :tags, Set
-
+    
         assert_nothing_raised do
           @page_class.set(@page.id, :tags => ['foo', 'bar'].to_set)
           @page.reload
           @page.tags.should == Set.new(['foo', 'bar'])
         end
       end
-
+    
       should "not typecast keys that are not defined in document" do
         assert_raises(BSON::InvalidDocument) do
           @page_class.set(@page.id, :colors => ['red', 'green'].to_set)
         end
       end
-
+    
       should "set keys that are not defined in document" do
         @page_class.set(@page.id, :colors => %w[red green])
         @page.reload
         @page[:colors].should == %w[red green]
       end
     end
-
+    
     context "push" do
       setup do
         @page  = @page_class.create(:title => 'Home')
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "work with criteria and modifier hashes" do
         @page_class.push({:title => 'Home'}, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
-
+    
       should "work with ids and modifier hash" do
         @page_class.push(@page.id, @page2.id, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
     end
-
+    
     context "push_all" do
       setup do
         @page  = @page_class.create(:title => 'Home')
         @page2 = @page_class.create(:title => 'Home')
         @tags = %w(foo bar)
       end
-
+    
       should "work with criteria and modifier hashes" do
         @page_class.push_all({:title => 'Home'}, :tags => @tags)
-
+    
         @page.reload
         @page.tags.should == @tags
-
+    
         @page2.reload
         @page2.tags.should == @tags
       end
-
+    
       should "work with ids and modifier hash" do
         @page_class.push_all(@page.id, @page2.id, :tags => @tags)
-
+    
         @page.reload
         @page.tags.should == @tags
-
+    
         @page2.reload
         @page2.tags.should == @tags
       end
     end
-
+    
     context "pull" do
       setup do
         @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
         @page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
       end
-
+    
       should "work with criteria and modifier hashes" do
         @page_class.pull({:title => 'Home'}, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(bar)
-
+    
         @page2.reload
         @page2.tags.should == %w(bar)
       end
-
+    
       should "be able to pull with ids and modifier hash" do
         @page_class.pull(@page.id, @page2.id, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(bar)
-
+    
         @page2.reload
         @page2.tags.should == %w(bar)
       end
     end
-
+    
     context "pull_all" do
       setup do
         @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
         @page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
       end
-
+    
       should "work with criteria and modifier hashes" do
         @page_class.pull_all({:title => 'Home'}, :tags => %w(foo bar))
-
+    
         @page.reload
         @page.tags.should == %w(baz)
-
+    
         @page2.reload
         @page2.tags.should == %w(baz)
       end
-
+    
       should "work with ids and modifier hash" do
         @page_class.pull_all(@page.id, @page2.id, :tags => %w(foo bar))
-
+    
         @page.reload
         @page.tags.should == %w(baz)
-
+    
         @page2.reload
         @page2.tags.should == %w(baz)
       end
     end
-
+    
     context "add_to_set" do
       setup do
         @page  = @page_class.create(:title => 'Home', :tags => 'foo')
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "be able to add to set with criteria and modifier hash" do
         @page_class.add_to_set({:title => 'Home'}, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
-
+    
       should "be able to add to set with ids and modifier hash" do
         @page_class.add_to_set(@page.id, @page2.id, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
     end
-
+    
     context "push_uniq" do
       setup do
         @page  = @page_class.create(:title => 'Home', :tags => 'foo')
         @page2 = @page_class.create(:title => 'Home')
       end
-
+    
       should "be able to push uniq with criteria and modifier hash" do
         @page_class.push_uniq({:title => 'Home'}, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
-
+    
       should "be able to push uniq with ids and modifier hash" do
         @page_class.push_uniq(@page.id, @page2.id, :tags => 'foo')
-
+    
         @page.reload
         @page.tags.should == %w(foo)
-
+    
         @page2.reload
         @page2.tags.should == %w(foo)
       end
     end
-
+    
     context "pop" do
       setup do
         @page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
       end
-
+    
       should "be able to remove the last element the array" do
         @page_class.pop(@page.id, :tags => 1)
         @page.reload
         @page.tags.should == %w(foo)
       end
-
+    
       should "be able to remove the first element of the array" do
         @page_class.pop(@page.id, :tags => -1)
         @page.reload
         @page.tags.should == %w(bar)
       end
     end
+    
+    context "additional options (upsert & safe)" do
+      should "be able to pass upsert option" do
+        new_key_value = DateTime.now.to_s
+        @page_class.increment({:title => new_key_value}, {:day_count => 1}, {:upsert => true})
+        @page_class.count(:title => new_key_value).should == 1
+        @page_class.first(:title => new_key_value).day_count.should == 1
+      end
+      
+      should "be able to pass safe option" do
+        @page_class.create(:title => "Better Be Safe than Sorry")
+        
+        # We are trying to increment a key of type string here which should fail
+        assert_raises(Mongo::OperationFailure) do
+          @page_class.increment({:title => "Better Be Safe than Sorry"}, {:title => 1}, {:safe => true})
+        end
+      end
+      
+      should "be able to pass both safe and upsert options" do
+        new_key_value = DateTime.now.to_s
+        @page_class.increment({:title => new_key_value}, {:day_count => 1}, {:upsert => true, :safe => true})
+        @page_class.count(:title => new_key_value).should == 1
+        @page_class.first(:title => new_key_value).day_count.should == 1
+      end
+    end
   end
 
   context "instance methods" do
@@ -331,102 +356,128 @@ class ModifierTest < Test::Unit::TestCase
       page.unset(:title, :tags)
       assert_keys_removed page, :title, :tags
     end
-
+  
     should "be able to increment with modifier hashes" do
       page = @page_class.create
       page.increment(:day_count => 1, :week_count => 2, :month_count => 3)
-
+  
       assert_page_counts page, 1, 2, 3
     end
-
+  
     should "be able to decrement with modifier hashes" do
       page = @page_class.create(:day_count => 1, :week_count => 2, :month_count => 3)
       page.decrement(:day_count => 1, :week_count => 2, :month_count => 3)
-
+      
       assert_page_counts page, 0, 0, 0
     end
-
+      
     should "always decrement when decrement is called whether number is positive or negative" do
       page = @page_class.create(:day_count => 1, :week_count => 2, :month_count => 3)
       page.decrement(:day_count => -1, :week_count => 2, :month_count => -3)
-
+      
       assert_page_counts page, 0, 0, 0
     end
-
+      
     should "be able to set with modifier hashes" do
       page  = @page_class.create(:title => 'Home')
       page.set(:title => 'Home Revised')
-
+      
       page.reload
       page.title.should == 'Home Revised'
     end
-
+      
     should "be able to push with modifier hashes" do
       page = @page_class.create
       page.push(:tags => 'foo')
-
+      
       page.reload
       page.tags.should == %w(foo)
     end
-
+      
     should "be able to push_all with modifier hashes" do
       page = @page_class.create
       page.push_all(:tags => %w(foo bar))
-
+      
       page.reload
       page.tags.should == %w(foo bar)
     end
-
+      
     should "be able to pull with criteria and modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar))
       page.pull(:tags => 'foo')
-
+      
       page.reload
       page.tags.should == %w(bar)
     end
-
+      
     should "be able to pull_all with criteria and modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar baz))
       page.pull_all(:tags => %w(foo bar))
-
+      
       page.reload
       page.tags.should == %w(baz)
     end
-
+      
     should "be able to add_to_set with criteria and modifier hash" do
       page  = @page_class.create(:tags => 'foo')
       page2 = @page_class.create
-
+      
       page.add_to_set(:tags => 'foo')
       page2.add_to_set(:tags => 'foo')
-
+      
       page.reload
       page.tags.should == %w(foo)
-
+      
       page2.reload
       page2.tags.should == %w(foo)
     end
-
+      
     should "be able to push uniq with criteria and modifier hash" do
       page  = @page_class.create(:tags => 'foo')
       page2 = @page_class.create
-
+      
       page.push_uniq(:tags => 'foo')
       page2.push_uniq(:tags => 'foo')
-
+      
       page.reload
       page.tags.should == %w(foo)
-
+      
       page2.reload
       page2.tags.should == %w(foo)
     end
-
+      
     should "be able to pop with modifier hashes" do
       page = @page_class.create(:tags => %w(foo bar))
       page.pop(:tags => 1)
-
+      
       page.reload
       page.tags.should == %w(foo)
     end
+    
+    should "be able to pass upsert option" do
+      page = @page_class.create(:title => "Upsert Page")
+      page.increment({:new_count => 1}, {:upsert => true})
+      
+      page.reload
+      page.new_count.should == 1
+    end
+    
+    should "be able to pass safe option" do
+      page = @page_class.create(:title => "Safe Page")
+      
+      # We are trying to increment a key of type string here which should fail
+      assert_raises(Mongo::OperationFailure) do
+        page.increment({:title => 1}, {:safe => true})
+      end
+    end
+    
+    should "be able to pass upsert and safe options" do
+      page = @page_class.create(:title => "Upsert and Safe Page")
+      page.increment({:another_count => 1}, {:upsert => true, :safe => true})
+      
+      page.reload
+      page.another_count.should == 1
+    end
+    
   end
 end