calculon 0.0.3 → 0.0.4

data/.rubocop.yml

@@ -0,0 +1,96 @@
+AllCops:
+  Exclude:
+    - calculon.gemspec
+
+AndOr:
+  Enabled: false
+
+StringLiterals:
+  Enabled: false
+
+AccessorMethodName:
+  Enabled: false
+
+ClassLength:
+  Max: 300
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+BracesAroundHashParameters:
+  Enabled: false
+
+Blocks:
+  Enabled: false
+
+ClassVars:
+  Enabled: false
+
+CollectionMethods:
+  Enabled: false
+
+CyclomaticComplexity:
+  Max: 14
+
+HandleExceptions:
+  Enabled: false
+
+HashSyntax:
+  Enabled: false
+
+IfUnlessModifier:
+  Enabled: false
+
+LineLength:
+  Max: 183
+
+MethodLength:
+  Max: 40
+
+MultilineBlockChain:
+  Enabled: false
+
+NestedTernaryOperator:
+  Enabled: false
+
+Not:
+  Enabled: false
+
+NumericLiterals:
+  Enabled: false
+
+ParameterLists:
+  Enabled: false
+
+ParenthesesAroundCondition:
+  Enabled: false
+
+ParenthesesAsGroupedExpression:
+  Enabled: false
+
+RedundantBegin:
+  Enabled: false
+
+RedundantSelf:
+  Enabled: false
+
+RescueException:
+  Enabled: false
+
+RescueModifier:
+  Enabled: false
+
+Semicolon:
+  Enabled: false
+
+SignalException:
+  Enabled: false
+
+SingleLineBlockParams:
+  Enabled: false
+
+WordArray:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3
+ruby-1.9.3-p392

data/calculon.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
   gem.add_development_dependency('sqlite3')
   gem.add_development_dependency('mysql2')
+  gem.add_development_dependency('rubocop')
 end

data/lib/calculon.rb

@@ -7,13 +7,13 @@ module Calculon
   def self.included(base)
     base.extend(ClassMethods)
   end
-  
+
   module ClassMethods
-    def calculon_view(name, cols, opts=nil)
+    def calculon_view(name, cols, opts = nil)
       metaclass = class << self; self; end
       metaclass.instance_eval do
-        [ "minute", "hour", "day", "month", "year" ].each do |window|
-          define_method("#{name}_by_#{window}") { |nopts=nil|
+        ["minute", "hour", "day", "month", "year"].each do |window|
+          define_method("#{name}_by_#{window}") { |nopts = nil|
             nopts = (opts || {}).merge(nopts || {})
             # clone cols so modifications downstream don't affect our original copy here
             send("by_#{window}".intern, cols.clone, nopts)
@@ -31,13 +31,12 @@ module Calculon
       { :time_column => @@calculon_time_column, :group_by => [] }
     end
 
-    def on(date, opts=nil)
-      opts = default_calculon_opts.merge(opts || {})
+    def on(date)
       raise "'on' method takes a Date object as the first param" unless date.is_a?(Date)
       between date.to_time, date.to_time + 86399.seconds
     end
 
-    def between(starttime, endtime, opts=nil)
+    def between(starttime, endtime, opts = nil)
       opts = default_calculon_opts.merge(opts || {})
       relation = where ["#{opts[:time_column]} >= ? and #{opts[:time_column]} <= ?", starttime, endtime]
       relation.calculon_opts ||= {}
@@ -45,28 +44,28 @@ module Calculon
       relation
     end
 
-    def by_minute(cols, opts=nil)
+    def by_minute(cols, opts = nil)
       tcol = "concat(date(%{time_column}),' ',lpad(hour(%{time_column}),2,'0'),':',lpad(minute(%{time_column}),2,'0'),':00')"
       by_bucket :minute, tcol, cols, opts
     end
 
-    def by_hour(cols, opts=nil)
+    def by_hour(cols, opts = nil)
       by_bucket :hour, "concat(date(%{time_column}),' ',lpad(hour(%{time_column}),2,'0'),':00:00')", cols, opts
     end
 
-    def by_day(cols, opts=nil)
+    def by_day(cols, opts = nil)
       by_bucket :day, "concat(date(%{time_column}),' 00:00:00')", cols, opts
     end
 
-    def by_month(cols, opts=nil)
+    def by_month(cols, opts = nil)
       by_bucket :month, "concat(year(%{time_column}),'-',lpad(month(%{time_column}),2,'0'),'-01 00:00:00')", cols, opts
     end
 
-    def by_year(cols, opts=nil)
+    def by_year(cols, opts = nil)
       by_bucket :year, "concat(year(%{time_column}),'-01-01 00:00:00')", cols, opts
     end
 
-    def by_bucket(bucket_name, bucket, cols, opts=nil)
+    def by_bucket(bucket_name, bucket, cols, opts = nil)
       opts = default_calculon_opts.merge(opts || {})
       # allow group by to be either single symbol or array of symbols
       opts[:group_by] = [opts[:group_by]].flatten
@@ -85,10 +84,10 @@ module Calculon
       # if we're grouping by other columns, we need to select them
       groupby = opts[:group_by] + ["time_bucket"]
       opts[:group_by].each { |c| cols[c] = nil }
-      cols = cols.map { |name,method| 
+      cols = cols.map { |name, method|
         asname = name.to_s.gsub(' ', '').tr('^A-Za-z0-9', '_')
-        method.nil? ? name : "#{method}(#{name}) as #{asname}" 
-      } + [ "#{bucket} as time_bucket" ]
+        method.nil? ? name : "#{method}(#{name}) as #{asname}"
+      } + ["#{bucket} as time_bucket"]
 
       relation = select(cols.join(",")).group(*groupby).order("time_bucket ASC")
       relation.calculon_opts ||= {}

data/lib/calculon/ext.rb

@@ -5,7 +5,7 @@ module ActiveRecord
 
   class Relation
     def to_buckets
-      if(calculon_opts.nil?)
+      if calculon_opts.nil?
         raise "Not a Calculon Relation: You must call by_day/by_hour/etc before you can call to_buckets"
       end
       Calculon::Results.create(self)

data/lib/calculon/railtie.rb

@@ -1,5 +1,4 @@
 module Calculon
-
   class Railtie < Rails::Railtie
     initializer 'calculon.insert_into_active_record' do
       ActiveSupport.on_load :active_record do
@@ -7,5 +6,4 @@ module Calculon
       end
     end
   end
-
 end

data/lib/calculon/results.rb

@@ -11,17 +11,17 @@ module Calculon
       @grouped_by = relation.calculon_opts[:group_by] || []
       @grouped_by_values = Set.new
 
-      @start_time = relation.calculon_opts[:starttime] || keys.sort.first
-      @start_time = @start_time.to_time if @start_time.is_a?(Date)
-
-      @end_time = relation.calculon_opts[:endtime] || keys.sort.last
-      @end_time = @end_time.to_time if @end_time.is_a?(Date)
-
       relation.to_a.each { |row|
         # Keep track of all of the unique column values for the group_by cols
-        @grouped_by_values.add @grouped_by.inject({}) { |h,col| h[col] = row.send(col); h }
-        self[row.time_bucket] = fetch(row.time_bucket, []) + [ row ]
+        @grouped_by_values.add @grouped_by.inject({}) { |h, col| h[col] = row.send(col); h }
+        self[row.time_bucket] = fetch(row.time_bucket, []) + [row]
       }
+
+      @start_time = relation.calculon_opts[:starttime] || Time.zone.parse(keys.sort.first)
+      @start_time = @start_time.to_time if @start_time.is_a?(Date)
+
+      @end_time = relation.calculon_opts[:endtime] || Time.zone.parse(keys.sort.last)
+      @end_time = @end_time.to_time if @end_time.is_a?(Date)
     end
 
     def self.create(relation)
@@ -37,34 +37,38 @@ module Calculon
     end
 
     def time_format
-      { 
-        :minute => "%Y-%m-%d %H:%M:00", 
-        :hour => "%Y-%m-%d %H:00:00", 
-        :day => "%Y-%m-%d 00:00:00", 
-        :month => "%Y-%m-01 00:00:00", 
+      {
+        :minute => "%Y-%m-%d %H:%M:00",
+        :hour => "%Y-%m-%d %H:00:00",
+        :day => "%Y-%m-%d 00:00:00",
+        :month => "%Y-%m-01 00:00:00",
         :year => "%Y-01-01 00:00:00"
       }.fetch(@bucket_size)
     end
 
-    def map_each_time
-      increment_amounts = { :minute => 1.minute, :hour => 1.hour, :day => 1.day, :month => 1.month, :year => 1.year }
-      increment = increment_amounts[@bucket_size]
+    def map_each_time(&block)
+      @time_bucket_names ||= lambda do
+        increment_amounts = { :minute => 1.minute, :hour => 1.hour, :day => 1.day, :month => 1.month, :year => 1.year }
+        increment = increment_amounts[@bucket_size]
 
-      # get the "floor" of the start and end times (the "floor" bucket)
-      current = Time.zone.parse(@start_time.strftime(time_format + " %z"))
-      last_time = Time.zone.parse(@end_time.strftime(time_format + " %z"))
+        # get the "floor" of the start and end times (the "floor" bucket)
+        current = Time.zone.parse(@start_time.strftime(time_format + " %z"))
+        last_time = Time.zone.parse(@end_time.strftime(time_format + " %z"))
 
-      results = []
-      while current <= last_time
-        results << yield(current.strftime(time_format))
-        current += increment
-      end
-      results
+        results = []
+        while current <= last_time
+          results << current.strftime(time_format)
+          current += increment
+        end
+        results
+      end.call
+
+      @time_bucket_names.map { |b| block.call(b) }
     end
   end
 
   class SingleGroupingResults < Results
-    def to_a(default=nil)
+    def to_a(default = nil)
       map_each_time { |key|
         fetch(key, [default]).first
       }
@@ -78,9 +82,9 @@ module Calculon
       }
     end
 
-    def values_for(grouping, default=nil)
+    def values_for(grouping, default = nil)
       map_each_time { |key|
-        matches = fetch(key, []).select { |value| grouping.map { |k,v| value.send(k) == v }.all? }
+        matches = fetch(key, []).select { |value| grouping.map { |k, v| value.send(k) == v }.all? }
         matches.length > 0 ? matches.first : default
       }
     end

data/lib/calculon/version.rb

@@ -1,3 +1,3 @@
 module Calculon
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/calculon_test.rb

@@ -40,15 +40,15 @@ class CalculonTest < Test::Unit::TestCase
     results = Game.points_by_hour.to_buckets
     keys = [33.hours.ago.strftime("%Y-%m-%d %H:00:00"), 2.hours.ago.strftime("%Y-%m-%d %H:00:00")]
     assert_equal keys, results.keys.sort
-    assert_equal results[keys.first].first.team_a_points, 10 
-    assert_equal results[keys.last].first.team_b_points, 40 
+    assert_equal results[keys.first].first.team_a_points, 10
+    assert_equal results[keys.last].first.team_b_points, 40
 
     assert_equal Game.by_day(:team_a_points => :sum).length, 2
     results = Game.points_by_day.to_buckets
     keys = [33.hours.ago.strftime("%Y-%m-%d 00:00:00"), 2.hours.ago.strftime("%Y-%m-%d 00:00:00")]
     assert_equal keys, results.keys.sort
-    assert_equal results[keys.first].first.team_a_points, 10 
-    assert_equal results[keys.last].first.team_b_points, 40     
+    assert_equal results[keys.first].first.team_a_points, 10
+    assert_equal results[keys.last].first.team_b_points, 40
   end
 
   def test_results_hash_missing
@@ -56,9 +56,9 @@ class CalculonTest < Test::Unit::TestCase
     Game.create(:team_a_points => 20, :created_at => Time.zone.now - 1.hours)
     Game.create(:team_a_points => 30, :created_at => Time.zone.now - 2.hours)
     Game.create(:team_a_points => 40, :created_at => Time.zone.now - 25.hours)
-    
+
     days = Game.points_by_day.to_a
     assert_equal days.length, 2
-    assert_equal days.inject(0) { |s,g| s + g.team_a_points }, 100
+    assert_equal days.inject(0) { |s, g| s + g.team_a_points }, 100
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calculon
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Calculon provides aggregate time functions for ActiveRecord.
 email:
 - bamuller@gmail.com
@@ -115,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .ruby-gemset
 - .ruby-version
 - Gemfile
@@ -142,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 927223150762436889
+      hash: 2649945751617820955
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 927223150762436889
+      hash: 2649945751617820955
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25