tabs 0.9.0 → 0.9.1

data/README.md

@@ -1,4 +1,4 @@
-![Travis Status](https://api.travis-ci.org/thegrubbsian/tabs.png)
+![Travis Status](https://api.travis-ci.org/devmynd/tabs.png)
 
 # Tabs
 
@@ -226,6 +226,10 @@ module SecondResolution
     s / 1
   end
 
+  def add(timestamp, num_of_seconds)
+    timestamp + num_of_seconds.seconds
+  end
+
   def normalize(ts)
     Time.utc(ts.year, ts.month, ts.day, ts.hour, ts.min, ts.sec)
   end
@@ -245,6 +249,9 @@ into an actual DateTime value.
 *`from_seconds`*: should return the number of periods in the given
 number of seconds.  For example, there are 60 seconds in a minute.
 
+*`add`*: should add the number of seconds in the given resolution to the
+supplied timestamp.
+
 *`normalize`*: should simply return the first timestamp for the period.
 For example, the week resolution returns the first hour of the first day
 of the week.

data/lib/tabs/helpers.rb

@@ -7,7 +7,7 @@ module Tabs
       dt = period.first
       [].tap do |arr|
         arr << dt
-        while (dt = dt + 1.send(resolution)) <= period.last
+        while (dt = Tabs::Resolution.add(resolution, dt, 1)) <= period.last
           arr << dt.utc
         end
       end

data/lib/tabs/resolution.rb

@@ -1,5 +1,6 @@
 module Tabs
   module Resolution
+    extend Resolutionable
     extend self
 
     def register(resolution, klass)
@@ -19,6 +20,10 @@ module Tabs
       resolution_klass(resolution).from_seconds(s)
     end
 
+    def add(resolution, ts, num)
+      resolution_klass(resolution).add(ts, num)
+    end
+
     def normalize(resolution, timestamp)
       resolution_klass(resolution).normalize(timestamp)
     end

data/lib/tabs/resolutionable.rb

@@ -2,22 +2,24 @@ module Tabs
   module Resolutionable
     extend self
 
-    class MethodNotImplementedException < Exception; end
-
     def serialize
-      raise MethodNotImplementedException
+      raise "Must implement serialize in the concrete resolution module"
     end
 
     def deserialize
-      raise MethodNotImplementedException
+      raise "Must implement deserialize in the concrete resolution module"
     end
 
     def from_seconds
-      raise MethodNotImplementedException
+      raise "Must implement from_seconds in the concrete resolution module"
+    end
+
+    def add
+      raise "Must implement to_seconds in the concrete resolution module"
     end
 
     def normalize
-      raise MethodNotImplementedException
+      raise "Must implement normalize in the concrete resolution module"
     end
   end
 end

data/lib/tabs/resolutions/day.rb

@@ -16,7 +16,11 @@ module Tabs
       end
 
       def from_seconds(s)
-        s / 86400
+        s / 1.day
+      end
+
+      def add(ts, num)
+        ts + num.days
       end
 
       def normalize(ts)

data/lib/tabs/resolutions/hour.rb

@@ -16,7 +16,11 @@ module Tabs
       end
 
       def from_seconds(s)
-        s / 3600
+        s / 1.hour
+      end
+
+      def add(ts, num)
+        ts + num.hours
       end
 
       def normalize(ts)

data/lib/tabs/resolutions/minute.rb

@@ -16,7 +16,11 @@ module Tabs
       end
 
       def from_seconds(s)
-        s / 60.0
+        s / 1.minute
+      end
+
+      def add(ts, num)
+        ts + num.minutes
       end
 
       def normalize(ts)

data/lib/tabs/resolutions/month.rb

@@ -16,7 +16,11 @@ module Tabs
       end
 
       def from_seconds(s)
-        s / 1728000
+        s / 1.month
+      end
+
+      def add(ts, num)
+        ts + num.months
       end
 
       def normalize(ts)

data/lib/tabs/resolutions/week.rb

@@ -17,8 +17,12 @@ module Tabs
         self.normalize(dt)
       end
 
-      def from_seconds(s)
-        s / 432000
+      def seconds(s)
+        s / 1.week
+      end
+
+      def add(ts, num)
+        ts + num.weeks
       end
 
       def normalize(ts)

data/lib/tabs/resolutions/year.rb

@@ -16,7 +16,11 @@ module Tabs
       end
 
       def from_seconds(s)
-        s / 31536000
+        s / 1.year
+      end
+
+      def add(ts, num)
+        ts + num.years
       end
 
       def normalize(ts)

data/lib/tabs/version.rb

@@ -1,3 +1,3 @@
 module Tabs
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/lib/tabs/resolution_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
-require File.expand_path('../../../support/custom_resolutions', __FILE__)
+require "spec_helper"
+require File.expand_path("../../../support/custom_resolutions", __FILE__)
 
 describe Tabs::Resolution do
-  describe '#register' do
-    it 'registers a new resolution' do
+  describe "#register" do
+    it "registers a new resolution" do
       Tabs::Resolution.register(:test, Tabs::Resolutions::Minute)
       expect(Tabs::Resolution.all).to include :test
     end
 
-    context 'with a custom resolution' do
-      it 'does not return nil' do
+    context "with a custom resolution" do
+      it "does not return nil" do
         expect(WellFormedResolution.serialize(Time.now)).to_not be_nil
       end
 
-      it 'gets stats for custom resolution' do
+      it "gets stats for custom resolution" do
         Tabs::Resolution.register(:seconds, WellFormedResolution)
         Timecop.freeze(Time.now)
 
-        Tabs.increment_counter('foo')
-        expect(Tabs.get_stats('foo', (Time.now - 5.seconds..Time.now), :seconds).values.size).to eq(6)
+        Tabs.increment_counter("foo")
+        expect(Tabs.get_stats("foo", (Time.now - 5.seconds..Time.now), :seconds).values.size).to eq(6)
       end
 
-      it 'raises an error when method not implemented' do
-        expect{BadlyFormedResolution.normalize}.to raise_error Tabs::Resolutionable::MethodNotImplementedException
+      it "raises an error when method not implemented" do
+        expect{BadlyFormedResolution.normalize}.to raise_error
       end
     end
   end

data/spec/support/custom_resolutions.rb

@@ -22,6 +22,10 @@ module WellFormedResolution
     s / 1
   end
 
+  def add(ts, num)
+    ts + num.seconds
+  end
+
   def normalize(ts)
     Time.utc(ts.year, ts.month, ts.day, ts.hour, ts.min, ts.sec)
   end

data/tabs.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["jc.grubbs@devmynd.com"]
   gem.description   = %q{A redis-backed metrics tracker for keeping tabs on pretty much anything ;)}
   gem.summary       = %q{A redis-backed metrics tracker for keeping tabs on pretty much anything ;)}
-  gem.homepage      = "https://github.com/thegrubbsian/tabs"
+  gem.homepage      = "https://github.com/devmynd/tabs"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabs
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -169,7 +169,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/custom_resolutions.rb
 - tabs.gemspec
-homepage: https://github.com/thegrubbsian/tabs
+homepage: https://github.com/devmynd/tabs
 licenses: []
 post_install_message: ! 'Tabs v0.8.0 - BREAKING CHANGES: