rlimiter 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae17e6b57d6de5ab529b3455a9ad64863ac6b8bf73dfba7a6a3b1c3fa701203
-  data.tar.gz: 70e6a8a00cde9742a5792c5385c913edb161cb59ffe38123424df27421f9c2ef
+  metadata.gz: 4aa40b5348d1b14d3f593091349886b8e3afa9e7ff0e5dcd20acdd9c78a71490
+  data.tar.gz: f77541b45e1e67d89bdd1acadb8bcee1b3b71fe3dbd32bb4422b0fadfcf2c8a3
 SHA512:
-  metadata.gz: e7191d97eb6efbe09c7bb27750d4d6c254a7a03ab0348576b6b133e3c6ed175a8ea90b7356a00275cf95406129450866730bdb25f61baf046dd27c0afd2e7fec
-  data.tar.gz: e86a222c7a0cf80de61f3ed5c4623c378610461d20127cd3e56d058067821f042db16089f8b8b6cb06f0b3f2f8af19d56f2b993775db14669a127823e8f489db
+  metadata.gz: ec2174ca32cda24c62da3e0c297a232bdc90f498a9e02a62e6ab48f8f2317b91b8adcf6d51b6bcb5f61e36f5643d810cc776b13947a355a8d9870ede11b10590
+  data.tar.gz: b83756b0bbeb5ee418d7a40bcda73dcff3f68844dcff3bf2852dce8afe2fe20d8fb5dfbf0e097b9afcbce88e7a6094fac547a51fe9fea6393b4caf01011c7776

data/Gemfile

@@ -5,3 +5,5 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'redis'
+gem 'simplecov', require: false, group: :test
+gem 'timecop', require: false, group: :test

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    rlimiter (1.0.1)
-      redis (~> 4.0.2)
+    rlimiter (1.0.3)
+      redis (~> 4.0, >= 4.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    docile (1.3.1)
+    json (2.1.0)
     rake (10.5.0)
     redis (4.0.2)
     rspec (3.8.0)
@@ -23,6 +25,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    timecop (0.9.1)
 
 PLATFORMS
   ruby
@@ -33,6 +41,8 @@ DEPENDENCIES
   redis
   rlimiter!
   rspec (~> 3.0)
+  simplecov
+  timecop
 
 BUNDLED WITH
    1.16.4

data/README.md

@@ -65,8 +65,8 @@ A more complicated approach could also be implemented :
     @phone_number = '2947126943'
     @limit_key = generate_limit_key
     @limit_count = fetch_limit_count
-    limit_breached = Rlimiter.limit(@limit_key, @limit_count, DEFAULT_LIMIT_DURATION)
-    unless limit_breached
+    limit_not_breached = Rlimiter.limit(@limit_key, @limit_count, DEFAULT_LIMIT_DURATION)
+    if limit_not_breached
       {
         :status_code => 200,
         :otp_dispatch_status => send_mobile_otp,

data/lib/rlimiter/client.rb

@@ -10,7 +10,7 @@ module Rlimiter
       # Stub
     end
 
-    def current_count
+    def current_count(key)
       # Stub
     end
 

data/lib/rlimiter/redis_client.rb

@@ -30,7 +30,7 @@ module Rlimiter
     # @return [Redis]
     #
     def initialize(params)
-      @redis = Redis.new(params.deep_symbolize_keys)
+      @redis = Redis.new(params)
     end
 
     # Registers a hit corresponding to the key specified, requires the max hit count and the duration to be passed.
@@ -76,8 +76,8 @@ module Rlimiter
     def next_in(key, count, duration)
       @key = key
       @duration = duration
-      return 0 if current_count(key) <= count
-      @duration - elapsed
+      return 0 if current_count(key) < count
+      [@duration - elapsed, 0].max
     end
 
     private
@@ -91,7 +91,7 @@ module Rlimiter
     end
 
     def elapsed
-      ((Time.now.getutc.to_f * 1000 - start_time) / 1000).to_i
+      ((Time.now.getutc.to_time.to_i * 1000 - start_time) / 1000).to_i
     end
 
     def start_time

data/lib/rlimiter/version.rb

@@ -1,3 +1,5 @@
 module Rlimiter
-  VERSION = '1.0.2'.freeze
+  #:nocov:
+  VERSION = '1.0.3'.freeze
+  #:nocov:
 end

data/lib/rlimiter.rb

@@ -13,7 +13,7 @@ module Rlimiter
 
     # At the moment only redis client is supported.
     CLIENTS = %w[redis].freeze
-    attr_accessor :client
+    attr_reader :client
 
     # One time initializes the client which is to be used throughout the application.
     # The value of params variable will change depending on the storage client to be initialized.

data/rlimiter.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_runtime_dependency 'redis', '~> 4.0.2'
+  spec.add_runtime_dependency 'redis', '~> 4.0', '>= 4.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlimiter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Sidharth Patro
@@ -57,6 +57,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
@@ -64,6 +67,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
 description: