calculations_by_time_range 0.2.0 → 0.2.1

data/README.rdoc

@@ -14,8 +14,8 @@ You could count how many people register by day:
   User.counts_by_day
 
 
-Found sum of ages by month:
-  User.sums_by_month
+Found sum of ages by month in field updated_at:
+  User.sums_by :month, 'age', 'updated_at'
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/calculations_by_time_range.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{calculations_by_time_range}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Nikitochkin"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "calculations_by_time_range.gemspec",
      "lib/calculations_by_time_range.rb",
+     "lib/calculations_by_time_range/active_record/calculations.rb",
      "rails/init.rb",
      "test/helper.rb",
      "test/test_calculations_by_time_range.rb"

data/lib/calculations_by_time_range.rb

@@ -1,56 +1,6 @@
-module JetThoughts
-  module CalculationsByTimeRange
-
-    @@time_zone_offset_in_hours = Time.zone.utc_offset / 3600
-    QUERY = (ActiveRecord::Base.connection.adapter_name == "PostgreSQL") ? "EXTRACT(%s FROM %s + INTERVAL '%d hour')" : "EXTRACT(%s FROM %s + INTERVAL %d hour)"
-
-    COLUMNS = {
-      :year => [:year],
-      :month => [:year, :month],
-      :week => [:year, :month, :week],
-      :day => [:year, :month, :week, :day],
-      :hour => [:year, :month, :week, :day, :hour]
-    }
-
-    OPERATIONS = ["sum", "count", "min", "max", "avg"]
-
-    COLUMNS.each do |k,v|
-      OPERATIONS.each do |o|
-        define_method "#{o.pluralize}_by_#{k.to_s}" do
-          calculations_by_time_column(o.to_sym, v, :column => 'id', :time_column => 'created_at')
-        end
-
-        define_method "#{o.pluralize}_by" do |*args|
-          range, column, time_column = args
-          calculations_by_time_column(o.to_sym, COLUMNS[range.to_sym], :column => column || "id", :time_column => time_column || "created_at")
-        end
-      end
-    end
-
-    private
-
-    def calculations_by_time_column(operation, fields = [], opts = {})
-      options = {:time_column => 'created_at', :column => 'id'}
-      options = options.merge(opts)
-
-      fields = [fields] if !fields.is_a?(Array)
-      select_q, order_by_q, group_by_q = [], [], []
-
-      fields.each_with_index do|range, indx|
-        q = QUERY % [range, options[:time_column], @@time_zone_offset_in_hours]
-        select_q << ((q + " AS %s_%s") % [range.to_s, options[:time_column]])
-        group_by_q << q
-        order_by_q << 2 + indx
-      end
-
-      sql = "SELECT %s(%s) AS %s_all, %s FROM %s " % [operation, options[:column], operation, select_q.join(','), table_name]
-
-      add_conditions!(sql, options[:conditions])
-      sql << "GROUP BY #{group_by_q.join(',')}
-                                                                                                                                      ORDER BY #{order_by_q.join(',')}"
-                                                                                                                                      find_by_sql(sql)
-    end
-
+require 'calculations_by_time_range/active_record/calculations'
+module ActiveRecord
+  class Base
+    class << self; include CalculationsByTimeRange::ActiveRecord::Calculations end
   end
 end
-

data/lib/calculations_by_time_range/active_record/calculations.rb

@@ -0,0 +1,58 @@
+module CalculationsByTimeRange
+  module ActiveRecord
+    module Calculations
+
+      TIME_OFFSET = Time.zone.utc_offset / 3600
+
+      COLUMNS = {
+        :year => [:year],
+        :month => [:year, :month],
+        :week => [:year, :month, :week],
+        :day => [:year, :month, :week, :day],
+        :hour => [:year, :month, :week, :day, :hour]
+      }
+
+      OPERATIONS = ["sum", "count", "min", "max", "avg"]
+
+      COLUMNS.each do |k,v|
+        OPERATIONS.each do |o|
+          define_method "#{o.pluralize}_by_#{k.to_s}" do |*args|
+            column, time_column = args
+            calculations_by_time_column(o.to_sym, v, :column => column || 'id', :time_column => time_column || 'created_at')
+          end
+
+          define_method "#{o.pluralize}_by" do |*args|
+            range, column, time_column = args
+            calculations_by_time_column(o.to_sym, COLUMNS[range.to_sym], :column => column || "id", :time_column => time_column || "created_at")
+          end
+        end
+      end
+
+      private
+
+      def calculations_by_time_column(operation, fields = [], opts = {})
+        query = (::ActiveRecord::Base.connection.adapter_name == "PostgreSQL") ? "EXTRACT(%s FROM %s + INTERVAL '%d hour')" : "EXTRACT(%s FROM %s + INTERVAL %d hour)"
+        options = {:time_column => 'created_at', :column => 'id'}
+        options = options.merge(opts)
+
+        fields = [fields] if !fields.is_a?(Array)
+        select_q, order_by_q, group_by_q = [], [], []
+
+        fields.each_with_index do|range, indx|
+          q = query % [range, options[:time_column], TIME_OFFSET]
+          select_q << ((q + " AS %s_%s") % [range.to_s, options[:time_column]])
+          group_by_q << q
+          order_by_q << 2 + indx
+        end
+
+        sql = "SELECT %s(%s) AS %s_all, %s FROM %s " % [operation, options[:column], operation, select_q.join(','), table_name]
+
+        add_conditions!(sql, options[:conditions])
+        sql << "GROUP BY #{group_by_q.join(',')}
+                                                                                                                                      ORDER BY #{order_by_q.join(',')}"
+                                                                                                                                      find_by_sql(sql)
+      end
+
+    end
+  end
+end

data/rails/init.rb

@@ -1,2 +1 @@
 require 'calculations_by_time_range'
-ActiveRecord::Base.extend(JetThoughts::CalculationsByTimeRange)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calculations_by_time_range
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Nikitochkin
@@ -40,6 +40,7 @@ files:
 - VERSION
 - calculations_by_time_range.gemspec
 - lib/calculations_by_time_range.rb
+- lib/calculations_by_time_range/active_record/calculations.rb
 - rails/init.rb
 - test/helper.rb
 - test/test_calculations_by_time_range.rb