time_window_drop_collector 0.0.9 → 0.0.11

data/README.md

@@ -14,6 +14,13 @@ You can also keep record for **different keys**.
 
 ### Config
 
+    twdc =
+      TimeWindowDropCollector.new do
+        client <client>, <client_opts>     # underneeth client
+        window <seconds>                   # in seconds
+        slices <num of slices>             # one slice every minute
+      end
+
 These are the default values
 
     twdc =
@@ -23,14 +30,23 @@ These are the default values
         slices 10                               # one slice every minute
       end
 
+#### Client
+Can be:
+
+* :memcache
+* :redis
+* :rails
+* :mock
+
 ### Use
 
     twdc.drop( "id1" )
     twdc.drop( "id1" )
     twdc.drop( "id2" )
-    twdc.drop( ["id1", "id2"] )
+    twdc.drop( "id1" )
 
     twdc.count( "id1" )  # => 3
+    twdc.count( "id2" )  # => 1
 
     # after 10 minutes
     twdc.count( "id1" )  # => 0
@@ -64,5 +80,3 @@ It uses the `Rails.cache` accesible
       TimeWindowDropCollector.new do
         client :redis, { :host => "host", :port => "port" }
       end
-
-At the moment this wrapper does not support auto-key-clean so the stored keys will be there until anyone delete them.

data/lib/time_window_drop_collector/config.rb

@@ -5,8 +5,8 @@ module TimeWindowDropCollector::Config
     @opts
   end
 
-  def self.client( type, *opts )
-    @opts[:client] = type
+  def self.client( type, opts=nil )
+    @opts[:client]      = type
     @opts[:client_opts] = opts
   end
 

data/lib/time_window_drop_collector/version.rb

@@ -1,3 +1,3 @@
 class TimeWindowDropCollector
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

data/lib/time_window_drop_collector/wrappers/memcache.rb

@@ -4,7 +4,7 @@ class TimeWindowDropCollector
       attr_reader :client
 
       def initialize( opts )
-        @client = Dalli::Client.new( *opts )
+        @client = Dalli::Client.new( opts )
       end
 
       def incr( key, expire_time )

data/lib/time_window_drop_collector/wrappers/redis.rb

@@ -4,11 +4,14 @@ class TimeWindowDropCollector
   		attr_reader :client
 
       def initialize( opts )
-        @client = ::Redis.new( *opts )
+        @client = ::Redis.new( opts )
       end
 
   		def incr( key, expire_time )
-  			client.incr( key )
+        client.multi do
+          client.incr( key )
+          client.expire( key, expire_time )
+        end
   		end
 
   		def values_for( keys )

data/test/config_test.rb

@@ -8,16 +8,16 @@ class ConfigTest < Test::Unit::TestCase
   def test_config
     proc =
       Proc.new do
-        client "client", "client_opt1", "client_opt2"
+        client "client", "client_opt1"
         window "window"
         slices "slices"
       end
 
     config = TimeWindowDropCollector::Config.extract( proc )
 
-    assert_equal( "client", config[:client] )
-    assert_equal( ["client_opt1", "client_opt2"], config[:client_opts] )
-    assert_equal( "window", config[:window] )
-    assert_equal( "slices", config[:slices] )
+    assert_equal( "client",      config[:client] )
+    assert_equal( "client_opt1", config[:client_opts] )
+    assert_equal( "window",      config[:window] )
+    assert_equal( "slices",      config[:slices] )
   end
 end

data/test/redis_wrapper_test.rb

@@ -1,26 +1,47 @@
 require_relative "test_helper"
 
-class Redis
-  def initialize( *opts )
+class RedisMock
+  def multi(&block)
+    yield
   end
+  def incr(key);end
+  def expire(key);end
+  def mget(keys);end
 end
 
-class MemcacheWrapperTest < Test::Unit::TestCase
+class RedisWrapperTest < Test::Unit::TestCase
   def test_initialize
-    Redis.expects( :new ).with( "arg1", "arg2" ).returns( "client" )
+    Redis.expects( :new ).with( ["arg1", "arg2"] ).returns( "client" )
     wrapper = TimeWindowDropCollector::Wrappers::Redis.new( ["arg1", "arg2"] )
+
     assert_equal( "client", wrapper.client )
   end
 
   def test_incr
-    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( ["arg1"] )
+    Redis.expects( :new ).returns( RedisMock.new )
+    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
+
     wrapper.client.expects( :incr ).with( "key" )
+    wrapper.client.expects( :expire ).with( "key", "expire_time" )
+
     wrapper.incr( "key", "expire_time" )
   end
 
+  def test_incr_agregates_commands_under_multi
+    Redis.expects( :new ).returns( RedisMock.new )
+    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
+
+    wrapper.client.expects( :multi )
+
+    wrapper.incr( nil, nil )
+  end
+
   def test_values_for
-    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( ["arg1"] )
+    Redis.expects( :new ).returns( RedisMock.new )
+    wrapper = TimeWindowDropCollector::Wrappers::Redis.new( nil )
+
     wrapper.client.expects( :mget ).with( "key1", "key2" ).returns( [1, 2] )
+
     assert_equal( [1, 2], wrapper.values_for( ["key1", "key2"] ))
   end
 end

data/test/test_helper.rb

@@ -12,5 +12,4 @@ class Rails
 end
 
 class Redis
-end
-
+end

data/test/wrapper_test.rb

@@ -12,6 +12,7 @@ class WrapperTest < Test::Unit::TestCase
   end
 
   def test_instance_when_redis
+    Redis.stubs( :new )
     instance = TimeWindowDropCollector::Wrapper.instance( :redis, ["server", "port"] )
     assert( instance.is_a? TimeWindowDropCollector::Wrappers::Redis )
   end

data/time_window_drop_collector.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = TimeWindowDropCollector::VERSION
   s.authors     = ["Fernando Guillen", "Carlos Moutinho"]
   s.email       = ["fguillen.mail@gmail.com", "carlosmoutinho@gmail.com"]
-  s.homepage    = ""
+  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"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_window_drop_collector
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70157926140260 !ruby/object:Gem::Requirement
+  requirement: &70114503076580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *70157926140260
+  version_requirements: *70114503076580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70157926139320 !ruby/object:Gem::Requirement
+  requirement: &70114503076080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70157926139320
+  version_requirements: *70114503076080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70157926138400 !ruby/object:Gem::Requirement
+  requirement: &70114503075620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70157926138400
+  version_requirements: *70114503075620
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70157926137380 !ruby/object:Gem::Requirement
+  requirement: &70114503075160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70157926137380
+  version_requirements: *70114503075160
 - !ruby/object:Gem::Dependency
   name: memcache_mock
-  requirement: &70157926136620 !ruby/object:Gem::Requirement
+  requirement: &70114503074700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70157926136620
+  version_requirements: *70114503074700
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70157926136060 !ruby/object:Gem::Requirement
+  requirement: &70114503074320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157926136060
+  version_requirements: *70114503074320
 description: Counter storage system for a concrete time window
 email:
 - fguillen.mail@gmail.com
@@ -113,7 +113,7 @@ files:
 - test/time_window_drop_collector_test.rb
 - test/wrapper_test.rb
 - time_window_drop_collector.gemspec
-homepage: ''
+homepage: https://github.com/fguillen/TimeWindowDropCollector
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -125,18 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2014524579348861300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2014524579348861300
 requirements: []
 rubyforge_project: time_window_drop_collector
 rubygems_version: 1.8.15