berater 0.1.1 → 0.3.0

data/spec/unlimiter_spec.rb

@@ -1,5 +1,5 @@
 describe Berater::Unlimiter do
-  before { Berater.mode = :unlimited }
+  it_behaves_like 'a limiter', described_class.new
 
   describe '.new' do
     it 'initializes without any arguments or options' do
@@ -7,44 +7,24 @@ describe Berater::Unlimiter do
     end
 
     it 'initializes with any arguments and options' do
-      expect(described_class.new(:abc, x: 123)).to be_a described_class
+      expect(described_class.new(:abc, :def, x: 123)).to be_a described_class
     end
 
     it 'has default values' do
-      expect(described_class.new.key).to eq described_class.to_s
+      expect(described_class.new.key).to be :unlimiter
       expect(described_class.new.redis).to be Berater.redis
     end
   end
 
-  describe '.limit' do
-    it 'works' do
-      expect(described_class.limit).to be_nil
-    end
-
-    it 'yields' do
-      expect {|b| described_class.limit(&b) }.to yield_control
-    end
-
-    it 'is never overloaded' do
-      10.times do
-        expect { described_class.limit }.not_to be_overloaded
-      end
-    end
-
-    it 'works with any arguments or options' do
-      expect(described_class.limit(:abc, x: 123)).to be_nil
-    end
-  end
-
   describe '#limit' do
     let(:limiter) { described_class.new }
 
     it 'works' do
-      expect(limiter.limit).to be_nil
+      expect {|b| limiter.limit(&b) }.to yield_control
     end
 
-    it 'yields' do
-      expect {|b| limiter.limit(&b) }.to yield_control
+    it 'works without a block' do
+      expect(limiter.limit).to be_a Berater::Lock
     end
 
     it 'is never overloaded' do
@@ -52,10 +32,5 @@ describe Berater::Unlimiter do
         expect { limiter.limit }.not_to be_overloaded
       end
     end
-
-    it 'works with any arguments or options' do
-      expect(limiter.limit(x: 123)).to be_nil
-    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -115,18 +115,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/berater.rb
-- lib/berater/base_limiter.rb
 - lib/berater/concurrency_limiter.rb
+- lib/berater/dsl.rb
 - lib/berater/inhibitor.rb
+- lib/berater/limiter.rb
+- lib/berater/lock.rb
 - lib/berater/rate_limiter.rb
+- lib/berater/rspec.rb
+- lib/berater/rspec/matchers.rb
+- lib/berater/test_mode.rb
 - lib/berater/unlimiter.rb
 - lib/berater/version.rb
 - spec/berater_spec.rb
 - spec/concurrency_limiter_spec.rb
-- spec/concurrency_lock_spec.rb
 - spec/inhibitor_spec.rb
-- spec/matcher_spec.rb
+- spec/matchers_spec.rb
 - spec/rate_limiter_spec.rb
+- spec/test_mode_spec.rb
 - spec/unlimiter_spec.rb
 homepage: https://github.com/dpep/berater_rb
 licenses:
@@ -153,9 +158,9 @@ specification_version: 4
 summary: Berater
 test_files:
 - spec/rate_limiter_spec.rb
-- spec/matcher_spec.rb
+- spec/matchers_spec.rb
+- spec/test_mode_spec.rb
 - spec/concurrency_limiter_spec.rb
-- spec/concurrency_lock_spec.rb
 - spec/berater_spec.rb
 - spec/inhibitor_spec.rb
 - spec/unlimiter_spec.rb

data/lib/berater/base_limiter.rb

@@ -1,34 +0,0 @@
-module Berater
-  class BaseLimiter
-
-    class Overloaded < StandardError; end
-
-    attr_reader :options
-
-    def initialize(**opts)
-      @options = opts
-    end
-
-    def key
-      if options[:key]
-        "#{self.class}:#{options[:key]}"
-      else
-        # default value
-        self.class.to_s
-      end
-    end
-
-    def redis
-      options[:redis] || Berater.redis
-    end
-
-    def limit(**opts)
-      raise NotImplementedError
-    end
-
-    def self.limit(*args, **opts, &block)
-      self.new(*args, **opts).limit(&block)
-    end
-
-  end
-end

data/spec/concurrency_lock_spec.rb

@@ -1,50 +0,0 @@
-describe Berater::ConcurrencyLimiter::Lock do
-  subject { Berater.limit(1, timeout: 1) }
-
-  before { Berater.mode = :concurrency }
-
-  it { expect(subject.released?).to be false }
-  it { expect(subject.expired?).to be false }
-
-  context 'after being released' do
-    before { subject.release }
-
-    it { expect(subject.released?).to be true }
-    it { expect(subject.expired?).to be false }
-
-    it 'can not be released again' do
-      expect { subject.release }.to raise_error(RuntimeError, /already/)
-    end
-  end
-
-  context 'when enough time passes' do
-    before { subject; Timecop.freeze(2) }
-
-    it 'expires' do
-      expect(subject.expired?).to be true
-    end
-
-    it 'fails to release' do
-      expect { subject.release }.to raise_error(RuntimeError, /expired/)
-    end
-
-    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