redis-em-mutex 0.1.2 → 0.2.0

data/spec/redis-em-mutex-semaphores.rb

@@ -7,34 +7,34 @@ require 'redis-em-mutex'
 describe Redis::EM::Mutex do
 
   it "should lock and prevent locking on the same semaphore" do
-    described_class.new(@lock_names.first).owned?.should be_false
+    described_class.new(@lock_names.first).owned?.should be false
     mutex = described_class.lock(@lock_names.first)
     mutex.names.should eq [@lock_names.first]
-    mutex.locked?.should be_true
-    mutex.owned?.should be_true
+    mutex.locked?.should be true
+    mutex.owned?.should be true
     mutex.should be_an_instance_of described_class
-    described_class.new(@lock_names.first).try_lock.should be_false
+    described_class.new(@lock_names.first).try_lock.should be false
     expect {
       mutex.lock
     }.to raise_error(Redis::EM::Mutex::MutexError, /deadlock; recursive locking/)
     mutex.unlock.should be_an_instance_of described_class
-    mutex.locked?.should be_false
-    mutex.owned?.should be_false
-    mutex.try_lock.should be_true
+    mutex.locked?.should be false
+    mutex.owned?.should be false
+    mutex.try_lock.should be true
     mutex.unlock if mutex
   end
 
   it "should lock and prevent locking on the same multiple semaphores" do
     mutex = described_class.lock(*@lock_names)
     mutex.names.should eq @lock_names
-    mutex.locked?.should be_true
-    mutex.owned?.should be_true
+    mutex.locked?.should be true
+    mutex.owned?.should be true
     mutex.should be_an_instance_of described_class
-    described_class.new(*@lock_names).try_lock.should be_false
+    described_class.new(*@lock_names).try_lock.should be false
     @lock_names.each do |name|
-      described_class.new(name).try_lock.should be_false
+      described_class.new(name).try_lock.should be false
     end
-    mutex.try_lock.should be_false
+    mutex.try_lock.should be false
     expect {
       mutex.lock
     }.to raise_error(Redis::EM::Mutex::MutexError, /deadlock; recursive locking/)
@@ -44,25 +44,25 @@ describe Redis::EM::Mutex do
       }.to raise_error(Redis::EM::Mutex::MutexError, /deadlock; recursive locking/)
     end
     mutex.unlock.should be_an_instance_of described_class
-    mutex.locked?.should be_false
-    mutex.owned?.should be_false
-    mutex.try_lock.should be_true
+    mutex.locked?.should be false
+    mutex.owned?.should be false
+    mutex.try_lock.should be true
     mutex.unlock if mutex
   end
 
   it "should lock and prevent other fibers to lock on the same semaphore" do
     mutex = described_class.lock(@lock_names.first)
     mutex.should be_an_instance_of described_class
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     locked = true
     ::EM::Synchrony.next_tick do
       begin
-        mutex.try_lock.should be_false
-        mutex.owned?.should be_false
+        mutex.try_lock.should be false
+        mutex.owned?.should be false
         start = Time.now
         mutex.synchronize do
           (Time.now - start).should be_within(0.015).of(0.26)
-          locked.should be_false
+          locked.should be false
           locked = nil
         end
       rescue Exception => e
@@ -71,9 +71,9 @@ describe Redis::EM::Mutex do
     end
     ::EM::Synchrony.sleep 0.25
     locked = false
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
-    mutex.owned?.should be_false
+    mutex.owned?.should be false
     ::EM::Synchrony.sleep 0.2
     locked.should be_nil
   end
@@ -81,25 +81,25 @@ describe Redis::EM::Mutex do
   it "should lock and prevent other fibers to lock on the same multiple semaphores" do
     mutex = described_class.lock(*@lock_names)
     mutex.should be_an_instance_of described_class
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     locked = true
     ::EM::Synchrony.next_tick do
       begin
-        locked.should be_true
-        mutex.try_lock.should be_false
-        mutex.owned?.should be_false
+        locked.should be true
+        mutex.try_lock.should be false
+        mutex.owned?.should be false
         start = Time.now
         mutex.synchronize do
-          mutex.owned?.should be_true
+          mutex.owned?.should be true
           (Time.now - start).should be_within(0.015).of(0.26)
-          locked.should be_false
+          locked.should be false
         end
-        mutex.owned?.should be_false
+        mutex.owned?.should be false
         ::EM::Synchrony.sleep 0.1
         start = Time.now
         ::EM::Synchrony::FiberIterator.new(@lock_names, @lock_names.length).each do |name|
           begin
-            locked.should be_true
+            locked.should be true
             described_class.new(name).synchronize do
               (Time.now - start).should be_within(0.015).of(0.26)
               locked.should be_an_instance_of Fixnum
@@ -115,13 +115,13 @@ describe Redis::EM::Mutex do
     end
     ::EM::Synchrony.sleep 0.25
     locked = false
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
-    mutex.owned?.should be_false
+    mutex.owned?.should be false
     ::EM::Synchrony.sleep 0.1
 
     locked = true
-    mutex.lock.should be_true
+    mutex.lock.should be true
     ::EM::Synchrony.sleep 0.25
     locked = 10
     mutex.unlock.should be_an_instance_of described_class
@@ -132,15 +132,15 @@ describe Redis::EM::Mutex do
   it "should lock and prevent other fibers to lock on the same semaphore with block timeout" do
     mutex = described_class.lock(*@lock_names)
     mutex.should be_an_instance_of described_class
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     locked = true
     ::EM::Synchrony.next_tick do
       begin
         start = Time.now
-        mutex.lock(0.25).should be_false
-        mutex.owned?.should be_false
+        mutex.lock(0.25).should be false
+        mutex.owned?.should be false
         (Time.now - start).should be_within(0.01).of(0.26)
-        locked.should be_true
+        locked.should be true
         locked = nil
       rescue Exception => e
         @exception = e
@@ -149,34 +149,37 @@ describe Redis::EM::Mutex do
     ::EM::Synchrony.sleep 0.26
     locked.should be_nil
     locked = false
-    mutex.locked?.should be_true
-    mutex.owned?.should be_true
+    mutex.locked?.should be true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
-    mutex.locked?.should be_false
-    mutex.owned?.should be_false
+    mutex.locked?.should be false
+    mutex.owned?.should be false
   end
 
   it "should lock and expire while other fiber lock on the same semaphore with block timeout" do
+    expect {
+      described_class.new(*@lock_names, expire: -1)
+    }.to raise_error(ArgumentError, /expire_timeout value must be greater than 0/)
     mutex = described_class.lock(*@lock_names, expire: 0.2499999)
     mutex.expire_timeout.should eq 0.2499999
     mutex.should be_an_instance_of described_class
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     locked = true
     ::EM::Synchrony.next_tick do
       begin
-        mutex.owned?.should be_false
+        mutex.owned?.should be false
         start = Time.now
-        mutex.lock(0.25).should be_true
+        mutex.lock(0.25).should be true
         (Time.now - start).should be_within(0.011).of(0.26)
-        locked.should be_true
+        locked.should be true
         locked = nil
-        mutex.locked?.should be_true
-        mutex.owned?.should be_true
+        mutex.locked?.should be true
+        mutex.owned?.should be true
         ::EM::Synchrony.sleep 0.2
-        locked.should be_false
+        locked.should be false
         mutex.unlock.should be_an_instance_of described_class
-        mutex.owned?.should be_false
-        mutex.locked?.should be_false
+        mutex.owned?.should be false
+        mutex.locked?.should be false
       rescue Exception => e
         @exception = e
       end
@@ -184,45 +187,45 @@ describe Redis::EM::Mutex do
     ::EM::Synchrony.sleep 0.26
     locked.should be_nil
     locked = false
-    mutex.locked?.should be_true
-    mutex.owned?.should be_false
+    mutex.locked?.should be true
+    mutex.owned?.should be false
     mutex.unlock.should be_an_instance_of described_class
-    mutex.locked?.should be_true
-    mutex.owned?.should be_false
+    mutex.locked?.should be true
+    mutex.owned?.should be false
     ::EM::Synchrony.sleep 0.5
   end
 
   it "should lock and prevent (with refresh) other fibers to lock on the same semaphore with block timeout" do
     mutex = described_class.lock(*@lock_names, expire: 0.11)
     mutex.should be_an_instance_of described_class
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     locked = true
     ::EM::Synchrony.next_tick do
       begin
         start = Time.now
-        mutex.lock(0.3).should be_false
-        mutex.owned?.should be_false
+        mutex.lock(0.3).should be false
+        mutex.owned?.should be false
         (Time.now - start).should be_within(0.01).of(0.31)
-        locked.should be_true
+        locked.should be true
         locked = nil
       rescue Exception => e
         @exception = e
       end
     end
     ::EM::Synchrony.sleep 0.08
-    mutex.owned?.should be_true
-    mutex.refresh
+    mutex.owned?.should be true
+    mutex.refresh.should be true
     ::EM::Synchrony.sleep 0.08
-    mutex.owned?.should be_true
-    mutex.refresh(0.5)
+    mutex.owned?.should be true
+    mutex.refresh(0.5).should be true
     ::EM::Synchrony.sleep 0.15
     locked.should be_nil
     locked = false
-    mutex.locked?.should be_true
-    mutex.owned?.should be_true
+    mutex.locked?.should be true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
-    mutex.locked?.should be_false
-    mutex.owned?.should be_false
+    mutex.locked?.should be false
+    mutex.owned?.should be false
   end
 
   it "should lock some resource and play with it safely" do
@@ -233,23 +236,23 @@ describe Redis::EM::Mutex do
       begin
         was_locked = false
         redis = Redis.new @redis_options
-        mutex.owned?.should be_false
+        mutex.owned?.should be false
         mutex.synchronize do
-          mutex.owned?.should be_true
+          mutex.owned?.should be true
           was_locked = true
-          redis.setnx(play_name, i).should be_true
+          redis.setnx(play_name, i).should be true
           ::EM::Synchrony.sleep 0.1
           redis.get(play_name).should eq i.to_s
           redis.del(play_name).should eq 1
         end
-        was_locked.should be_true
-        mutex.owned?.should be_false
+        was_locked.should be true
+        mutex.owned?.should be false
         result << i
       rescue Exception => e
         @exception = e
       end
     end
-    mutex.locked?.should be_false
+    mutex.locked?.should be false
     result.sort.should eq (0..9).to_a
   end
 
@@ -266,16 +269,16 @@ describe Redis::EM::Mutex do
           (Time.now - time).should be < 0.0009
           was_locked = true
         end
-        was_locked.should be_true
+        was_locked.should be true
       rescue Exception => e
         @exception = e
       end
     end
     EM::Synchrony.sleep 0.1
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
     time = Time.now
-    mutex.owned?.should be_false
+    mutex.owned?.should be false
     EM::Synchrony.sleep 0.1
   end
 
@@ -301,10 +304,10 @@ describe Redis::EM::Mutex do
       end.resume
     end
     EM::Synchrony.sleep 0.25
-    mutex.owned?.should be_true
+    mutex.owned?.should be true
     mutex.unlock.should be_an_instance_of described_class
     time = Time.now.to_f
-    mutex.owned?.should be_false
+    mutex.owned?.should be false
     EM::Synchrony.sleep 0.25
     redis = Redis.new @redis_options
     t1, t2 = redis.mget(time_key1, time_key2)
@@ -316,6 +319,73 @@ describe Redis::EM::Mutex do
     redis.del(time_key1, time_key2)
   end
 
+  it "should lock and provide current expiration timeout correctly" do
+    begin
+      mutex = described_class.new(@lock_names.first)
+      mutex.unlock!.should be false
+      mutex.expired?.should be_nil
+      mutex.locked?.should be false
+      mutex.owned?.should be false
+      mutex.expires_in.should be_nil
+      mutex.expires_at.should be_nil
+      mutex.expiration_timestamp.should be_nil
+      mutex.expire_timeout.should eq described_class.default_expire
+      mutex.expire_timeout = 0.5
+      mutex.expire_timeout.should eq 0.5
+      start = Time.now
+      mutex.lock
+      mutex.expired?.should be false
+      now = Time.now
+      mutex.expires_in.should be_within(0.01).of(mutex.expire_timeout - (now - start))
+      mutex.expiration_timestamp.should be_within(0.01).of(start.to_f + mutex.expire_timeout)
+      mutex.expires_at.should eq Time.at(mutex.expiration_timestamp)
+      mutex.locked?.should be true
+      mutex.owned?.should be true
+      mutex.unlock!.should be_an_instance_of described_class
+      mutex.locked?.should be false
+      mutex.owned?.should be false
+      mutex.unlock.should be_an_instance_of described_class
+      mutex.unlock!.should be false
+      mutex.expired?.should be_nil
+      mutex.expires_in.should be_nil
+      mutex.expires_at.should be_nil
+      mutex.expiration_timestamp.should be_nil
+      start = Time.now
+      mutex.lock
+      now = Time.now
+      mutex.expires_in.should be_within(0.01).of(mutex.expire_timeout - (now - start))
+      EM::Synchrony.sleep mutex.expires_in + 0.001
+      mutex.expired?.should be true
+      mutex.expires_in.should be < 0
+      mutex.expiration_timestamp.should be < Time.now.to_f
+      mutex.expires_at.should eq Time.at(mutex.expiration_timestamp)
+      mutex.expires_at.should be < Time.now
+      start = Time.now
+      mutex.refresh.should be true
+      now = Time.now
+      mutex.expires_in.should be_within(0.01).of(mutex.expire_timeout - (now - start))
+      EM::Synchrony.sleep mutex.expires_in + 0.001
+      mutex.expired?.should be true
+      mutex.expires_in.should be < 0
+      mutex.expiration_timestamp.should be < Time.now.to_f
+      mutex.expires_at.should eq Time.at(mutex.expiration_timestamp)
+      mutex.expires_at.should be < Time.now
+      fiber = Fiber.current
+      EM::Synchrony.next_tick {
+        described_class.lock(@lock_names.first).unlock
+        fiber.resume
+      }
+      Fiber.yield
+      mutex.refresh.should be false
+      mutex.unlock!.should be false
+      mutex.refresh.should be false
+      mutex.unlock!.should be false
+      mutex.unlock.should be_an_instance_of described_class
+    ensure
+      mutex.unlock if mutex
+    end
+  end
+
   around(:each) do |testcase|
     @after_em_stop = nil
     @exception = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-em-mutex
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &90657860 !ruby/object:Gem::Requirement
+  requirement: &133617360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *90657860
+  version_requirements: *133617360
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &90657060 !ruby/object:Gem::Requirement
+  requirement: &133616520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *90657060
+  version_requirements: *133616520
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &90656280 !ruby/object:Gem::Requirement
+  requirement: &133615240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *90656280
+  version_requirements: *133615240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &90655560 !ruby/object:Gem::Requirement
+  requirement: &133614140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *90655560
+  version_requirements: *133614140
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &90654360 !ruby/object:Gem::Requirement
+  requirement: &133629580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *90654360
+  version_requirements: *133629580
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &90652800 !ruby/object:Gem::Requirement
+  requirement: &133629000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *90652800
+  version_requirements: *133629000
 description: Cross server-process-fiber EventMachine + Redis based semaphore with
   many features
 email: rafal@yeondir.com
@@ -91,11 +91,14 @@ files:
 - lib/redis-em-mutex.rb
 - lib/redis/em-mutex.rb
 - lib/redis/em-mutex/macro.rb
+- lib/redis/em-mutex/ns.rb
 - lib/redis/em-mutex/version.rb
 - redis-em-mutex.gemspec
+- spec/redis-em-mutex-condition.rb
 - spec/redis-em-mutex-features.rb
 - spec/redis-em-mutex-macros.rb
 - spec/redis-em-mutex-namespaces.rb
+- spec/redis-em-mutex-owners.rb
 - spec/redis-em-mutex-semaphores.rb
 homepage: http://github.com/royaltm/redis-em-mutex
 licenses: []
@@ -127,6 +130,8 @@ signing_key:
 specification_version: 3
 summary: Cross server-process-fiber EventMachine + Redis based semaphore
 test_files:
+- spec/redis-em-mutex-owners.rb
+- spec/redis-em-mutex-condition.rb
 - spec/redis-em-mutex-namespaces.rb
 - spec/redis-em-mutex-semaphores.rb
 - spec/redis-em-mutex-features.rb