mongoid_optimistic_locking 0.0.3 → 0.0.4

data/lib/mongoid/optimistic_locking/operations.rb

@@ -3,14 +3,14 @@ module Mongoid
     module Operations
 
       def insert(options = {})
-        return super unless optimistic_locking?
+        return super unless optimistic_locking? && valid?
         increment_lock_version do
           super
         end
       end
 
       def update(options = {})
-        return super unless optimistic_locking?
+        return super unless optimistic_locking? && valid?
         set_lock_version_for_selector do
           increment_lock_version do
             result = super

data/lib/mongoid/optimistic_locking/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module OptimisticLocking
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/optimistic_locking_spec.rb

@@ -47,6 +47,15 @@ describe Mongoid::OptimisticLocking do
       field :name
     end
 
+    class Hamburger
+      include Mongoid::Document
+      include Mongoid::OptimisticLocking
+      field :patty
+      field :toppings
+      validates :patty, presence: true
+      validates :toppings, presence: true
+    end
+
   end
 
   after(:all) { COLLECTIONS.each { |n| Object.send(:remove_const, n) } }
@@ -180,6 +189,20 @@ describe Mongoid::OptimisticLocking do
 
   end
 
+  context 'optimistic locking on a document with validation' do
+    it 'should not incremement lock version when validation fails' do
+      burger = Hamburger.new
+      burger._lock_version.should == 0
+      burger.save.should == false
+      burger._lock_version.should == 0
+    end
+
+    it 'should allow creation when valid' do
+      burger = Hamburger.create({patty: 'beef', toppings: 'bacon'})
+      burger._lock_version.should == 1
+    end
+  end
+
   context 'optimistic locking on an embeds_one document' do
 
     let!(:state) { State.new(:name => 'California') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_optimistic_locking
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -102,12 +102,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1302811903269459729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1302811903269459729
 requirements: []
 rubyforge_project: mongoid_optimistic_locking
 rubygems_version: 1.8.24