tabs 0.6.1 → 0.6.2

data/README.md

@@ -2,13 +2,14 @@
 
 # Tabs
 
-Tabs is a redis-backed metrics tracker that supports counts, sums, averages, and min/max stats sliceable by the minute, hour, day, week, month, and year.
+Tabs is a redis-backed metrics tracker that supports counts, sums,
+averages, and min/max, and task based stats sliceable by the minute, hour, day, week, month, and year.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'tabs'
+    gem 'tabs', '~> 0.6.1'
 
 And then execute:
 
@@ -28,7 +29,7 @@ type will only be available in v0.6.0 and above.
 
 ## Usage
 
-Metrics come in two flavors: counters and values.
+Metrics come in three flavors: counters, values, and tasks.
 
 ### Counter Metrics
 
@@ -129,7 +130,7 @@ Tabs.complete_task("mobile-to-purchase", "2g4hj17787s")
 Retrieving stats for a task metric is just like the other types:
 
 ```ruby
-Tabs.get_stats("mobile-to-purchase", (Time.now - 6.hours)..Time.now), : minute)
+Tabs.get_stats("mobile-to-purchase", (Time.now - 6.hours)..Time.now), :minute)
 ```
 
 This will return a hash like this:
@@ -139,7 +140,7 @@ This will return a hash like this:
   started: 3,                     #=> number of items started within the period
   completed: 2,                   #=> number of items completed within the period
   completed_within_period: 2,     #=> number started AND completed within the period
-  completion_rate: 0.18,          #=> rate of completion
+  completion_rate: 0.18,          #=> rate of completion in the specified resolution (e.g. :minute)
   average_completion_time: 1.5    #=> average completion time in the specified resolution
 }
 ```

data/lib/tabs/metrics/counter.rb

@@ -31,7 +31,11 @@ module Tabs
       end
 
       def total
-        get("stat:counter:#{key}:total").to_i
+        (get("stat:counter:#{key}:total") || 0).to_i
+      end
+
+      def drop!
+        del_by_prefix("stat:counter:#{key}")
       end
 
       private

data/lib/tabs/metrics/task.rb

@@ -39,6 +39,10 @@ module Tabs
         }
       end
 
+      def drop!
+        del_by_prefix("stat:task:#{key}")
+      end
+
       private
 
       def tokens_for_period(range, resolution, type)

data/lib/tabs/metrics/value.rb

@@ -32,6 +32,10 @@ module Tabs
         filtered_pairs.map { |p| Hash[[p]] }
       end
 
+      def drop!
+        del_by_prefix("stat:value:#{key}")
+      end
+
       private
 
       def update_values(stat_key, value)

data/lib/tabs/storage.rb

@@ -24,10 +24,17 @@ module Tabs
     end
 
     def del(*keys)
+      return 0 if keys.empty?
       prefixed_keys = keys.map { |k| "tabs:#{k}" }
       redis.del(*prefixed_keys)
     end
 
+    def del_by_prefix(pattern)
+      keys = redis.keys("tabs:#{pattern}*")
+      return 0 if keys.empty?
+      redis.del(*keys)
+    end
+
     def incr(key)
       redis.incr("tabs:#{key}")
     end

data/lib/tabs/tabs.rb

@@ -86,13 +86,9 @@ module Tabs
 
   def drop_metric(key)
     raise UnknownMetricError.new("Unknown metric: #{key}") unless metric_exists?(key)
+    metric = get_metric(key)
+    metric.drop!
     hdel "metrics", key
-    Tabs::RESOLUTIONS.each do |resolution|
-      stat_key = "stat:keys:#{key}:#{resolution}"
-      keys = smembers(stat_key)
-      del(keys)
-      del stat_key
-    end
   end
 
   private

data/lib/tabs/version.rb

@@ -1,3 +1,3 @@
 module Tabs
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/lib/tabs/metrics/counter_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe Tabs::Metrics::Counter do
 
+  include Tabs::Storage
+
   let(:metric) { Tabs.create_metric("foo", "counter") }
   let(:now) { Time.utc(2000, 1, 1, 0, 0) }
 
@@ -111,4 +113,33 @@ describe Tabs::Metrics::Counter do
 
   end
 
+  describe ".drop!" do
+
+    before do
+      3.times { metric.increment }
+      expect(exists("stat:counter:foo:total")).to be_true
+      @count_keys = (Tabs::RESOLUTIONS.map do |res|
+        smembers("stat:counter:foo:keys:#{res}")
+      end).flatten
+      metric.drop!
+    end
+
+    it "deletes the counter total key" do
+      expect(exists("stat:counter:foo:total")).to be_false
+    end
+
+    it "deletes all resolution count keys" do
+      @count_keys.each do |key|
+        expect(exists(key)).to be_false
+      end
+    end
+
+    it "deletes all resolution key collection keys" do
+      Tabs::RESOLUTIONS.each do |res|
+        expect(exists("stat:counter:foo:keys:#{res}")).to be_false
+      end
+    end
+
+  end
+
 end

data/spec/lib/tabs/metrics/value_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe Tabs::Metrics::Value do
 
+  include Tabs::Storage
+
   let(:metric) { Tabs.create_metric("foo", "value") }
   let(:now) { Time.utc(2000, 1, 1, 0, 0) }
 
@@ -82,4 +84,28 @@ describe Tabs::Metrics::Value do
 
   end
 
+  describe ".drop!" do
+
+    before do
+      3.times { metric.record(rand(30)) }
+      @count_keys = (Tabs::RESOLUTIONS.map do |res|
+        smembers("stat:value:foo:keys:#{res}")
+      end).flatten
+      metric.drop!
+    end
+
+    it "deletes all resolution count keys" do
+      @count_keys.each do |key|
+        expect(exists(key)).to be_false
+      end
+    end
+
+    it "deletes all resolution key collection keys" do
+      Tabs::RESOLUTIONS.each do |res|
+        expect(exists("stat:value:foo:keys:#{res}")).to be_false
+      end
+    end
+
+  end
+
 end

data/spec/lib/tabs_spec.rb

@@ -74,15 +74,18 @@ describe Tabs do
     it "removes the metric from the list_metrics" do
       Tabs.drop_metric("foo")
       expect(Tabs.list_metrics).to_not include("foo")
+    end
+
+    it "results in metric_exists? returning false" do
+      Tabs.drop_metric("foo")
       expect(Tabs.metric_exists?("foo")).to be_false
     end
 
-    it "removes the metrics values from redis" do
-      Tabs.increment_counter("foo")
-      keys = smembers("tabs:stat:keys:foo:hour")
-      expect(redis.keys).to include("tabs:stat:counter:foo:keys:hour")
+    it "calls drop! on the metric" do
+      metric = stub(:metric)
+      Tabs.stub(get_metric: metric)
+      metric.should_receive(:drop!)
       Tabs.drop_metric("foo")
-      expect(redis.keys).to_not include(keys[0])
     end
 
   end
@@ -144,13 +147,21 @@ describe Tabs do
 
   describe "#metric_type" do
 
-    it "returns the type of a given metric" do
+    it "returns the type of a counter metric" do
       Tabs.create_metric("foo", "counter")
-      Tabs.create_metric("bar", "value")
       expect(Tabs.metric_type("foo")).to eq("counter")
+    end
+
+    it "returns the type of a value metric" do
+      Tabs.create_metric("bar", "value")
       expect(Tabs.metric_type("bar")).to eq("value")
     end
 
+    it "returns the type of a task metric" do
+      Tabs.create_metric("baz", "task")
+      expect(Tabs.metric_type("baz")).to eq("task")
+    end
+
   end
 
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: tabs
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
+  prerelease: 
 platform: ruby
 authors:
 - JC Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -162,7 +179,6 @@ files:
 - tabs.gemspec
 homepage: https://github.com/thegrubbsian/tabs
 licenses: []
-metadata: {}
 post_install_message: ! '**** NOTICE ****
 
   Please note there are breaking changes in this version of tabs!
@@ -176,20 +192,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A redis-backed metrics tracker for keeping tabs on pretty much anything ;)
 test_files:
 - spec/lib/tabs/metrics/counter_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGVkZDU2ZjE2NzVjMDFiNjRjZDVmZWQyODQzNmE0MzZmMWE3MzRkZA==
-  data.tar.gz: !binary |-
-    ZThhYTI3ODI5ZGNhM2M5ZmU2MWE4YTg0YzljOTQ3NDIyNDg1Njc4YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDJjNzY3YzM5MTAyYmJkOWUyYWMwYmNhYmU0YWY2YjcwYWJmMjQ2ZWRiZGZj
-    MDU0MjU2MzJiMTE5NzNlMDcwMzY0YmI2MTJmNzg5YzdmMmIyMjdkMjg5NjAz
-    ZDJiMjExMjNhNGI2YjY3MWJmNjg0ODJjODk3Mjc0ZjJhM2QxYjc=
-  data.tar.gz: !binary |-
-    M2U3MDczNmZhNjJhYzE5MDA2NzlkMzliYjQ0MzBmOWUxNmVmNDU0Zjc0MWRk
-    ZWNiNDVmOTEzNDdjMzQ3YWRlMzRkNGI2ZTk3MWYyNmYwYTk5MjMyYzVkNDQ3
-    OTRlZjA1ZTIzYzY0ZjQ5ZTljNjQ2MGZiYTkwMTkwYmVhNzZmMDg=