time_window_drop_collector 0.1.15 → 0.3.1

data/README.md

@@ -43,9 +43,9 @@ Can be:
     twdc.drop( "id1" )
     twdc.drop( "id1" )
     twdc.drop( "id2" )
-    twdc.drop( "id1" )
+    twdc.drop( "id1", 4 )
 
-    twdc.count( "id1" )  # => 3
+    twdc.count( "id1" )  # => 6
     twdc.count( "id2" )  # => 1
 
     # after 10 minutes
@@ -80,3 +80,4 @@ It uses the `Rails.cache` accesible
       TimeWindowDropCollector.new do
         client :redis, { :host => "host", :port => "port" }
       end
+

data/lib/time_window_drop_collector.rb

@@ -33,12 +33,12 @@ class TimeWindowDropCollector
     @storage = TimeWindowDropCollector::Storage.new( wrapper, config[:window], config[:slices] )
   end
 
-  def drop( keys )
+  def drop( keys, amount=1 )
     keys = [keys] unless keys.is_a? Array
     keys = keys.map(&:to_s)
 
-    TimeWindowDropCollector::Logger.log "DROP keys: #{keys.join(", ")}"
-    storage.incr( keys )
+    TimeWindowDropCollector::Logger.log "DROP keys: #{keys.join(", ")}, amount: #{amount}"
+    storage.incr( keys, amount )
   end
 
   def count( orig_keys )

data/lib/time_window_drop_collector/storage.rb

@@ -9,8 +9,8 @@ class TimeWindowDropCollector::Storage
     @slices  = slices
   end
 
-  def incr( keys )
-    wrapper.incr( timestamp_key_multi( keys ), window )
+  def incr( keys, amount=1 )
+    wrapper.incr( timestamp_key_multi( keys ), window, amount )
   end
 
   def count( keys )

data/lib/time_window_drop_collector/version.rb

@@ -1,3 +1,3 @@
 class TimeWindowDropCollector
-  VERSION = "0.1.15"
+  VERSION = "0.3.1"
 end

data/lib/time_window_drop_collector/wrappers/memcache.rb

@@ -7,10 +7,10 @@ class TimeWindowDropCollector
         @client = Dalli::Client.new( opts )
       end
 
-      def incr( keys, expire_time )
+      def incr( keys, expire_time, amount )
         client.multi do
           keys.each do |key|
-            client.incr( key, 1, expire_time, 1 )
+            client.incr( key, amount, expire_time, 1 )
           end
         end
       end

data/lib/time_window_drop_collector/wrappers/mock.rb

@@ -7,9 +7,9 @@ class TimeWindowDropCollector
 				@client = MemcacheMock.new
 			end
 
-			def incr( keys, expire_time )
+			def incr( keys, expire_time, amount )
 				keys.each do |key|
-					client.incr( key, 1, nil, 1 )
+					client.incr( key, amount, nil, 1 )
 				end
 			end
 

data/lib/time_window_drop_collector/wrappers/rails_cache.rb

@@ -7,9 +7,9 @@ class TimeWindowDropCollector
 				@client = Rails.cache
 			end
 
-			def incr( keys, expire_time )
+			def incr( keys, expire_time, amount )
 				keys.each do |key|
-					client.increment( key, 1, :expires_in => expire_time )
+					client.increment( key, amount, :expires_in => expire_time )
 				end
 			end
 

data/lib/time_window_drop_collector/wrappers/redis.rb

@@ -7,10 +7,10 @@ class TimeWindowDropCollector
         @client = ::Redis.new( opts )
       end
 
-  		def incr( keys, expire_time )
+  		def incr( keys, expire_time, amount )
         client.pipelined do
           keys.each do |key|
-            client.incr( key )
+            client.incrby( key, amount )
             client.expire( key, expire_time )
           end
         end

data/test/memcache_wrapper_test.rb

@@ -9,8 +9,8 @@ class MemcacheWrapperTest < Test::Unit::TestCase
 
   def test_incr
     wrapper = TimeWindowDropCollector::Wrappers::Memcache.new( ["arg1"] )
-    wrapper.client.expects( :incr ).with( "key", 1, "expire_time", 1 )
-    wrapper.incr( "key", "expire_time" )
+    wrapper.client.expects( :incr ).with( "key", 5, "expire_time", 1 )
+    wrapper.incr( "key", "expire_time", 5 )
   end
 
   def test_values_for

data/test/mock_wrapper_test.rb

@@ -9,9 +9,9 @@ class MockWrapperTest < Test::Unit::TestCase
 
   def test_incr
     wrapper = TimeWindowDropCollector::Wrappers::Mock.new( ["arg1"] )
-    wrapper.client.expects( :incr ).with( "key1", 1, nil, 1 )
-    wrapper.client.expects( :incr ).with( "key2", 1, nil, 1 )
-    wrapper.incr( ["key1", "key2"], "expire_time" )
+    wrapper.client.expects( :incr ).with( "key1", 2, nil, 1 )
+    wrapper.client.expects( :incr ).with( "key2", 2, nil, 1 )
+    wrapper.incr( ["key1", "key2"], "expire_time", 2 )
   end
 
   def test_values_for

data/test/rails_cache_wrapper_test.rb

@@ -14,10 +14,10 @@ class MemcacheWrapperTest < Test::Unit::TestCase
 
   def test_incr
     wrapper = TimeWindowDropCollector::Wrappers::RailsCache.new( ["arg1"] )
-    wrapper.client.expects( :increment ).with( "key1", 1, :expires_in => "expire_time" )
-    wrapper.client.expects( :increment ).with( "key2", 1, :expires_in => "expire_time" )
+    wrapper.client.expects( :increment ).with( "key1", 5, :expires_in => "expire_time" )
+    wrapper.client.expects( :increment ).with( "key2", 5, :expires_in => "expire_time" )
 
-    wrapper.incr( ["key1", "key2"], "expire_time" )
+    wrapper.incr( ["key1", "key2"], "expire_time", 5 )
   end
 
   def test_values_for

data/test/redis_wrapper_test.rb

@@ -4,7 +4,7 @@ class RedisMock
   def multi
     yield
   end
-  def incr(key);end
+  def incrby(key,amount);end
   def expire(key);end
   def mget(keys);end
   def pipelined
@@ -24,13 +24,13 @@ class RedisWrapperTest < Test::Unit::TestCase
     Redis.expects( :new ).returns( RedisMock.new )
     wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
 
-    wrapper.client.expects( :incr ).with( "key1" )
+    wrapper.client.expects( :incrby ).with( "key1", 10 )
     wrapper.client.expects( :expire ).with( "key1", "expire_time" )
 
-    wrapper.client.expects( :incr ).with( "key2" )
+    wrapper.client.expects( :incrby ).with( "key2", 10 )
     wrapper.client.expects( :expire ).with( "key2", "expire_time" )
 
-    wrapper.incr( ["key1", "key2"], "expire_time" )
+    wrapper.incr( ["key1", "key2"], "expire_time", 10 )
   end
 
   def test_incr_agregates_commands_under_pipelined
@@ -39,7 +39,7 @@ class RedisWrapperTest < Test::Unit::TestCase
 
     wrapper.client.expects( :pipelined )
 
-    wrapper.incr( nil, nil )
+    wrapper.incr( nil, nil, nil )
   end
 
   def test_get

data/test/storage_test.rb

@@ -37,11 +37,18 @@ class StorageTest < Test::Unit::TestCase
 
   def test_incr
     @storage.expects( :timestamp_key_multi ).with( ["keys"] ).returns( "timestamp_keys" )
-    @wrapper.expects( :incr ).with( "timestamp_keys", 600 )
+    @wrapper.expects( :incr ).with( "timestamp_keys", 600, 1 )
 
     @storage.incr( ["keys"] )
   end
 
+  def test_incr_with_val
+    @storage.expects( :timestamp_key_multi ).with( ["keys"] ).returns( "timestamp_keys" )
+    @wrapper.expects( :incr ).with( "timestamp_keys", 600, 30.5 )
+
+    @storage.incr( ["keys"], 30.5 )
+  end
+
   def test_count
     @storage.expects( :window_keys_multi ).with( "keys" ).returns( "window_keys" )
     @wrapper.expects( :get ).with( "window_keys" ).returns( "keys_values" )

data/test/time_window_drop_collector_test.rb

@@ -33,7 +33,7 @@ class TimeWindowDropCollectorTest < Test::Unit::TestCase
 
   def test_drop
     storage = mock()
-    storage.expects( :incr ).with( ["key"] )
+    storage.expects( :incr ).with( ["key"], 1 )
 
     twdc = TimeWindowDropCollector.new
     twdc.stubs( :storage ).returns( storage )
@@ -41,6 +41,16 @@ class TimeWindowDropCollectorTest < Test::Unit::TestCase
     twdc.drop( "key" )
   end
 
+  def test_drop_with_custom_amount
+    storage = mock()
+    storage.expects( :incr ).with( ["key"], 15 )
+
+    twdc = TimeWindowDropCollector.new
+    twdc.stubs( :storage ).returns( storage )
+
+    twdc.drop( "key", 15 )
+  end
+
   def test_count
     storage = mock()
     storage.expects( :count ).with( ["key"] ).returns( { "key" => 10 } )

data/time_window_drop_collector.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split( "\n" ).map{ |f| File.basename( f ) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "bundler",         "1.0.21"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake",            "0.9.2.2"
   s.add_development_dependency "mocha",           "0.10.0"
   s.add_development_dependency "delorean",        "1.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_window_drop_collector
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206581150800 !ruby/object:Gem::Requirement
+  requirement: &70353016535360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206581150800
+  version_requirements: *70353016535360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206581150300 !ruby/object:Gem::Requirement
+  requirement: &70353016534860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70206581150300
+  version_requirements: *70353016534860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70206581149840 !ruby/object:Gem::Requirement
+  requirement: &70353016534360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70206581149840
+  version_requirements: *70353016534360
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70206581149380 !ruby/object:Gem::Requirement
+  requirement: &70353016533900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70206581149380
+  version_requirements: *70353016533900
 - !ruby/object:Gem::Dependency
   name: memcache_mock
-  requirement: &70206581148920 !ruby/object:Gem::Requirement
+  requirement: &70353016533440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70206581148920
+  version_requirements: *70353016533440
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70206581148540 !ruby/object:Gem::Requirement
+  requirement: &70353016533060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206581148540
+  version_requirements: *70353016533060
 description: Counter storage system for a concrete time window
 email:
 - fguillen.mail@gmail.com