berater 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1a54a65428bf73c9a8840d95900215411a7320d87af5297cbc75039976e182c
-  data.tar.gz: 5804acf97ae46ab33bf8366438304a301d183fb0b8da48f4b872252769e79a54
+  metadata.gz: 3452315467fe2c079071179703283dd9ea92eb8e6abcc959905f40e16f3e2414
+  data.tar.gz: 90d783190f15f57c3ac44dc2afc89fb5a000a392163ab9a8351ff498e323901a
 SHA512:
-  metadata.gz: c4f2f7002db193351b915c0f21b4ff6a704c20e90e7ff5815a5bfef3f38064608a367e7e150cf430e2d87a8b7b10420a3ec00a1c211bc4edcd04d0c479af3eb8
-  data.tar.gz: '06489eb2f8769e349b163d49b9a6e6a0f1a8d55b97ded73fcdeb01652b0048e4dd3d940fc71075041129b1f280120d44eec906d258056d720c1f07ac23089cb7'
+  metadata.gz: 228f67adfb24027a6ea3c7b090c64aecee1a38e64ed00f7272b0c1af273dbcc73bbec8112fbb15595133cd450b45ac10f603e30ad252218d41e66d5206cc549d
+  data.tar.gz: 9068fd600128bb11f718318fa41f1030d17cd5ad36b9ce5884cbdc5f105fe56f92da73568dc60f12f6e1c7a64402652381259a64524c80889465d4c794a91e69

data/lib/berater/base_limiter.rb

@@ -1,7 +1,7 @@
 module Berater
   class BaseLimiter
 
-    class Overloaded < RuntimeError; end
+    class Overloaded < StandardError; end
 
     attr_reader :options
 

data/lib/berater/concurrency_limiter.rb

@@ -33,11 +33,12 @@ module Berater
     end
 
     class Lock
-      attr_reader :limiter, :id
+      attr_reader :limiter, :id, :contention
 
-      def initialize(limiter, id)
+      def initialize(limiter, id, contention)
         @limiter = limiter
         @id = id
+        @contention = contention
         @released = false
         @locked_at = Time.now
       end
@@ -127,11 +128,11 @@ module Berater
 
       raise Incapacitated unless lock_id
 
-      lock = Lock.new(self, lock_id)
+      lock = Lock.new(self, lock_id, count)
 
       if block_given?
         begin
-          yield
+          yield lock
         ensure
           release(lock)
         end
@@ -142,7 +143,7 @@ module Berater
 
     def release(lock)
       res = redis.zrem(key, lock.id)
-      res == true || res == 1
+      res == true || res == 1 # depending on which version of Redis
     end
 
   end

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/concurrency_lock_spec.rb

@@ -31,4 +31,20 @@ describe Berater::ConcurrencyLimiter::Lock do
     it { expect(subject.released?).to be false }
   end
 
+  describe '#contention' do
+    let(:limiter) { Berater.new(:concurrency, 3) }
+
+    it 'tracks contention' do
+      lock_1 = limiter.limit
+      expect(lock_1.contention).to eq 1
+
+      lock_2 = limiter.limit
+      expect(lock_2.contention).to eq 2
+
+      limiter.limit do |lock_3|
+        expect(lock_3.contention).to eq 3
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Pepper