event-counter 0.0.1 → 0.1.0

data/gemfiles/pg_ar_40.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rspec"
+gem "database_cleaner"
+gem "activerecord", "~> 4.0"
+gem "activesupport", "~> 4.0"
+gem "pg"
+
+gemspec :path => "../"

data/gemfiles/pg_ar_40.gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: ../
+  specs:
+    event-counter (0.1.0)
+      activerecord (>= 3)
+      activesupport (>= 3)
+      pg (~> 0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.1)
+    pg (0.17.1)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0)
+  activesupport (~> 4.0)
+  appraisal
+  database_cleaner
+  event-counter!
+  pg
+  rspec

data/gemfiles/pg_ar_41.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rspec"
+gem "database_cleaner"
+gem "activerecord", "~> 4.1"
+gem "activesupport", "~> 4.1"
+gem "pg"
+
+gemspec :path => "../"

data/gemfiles/pg_ar_41.gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: ../
+  specs:
+    event-counter (0.1.0)
+      activerecord (>= 3)
+      activesupport (>= 3)
+      pg (~> 0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.1)
+    pg (0.17.1)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1)
+  activesupport (~> 4.1)
+  appraisal
+  database_cleaner
+  event-counter!
+  pg
+  rspec

data/lib/event_counter.rb

@@ -6,6 +6,8 @@ class EventCounter < ActiveRecord::Base
 
   belongs_to :countable, polymorphic: true
 
+  scope :within, ->(range) { range && where(created_at: range) }
+
   def increase_by(val)
     self.class.where(id: id).update_all(['value = value + ?', val])
     increment(:value, val)
@@ -86,13 +88,13 @@ class EventCounter < ActiveRecord::Base
   end
 
   def self.normalize_on_time(on_time)
-    on_time ||= Time.now
+    on_time ||= Time.zone.now
     on_time =
       case current_interval
       when Symbol
-        on_time.send(:"beginning_of_#{current_interval}")
+        on_time.in_time_zone.send(:"beginning_of_#{current_interval}")
       else
-        on_time.floor(current_interval)
+        on_time.in_time_zone.floor(current_interval)
       end
     on_time
   end
@@ -123,16 +125,26 @@ class EventCounter < ActiveRecord::Base
 end
 
 require 'event_counter/active_record_extension'
-
 ActiveRecord::Base.send(:include, EventCounter::ActiveRecordExtension)
 
+if ActiveSupport::VERSION::MAJOR > 3
+  require 'active_support/core_ext/time'
+else
+  require 'active_support/time'
+end
+
 # :nodoc:
-class Time
+class ActiveSupport::TimeWithZone
+  def round_off(seconds = 60)
+    Time.zone.at((to_f / seconds).round * seconds)
+  end
+
   def floor(seconds = 60)
-    Time.at((to_f / seconds).floor * seconds)
+    Time.zone.at((to_f / seconds).floor * seconds)
   end
 end
 
+# :nodoc:
 class String
 
   unless method_defined?(:squish!)

data/lib/event_counter/active_record_extension.rb

@@ -42,8 +42,8 @@ class EventCounter < ActiveRecord::Base
         rotate_counter(*args, opts)
       end
 
-      def data_for(name, interval: nil, range: nil, raw: false)
-        self.class.data_for(name, id, interval: interval, range: range, raw: raw)
+      def data_for(name, opts = {})
+        self.class.data_for(name, id, opts)
       end
 
       private
@@ -68,99 +68,113 @@ class EventCounter < ActiveRecord::Base
         day: 1.day
       }.freeze
 
-      def data_for(counter_name, id = nil, interval: nil, range: nil, raw: false)
-        interval = normalize_interval!(counter_name, interval)
+      def data_for(name, id = nil, interval: nil, range: nil, raw: nil, tz: nil)
+        interval = normalize_interval!(name, interval)
 
-        sql = <<SQL.squish!
-#{cte_definition(counter_name, interval, id)}
-SELECT
-  created_at,
-  COALESCE(sum(value) OVER (PARTITION BY counters.created_at) , 0) AS value
-FROM (#{series_definition(interval, range)}) intervals
-LEFT JOIN CTE counters USING (created_at)
-ORDER BY 1
-SQL
+        range = normalize_range!(range, interval) if range
+
+        tz ||= (Time.zone || 'UTC')
+        tz_abbr = tz.now.zone
+
+        subq = EventCounter
+          .select(subq_select(interval, tz_abbr))
+          .where(name: name, countable_type: self)
+          .where(id && { countable_id: id })
+          .within(range)
+          .group("1")
+          .order("1")
+          .to_sql
+
+        sql = <<-SQL.squish!
+          SELECT created_at, value
+          FROM (#{series(interval, range, tz_abbr)}) intervals
+          LEFT OUTER JOIN (#{subq}) counters USING (created_at)
+          ORDER BY 1
+        SQL
 
         result = connection.execute(sql).to_a
 
-        raw ? result : normalize_counters_data(result)
+        raw ? result : normalize_counters_data(result, tz)
       end
 
-      def cte_definition(counter_name, interval, id = nil)
-<<SQL
-WITH CTE AS (
-  SELECT #{cte_extract(interval)} as created_at, sum(value) AS value
-  FROM event_counters
-  WHERE
-    countable_type = #{sanitize(name)} AND
-    #{ "countable_id = #{sanitize(id)} AND" if id.present? }
-    name = #{sanitize(counter_name)}
-  GROUP BY 1
-)
-SQL
+      def subq_select(interval, tz)
+        "#{subq_extract(interval, tz)} as created_at, sum(value) AS value"
       end
 
-      def cte_extract(interval)
+      def subq_extract(interval, tz)
         case interval
         when Symbol
-          "date_trunc(#{sanitize(interval)}, created_at)"
+          "date_trunc(#{sanitize(interval)}, #{tstamp_tz('created_at', tz)})"
         else
-          tstamp(<<SQL)
-floor(EXTRACT(EPOCH FROM created_at::timestamp with time zone) /
-#{sanitize(interval)})::int * #{sanitize(interval)}
-SQL
+          time = <<-SQL
+            floor(EXTRACT(EPOCH FROM created_at) /
+            #{sanitize(interval)})::int * #{sanitize(interval)}
+          SQL
+          tstamp_tz("to_timestamp(#{time})", tz)
         end
       end
 
-      def series_definition(interval, range)
-        range_min, range_max = min_and_max_of_range(interval, range)
-
-        args =
+      def series(interval, range, tz)
+        a =
           case interval
           when Symbol
-            interval_sql = "interval '1 #{interval}'"
-            if range
-              [
-                "date_trunc(#{sanitize(interval)}, #{tstamp(range.min.to_i)} )",
-                "date_trunc(#{sanitize(interval)}, #{tstamp(range.max.to_i)} )",
-                interval_sql
-              ]
-            else
-              [
-                "date_trunc(#{sanitize(interval)}, min(created_at))",
-                "date_trunc(#{sanitize(interval)}, max(created_at))",
-                interval_sql
-              ]
-            end
+            series_for_symbol(interval, range, tz)
           else
-            interval_sql = %Q(#{sanitize(interval)} * interval '1 seconds')
-            if range
-              [
-                tstamp(sanitize(range_min)),
-                tstamp(sanitize(range_max)),
-                interval_sql
-              ]
-            else
-              [ 'min(created_at)', 'max(created_at)', interval_sql ]
-            end
+            series_for_integer(interval, range, tz)
           end
-        <<SQL
-SELECT
-  count(*), generate_series(#{args[0]}, #{args[1] }, #{args[2]}) AS created_at
-FROM CTE
-SQL
+        EventCounter.within(range).select(<<-SQL).to_sql
+          count(*), generate_series(#{a[0]}, #{a[1] }, #{a[2]}) AS created_at
+        SQL
+      end
+
+      def series_for_symbol(interval, range, tz)
+        interval_sql = "interval '1 #{interval}'"
+        if range
+          a = [
+            dtrunc(interval, sanitize(range.min).to_s, tz),
+            dtrunc(interval, sanitize(range.max).to_s, tz),
+            interval_sql
+          ]
+        else
+          a = [
+            dtrunc(interval, 'min(created_at)', tz),
+            dtrunc(interval, 'max(created_at)', tz),
+            interval_sql
+          ]
+        end
       end
 
-      def tstamp(val)
-        "to_timestamp(#{val})"
+      def series_for_integer(interval, range, tz)
+        interval_sql = %Q(#{sanitize(interval)} * interval '1 seconds')
+        if range
+          a = [
+            tstamp_tz("to_timestamp(#{sanitize(range.min.to_i)})", tz),
+            tstamp_tz("to_timestamp(#{sanitize(range.max.to_i)})", tz),
+            interval_sql
+          ]
+        else
+          a = [
+            tstamp_tz('min(created_at)', tz),
+            tstamp_tz('max(created_at)', tz),
+            interval_sql
+          ]
+        end
+      end
+
+      def dtrunc(interval, value, tz)
+        "date_trunc(#{sanitize(interval)}, #{tstamp_tz(value, tz)})"
+      end
+
+      def tstamp_tz(str, tz)
+        "#{str}::timestamptz AT TIME ZONE #{sanitize(tz)}"
       end
 
       def counter_error!(*args)
         fail EventCounter::CounterError, args
       end
 
-      def normalize_interval!(counter_name, interval)
-        default_interval = default_interval_for(counter_name)
+      def normalize_interval!(name, interval)
+        default_interval = default_interval_for(name)
 
         h = {
           default_interval: default_interval,
@@ -195,28 +209,30 @@ SQL
         interval.is_a?(Symbol) ? INTERVALS[interval] : interval
       end
 
-      def normalize_counters_data(raw_data)
-        raw_data.map  do |i|
-          [ Time.parse(i['created_at']), i['value'].to_i ]
+      def normalize_counters_data(data, tz)
+        Time.use_zone(tz) do
+          data.map { |i| [ Time.zone.parse(i['created_at']), i['value'].to_i ] }
         end
       end
 
-      def default_interval_for(counter_name)
-        event_counters[counter_name.to_sym]
+      def default_interval_for(name)
+        event_counters[name.to_sym]
       end
 
-      def min_and_max_of_range(interval, range)
-        return unless range
+      def normalize_range!(range, interval)
+        range_min, range_max =
+          case interval
+          when Symbol
+            [
+              range.min.send(:"beginning_of_#{interval}"),
+              range.max.send(:"end_of_#{interval}")
+            ]
+          else
+            [ range.min.floor(interval), range.max.floor(interval) ]
+          end
 
-        case interval
-        when Symbol
-          [
-            range.min.send(:"beginning_of_#{interval}").to_i,
-            range.max.send(:"end_of_#{interval}").to_i
-          ]
-        else
-          [ range.min.floor(interval).to_i, range.max.floor(interval).to_i ]
-        end
+        # TODO: ensure that range in time zone
+        range_min..range_max
       end
     end
   end