trackoid 0.3.5 → 0.3.6

data/README.rdoc

@@ -315,6 +315,8 @@ Trackoid will correctly translate dates for you (hopefully) if you pass a date t
 
 = Revision History
 
+  0.3.6  - Optimization for 'on' reader for ranges. Many times fold quicker.
+
   0.3.5  - BUGFIX: ReaderExtender "+" acted like an accumulator. Problem more
            evident when using ActiveSupport "sum" for arrays.
 

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/trackoid/core_ext/time.rb

@@ -22,10 +22,18 @@ class Time
     self.dup.utc.to_i / ONEDAY
   end
 
+  def to_key_timestamp
+    to_i_timestamp.to_s
+  end
+
   def to_i_hour
     self.dup.utc.hour
   end
 
+  def to_key_hour
+    to_i_hour.to_s
+  end
+
   # Returns an integer to use as MongoDB key
   def to_key
     "#{to_i_timestamp}.#{to_i_hour}"

data/lib/trackoid/readers.rb

@@ -28,8 +28,11 @@ module Mongoid  #:nodoc:
       end
 
       def on(date)
-        return date.collect {|d| whole_data_for(d)} if date.is_a?(Range)
-        whole_data_for(date)
+        if date.is_a?(Range)
+          whole_data_for_range(date)
+        else
+          whole_data_for(date)
+        end
       end
 
       def all_values

data/lib/trackoid/tracker.rb

@@ -145,11 +145,50 @@ module Mongoid  #:nodoc:
       def whole_data_for(date)
         unless date.nil?
           date = normalize_date(date)
-          h = date.whole_day.hour_collect {|d| data_for(d)}
-          ReaderExtender.new(h.sum, h)
+          if date.utc?
+            d = expand_hash @data[date.to_key_timestamp]
+            ReaderExtender.new(d.sum, d)
+          else
+            r = date.whole_day
+            d1 = expand_hash @data[r.first.to_key_timestamp]
+            d2 = expand_hash @data[r.last.to_key_timestamp]
+            t = d1[r.first.to_i_hour, 24] + d2[0, r.first.to_i_hour]
+            ReaderExtender.new(t.sum, t)
+          end
         end
       end
 
+      def whole_data_for_range(date)
+        date = normalize_date(date)
+        if date.first.utc?
+          keys = date.map(&:to_key_timestamp)
+          keys.inject([]) {|r,e|
+            d = expand_hash(@data[e])
+            r << ReaderExtender.new(d.sum, d)
+          }
+        else
+          first = date.first.whole_day.first.to_key_timestamp
+          last  = date.last.whole_day.last.to_key_timestamp
+          pivot = date.first.whole_day.first.to_i_hour
+          acc = expand_hash(@data[first.to_s])
+
+          data = []
+          first.succ.upto(last) do |n|
+            d = expand_hash(@data[n])
+            t = acc[pivot, 24] + d[0, pivot]
+            acc = d
+            data << ReaderExtender.new(t.sum, t)
+          end
+          data
+        end
+      end
+
+      def expand_hash(h)
+        d = Array.new(24, 0)
+        h.inject(d) {|d,e| d[e.first.to_i] = e.last; d} if h
+        d
+      end
+
       def update_data(value, date)
         unless date.nil?
           return remove_data(date) unless value
@@ -188,6 +227,8 @@ module Mongoid  #:nodoc:
           Time.parse(date)
         when Date
           date.to_time
+        when Range
+          normalize_date(date.first)..normalize_date(date.last)
         else
           date
         end

data/trackoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackoid}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Miguel Perez"]
-  s.date = %q{2011-04-29}
+  s.date = %q{2011-05-01}
   s.description = %q{Trackoid uses an embeddable approach to track analytics data using the poweful features of MongoDB for scalability}
   s.email = %q{josemiguel@perezruiz.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Jose Miguel Perez
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -07:00
+date: 2011-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency