esilverberg-google_otg 1.0.2 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/google_otg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_otg}
-  s.version = "1.0.2"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["esilverberg"]
-  s.date = %q{2009-09-19}
+  s.date = %q{2009-09-25}
   s.description = %q{Include Google's Over Time Graph in your app}
   s.email = %q{eric@ericsilverberg.com}
   s.extra_rdoc_files = [

data/lib/google_otg.rb

@@ -127,13 +127,14 @@ eos
             end
         }
       
+        tz = args.has_key?(:time_zone) ? args[:time_zone] : ActiveSupport::TimeZone['UTC']
+        Time.zone = tz
         label = args.has_key?(:label) ? args[:label] : "Value"
         time_fn = args.has_key?(:time_fn) ? args[:time_fn] : lambda {|h| h.created_at }
         range = args.has_key?(:range) ? args[:range] : DEFAULT_RANGE
         x_label_format = args.has_key?(:x_label_format) ? args[:x_label_format] : "%A %I:%M%p"
       
         max_y = 0
-        tz = args.has_key?(:time_zone) ? args[:time_zone] : ActiveSupport::TimeZone['UTC']
         hits_dict = {}
         hits.each { |h|
             hits_dict[time_fn.call(h)] = h
@@ -142,15 +143,15 @@ eos
         total = 0
         
         points = []
-        now_floored = Time.at((Time.now.to_i/(60*range))*(60*range)).gmtime
+        now_floored = Time.at((Time.now.to_i/(60*range))*(60*range))
         current = hits.length > 0 ? time_fn.call(hits[0]) : now_floored
 
-        while (current <= now_floored + 1.day && range > 0) do
+        while (current <= now_floored && range > 0) do
             if hits_dict[current]
                 count = hits_dict[current].count.to_i
                 max_y = count if count > max_y
 
-                date = tz.utc_to_local(time_fn.call(hits_dict[current]))
+                date = time_fn.call(hits_dict[current])
                 date_key = date.to_i
                 date_value = date.strftime(x_label_format)
                 
@@ -158,7 +159,7 @@ eos
                 total += count
             else
             
-                date = tz.utc_to_local(current)
+                date = current
                 date_key = date.to_i
                 date_value = date.strftime(x_label_format)
                 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: esilverberg-google_otg
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
 - esilverberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-19 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency