mongoid-semaphore 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/mongoid/lock/synch_methods.rb

@@ -0,0 +1,49 @@
+require 'socket'
+
+module Mongoid
+  module Lock
+    
+    def reset_lock!
+      self.update_attributes!({:sema_count => __semaphore_initial_count, :used_by => nil})
+    end
+    
+    def lock_acquire
+      self.sema_down
+      if (self.sema_ready?)
+        self.set(:used_by, "#{Socket.hostname}:#{Process.pid}")
+      else
+        self.sema_up
+        raise Mongoid::Semaphore::UnsynchronizedAccess.new(self.sema_count, "Lock in Use! (#{self.used_by})")
+      end
+    end
+    
+    def lock_release
+      if (self.used_by == "#{Socket.hostname}:#{Process.pid}")
+        self.sema_up
+        self.set(:used_by, nil)
+      end
+    end
+    
+    
+    def synchronized(&block)
+      self.lock_acquire
+      begin
+        block.call()
+      ensure
+        self.lock_release
+      end
+    end
+    
+    def try_synchronized(&try_block)
+      return false unless self.sema_ready?
+      begin
+        self.synchronized do
+          try_block.call()
+        end
+        return true
+      rescue Mongoid::Semaphore::UnsynchronizedAccess => ua
+        return false
+      end
+    end
+  end
+end

data/lib/mongoid/lock.rb

@@ -0,0 +1,24 @@
+require 'mongoid/semaphore'
+
+module Mongoid
+  module Lock
+    extends Mongoid::Semaphore
+    
+    # => Volatile Access, Reload to Ensure state
+    def used_by
+      self.save
+      self.reload
+      return super
+    end
+    
+    def self.included(base)
+      base.class_eval do
+        include Mongoid::Semaphore
+        default_sema_count 1
+        field :used_by, :type => String, :default => nil
+      end
+    end
+  end
+end
+
+require 'mongoid/lock/synch_methods'

data/lib/mongoid/semaphore/sync_methods.rb

@@ -1,31 +1,38 @@
-require 'socket'
-
 module Mongoid
   module Semaphore
     def reset_semaphore!
-      self.update_attributes!({:sema_count => 1, :used_by => nil})
+      self.update_attributes!({:sema_count => __semaphore_initial_count})
+    end
+    
+    def sema_up
+      self.inc(:sema_count, 1)
+    end
+    
+    def sema_down
+      self.dec(:sema_count, 1)
+    end
+    
+    def sema_ready?
+      self.save()
+      self.reload()
+      return (self.sema_count >= 0)
     end
     
     def synchronized(&block)
       begin
-        self.dec(:sema_count, 1)
-        if (self.sema_count == 0)
-          begin
-            self.set(:used_by, "#{Socket.gethostname}:#{Process.pid}")
-            block.call(self)
-          ensure
-            self.set(:used_by, nil)
-          end
+        self.sema_down
+        if (self.sema_ready?)
+          block.call()
         else
-          raise Mongoid::Semaphore::UnsynchronizedAccess.new(self.sema_count, "Semaphore in Use! (#{self.used_by})")
+          raise Mongoid::Semaphore::UnsynchronizedAccess.new(self.sema_count)
         end
       ensure
-        self.inc(:sema_count, 1)
+        self.sema_up
       end
     end
     
     def try_synchronized(&try_block)
-      return false unless self.sema_count == 1
+      return false unless self.sema_ready?
       begin
         self.synchronized do
           try_block.call()

data/lib/mongoid/semaphore.rb

@@ -23,12 +23,6 @@ module Mongoid
       self.reload
       return super
     end
-    # => Volatile Value, Refresh Before Returning
-    def used_by
-      self.save()
-      self.reload
-      return super
-    end
 #------------------------------------------------------------------------------
 # => Inclusion hook. Adds fields, and default attributes
 #------------------------------------------------------------------------------    
@@ -42,8 +36,6 @@ module Mongoid
         base.extend(Mongoid::Semaphore::ClassMethods)
         # =>  Semaphore Counter
         field :sema_count, :type => Integer, :default => lambda { __semaphore_initial_count }
-        # => Semaphore is currently held by "<hostname>:<pid>" || nil
-        field :used_by, :type => String, :default => nil
       end
     end
   end

data/lib/mongoid-semaphore.rb

@@ -6,10 +6,12 @@ if (defined?(Rails) and Rails.version.to_i > 3)
         railtie_name :"mongoid-semaphore"
         initializer "mongoid-semaphore.load_dependencies" do
           require 'mongoid/semaphore'
+          require 'mongoid/lock'
         end
       end
     end
   end
 else
   require 'mongoid/semaphore'
+  require 'mongoid/lock'
 end

data/mongoid-semaphore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid-semaphore"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/mongoid-semaphore.rb",
+    "lib/mongoid/lock.rb",
+    "lib/mongoid/lock/synch_methods.rb",
     "lib/mongoid/semaphore.rb",
     "lib/mongoid/semaphore/class_methods.rb",
     "lib/mongoid/semaphore/sync_methods.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-semaphore
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   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: &18269920 !ruby/object:Gem::Requirement
+  requirement: &15839100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18269920
+  version_requirements: *15839100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18269020 !ruby/object:Gem::Requirement
+  requirement: &15838160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18269020
+  version_requirements: *15838160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18268040 !ruby/object:Gem::Requirement
+  requirement: &15835940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18268040
+  version_requirements: *15835940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18267100 !ruby/object:Gem::Requirement
+  requirement: &15834320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18267100
+  version_requirements: *15834320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18266540 !ruby/object:Gem::Requirement
+  requirement: &15832960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18266540
+  version_requirements: *15832960
 description: Adds Semaphore-like behaviors to a Mongoid::Document instance
 email: jp@jibe.com
 executables: []
@@ -81,6 +81,8 @@ files:
 - Rakefile
 - VERSION
 - lib/mongoid-semaphore.rb
+- lib/mongoid/lock.rb
+- lib/mongoid/lock/synch_methods.rb
 - lib/mongoid/semaphore.rb
 - lib/mongoid/semaphore/class_methods.rb
 - lib/mongoid/semaphore/sync_methods.rb
@@ -102,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2512375046165772832
+      hash: 1476559913060575075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: