streak 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.3.0 (2012-07-06)
+
+* Use of Redis hashes to store data.
+* Added `remove_all_statistics(id)` method to remove all streak data for a given ID.
+
 ## 0.2.0 (2012-07-02)
 
 * You can now pass a custom set of keys to be used in the `aggregate` call if you want to

data/README.md

@@ -90,6 +90,8 @@ Streak.reset_statistics('david')
 Streak.reset_statistics('david', custom_keys.values)
 ```
 
+You can remove all data for a given ID using the `remove_all_statistics(id)` method.
+
 ## Contributing
 
 1. Fork it

data/lib/streak/collector.rb

@@ -15,35 +15,35 @@ module Streak
     def aggregate(id, count, keys = keys_for_aggregate)
       if count >= 0
         previous_data = Streak.redis.multi do |transaction|
-          transaction.get("#{Streak.namespace}:#{keys[:positive_key]}:#{id}")
-          transaction.get("#{Streak.namespace}:#{keys[:positive_streak_key]}:#{id}")
+          transaction.hget("#{Streak.namespace}:#{id}", keys[:positive_key])
+          transaction.hget("#{Streak.namespace}:#{id}", keys[:positive_streak_key])
         end
 
         previous_wins = previous_data[0].to_i
         previous_streak = previous_data[1].to_i
 
         Streak.redis.multi do |transaction|
-          transaction.set("#{Streak.namespace}:#{keys[:positive_streak_key]}:#{id}", [previous_wins + count, previous_streak].max)
-          transaction.incrby("#{Streak.namespace}:#{keys[:positive_key]}:#{id}", count.abs)
-          transaction.incrby("#{Streak.namespace}:#{keys[:positive_total_key]}:#{id}", count.abs)
-          transaction.set("#{Streak.namespace}:#{keys[:negative_key]}:#{id}", 0)
-          transaction.incrby("#{Streak.namespace}:#{keys[:total_key]}:#{id}", count.abs)
+          transaction.hset("#{Streak.namespace}:#{id}", keys[:positive_streak_key], [previous_wins + count, previous_streak].max)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:positive_key], count.abs)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:positive_total_key], count.abs)
+          transaction.hset("#{Streak.namespace}:#{id}", keys[:negative_key], 0)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:total_key], count.abs)
         end
       else
         previous_data = Streak.redis.multi do |transaction|
-          transaction.get("#{Streak.namespace}:#{keys[:negative_key]}:#{id}")
-          transaction.get("#{Streak.namespace}:#{keys[:negative_streak_key]}:#{id}")
+          transaction.hget("#{Streak.namespace}:#{id}", keys[:negative_key])
+          transaction.hget("#{Streak.namespace}:#{id}", keys[:negative_streak_key])
         end
 
         previous_losses = previous_data[0].to_i
         previous_streak = previous_data[1].to_i
 
         Streak.redis.multi do |transaction|
-          transaction.set("#{Streak.namespace}:#{keys[:negative_streak_key]}:#{id}", [previous_losses + count.abs, previous_streak].max)
-          transaction.incrby("#{Streak.namespace}:#{keys[:negative_key]}:#{id}", count.abs)
-          transaction.incrby("#{Streak.namespace}:#{keys[:negative_total_key]}:#{id}", count.abs)
-          transaction.set("#{Streak.namespace}:#{keys[:positive_key]}:#{id}", 0)
-          transaction.incrby("#{Streak.namespace}:#{keys[:total_key]}:#{id}", count.abs)
+          transaction.hset("#{Streak.namespace}:#{id}", keys[:negative_streak_key], [previous_losses + count.abs, previous_streak].max)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:negative_key], count.abs)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:negative_total_key], count.abs)
+          transaction.hset("#{Streak.namespace}:#{id}", keys[:positive_key], 0)
+          transaction.hincrby("#{Streak.namespace}:#{id}", keys[:total_key], count.abs)
         end
       end
     end
@@ -62,7 +62,7 @@ module Streak
     def statistics(id, keys = [Streak.positive_key, Streak.positive_total_key, Streak.positive_streak_key, Streak.negative_key, Streak.negative_total_key, Streak.negative_streak_key, Streak.total_key])
       values = Streak.redis.multi do |transaction|
         keys.each do |key|
-          transaction.get("#{Streak.namespace}:#{key}:#{id}")
+          transaction.hget("#{Streak.namespace}:#{id}", key)
         end
       end.map(&:to_i)
 
@@ -76,11 +76,18 @@ module Streak
     def reset_statistics(id, keys = [Streak.positive_key, Streak.positive_total_key, Streak.positive_streak_key, Streak.negative_key, Streak.negative_total_key, Streak.negative_streak_key, Streak.total_key])
       Streak.redis.multi do |transaction|
         keys.each do |key|
-          transaction.set("#{Streak.namespace}:#{key}:#{id}", 0)
+          transaction.hset("#{Streak.namespace}:#{id}", key, 0)
         end
       end
     end
 
+    # Remove all the statistics for a given +id+.
+    #
+    # @param id [String] ID.
+    def remove_all_statistics(id)
+      Streak.redis.del("#{Streak.namespace}:#{id}")
+    end
+
     private
 
     def keys_for_aggregate

data/lib/streak/version.rb

@@ -1,3 +1,3 @@
 module Streak
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/spec_helper.rb

@@ -21,6 +21,6 @@ RSpec.configure do |config|
   end
 
   def streak_value_for(key, id)
-    Streak.redis.get("#{Streak.namespace}:#{key}:#{id}").to_i
+    Streak.redis.hget("#{Streak.namespace}:#{id}", key).to_i
   end
 end

data/spec/streak/collector_spec.rb

@@ -110,4 +110,20 @@ describe Streak::Collector do
       Streak.statistics('david', custom_keys.values).should == {:kills => 0, :kills_total => 0, :kills_streak => 0, :deaths => 0, :deaths_total => 0, :deaths_streak => 0, :kills_deaths_total => 0}
     end
   end
+
+  describe '#remove_all_statistics' do
+    it 'should remove all the statistics for a given ID' do
+      Streak.aggregate('david', 3)
+      Streak.aggregate('david', -2)
+      Streak.aggregate('david', 5)
+      Streak.aggregate('david', -1)
+
+      Streak.statistics('david').should == {:wins => 0, :wins_total => 8, :wins_streak => 5, :losses => 1, :losses_total => 3, :losses_streak => 2, :total => 11}
+
+      Streak.remove_all_statistics('david')
+      Streak.statistics('david').should == {:wins => 0, :wins_total => 0, :wins_streak => 0, :losses => 0, :losses_total => 0, :losses_streak => 0, :total => 0}
+
+      Streak.redis.exists("#{Streak.namespace}:david").should be_false
+    end
+  end
 end

data/spec/streak/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'Streak::VERSION' do
   it 'should be the correct version' do
-    Streak::VERSION.should == '0.2.0'
+    Streak::VERSION.should == '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streak
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70182212219520 !ruby/object:Gem::Requirement
+  requirement: &2152469960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182212219520
+  version_requirements: *2152469960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70182212218380 !ruby/object:Gem::Requirement
+  requirement: &2152469080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182212218380
+  version_requirements: *2152469080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70182212217580 !ruby/object:Gem::Requirement
+  requirement: &2152468280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182212217580
+  version_requirements: *2152468280
 description: Streak is a gem for calculating win/loss streaks
 email:
 - me@davidczarnecki.com
@@ -80,18 +80,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3197324458808714618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3197324458808714618
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15