mongoid-lock 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/mongoid/lock.rb

@@ -15,6 +15,12 @@ module Mongoid
 #------------------------------------------------------------------------------
 # => Volatile Instance Attribute Accessor
 #------------------------------------------------------------------------------
+    def lock_waiter
+      self.save
+      self.reload
+      return super
+    end
+
     def lock_used_by
       self.save
       self.reload
@@ -37,6 +43,7 @@ module Mongoid
           include Mongoid::Document
         end
         # => Add special field
+        field :lock_waiter, :type => String, :default => nil
         field :lock_used_by, :type => String, :default => nil
         field :lock_acquired_at, :type => Time, :default => nil
         index [[:lock_acquired_at, -1]], :sparse => true

data/lib/mongoid/lock/synch_methods.rb

@@ -8,17 +8,33 @@ module Mongoid
     end
     
     def reset_lock!
-      self.update_attributes(:lock_used_by => nil, :lock_acquired_at => nil)
+      self.update_attributes(:lock_used_by => nil, :lock_acquired_at => nil, :lock_waiter => nil)
     end
     
     def lock_acquire
+      self.lock_acquire_begin
       local = "#{Socket.gethostname}:#{Process.pid}"
       ident = self.lock_used_by
+      wait  = self.lock_waiter
       if (ident and ident != local)
         raise Mongoid::Lock::UnsynchronizedAccess.new(ident)
+      elsif (wait != local)
+        raise Mongoid::Lock::UnsynchronizedAccess.new(wait)
       else
         self.set(:lock_used_by, local)
-        self.update_attributes(:lock_used_by => local, :lock_acquired_at => Time.now)
+        self.set(:lock_acquired_at, Time.now)
+        self.set(:lock_waiter, nil)
+      end
+    end
+    
+    def lock_acquire_begin
+      local = "#{Socket.gethostname}:#{Process.pid}"
+      ident = self.lock_used_by
+      wait  = self.lock_waiter
+      if (ident or wait)
+        raise Mongoid::Lock::UnsynchronizedAccess.new(ident)
+      else
+        self.set(:lock_waiter, local)
       end
     end
     

data/mongoid-lock.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid-lock"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-lock
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &4635000 !ruby/object:Gem::Requirement
+  requirement: &15237780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4635000
+  version_requirements: *15237780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &4633160 !ruby/object:Gem::Requirement
+  requirement: &15303120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4633160
+  version_requirements: *15303120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &4594820 !ruby/object:Gem::Requirement
+  requirement: &15300780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *4594820
+  version_requirements: *15300780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &4591660 !ruby/object:Gem::Requirement
+  requirement: &15298840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *4591660
+  version_requirements: *15298840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &4588540 !ruby/object:Gem::Requirement
+  requirement: &15297040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4588540
+  version_requirements: *15297040
 description: Adds synchronized lock-like behavior to a mongoid model instance
 email: jp@jibe.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -469860734459383897
+      hash: -4350909105218756356
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: