time_window_drop_collector 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34b9b2de8a482fd8222318926c3e386f55a73b17
+  data.tar.gz: b813b99402ffc1a28c55cb5e972775667e30a1e2
+SHA512:
+  metadata.gz: 699bf75c79b1e6eab0ce40f52bdff4c6ed913b3a7005f058a8d29770636b892d4469e8915069b02a68466ed1140522c94a44ad0713dc093ef1417035e14b7326
+  data.tar.gz: 05a93a25754cc7c977d206de6d79b21bc0158cb9feceb2656d5c52cb628ec7a195ca2a1a0d5523d81ae2cb40cf0ac465241d482e7647a3d67d6b87ac1239832f

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -43,11 +43,14 @@ Can be:
     twdc.drop( "id1" )
     twdc.drop( "id1" )
     twdc.drop( "id2" )
-    twdc.drop( "id1", 4 )
+    ts = twdc.drop( "id1", 4 )
 
     twdc.count( "id1" )  # => 6
     twdc.count( "id2" )  # => 1
 
+    twdc.pick( ts, "id1", 2)
+    twdc.count( "id1" )  # => 4
+
     # after 10 minutes
     twdc.count( "id1" )  # => 0
 

data/lib/time_window_drop_collector.rb

@@ -41,6 +41,15 @@ class TimeWindowDropCollector
     storage.incr( keys, amount )
   end
 
+  def pick( time, keys, amount=1)
+    keys = [keys] unless keys.is_a? Array
+    keys = keys.map(&:to_s)
+
+    TimeWindowDropCollector::Logger.log "PICK keys: #{keys.join(", ")}, amount: #{amount}"
+
+    storage.decr( time, keys, amount )
+  end
+
   def count( orig_keys )
     keys = orig_keys.is_a?(Array) ? orig_keys : [orig_keys]
     keys = keys.map(&:to_s)

data/lib/time_window_drop_collector/storage.rb

@@ -10,7 +10,13 @@ class TimeWindowDropCollector::Storage
   end
 
   def incr( keys, amount=1 )
-    wrapper.incr( timestamp_key_multi( keys ), window, amount )
+    now = Time.now
+    wrapper.incr( timestamp_key_multi( keys, now), window, amount )
+    now
+  end
+
+  def decr( timestamp, keys, amount=1 )
+    wrapper.decr(timestamp_key_multi( keys, timestamp), window, amount)
   end
 
   def count( keys )
@@ -21,4 +27,4 @@ class TimeWindowDropCollector::Storage
 
     grouping_count( keys_values )
   end
-end
+end

data/lib/time_window_drop_collector/utils.rb

@@ -15,22 +15,18 @@ module TimeWindowDropCollector::Utils
     "drop_window_#{key}_#{slice_start_timestamp( time )}"
   end
 
-  def timestamp_key_multi( keys )
-    now = timestamp
-
-    keys.map { |key| timestamp_key( key, now ) }.flatten
+  def timestamp_key_multi( keys, time = timestamp)
+    keys.map { |key| timestamp_key( key, time) }.flatten
   end
 
-  def window_keys( key, now = timestamp )
+  def window_keys( key, time = timestamp )
     ( 0..( slices - 1 ) ).map{ |i|
-      timestamp_key( key, now - ( ( i*slice_milliseconds ) / 1000 ) )
+      timestamp_key( key, time - ( ( i*slice_milliseconds ) / 1000 ) )
     }
   end
 
   def window_keys_multi( keys )
-    now = timestamp
-
-    keys.map { |key| window_keys( key, now ) }.flatten
+    keys.map { |key| window_keys( key ) }.flatten
   end
 
   def timestamp
@@ -46,4 +42,4 @@ module TimeWindowDropCollector::Utils
 
     ( time_milliseconds / slice_milliseconds ) * slice_milliseconds
   end
-end
+end

data/lib/time_window_drop_collector/version.rb

@@ -1,3 +1,3 @@
 class TimeWindowDropCollector
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/time_window_drop_collector/wrappers/memcache.rb

@@ -15,6 +15,14 @@ class TimeWindowDropCollector
         end
       end
 
+      def decr( keys, expire_time, amount )
+        client.multi do
+          keys.each do |key|
+            client.decr( key, amount, expire_time, -1 )
+          end
+        end
+      end
+
       def get( keys )
         client.get_multi( keys )
       end

data/lib/time_window_drop_collector/wrappers/mock.rb

@@ -1,25 +1,31 @@
 class TimeWindowDropCollector
-	module Wrappers
-		class Mock
-			attr_reader :client
+  module Wrappers
+    class Mock
+      attr_reader :client
 
-			def initialize( opts )
-				@client = MemcacheMock.new
-			end
+      def initialize( opts )
+        @client = MemcacheMock.new
+      end
 
-			def incr( keys, expire_time, amount )
-				keys.each do |key|
-					client.incr( key, amount, nil, 1 )
-				end
-			end
+      def incr( keys, expire_time, amount )
+        keys.each do |key|
+          client.incr( key, amount, nil, 1 )
+        end
+      end
 
-			def get( keys )
-				client.get_multi( keys )
-			end
+      def decr( keys, expire_time, amount )
+        keys.each do |key|
+          client.decr( key, amount, nil, -1 )
+        end
+      end
+
+      def get( keys )
+        client.get_multi( keys )
+      end
 
       def reset
         client.flush
       end
-		end
-	end
-end
+    end
+  end
+end

data/lib/time_window_drop_collector/wrappers/rails_cache.rb

@@ -1,26 +1,32 @@
 class TimeWindowDropCollector
-	module Wrappers
-		class RailsCache
-			attr_reader :client
+  module Wrappers
+    class RailsCache
+      attr_reader :client
 
-			def initialize( opts )
-				@client = Rails.cache
-			end
+      def initialize( opts )
+        @client = Rails.cache
+      end
 
-			def incr( keys, expire_time, amount )
-				keys.each do |key|
-					client.increment( key, amount, :expires_in => expire_time )
-				end
-			end
+      def incr( keys, expire_time, amount )
+        keys.each do |key|
+          client.increment( key, amount, :expires_in => expire_time )
+        end
+      end
 
-			def get( keys )
-				client.read_multi( keys )
-			end
+      def decr( keys, expire_time, amount )
+        keys.each do |key|
+          client.decrement( key, amount, :expires_in => expire_time )
+        end
+      end
+
+      def get( keys )
+        client.read_multi( keys )
+      end
 
       def reset
         client.reset
       end
-		end
-	end
+    end
+  end
 end
 

data/lib/time_window_drop_collector/wrappers/redis.rb

@@ -1,23 +1,32 @@
 class TimeWindowDropCollector
   module Wrappers
     class Redis
-  		attr_reader :client
+      attr_reader :client
 
       def initialize( opts )
         @client = ::Redis.new( opts )
       end
 
-  		def incr( keys, expire_time, amount )
+      def incr( keys, expire_time, amount )
         client.pipelined do
           keys.each do |key|
             client.incrby( key, amount )
             client.expire( key, expire_time )
           end
         end
-  		end
+      end
 
-  		def get( keys )
-  			values = client.mget( *keys )
+      def decr( keys, expire_time, amount )
+        client.pipelined do
+          keys.each do |key|
+            client.decrby( key, amount )
+            client.expire( key, expire_time )
+          end
+        end
+      end
+
+      def get( keys )
+        values = client.mget( *keys )
 
         result = {}
 
@@ -26,12 +35,12 @@ class TimeWindowDropCollector
         end
 
         result
-  		end
+      end
 
       def reset
         client.quit
       end
-  	end
+    end
   end
 end
 

data/test/memcache_wrapper_test.rb

@@ -12,4 +12,10 @@ class MemcacheWrapperTest < Test::Unit::TestCase
     wrapper.client.expects( :incr ).with( "key", 5, "expire_time", 1)
     wrapper.incr( ["key"], "expire_time", 5 )
   end
-end
+
+  def test_decr
+    wrapper = TimeWindowDropCollector::Wrappers::Memcache.new( ["arg1"] )
+    wrapper.client.expects( :decr ).with( "key", 5, "expire_time", -1)
+    wrapper.decr( ["key"], "expire_time", 5 )
+  end
+end

data/test/mock_wrapper_test.rb

@@ -14,6 +14,13 @@ class MockWrapperTest < Test::Unit::TestCase
     wrapper.incr( ["key1", "key2"], "expire_time", 2 )
   end
 
+  def test_decr
+    wrapper = TimeWindowDropCollector::Wrappers::Mock.new( ["arg1"] )
+    wrapper.client.expects( :decr ).with( "key1", 2, nil, -1 )
+    wrapper.client.expects( :decr ).with( "key2", 2, nil, -1 )
+    wrapper.decr( ["key1", "key2"], "expire_time", 2 )
+  end
+
   def test_values_for
     wrapper = TimeWindowDropCollector::Wrappers::Mock.new( ["arg1"] )
     wrapper.client.expects( :get_multi ).with( "keys" ).returns( "keys_values" )
@@ -25,4 +32,4 @@ class MockWrapperTest < Test::Unit::TestCase
     wrapper.client.expects( :flush )
     wrapper.reset
   end
-end
+end

data/test/rails_cache_wrapper_test.rb

@@ -20,6 +20,14 @@ class MemcacheWrapperTest < Test::Unit::TestCase
     wrapper.incr( ["key1", "key2"], "expire_time", 5 )
   end
 
+  def test_decr
+    wrapper = TimeWindowDropCollector::Wrappers::RailsCache.new( ["arg1"] )
+    wrapper.client.expects( :decrement ).with( "key1", 5, :expires_in => "expire_time" )
+    wrapper.client.expects( :decrement ).with( "key2", 5, :expires_in => "expire_time" )
+
+    wrapper.decr( ["key1", "key2"], "expire_time", 5 )
+  end
+
   def test_values_for
     wrapper = TimeWindowDropCollector::Wrappers::RailsCache.new( ["arg1"] )
     wrapper.client.expects( :read_multi ).with( "keys" ).returns( "keys_values" )
@@ -31,4 +39,4 @@ class MemcacheWrapperTest < Test::Unit::TestCase
     wrapper.client.expects( :reset )
     wrapper.reset
   end
-end
+end

data/test/redis_wrapper_test.rb

@@ -33,6 +33,19 @@ class RedisWrapperTest < Test::Unit::TestCase
     wrapper.incr( ["key1", "key2"], "expire_time", 10 )
   end
 
+  def test_decr
+    Redis.expects( :new ).returns( RedisMock.new )
+    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
+
+    wrapper.client.expects( :decrby ).with( "key1", 10 )
+    wrapper.client.expects( :expire ).with( "key1", "expire_time" )
+
+    wrapper.client.expects( :decrby ).with( "key2", 10 )
+    wrapper.client.expects( :expire ).with( "key2", "expire_time" )
+
+    wrapper.decr( ["key1", "key2"], "expire_time", 10 )
+  end
+
   def test_incr_agregates_commands_under_pipelined
     Redis.expects( :new ).returns( RedisMock.new )
     wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
@@ -59,4 +72,4 @@ class RedisWrapperTest < Test::Unit::TestCase
     wrapper.reset
   end
 
-end
+end

data/test/storage_test.rb

@@ -36,17 +36,35 @@ class StorageTest < Test::Unit::TestCase
   end
 
   def test_incr
-    @storage.expects( :timestamp_key_multi ).with( ["keys"] ).returns( "timestamp_keys" )
+    Time.expects(:now).returns('now')
+    @storage.expects( :timestamp_key_multi ).with( ["keys"], 'now' ).returns( "timestamp_keys" )
     @wrapper.expects( :incr ).with( "timestamp_keys", 600, 1 )
 
-    @storage.incr( ["keys"] )
+    result = @storage.incr( ["keys"] )
+    assert_equal result, 'now'
   end
 
   def test_incr_with_val
-    @storage.expects( :timestamp_key_multi ).with( ["keys"] ).returns( "timestamp_keys" )
+    Time.expects(:now).returns('now')
+    @storage.expects( :timestamp_key_multi ).with( ["keys"], 'now' ).returns( "timestamp_keys" )
     @wrapper.expects( :incr ).with( "timestamp_keys", 600, 30.5 )
 
-    @storage.incr( ["keys"], 30.5 )
+    result = @storage.incr( ["keys"], 30.5 )
+    assert_equal result, 'now'
+  end
+
+  def test_decr
+    @storage.expects( :timestamp_key_multi ).with( ["keys"], 'now' ).returns( "timestamp_keys" )
+    @wrapper.expects( :decr ).with( "timestamp_keys", 600, 1 )
+
+    @storage.decr( 'now', ["keys"] )
+  end
+
+  def test_decr_with_val
+    @storage.expects( :timestamp_key_multi ).with( ["keys"], 'now' ).returns( "timestamp_keys" )
+    @wrapper.expects( :decr ).with( "timestamp_keys", 600, 30.5 )
+
+    @storage.decr( 'now', ["keys"], 30.5 )
   end
 
   def test_count
@@ -271,4 +289,4 @@ class StorageTest < Test::Unit::TestCase
       assert_equal( nil,  storage.count( ["key_1"] )["key_1"] )
     end
   end
-end
+end

data/test/time_window_drop_collector_test.rb

@@ -51,6 +51,26 @@ class TimeWindowDropCollectorTest < Test::Unit::TestCase
     twdc.drop( "key", 15 )
   end
 
+  def test_pick
+    storage = mock()
+    storage.expects( :decr ).with( "time", ["key"], 1 )
+
+    twdc = TimeWindowDropCollector.new
+    twdc.stubs( :storage ).returns( storage )
+
+    twdc.pick( "time", "key" )
+  end
+
+  def test_pick_with_custom_amount
+    storage = mock()
+    storage.expects( :decr ).with( "time", ["key"], 15 )
+
+    twdc = TimeWindowDropCollector.new
+    twdc.stubs( :storage ).returns( storage )
+
+    twdc.pick( "time", "key", 15 )
+  end
+
   def test_count
     storage = mock()
     storage.expects( :count ).with( ["key"] ).returns( { "key" => 10 } )
@@ -77,10 +97,10 @@ class TimeWindowDropCollectorTest < Test::Unit::TestCase
     assert_equal( 20, twdc.storage.slices )
   end
 
-  def test_integration_drop_and_count
+  def test_integration_drop_and_pick_and_count
     twdc = TimeWindowDropCollector.new { client :mock }
 
-    twdc.drop( "key_1" )
+    ts = twdc.drop( "key_1" )
     twdc.drop( "key_1" )
     twdc.drop( "key_2" )
     twdc.drop( "key_2" )
@@ -97,25 +117,50 @@ class TimeWindowDropCollectorTest < Test::Unit::TestCase
     assert_equal( 2, twdc.count( ["key_1", "key_2"] )["key_1"] )
     assert_equal( 3, twdc.count( ["key_1", "key_2"] )["key_2"] )
     assert_equal( 0, twdc.count( ["key_6"] )["key_6"] )
+
+    twdc.pick(ts, "key_1" )
+    assert_equal( 1, twdc.count( "key_1" ) )
+
+    twdc.pick(ts, "key_2" )
+    assert_equal( 2, twdc.count( "key_2" ) )
+
+    twdc.pick(ts, ["key_2"] )
+    assert_equal( 1, twdc.count( "key_2" ) )
+
+    twdc.pick(ts, ["key_3", "key_4", "key_5"] )
+    assert_equal( 0, twdc.count( "key_3" ) )
+    assert_equal( 0, twdc.count( "key_4" ) )
+    assert_equal( 0, twdc.count( "key_5" ) )
   end
 
-  def test_integration_drop_array_keys
+  def test_integration_drop_and_pick_array_keys
     twdc = TimeWindowDropCollector.new { client :mock }
 
-    twdc.drop( ["key_1", "key_2"] )
+    ts = twdc.drop( ["key_1", "key_2"] )
 
     assert_equal( 1, twdc.count( "key_1" ) )
     assert_equal( 1, twdc.count( "key_2" ) )
+
+    twdc.pick(ts, ["key_1", "key_2"] )
+
+    assert_equal( 0, twdc.count( "key_1" ) )
+    assert_equal( 0, twdc.count( "key_2" ) )
   end
 
-  def test_integration_drop_and_count_with_numerical_keys
+  def test_integration_drop_and_pick_and_count_with_numerical_keys
     twdc = TimeWindowDropCollector.new { client :mock }
 
-    twdc.drop( 1000 )
+    ts = twdc.drop( 1000 )
     twdc.drop( [1001])
 
     assert_equal( 1, twdc.count( 1000 ) )
     assert_equal( 1, twdc.count( 1001 ) )
+
+    twdc.pick( ts, 1000 )
+    twdc.pick( ts, [1001])
+
+    assert_equal( 0, twdc.count( 1000 ) )
+    assert_equal( 0, twdc.count( 1001 ) )
   end
 
   def test_reset

data/time_window_drop_collector.gemspec

@@ -5,8 +5,8 @@ require "time_window_drop_collector/version"
 Gem::Specification.new do |s|
   s.name        = "time_window_drop_collector"
   s.version     = TimeWindowDropCollector::VERSION
-  s.authors     = ["Fernando Guillen", "Carlos Moutinho"]
-  s.email       = ["fguillen.mail@gmail.com", "carlosmoutinho@gmail.com"]
+  s.authors     = ["Fernando Guillen", "Carlos Moutinho", "Krzysztof Jablonski"]
+  s.email       = ["fguillen.mail@gmail.com", "carlosmoutinho@gmail.com", "jablko@gmail.com"]
   s.homepage    = "https://github.com/fguillen/TimeWindowDropCollector"
   s.summary     = "Counter storage system for a concrete time window"
   s.description = "Counter storage system for a concrete time window"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   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"
-  s.add_development_dependency "memcache_mock",   "0.0.1"
+  s.add_development_dependency "memcache_mock",   "0.0.14"
 
   s.add_dependency "dalli"
 end

metadata

@@ -1,117 +1,106 @@
 --- !ruby/object:Gem::Specification
 name: time_window_drop_collector
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Fernando Guillen
 - Carlos Moutinho
+- Krzysztof Jablonski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-    none: false
 - !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.0
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.0
-    none: false
 - !ruby/object:Gem::Dependency
   name: delorean
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
-    none: false
 - !ruby/object:Gem::Dependency
   name: memcache_mock
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
-    none: false
+        version: 0.0.14
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
-    none: false
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: dalli
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Counter storage system for a concrete time window
 email:
 - fguillen.mail@gmail.com
 - carlosmoutinho@gmail.com
+- jablko@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -147,27 +136,26 @@ files:
 - time_window_drop_collector.gemspec
 homepage: https://github.com/fguillen/TimeWindowDropCollector
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: time_window_drop_collector
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Counter storage system for a concrete time window
 test_files:
 - test/config_test.rb
@@ -180,4 +168,3 @@ test_files:
 - test/test_helper.rb
 - test/time_window_drop_collector_test.rb
 - test/wrapper_test.rb
-has_rdoc: