locky 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3175be064223f8910885f31dedef146ee2dcfd6d
-  data.tar.gz: 4b60fb8230056e04d5bff8865df94b5408a2e8d8
+  metadata.gz: 722dc396916ebc5c1f3fb90dd0b598fa2bc3ad44
+  data.tar.gz: 2a3961bf97cd47f5d7c20fb73de8110418e8957d
 SHA512:
-  metadata.gz: 08efe2542304e3b02a4c55752d9d8520f954a343782c0e1ba97ba58d9167a1298fcb8bd2a41dd8adb2df40d64e645b407085998f4e1fd4ea9c2b8d3362034d55
-  data.tar.gz: b92a1f667ff1d26e743397ec50e11fb1db2a9a620384150194c81f0de83da92736f5aaada1a6dc2320647ff35b0578e7626c95842f7b0557172ccfdcdf515fb0
+  metadata.gz: cd062d5aa843801664363763366fcbcc2df848604c05cb59e082fc3465bce64fc55e1e51b30d74d5c08702873a9a8089ff356a5e1f46d898a691c58653611743
+  data.tar.gz: 531cf00636ec388d40c4b5f02fdd9f8c83ebb5b97de49b34c583fc60a4740547b5b032a3e5c11a394b794a43591d92b3eb2de9417dbc04c6ff861bdff8b67dbc

data/lib/locky.rb

@@ -1,34 +1,73 @@
 class Locky
 
-  Error = Class.new StandardError
-  
+  class Error < StandardError
+    def initialize(locker)
+      @locker = locker
+    end
+
+    def message
+      "#{@locker.name} already locked by #{@locker.locked_by}"
+    end
+  end
+
   attr_reader :name
 
-  def initialize(name, adapter={})
+  def initialize(name, storage={})
     @name = name
-    @adapter = adapter
+    @storage = storage
   end
 
   def lock(process)
-    raise Error, "#{name} already locked by #{locked_by}" if locked?
-    adapter[name] = process
+    raise Error, self if locked? && locked_by != process
+    register process
     begin
       yield
     ensure
-      adapter.delete name
+      unregister
     end
   end
 
+  def lock!(process)
+    raise Error, self if locked?
+    lock(process) { yield }
+  end
+
+  def unlock!
+    storage.delete name
+    storage.delete counter
+  end
+
   def locked?
-    adapter.key? name
+    storage.key? name
   end
 
   def locked_by
-    adapter[name]
+    storage[name]
   end
 
   private
 
-  attr_reader :adapter
+  attr_reader :storage
+
+  def counter
+    "#{name}__counter__"
+  end
+
+  def register(process)
+    if storage.key? name
+      storage[counter] += 1
+    else
+      storage[name] = process
+      storage[counter] = 1
+    end
+  end
+
+  def unregister
+    if storage[counter] > 1
+      storage[counter] -= 1
+    else
+      unlock!
+    end
+  end
 
 end

data/lib/locky/version.rb

@@ -1,3 +1,3 @@
 class Locky
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/locky_spec.rb

@@ -2,9 +2,10 @@ require 'minitest_helper'
 
 describe Locky do
 
-  let(:locker) { Locky.new :test }
-  
-  it 'Test' do
+  let(:storage) { Hash.new }
+  let(:locker) { Locky.new :test, storage }
+
+  it 'Flexible' do
     locker.name.must_equal :test
     locker.wont_be :locked?
 
@@ -12,6 +13,8 @@ describe Locky do
       locker.must_be :locked?
       locker.locked_by.must_equal :process_1
 
+      locker.lock(:process_1) { }
+
       error = proc { locker.lock :process_2 }.must_raise Locky::Error
       error.message.must_equal 'test already locked by process_1'
     end
@@ -19,4 +22,30 @@ describe Locky do
     locker.wont_be :locked?
   end
 
+  it 'Strict' do
+    locker.name.must_equal :test
+    locker.wont_be :locked?
+
+    locker.lock! :process_1 do
+      locker.must_be :locked?
+      locker.locked_by.must_equal :process_1
+
+      error = proc { locker.lock! :process_1 }.must_raise Locky::Error
+      error.message.must_equal 'test already locked by process_1'
+
+      error = proc { locker.lock :process_2 }.must_raise Locky::Error
+      error.message.must_equal 'test already locked by process_1'
+    end
+
+    locker.wont_be :locked?
+  end
+
+  it 'Force unlock' do
+    storage[locker.name] = :process_1
+
+    locker.must_be :locked?
+    locker.unlock!
+    locker.wont_be :locked?
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locky
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler