berater 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 476b59e3f1e27908f5c8a5097087e6c8c2384531e1284d79b9d89a73fbbb5840
-  data.tar.gz: de50fdcab6ea7dc9520fcf1aefdd07b1f8775c0ce96a30e3f1d45b6ccfb7b00f
+  metadata.gz: 32de3ce22b3804c00224140d747e66fc9de887582f6bd4812c6404cfcba0056e
+  data.tar.gz: 16054c2814c98bd64fa0ea16ee9ca2110bff6df9cb4a17bf292759d3dcc901e7
 SHA512:
-  metadata.gz: 2446e64f528a8ef1d37791922d37cddcebdf702f3c5beff2ef7ea9d611ce4cc6d6c40ac42e1ea826987a2eb2ceea3ddf97e420bb7369686b8239b260a1725c55
-  data.tar.gz: 23dccad7e02cc425631ceeb1dfbc6960b94ac92c523d840a991917af02caaf39a7befc5887fe45631f565ddb2eddb4850e557348ab29427d3cbae1db89124c3c
+  metadata.gz: 78b027082f40a7bdc6d64e245359fc5b34f3b2738fdf683bfa28047f788378f46f1068f9c7541071b8e2e043b78bfee0219eaf70239e0ec09274238a979f7085
+  data.tar.gz: b63f8c4103be7c518c96eed52b98d00d094774acbc9b8df42810c945b210d4e5850a49c38ab318a38a25521da623ffb2940693191753a485779ca03be5232ea4

data/lib/berater/limiter.rb

@@ -99,11 +99,16 @@ module Berater
     end
 
     class << self
-      def new(*)
+      def new(*args, **kwargs)
         # can only call via subclass
         raise NoMethodError if self == Berater::Limiter
 
-        super
+        if RUBY_VERSION < '3' && kwargs.empty?
+          # avoid ruby 2 problems with empty hashes
+          super(*args)
+        else
+          super
+        end
       end
 
       def cache_key(key)
@@ -116,6 +121,7 @@ module Berater
       def inherited(subclass)
         # automagically create convenience method
         name = subclass.to_s.split(':')[-1]
+
         Berater.define_singleton_method(name) do |*args, **opts, &block|
           Berater::Utils.convenience_fn(subclass, *args, **opts, &block)
         end

data/lib/berater/lock.rb

@@ -20,7 +20,7 @@ module Berater
 
       @released_at = Time.now
       @release_fn&.call
-      nil
+      true
     end
 
   end

data/lib/berater/lua_script.rb

@@ -6,11 +6,11 @@ module Berater
     attr_reader :source
 
     def initialize(source)
-      @source = source
+      @source = source.dup.freeze
     end
 
     def sha
-      @sha ||= Digest::SHA1.hexdigest(minify)
+      @sha ||= Digest::SHA1.hexdigest(minify).freeze
     end
 
     def eval(redis, *args)
@@ -44,7 +44,7 @@ module Berater
     def minify
       # trim comments (whole line and partial)
       # and whitespace (prefix and empty lines)
-      @minify ||= source.gsub(/^\s*--.*\n|\s*--.*|^\s*|^$\n/, '').chomp
+      @minify ||= source.gsub(/^\s*--.*\n|\s*--.*|^\s*|^$\n/, '').chomp.freeze
     end
 
   end

data/lib/berater/utils.rb

@@ -44,12 +44,7 @@ module Berater
 
     def convenience_fn(klass, *args, **opts, &block)
       limiter = klass.new(*args, **opts)
-      if block_given?
-        limiter.limit(&block)
-      else
-        limiter
-      end
+      block ? limiter.limit(&block) : limiter
     end
-
   end
 end

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = '0.9.0'
+  VERSION = "0.10.0"
 end

data/spec/berater_spec.rb

@@ -59,8 +59,8 @@ describe Berater do
       end
 
       it 'accepts an optional redis parameter' do
-        redis = double('Redis')
-        limiter = Berater.new(:key, capacity, opts.merge(redis: redis))
+        redis = double(Redis)
+        limiter = Berater.new(:key, capacity, **opts.merge(redis: redis))
         expect(limiter.redis).to be redis
       end
     end

data/spec/limiter_spec.rb

@@ -79,6 +79,16 @@ describe Berater::Limiter do
         expect { limiter.limit }.to raise_error(RuntimeError)
       end
     end
+
+    it 'releases the lock even when limited code raises an error' do
+      lock = Berater::Lock.new(Float::INFINITY, 0)
+      expect(subject).to receive(:acquire_lock).and_return(lock)
+      expect(lock).to receive(:release)
+
+      expect {
+        subject.limit { raise 'fail' }
+      }.to raise_error(RuntimeError)
+    end
   end
 
   describe '#==' do

data/spec/lua_script_spec.rb

@@ -93,5 +93,4 @@ describe Berater::LuaScript do
       it { subject }
     end
   end
-
 end

data/spec/middleware_spec.rb

@@ -1,5 +1,5 @@
 class Meddler
-  def call(*)
+  def call(*args, **kwargs)
     yield
   end
 end
@@ -73,18 +73,18 @@ describe 'Berater.middleware' do
 
     context 'when middleware meddles' do
       it 'can change the capacity' do
-        expect(middleware).to receive(:call) do |limiter, opts, &block|
+        expect(middleware).to receive(:call) do |limiter, **opts, &block|
           opts[:capacity] = 0
-          block.call
+          block.call(limiter, **opts)
         end
 
         expect { limiter.limit }.to be_overloaded
       end
 
       it 'can change the cost' do
-        expect(middleware).to receive(:call) do |limiter, opts, &block|
+        expect(middleware).to receive(:call) do |limiter, **opts, &block|
           opts[:cost] = 2
-          block.call
+          block.call(limiter, **opts)
         end
 
         expect { limiter.limit }.to be_overloaded
@@ -93,8 +93,8 @@ describe 'Berater.middleware' do
       it 'can change the limiter' do
         other_limiter = Berater::Inhibitor.new
 
-        expect(middleware).to receive(:call) do |limiter, opts, &block|
-          block.call other_limiter, opts
+        expect(middleware).to receive(:call) do |limiter, **opts, &block|
+          block.call(other_limiter, **opts)
         end
         expect(other_limiter).to receive(:acquire_lock).and_call_original
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: meddleware
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -193,24 +193,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Berater
 test_files:
-- spec/rate_limiter_spec.rb
-- spec/matchers_spec.rb
+- spec/berater_spec.rb
+- spec/concurrency_limiter_spec.rb
 - spec/dsl_refinement_spec.rb
-- spec/test_mode_spec.rb
-- spec/middleware_spec.rb
 - spec/dsl_spec.rb
-- spec/lua_script_spec.rb
-- spec/concurrency_limiter_spec.rb
-- spec/riddle_spec.rb
+- spec/inhibitor_spec.rb
 - spec/limiter_set_spec.rb
-- spec/utils_spec.rb
-- spec/berater_spec.rb
 - spec/limiter_spec.rb
+- spec/lua_script_spec.rb
+- spec/matchers_spec.rb
+- spec/middleware_spec.rb
+- spec/rate_limiter_spec.rb
+- spec/riddle_spec.rb
 - spec/static_limiter_spec.rb
-- spec/inhibitor_spec.rb
+- spec/test_mode_spec.rb
 - spec/unlimiter_spec.rb
+- spec/utils_spec.rb