clientperf 0.1.3 → 0.1.4

data/clientperf.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Clientperf-0.1.3
+# Gem::Specification for Clientperf-0.1.4
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{clientperf}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 

data/lib/clientperf.rb

@@ -27,7 +27,7 @@ module Clientperf
     end
     
     def version
-      "0.1.3"
+      "0.1.4"
     end
     
     private

data/lib/clientperf_data_builder.rb

@@ -1,9 +1,6 @@
 module ClientperfDataBuilder
   def build_data_for_chart(results, start_time, periods, period_increment)
     max = 0
-    if period_increment == :days && ActiveRecord::Base.default_timezone == :utc
-      start_time = start_time.to_datetime.change(:offset => 0).to_time
-    end
     padded_results = (0..periods).map do |delta|
       time_period = start_time + delta.send(period_increment)
       data = get_data_or_pad(time_period, results)
@@ -13,6 +10,14 @@ module ClientperfDataBuilder
     [padded_results, max]
   end
   
+  def day_start_time
+    ((ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now) + 1.hour - 1.day).change(:min => 0)
+  end
+  
+  def month_start_time
+    ((ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now) + 1.day - 30.days).change(:hour => 0)
+  end
+  
   private
   
   def get_data_or_pad(point, results)

data/lib/clientperf_result.rb

@@ -6,7 +6,7 @@ class ClientperfResult < ActiveRecord::Base
     include ClientperfDataBuilder
 
     def last_24_hours
-      start_time = (Time.now + 1.hour - 1.day).change(:min => 0)
+      start_time = day_start_time
       results = average(:milliseconds, :conditions => ['created_at > ?', start_time], 
         :group => "date_format(created_at,'%Y-%m-%d %H')")
 
@@ -14,7 +14,7 @@ class ClientperfResult < ActiveRecord::Base
     end
 
     def last_30_days
-      start_time = (Time.now + 1.day - 30.days).change(:hour => 0)
+      start_time = month_start_time
       results = average(:milliseconds, :conditions => ['created_at > ?', start_time], 
         :group => "date_format(created_at,'%Y-%m-%d')")
 

data/lib/clientperf_uri.rb

@@ -3,7 +3,7 @@ class ClientperfUri < ActiveRecord::Base
   has_many :clientperf_results, :dependent => :delete_all
   
   def last_24_hours
-    start_time = (Time.now + 1.hour - 1.day).change(:min => 0)
+    start_time = day_start_time
     results = clientperf_results.average(:milliseconds, :conditions => ['created_at > ?', start_time], 
       :group => "date_format(created_at,'%Y-%m-%d %H')")
       
@@ -11,7 +11,7 @@ class ClientperfUri < ActiveRecord::Base
   end
   
   def last_30_days
-    start_time = (Time.now + 1.day - 30.days).change(:hour => 0)
+    start_time = month_start_time
     results = clientperf_results.average(:milliseconds, :conditions => ['created_at > ?', start_time], 
       :group => "date_format(created_at,'%Y-%m-%d')")
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clientperf
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Eric Falcao