tabs 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5925ee887e482c08b4ae405b4463162a90b41494
-  data.tar.gz: 878be73e42a4c32a58853c61385f71460bbafa60
+  metadata.gz: b55f352f352f83192698497faa68edf9d4980c48
+  data.tar.gz: 21b5c2b6425a43cc4920bc1d8f53a6caf2439c33
 SHA512:
-  metadata.gz: 531f0554860cb6143ee9d8cb29d7362d2111c63324a52ca5cc773f1767a80da58e2bae4680479abf791b024c185275334cc9b07fa7014dd459099af49e2cb4cd
-  data.tar.gz: 62bc646ae94b276fa7a089fe7e88824473b65e9080244be8a54a5ea0f5b064114226d06e82cbf918320c748bbedbfecc545280156c7b0542d2f3f4466f8c7be7
+  metadata.gz: a90941983c522edb2c1b6ba57a36b503e4b91d9ab16967bbfa659f10e279d890345f6c7f5e953efcfbbf7d2cd963f999cad6d84bb8fd6eb1c04238557d597968
+  data.tar.gz: 3929b6792a6d14299826c377f2cf4977e2938297b659ee3131cbe238544a8cab9636f10f361cf11cae1ca868d8b80afe1ebc700f9f13d5e402df42361293af75

data/README.md

@@ -216,7 +216,7 @@ module SecondResolution
   def name
     :seconds
   end
-  
+
   def serialize(timestamp)
     timestamp.strftime(PATTERN)
   end
@@ -229,7 +229,7 @@ module SecondResolution
   def from_seconds(s)
     s / 1
   end
-  
+
   def to_seconds
     1
   end
@@ -337,11 +337,11 @@ You can use the expiration features to age out old metrics that may no longer be
 
 ```ruby
 Tabs.configure do |config|
-	config.set_expirations(minute: 1.day, day: 1.week)
+  config.set_expirations(minute: 1.day, day: 1.week)
 end
 ```
 
-The expiration date will start counting at the beginning at the end of the given resolution.  Meaning that for a month resolution the given expiration time would start at the end of a given month.  A month resolution metric recorded in January with an expiration of 2 weeks would expire after the 2nd week of February.
+The expiration date will start counting at the beginning of the end of the given resolution.  Meaning that for a month resolution the given expiration time would start at the end of a given month.  A month resolution metric recorded in January with an expiration of 2 weeks would expire after the 2nd week of February.
 
 *NOTE: You cannot expire task metrics at this time, only counter and
 values.*
@@ -358,7 +358,7 @@ Tabs.configure do |config|
 
   # pass a config hash that will be passed to Redis.new
   config.redis = { :host => 'localhost', :port => 6379 }
-  
+
   # pass a prefix that will be used in addition to the "tabs" prefix with Redis keys
   # Example: "tabs:my_app:metric_name"
   config.prefix = "my_app"
@@ -372,7 +372,7 @@ Tabs.configure do |config|
 
   # unregisters any resolution
   config.unregister_resolutions(:minute, :hour)
-  
+
   # sets TTL for redis keys of specific resolutions
   config.set_expirations({ minute: 1.hour, hour: 1.day })
 
@@ -431,8 +431,8 @@ continue to use v0.8.1 or lower if that is an issue.
 _WARNING: Version 1.0.0 is not compatible with previous versions of
 Tabs_
 
-We have made a number of changes related to hour metric keys are stored
-in Redis.  At this point we'll be following semantec versioning and will
+We have made a number of changes related to how our metric keys are stored
+in Redis.  At this point we'll be following semantic versioning and will
 support backwards compatability between major versions.  In this release
 we've added a number of major features:
 

data/lib/tabs/tabs.rb

@@ -59,7 +59,13 @@ module Tabs
   end
 
   def counter_total(key)
-    raise UnknownMetricError.new("Unknown metric: #{key}") unless metric_exists?(key)
+    unless metric_exists?(key)
+      if block_given?
+        return yield
+      else
+        raise UnknownMetricError.new("Unknown metric: #{key}")
+      end
+    end
     raise MetricTypeMismatchError.new("Only counter metrics can be incremented") unless metric_type(key) == "counter"
     get_metric(key).total
   end

data/lib/tabs/version.rb

@@ -1,3 +1,3 @@
 module Tabs
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/lib/tabs_spec.rb

@@ -33,6 +33,23 @@ describe Tabs do
 
   end
 
+  describe ".counter_total" do
+
+    it "returns the total for a counter metric" do
+      Tabs.increment_counter("foo")
+      expect(Tabs.counter_total("foo")).to eq 1
+    end
+
+    it "returns the value of the block if given and the metric doesn't exist" do
+      expect(Tabs.counter_total("foo") { 42 }).to eq 42
+    end
+
+    it "raises an UnknownMetricError if no block is given and the metric does not exist" do
+      expect { Tabs.counter_total("foo") }.to raise_error Tabs::UnknownMetricError
+    end
+
+  end
+
   describe ".get_metric" do
 
     it "returns the expected metric object" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - JC Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport