snappy_stats 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
 script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in snappy_stats.gemspec
 gemspec
+group :development, :test do
+  gem 'fakeredis', :git => 'git://github.com/guilleiguaran/fakeredis.git', :ref =>'c2ad4ee'
+end

data/lib/snappy_stats/config.rb

@@ -1,15 +1,14 @@
-module SnappyStats
-  module Config
-    extend self
+class SnappyStats
+  class Config
     
     attr_accessor :namespace
     attr_accessor :raise_connection_errors
     
-    def init!  
+    def initialize(options = {})
       # all keys are prefixed with this namespace
-      self.namespace = 'stats'
+      @namespace = 'stats'
       # rescue Redis connection errors
-      self.raise_connection_errors = false      
+      @raise_connection_errors = false      
     end
 
     # Set the Redis connection to use

data/lib/snappy_stats/version.rb

@@ -1,3 +1,3 @@
-module SnappyStats
-  VERSION = "0.0.3"
+class SnappyStats
+  VERSION = "0.0.4"
 end

data/lib/snappy_stats.rb

@@ -4,7 +4,7 @@ require 'redis'
 require 'active_support/time'
 require 'snappy_stats/config'
 
-module SnappyStats
+class SnappyStats
 
   GRANULARITIES = {
 		# Available for 24 hours
@@ -12,90 +12,94 @@ module SnappyStats
       size:   1440,
       ttl:    172800,
       factor: 60
-		},
-    hour: {
+      },
+      hour: {
     # Available for 7 days
-      size:   168,
-      ttl:    1209600,
-      factor: 3600
-		},
+    size:   168,
+    ttl:    1209600,
+    factor: 3600
+    },
     day: {
     # Available for 24 months
-      size:   365,
-      ttl:    63113880,
-      factor: 86400
-    }  
- 	}
-
- 	def self.hash_key
- 		"#{SnappyStats.config.namespace}"
- 	end
-
-  def self.configure
-    yield(config)
-  end
+    size:   365,
+    ttl:    63113880,
+    factor: 86400
+  }  
+}
 
-  def self.config
-    Config
-  end
+attr_accessor :config
 
-  def self.connection
-    @connection ||= config.redis
-  end
-  
-  def self.getSecondsTimestamp
-    Time.now.getutc.to_i
-  end
+def initialize(options = {})
+ @config = SnappyStats::Config.new
+ @config.redis = options[:redis]
+end
 
-  def self.getRoundedTimestamp( ts , precision )
-    ts = ts || self.getSecondsTimestamp
-    precision = precision || 1
-    ( ts / precision ).floor * precision
-  end
-  
-  def self.getFactoredTimestamp( ts_seconds, factor )
-    ts_seconds = ts_seconds ||  self.getSecondsTimestamp
-    ( ts_seconds / factor ).floor * factor
-  end
-  
-  def self.recordHitNow(key)
-    self.recordHit(Time.now.utc.to_i, key)
+def hash_key
+ "#{config.namespace}"
+end
+
+def configure
+  yield(config)
+end
+
+def connection
+  @connection ||= config.redis
+end
+
+def getSecondsTimestamp
+  Time.now.getutc.to_i
+end
+
+def getRoundedTimestamp( ts , precision )
+  ts = ts || self.getSecondsTimestamp
+  precision = precision || 1
+  ( ts / precision ).floor * precision
+end
+
+def getFactoredTimestamp( ts_seconds, factor )
+  ts_seconds = ts_seconds ||  self.getSecondsTimestamp
+  ( ts_seconds / factor ).floor * factor
+end
+
+def recordHitNow(key)
+  recordHit(Time.now.utc.to_i, key)
+end
+
+def recordHit( time, key )
+  GRANULARITIES.keys.each do | gran |
+    granularity = GRANULARITIES[gran]
+    size = granularity[:size]
+    factor = granularity[:factor]
+    ttl = granularity[:ttl]
+    tsround = getRoundedTimestamp(time, size * factor)
+    redis_key = "#{hash_key}:#{key}:#{gran}:#{tsround}"
+    ts = getFactoredTimestamp time, factor
+    connection.pipelined{
+      connection.hincrby redis_key, ts, 1     
+      connection.expireat redis_key, tsround + ttl      
+    }
   end
+end
+
+def get(gran, from, to, key)      
+  granularity = GRANULARITIES[gran]
+  size = granularity[:size]
+  factor = granularity[:factor]
+
+  from = getFactoredTimestamp( from, factor )
+  to   = getFactoredTimestamp( to, factor )
 
-  def self.recordHit( time, key )
-    GRANULARITIES.keys.each do | gran |
-      granularity = GRANULARITIES[gran]
-      size = granularity[:size]
-      factor = granularity[:factor]
-      ttl = granularity[:ttl]
-      tsround = SnappyStats.getRoundedTimestamp(time, size * factor)
-      redis_key = "#{hash_key}:#{key}:#{gran}:#{tsround}"
-      ts = getFactoredTimestamp time, factor      
-      SnappyStats.connection.hincrby redis_key, ts, 1     
-      SnappyStats.connection.expireat redis_key, tsround + ttl      
-    end
+  ts = from
+  i = 0
+  results = {}
+  while ts <= to        
+    tsround = getRoundedTimestamp( ts, size * factor )
+    redis_key  = "#{hash_key}:#{key}:#{gran}:#{tsround}"
+    results[ts] = connection.hget( redis_key, ts )
+    i = i+1 
+    ts = ts + GRANULARITIES[gran][:factor]
   end
+  results
+end
 
-    def self.get(gran, from, to, key)      
-      granularity = GRANULARITIES[gran]
-      size = granularity[:size]
-      factor = granularity[:factor]
-
-      from = self.getFactoredTimestamp( from, factor )
-      to   = self.getFactoredTimestamp( to, factor )
-      
-      ts = from
-      i = 0
-      results = {}
-      while ts <= to        
-        tsround = getRoundedTimestamp( ts, size * factor )
-        redis_key  = "#{hash_key}:#{key}:#{gran}:#{tsround}"
-        results[ts] = SnappyStats.connection.hget( redis_key, ts )
-        i = i+1 
-        ts = ts + GRANULARITIES[gran][:factor]
-      end
-      results
-    end
-
-    config.init!
 end

data/spec/snappy_stats_spec.rb

@@ -1,50 +1,69 @@
 require 'spec_helper'
 
+require_relative '../lib/snappy_stats'
 describe SnappyStats do
 
-	before(:all) do
+	before(:each) do
+    redis = Redis.new
+    $snappy_stats = SnappyStats.new(:redis => redis)
 		#Redis::Connection.drivers.delete_if {|x| Redis::Connection::Memory == x }
-		keys = SnappyStats.connection.keys("stats:*")
-		keys.each { | key | SnappyStats.connection.del(key) }
+		keys = $snappy_stats.connection.keys("stats:*")
+		keys.each { | key | $snappy_stats.connection.del(key) }
 	end
 
   it "Calculates ts in seconds" do
     Timecop.freeze(Time.local(2013, 01, 01, 01, 01))
-    time = SnappyStats.getSecondsTimestamp
+    time =  $snappy_stats.getSecondsTimestamp
   	expect(time).to be 1357002060  	
-  	default_rounded = SnappyStats.getRoundedTimestamp(nil, 60)
+  	default_rounded =  $snappy_stats.getRoundedTimestamp(nil, 60)
   	expect(default_rounded).to be 1357002060  	  	
   	time = 1364833411 
-  	rounded = SnappyStats.getRoundedTimestamp(time, 60)
+  	rounded =  $snappy_stats.getRoundedTimestamp(time, 60)
   	expect(rounded).to be 1364833380 
   end
 
-  it "Records a hit at all granularities" do
-      pending("Need updated version of fakeredis with correct hincrby implementation")  	
+  it "Records a hit at all granularities" do    
     Timecop.freeze
     now = Time.now        
+    starting_hour = Time.now.beginning_of_hour.to_i
     5.times do 
-        SnappyStats.recordHitNow("test:counter1")
+        $snappy_stats.recordHitNow("test:counter1")
     end
     3.times do 
-        SnappyStats.recordHitNow("test:counter2")
+        $snappy_stats.recordHitNow("test:counter2")
     end       
     Timecop.freeze(now + 2.days) 
     2.times do 
-        SnappyStats.recordHitNow("test:counter1")
+        $snappy_stats.recordHitNow("test:counter1")
     end
     from = now.midnight.to_i
     to = (now.midnight + 2.day).to_i
-    daily_user1_stat = SnappyStats.get(:day,from,to,"test:counter1")
+    daily_user1_stat = $snappy_stats.get(:day,from,to,"test:counter1")
     Timecop.freeze(now + 1.day)
-    puts daily_user1_stat
     expect(daily_user1_stat[from]).to eq("5")
-    hourly_user1_stat = SnappyStats.get(:hour,from,to,"test:counter1")
-    expect(hourly_user1_stat[ Time.now.beginning_of_hour.to_i]).to eq("5")
-    daily_user2_stat = SnappyStats.get(:day,from,to,"test:counter2")
+    hourly_user1_stat = $snappy_stats.get(:hour,from,to,"test:counter1")
+    expect(hourly_user1_stat[ starting_hour.to_i]).to eq("5")
+    daily_user2_stat = $snappy_stats.get(:day,from,to,"test:counter2")
     expect(daily_user2_stat[from]).to eq("3")    
   end
 
+  it "can have two versions at same time" do
+    redis1 = Redis.new(db: 1)  
+    $snappy_stats_eu =  SnappyStats.new(:redis => redis1)
+    from = Time.now.midnight.to_i
+    to = (Time.now.midnight + 2.day).to_i
+    500.times do 
+        $snappy_stats.recordHitNow("test:counter1")
+    end
+    250.times do 
+        $snappy_stats_eu.recordHitNow("test:counter2")
+    end    
+    user1_stats = $snappy_stats.get(:day,from,to,"test:counter1")
+    expect(user1_stats[from]).to eq("500")
+    user2_stats = $snappy_stats_eu.get(:day,from,to,"test:counter2")
+    expect(user2_stats[from]).to eq("250")
+  end
+
   after(:each) do
     	Timecop.return
   end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'snappy_stats' # and any other gems you need
+# and any other gems you need
 require 'fakeredis'
 require 'timecop'
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snappy_stats
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport