simple-throttle 0.0.1 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64857d974825a0acfc9ea727baa6677cb65bc259
-  data.tar.gz: 82873bafc96d5958a22240c2314eed21f7880368
+  metadata.gz: 240699b699a121b5e2c61603da086dc0783fee5a
+  data.tar.gz: eb41f346aabdeae4e649b62beda29cea99c1ca3d
 SHA512:
-  metadata.gz: ecee0e9ed26d1f6a21721b94651681cb4afc38315ac6ac03082fccc0c9a2d460c2ab74707bfacd2fbe1ac9fdec5461f1131c76be467f9f20f11d83d02f6ee8a2
-  data.tar.gz: be1e90d260664b00b8b84e69bb0907578b1ee3f8a09012f09f416e08c585998b3d85a3b25b324b42a360a6f4665f4b57a806c06550d715009e4a5dd93448ec87
+  metadata.gz: 5375d65514aaca8c347576add62c8507e37769557e2fd485a5644c0d1b0cb78d4121a22f1aec99fc838c00533e8e01d99ddf418efad630e722b4ab80375b2ac5
+  data.tar.gz: 172875d5289072f07404a1bdfdee50c695517e6a12be2309fc17dc50f3e067c1fc1c2ad92a5720711e5fe52f7c9055f483544a3c2cabf4b226ce1ba43a6ec8b3

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in simple-throttle.gemspec
+# Specify your gem's dependencies in simple-simple_throttle.gemspec
 gemspec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "simple/throttle"
+require "simple_throttle"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/simple_throttle.rb

@@ -0,0 +1,22 @@
+require "simple_throttle/version"
+require "simple_throttle/time_window/runner"
+require "simple_throttle/manual/runner"
+
+module SimpleThrottle
+
+  HOUR_SECONDS = 3600
+  DAYS_SECONDS = 24 * HOUR_SECONDS
+
+  def self.per_hour(count)
+    TimeWindow::Runner.new(HOUR_SECONDS, count.to_i)
+  end
+
+  def self.per_day(count)
+    TimeWindow::Runner.new(DAYS_SECONDS, count.to_i)
+  end
+
+  def self.hourly_manual(count)
+    Manual::Runner.new(HOUR_SECONDS, count.to_i)
+  end
+end
+

data/lib/simple_throttle/manual/runner.rb

@@ -0,0 +1,33 @@
+module SimpleThrottle
+  module Manual
+    class Runner
+      #client can manually override the remaining count.
+      attr_accessor :remaining
+
+      # Parameters:
+      # +wait_s+: minimum number os seconds between +count+ block invocations
+      # +count+: maximum number of times block may be called between +wait_s+ seconds
+      def initialize(wait_s, count, sleep = ->(seconds) { sleep seconds })
+        @max = count
+        @remaining = @max
+        @wait_s = wait_s.to_f
+        @sleep = sleep
+      end
+
+      # Run given +block+ either immediately (if allowed) or after sleep.
+      def run(&block)
+        if @remaining < 1
+          @sleep.call @wait_s
+          @remaining = @max
+        end
+
+        @remaining -= 1
+        yield
+      end
+
+      def within_limit?
+        @remaining > 0
+      end
+    end
+  end
+end

data/lib/{throttle → simple_throttle}/time_window/runner.rb

@@ -1,4 +1,4 @@
-module Throttle
+module SimpleThrottle
   module TimeWindow
     ##
     # Executes at most a number of times within given time window.
@@ -18,17 +18,12 @@ module Throttle
       # Run given +block+ either immediately (if allowed) or after sleep.
       def run(&block)
         #puts "count: #{@count}, delta: #{Time.now.to_f - @last}"
-        now = Time.now.to_f
-        delta = now - @last
-        if delta >= @wait_s
-          #puts "resetting"
-          @last = now
-          @count = 0
-        end
 
-        if @count >= @max
+        restart_window_if_needed
+
+        if !within_limit?
           sleep_interval = @wait_s - delta
-          #puts "throttle forced sleep for #{sleep_interval}"
+          #puts "simple_throttle forced sleep for #{sleep_interval}"
           @sleep.call sleep_interval
         end
 
@@ -36,6 +31,25 @@ module Throttle
         #puts "running "
         yield
       end
+
+      def within_limit?
+        restart_window_if_needed
+        @count < @max
+      end
+
+      def delta
+        now = Time.now.to_f
+        now - @last
+      end
+
+      def restart_window_if_needed
+        if delta >= @wait_s
+          #puts "resetting"
+          @last = Time.now.to_f
+          @count = 0
+        end
+      end
+
     end
   end
 end

data/lib/simple_throttle/version.rb

@@ -0,0 +1,3 @@
+module SimpleThrottle
+  VERSION = "0.0.11".freeze
+end

data/simple-throttle.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'throttle/version'
+require 'simple_throttle/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "simple-throttle"
-  spec.version       = Throttle::VERSION
+  spec.version       = SimpleThrottle::VERSION
   spec.authors       = ["Alexandre Maia"]
   spec.email         = ["alexandre.maia@gmail.com"]
   spec.summary       = %q{Limit amount of executions with time windows.}
-  spec.homepage      = "https://www.github.com/cxz/simple-throttle"
+  spec.homepage      = "https://www.github.com/cxz/simple-simple_throttle"
   spec.license          = %q{MIT}
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-throttle
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.11
 platform: ruby
 authors:
 - Alexandre Maia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,11 +81,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/throttle.rb
-- lib/throttle/time_window/runner.rb
-- lib/throttle/version.rb
+- lib/simple_throttle.rb
+- lib/simple_throttle/manual/runner.rb
+- lib/simple_throttle/time_window/runner.rb
+- lib/simple_throttle/version.rb
 - simple-throttle.gemspec
-homepage: https://www.github.com/cxz/simple-throttle
+homepage: https://www.github.com/cxz/simple-simple_throttle
 licenses:
 - MIT
 metadata: {}

data/lib/throttle.rb

@@ -1,17 +0,0 @@
-require "throttle/version"
-require "throttle/time_window/runner"
-
-module Throttle
-
-  HOUR_SECONDS = 3600
-  DAYS_SECONDS = 24 * HOUR_SECONDS
-
-  def self.per_hour(count)
-    TimeWindow::Runner.new(HOUR_SECONDS, count)
-  end
-
-  def self.per_day(count)
-    TimeWindow::Runner.new(DAYS_SECONDS, count)
-  end
-end
-

data/lib/throttle/version.rb

@@ -1,3 +0,0 @@
-module Throttle
-  VERSION = "0.0.1".freeze
-end