berater 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57ab651eeb34e6a0bb7b889fefa9c13d1d1fc5b6e834bc2b9a6e0ba7b74a8e2
-  data.tar.gz: 8112aa91ae48872132d8222a07f03dce42ff6f5ff26a3bf17906a389ba675ec9
+  metadata.gz: 8b657c7eb3a69e868416ad2d149d6c35ab13989e77a16ece23217deaaa9fafb6
+  data.tar.gz: 30835e7c247da37543ea118067d0b61d16080399ff6b53e86783c53a94b8d560
 SHA512:
-  metadata.gz: 17ae5da54dcf9535d4afe93d7e239ddc1fefaedf3419883cfa22d1f55c0c0aa7a9365986509e8e54e37c08c258068db4a76064dcc6af3f654e170b3efc8c1cd0
-  data.tar.gz: 04b1e7553e86107bbc91fc486b7b0ae099f5575b8654f7800f2a1c281b7b8bfde1e63df2378f03fcb4a9864b15b6a5de610bb6e7a1ce4d4b8e53898d9f4f0869
+  metadata.gz: '04481aa9c3097930f66eb29c6e19e650309b882cf835c1f36cb3fa58524b957d1194b5acc6a83f9fdfd33b73f888261ff3cc3171d730fd9781d9cf768b2b0768'
+  data.tar.gz: e0cd1a220a418face72685b44d23dff0040dc5f3d94b8c0d82769123a1c387e709702e8f093cc9c0f600d002ea4c848ebd4f0a2e38a4368e743104fbee597f9d

data/lib/berater/limiter.rb

@@ -27,10 +27,24 @@ module Berater
     end
 
     protected def inner_limit(capacity:, cost:)
+      if capacity.is_a?(String)
+        # try casting
+        begin
+          capacity = Float(capacity)
+        rescue ArgumentError; end
+      end
+
       unless capacity.is_a?(Numeric) && capacity >= 0
         raise ArgumentError, "invalid capacity: #{capacity}"
       end
 
+      if cost.is_a?(String)
+        # try casting
+        begin
+          cost = Float(cost)
+        rescue ArgumentError; end
+      end
+
       unless cost.is_a?(Numeric) && cost >= 0 && cost < Float::INFINITY
         raise ArgumentError, "invalid cost: #{cost}"
       end
@@ -76,6 +90,13 @@ module Berater
     end
 
     def capacity=(capacity)
+      if capacity.is_a?(String)
+        # try casting
+        begin
+          capacity = Float(capacity)
+        rescue TypeError, ArgumentError; end
+      end
+
       unless capacity.is_a?(Numeric)
         raise ArgumentError, "expected Numeric, found #{capacity.class}"
       end

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/concurrency_limiter_spec.rb

@@ -24,6 +24,7 @@ describe Berater::ConcurrencyLimiter do
     it { expect_capacity(0) }
     it { expect_capacity(1) }
     it { expect_capacity(1.5) }
+    it { expect_capacity('1.5') }
     it { expect_capacity(10_000) }
 
     context 'with erroneous values' do
@@ -34,7 +35,7 @@ describe Berater::ConcurrencyLimiter do
       end
 
       it { expect_bad_capacity(-1) }
-      it { expect_bad_capacity('1') }
+      it { expect_bad_capacity('abc') }
       it { expect_bad_capacity(:one) }
       it { expect_bad_capacity(Float::INFINITY) }
     end

data/spec/limiter_spec.rb

@@ -14,6 +14,32 @@ describe Berater::Limiter do
     end
   end
 
+  describe '#capacity=' do
+    subject { Berater::Unlimiter.new(:key, capacity).capacity }
+
+    context 'when capacity is numeric' do
+      let(:capacity) { 3.5 }
+
+      it { is_expected.to be capacity }
+    end
+
+    context 'when capacity is a stringified numeric' do
+      let(:capacity) { '3.5' }
+
+      it 'casts the value gracefully' do
+        is_expected.to be capacity.to_f
+      end
+    end
+
+    context 'when capacity is a bogus value' do
+      let(:capacity) { :abc }
+
+      it 'raises' do
+        expect { subject }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
   describe '#limit' do
     subject { Berater::Unlimiter.new }
 
@@ -29,6 +55,12 @@ describe Berater::Limiter do
           subject.limit(capacity: 'abc')
         }.to raise_error(ArgumentError)
       end
+
+      it 'handles stringified numerics gracefully' do
+        is_expected.to receive(:acquire_lock).with(3.5, anything)
+
+        subject.limit(capacity: '3.5')
+      end
     end
 
     context 'with a cost parameter' do
@@ -51,6 +83,12 @@ describe Berater::Limiter do
           subject.limit(cost: Float::INFINITY)
         }.to raise_error(ArgumentError)
       end
+
+      it 'handles stringified numerics gracefully' do
+        is_expected.to receive(:acquire_lock).with(anything, 2.5)
+
+        subject.limit(cost: '2.5')
+      end
     end
 
     context 'when Berater.redis is nil' do

data/spec/rate_limiter_spec.rb

@@ -19,12 +19,13 @@ describe Berater::RateLimiter do
   describe '#capacity' do
     def expect_capacity(capacity)
       limiter = described_class.new(:key, capacity, :second)
-      expect(limiter.capacity).to eq capacity
+      expect(limiter.capacity).to eq capacity.to_f
     end
 
     it { expect_capacity(0) }
     it { expect_capacity(1) }
     it { expect_capacity(1.5) }
+    it { expect_capacity('1.5') }
     it { expect_capacity(100) }
 
     context 'with erroneous values' do
@@ -35,7 +36,7 @@ describe Berater::RateLimiter do
       end
 
       it { expect_bad_capacity(-1) }
-      it { expect_bad_capacity('1') }
+      it { expect_bad_capacity('abc') }
       it { expect_bad_capacity(:one) }
       it { expect_bad_capacity(Float::INFINITY) }
     end

metadata

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