event-counter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed77b0f7b2996138e3c7125f506022dbfb1b4f6
-  data.tar.gz: 703501bc075661a7ef2584740ec9163450a591ed
+  metadata.gz: 0bd855f0622ba4699ac98ae5f11d635fff270bbc
+  data.tar.gz: 996454629b26cf7eb0ce21338f5a5c443fd79713
 SHA512:
-  metadata.gz: d71bb461d356f61d8c0afd1718886e0e2be6b507ea1e0994e95b25c2370495921a14167d75a4e702730a8dac9ce5a5daeb2fc759c553e0f9a6265a68fdf2b4a0
-  data.tar.gz: aa7d2d7006bee6837fc7fd8440fa11f5e38148e7e478024f1a25f10285cbe3808c5558d0c5e1ab0c7ad8731371545021460293155339851b2e51cb976b759559
+  metadata.gz: 16a2277eeb66b50ca1110700ab4fc40497714b5fd928599e4310da1055ff62e38b44a4db6cd004f447bea28169219bb628f1a32c43265bd8e74f404a20a423f3
+  data.tar.gz: c67d8bcab89dcf2bdfd2f99b466e439269af57e13647c7fd13f93594efe4a19e1d49d4845e0d591080b5c31e0b4230e5c1f3e4ae0bdd6d8f20af31df2a5bb882

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
 
@@ -10,7 +9,7 @@ gemfile:
   - gemfiles/pg_ar_32.gemfile
   - gemfiles/pg_ar_40.gemfile
 
-script: RUN_ALL=true rspec spec
+script: RUN_ALL=true bundle exec rspec spec
 
 services:
   - postgresql

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # EventCounter Changelog
 
-0.1.0 (2014-10-12)
+0.1.1 (2014-10-22)
+
+* Fixed issue with creating time in time zone
+
+0.1.0 (2014-10-21)
 
 * Added time zones support
 * Improved specs

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/skyeagle/event-counter.svg)](https://travis-ci.org/skyeagle/event-counter)
+
 # EventCounter
 
 EventCounter is a database based event counter with throttling per time intervals.
@@ -69,8 +71,8 @@ article.data_for(:views, interval: 10.minutes)
 # ]
 
 # with range
-range_start = Time.mktime(2014, 10, 16, 23, 0).in_time_zone
-range_end   = Time.mktime(2014, 10, 16, 23, 10).in_time_zone
+range_start = Time.zone.local(2014, 10, 16, 23, 0)
+range_end   = Time.zone.local(2014, 10, 16, 23, 10)
 range = range_start..range_end
 article.data_for(:views, interval: 10.minutes, range: range)
 #=> [
@@ -79,8 +81,8 @@ article.data_for(:views, interval: 10.minutes, range: range)
 # ]
 
 # for different time zone (although we have no data for that time)
-range_start = Time.mktime(2014, 10, 16, 23, 0).in_time_zone('UTC')
-range_end   = Time.mktime(2014, 10, 16, 23, 10).in_time_zone('UTC')
+range_start = Time.zone.local(2014, 10, 16, 23, 0).in_time_zone('UTC')
+range_end   = Time.zone.local(2014, 10, 16, 23, 10).in_time_zone('UTC')
 range = range_start..range_end
 article.data_for(:views, interval: 10.minutes, range: range, tz: 'UTC')
 #=> [
@@ -98,8 +100,8 @@ article.data_for(:views, interval: :day, raw: true)
 # looks as `Time.zone.parse(i['created_at']), i['value'].to_i ]`
 
 # class wide
-range_start = Time.mktime(2014, 10, 15).in_time_zone
-range_end   = Time.mktime(2014, 10, 16).in_time_zone
+range_start = Time.zone.local(2014, 10, 15)
+range_end   = Time.zone.local(2014, 10, 16)
 range = range_start..range_end
 Article.data_for(:views, interval: :day, range: range)
 # => [
@@ -111,6 +113,7 @@ Article.data_for(:views, interval: :day, range: range)
 ## Limitations
 
   - It works *ONLY* with *PostgreSQL* at the moment.
+  - Ruby 2+
   - ActiveRecord 3+
   - ActiveSupport 3+
   - It's polymorphic association.
@@ -142,9 +145,9 @@ class CreateEventCounters < ActiveRecord::Migration
       t.datetime :created_at
     end
 
-    add_index :event_counters, :countable_type
+    add_index :event_counters, :created_at
     add_index :event_counters,
-      [:countable_type, :name, :countable_id], name: 'complex_index'
+      [:countable_type, :name, :countable_id], name: 'index_complex'
 
   end
 

data/lib/event_counter.rb

@@ -27,7 +27,7 @@ class EventCounter < ActiveRecord::Base
   end
 
   def self.make(val = 1, on_time: nil, force: false)
-    on_time = normalize_on_time(on_time)
+    on_time = normalize_on_time!(on_time)
 
     attrs = { created_at: on_time }
 
@@ -52,7 +52,7 @@ class EventCounter < ActiveRecord::Base
 
     val ||= 1
 
-    on_time = normalize_on_time(on_time)
+    on_time = normalize_on_time!(on_time)
 
     counter = where(created_at: on_time).first
 
@@ -87,8 +87,11 @@ class EventCounter < ActiveRecord::Base
     fail CounterError, args
   end
 
-  def self.normalize_on_time(on_time)
+  def self.normalize_on_time!(on_time)
     on_time ||= Time.zone.now
+
+    counter_error!(:time_zone) unless on_time.is_a?(ActiveSupport::TimeWithZone)
+
     on_time =
       case current_interval
       when Symbol
@@ -108,7 +111,9 @@ class EventCounter < ActiveRecord::Base
       less: 'Specified interval (%{interval}) could not be less then ' \
             'a defined (%{default_interval}) in a countable model (%{model}).',
       multiple: 'Specified interval (%{interval}) should be a multiple of ' \
-                'a defined (%{default_interval}) in a countable model (%{model}).'
+                'a defined (%{default_interval}) in a countable model (%{model}).',
+      time_zone: 'The :on_time option should be defined with time zone, e.x.: ' \
+                 'Time.zone.local(2014, 1, 1, 1, 1)'
     }
 
     attr_accessor :extra

data/lib/event_counter/version.rb

@@ -1,4 +1,4 @@
 # This module contains VERSION
 module EventCounterVersion
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/lib/event_counter_spec.rb

@@ -27,7 +27,7 @@ describe EventCounter do
   end
 
   it '#make on time' do
-    on_time = Time.mktime(2014, 1, 1, 1, 14).in_time_zone
+    on_time = Time.zone.local(2014, 1, 1, 1, 14)
     expect {
       counter = ball.rotations.make(
         3, on_time: on_time)
@@ -48,7 +48,7 @@ describe EventCounter do
   end
 
   it '#make on time with interval as symbol' do
-    on_time = Time.mktime(2014, 1, 1, 1, 1).in_time_zone
+    on_time = Time.zone.local(2014, 1, 1, 1, 1)
     [:week, :month, :year].each do |interval|
       expect {
         counter = ball.send(:"rotations_by_#{interval}").make(
@@ -80,13 +80,13 @@ describe Ball do
       expect(ball.up!(:rotations)).to be_a(EventCounter)
     }.to change { EventCounter.count }.by(1)
 
-    on_time = Time.mktime(2011, 11, 11, 11, 11)
+    on_time = Time.zone.local(2011, 11, 11, 11, 11)
     expect {
       expect(ball.up!(:rotations, on_time: on_time))
         .to be_a(EventCounter)
     }.to change { EventCounter.count }.by(1)
 
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     expect {
       expect(ball.up!(:rotations, 5, on_time: on_time))
         .to be_a(EventCounter)
@@ -98,13 +98,13 @@ describe Ball do
       expect(ball.down!(:rotations)).to be_a(EventCounter)
     }.to change { EventCounter.count }.by(1)
 
-    on_time = Time.mktime(2011, 11, 11, 11, 11)
+    on_time = Time.zone.local(2011, 11, 11, 11, 11)
     expect {
       expect(ball.down!(:rotations, on_time: on_time))
         .to be_a(EventCounter)
     }.to change { EventCounter.count }.by(1)
 
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     expect {
       expect(ball.down!(:rotations, 5, on_time: on_time))
         .to be_a(EventCounter)
@@ -152,7 +152,7 @@ describe Ball do
   end
 
   it 'increments existent counter on time with default value' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     counter = ball.rotations.make on_time: on_time
 
     expect {
@@ -163,7 +163,7 @@ describe Ball do
   end
 
   it 'decrements existent counter on time with default value' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     counter = ball.rotations.make on_time: on_time
 
     expect {
@@ -174,7 +174,7 @@ describe Ball do
   end
 
   it 'increments existent counter on time with specified value' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     counter = ball.rotations.make 2, on_time: on_time
 
     expect {
@@ -185,7 +185,7 @@ describe Ball do
   end
 
   it 'decrements existent counter on time with specified value' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     counter = ball.rotations.make 2, on_time: on_time
 
     expect {
@@ -207,7 +207,7 @@ describe Ball do
   end
 
   it 'forces existent counter on time with new value' do
-    on_time = Time.mktime(2012, 12, 12, 12, 12)
+    on_time = Time.zone.local(2012, 12, 12, 12, 12)
     counter = ball.rotations.make 2, on_time: on_time
 
     expect {
@@ -230,7 +230,7 @@ describe Ball do
 
   def setup_counters(countable_count = 1)
     [1, 1, 2, 3, 5, 8, 13, 21, 34].each do |n|
-      on_time = Time.mktime(2014, 1, 1, 1, n).in_time_zone
+      on_time = Time.zone.local(2014, 1, 1, 1, n)
       if countable_count == 1
         ball.rotations.make n, on_time: on_time
       else
@@ -282,8 +282,8 @@ describe Ball do
     end
 
     it 'with a greater interval and a time range' do
-      range_start = Time.mktime 2014, 1, 1, 1, 15
-      range_end =   Time.mktime 2014, 1, 1, 1, 45
+      range_start = Time.zone.local 2014, 1, 1, 1, 15
+      range_end =   Time.zone.local 2014, 1, 1, 1, 45
       range = range_start.in_time_zone..range_end.in_time_zone
 
       data = [ [ 10, 13 ], [ 20, 21 ], [ 30, 34 ], [ 40, 0] ]
@@ -293,7 +293,7 @@ describe Ball do
     end
 
     it 'with a greater interval as symbol' do
-      beginning_of_week = Time.mktime(2014).in_time_zone.beginning_of_week
+      beginning_of_week = Time.zone.local(2014).beginning_of_week
 
       data = [ [ beginning_of_week, 88 ] ]
 
@@ -333,8 +333,8 @@ describe Ball do
     it 'with a greater interval within range' do
       data = [ [ 10, 39 ], [ 20, 63 ] ]
 
-      range_start = Time.mktime(2014, 1, 1, 1, 15).in_time_zone
-      range_end = Time.mktime(2014, 1, 1, 1, 29).in_time_zone
+      range_start = Time.zone.local(2014, 1, 1, 1, 15)
+      range_end = Time.zone.local(2014, 1, 1, 1, 29)
       range = range_start..range_end
 
       expect(subject.data_for(:rotations, interval: 10.minutes, range: range))
@@ -342,7 +342,7 @@ describe Ball do
     end
 
     it 'with a greater interval as symbol and a simple data' do
-      bmonth = Time.mktime(2014, 1, 1).in_time_zone.beginning_of_month
+      bmonth = Time.zone.local(2014, 1, 1).beginning_of_month
       data = [ [ bmonth, 264 ] ]
 
       expect(subject.data_for(:rotations, interval: :month))
@@ -350,7 +350,7 @@ describe Ball do
     end
 
     it 'with a greater interval as symbol and a simple data within range' do
-      bmonth = Time.mktime(2014, 1, 1).in_time_zone.beginning_of_month
+      bmonth = Time.zone.local(2014, 1, 1).beginning_of_month
       data = [ [ bmonth, 264 ] ]
 
       range_start = bmonth
@@ -372,8 +372,7 @@ describe Ball do
         end
       end
 
-      data = (6..12).map { |x| [ Time.mktime(2013, x).in_time_zone, 264 ] }
-
+      data = (6..12).map { |x| [ Time.zone.local(2013, x), 264 ] }
       range_start = data[0][0].beginning_of_month
       range_end = data[-1][0].end_of_month
       range = range_start..range_end

data/spec/lib/performance_spec.rb

@@ -7,8 +7,8 @@ describe Ball, slow: true do
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  let(:range_start) { (Time.mktime 2013, 7).in_time_zone.beginning_of_month }
-  let(:range_end)   { (Time.mktime 2014, 6).in_time_zone.end_of_month       }
+  let(:range_start) { Time.zone.local(2013, 7).beginning_of_month }
+  let(:range_end)   { Time.zone.local(2014, 6).end_of_month       }
   let(:range)       { range_start..range_end }
 
   def disable_logging(&blk)
@@ -27,7 +27,7 @@ describe Ball, slow: true do
 
     ball = Ball.create!
 
-    (Time.mktime(2012).to_i..Time.mktime(2015).to_i).step(step) do |i|
+    (Time.zone.local(2012).to_i..Time.zone.local(2015).to_i).step(step) do |i|
       on_time = Time.at(i)
       ball.rotations.make on_time: on_time
     end

data/spec/support/matchers.rb

@@ -14,7 +14,7 @@ end
 module RSpec
   module Matchers
     def eql_data(items)
-      items.map! { |a, b| [ Time.mktime(2014, 1, 1, 1, a).in_time_zone, b ] }
+      items.map! { |a, b| [ Time.zone.local(2014, 1, 1, 1, a), b ] }
       contain_exactly(*items)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event-counter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anton Orel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord