gatoroid 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/gatoroid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]
-  s.date = "2012-06-07"
+  s.date = "2012-06-08"
   s.description = "Gatoroid is a way to store analytics using the poweful features of MongoDB for scalability"
   s.email = "kevinjhaight@gmail.com"
   s.extra_rdoc_files = [

data/lib/gator/gatorer.rb

@@ -25,9 +25,9 @@ module Mongoid  #:nodoc:
         end
         
         # Get collections for
-        def collection_for(date,grain, opts={})
+        def collection_for(date,grain,off_set,opts={})
           unless date.nil?
-            return  @object.collection.group(:keyf => create_fkey(grain), 
+            return  @object.collection.group(:keyf => create_fkey(grain,off_set), 
                     :reduce => "function(obj,prev){for (var key in obj.#{@for}) {prev.#{@for} += obj.#{@for}}}",
                     :cond=>create_query_hash(date,grain,opts),
                     :initial => {@for => 0})
@@ -45,23 +45,36 @@ module Mongoid  #:nodoc:
           end
           case level
           when HOUR
-            return sdate.change(:sec=>0), edate.change(:sec=>0)
+            return sdate.change(:sec=>0), edate.change(:sec=>0) + 1.hour
           when DAY
-            return sdate.change(:hour=>0).change(:sec=>0), edate.change(:hour=>24).change(:sec=>0)
+            return sdate.change(:hour=>0).change(:sec=>0), edate.change(:hour=>0).change(:sec=>0) + 1.day
           when MONTH
             return sdate.change(:day=>1).change(:hour=>0).change(:sec=>0), edate.change(:day=>1).change(:hour=>0).change(:sec=>0) + 1.month
           end
         end
         
         # Create fkey
-        def create_fkey(grain)
+        def create_fkey(grain,off_set)
           case grain
           when HOUR
             fkey = Javascript.aggregate_hour
           when MONTH
-            fkey = Javascript.aggregate_month
+            fkey = "function(doc) {
+                off_set = #{off_set} * 1000;
+                dd = new Date((doc.date + #{off_set})* 1000);
+                utc_date = parseInt((Date.parse((dd.getUTCMonth() + 1) + '/' + '01' + '/' + dd.getUTCFullYear()) / 1000)/86400)*86400;
+                out = (utc_date - #{off_set});
+                return {date:  out.toFixed(0)};
+                }"
+
           else # DEFAULT TO DAY
-            fkey = Javascript.aggregate_day
+	          fkey = "function(doc) {
+            	  off_set = #{off_set} * 1000;
+             	  dd = new Date((doc.date + #{off_set})* 1000);
+		            utc_date = parseInt((Date.parse((dd.getUTCMonth() + 1) + '/' + dd.getUTCDate() + '/' + dd.getUTCFullYear()) / 1000)/86400)*86400;
+		            out = (utc_date - #{off_set});
+            	return {date:  out.toFixed(0)};
+     	    	}"
           end
           return fkey
         end
@@ -201,4 +214,4 @@ module Mongoid  #:nodoc:
           
       end  
     end
-end
+end

data/lib/gator/javascript/functions.yml

@@ -1,17 +1,17 @@
 aggregate_hour:
-    "function(doc) { 
-        d = new Date(doc.date* 1000); 
-        return {date:  (Date.parse((d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear() + ' ' + d.getHours() + ':00:00') / 1000).toFixed(0)}; 
+    "function(doc) {
+        d = new Date(doc.date* 1000);
+        return {date:  (Date.parse((d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear() + ' ' + d.getHours() + ':00:00') / 1000).toFixed(0)};
      }"
-     
+
 aggregate_day:
-    "function(doc) { 
-        d = new Date(doc.date* 1000); 
-        return {date:   (Date.parse((d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear()) / 1000).toFixed(0)}; 
+    "function(doc) {
+        d = new Date(doc.date* 1000);
+        return {date:   (Date.parse((d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear() + ' 00::00') / 1000).toFixed(0)};
      }"
-    
+
 aggregate_month:
-    "function(doc) { 
-    d = new Date(doc.date* 1000); 
-    return {date:   (Date.parse((d.getMonth() + 1) + '/1/' + d.getFullYear()) / 1000).toFixed(0)}; 
-    }"
+    "function(doc) {
+    d = new Date(doc.date* 1000);
+    return {date:   (Date.parse((d.getMonth() + 1) + '/1/' + d.getFullYear()) / 1000).toFixed(0)};
+    }

data/lib/gator/readers.rb

@@ -7,15 +7,15 @@ module Mongoid  #:nodoc:
         DAY = "DAY"
         MONTH = "MONTH"
         DEFAULT_GRAIN = DAY
-      
+
         # Today - Gets total for today on DAY level
         def today(opts={})
-          total_for(Time.now, DEFAULT_GRAIN, opts).to_i
+          total_for(Time.zone.now, DEFAULT_GRAIN, opts).to_i
         end
-      
+
         # Yesterday - Gets total for tomorrow on DAY level
         def yesterday(opts={})
-          total_for(Time.now - 1.day, DEFAULT_GRAIN,opts).to_i
+          total_for(Time.zone.now - 1.day, DEFAULT_GRAIN,opts).to_i
         end
 
         # On - Gets total for a specified day on DAY level
@@ -25,31 +25,40 @@ module Mongoid  #:nodoc:
 
         # Range - retuns a collection for a specified range on specified level
         def range(date, grain=DEFAULT_GRAIN, opts={})
-            data = collection_for(date,grain,opts)
+            # Get Offset
+            if date.is_a?(Range)
+                off_set = date.first.utc_offset
+            else
+                off_set = date.utc_offset
+            end
+
+
+            data = collection_for(date,grain,off_set,opts)
+
             # Add Zero values for dates missing
             # May want to look into a way to get mongo to do this
             if date.is_a?(Range)
               start_date = date.first
               end_date = date.last
-              
+
               case grain
                 when HOUR
-                  start_date = start_date.change(:sec=>0)
-                  end_date = end_date.change(:sec=>0)
+                  start_date.change(:sec=>0)
+                  end_date.change(:sec=>0)
                 when DAY
-                  start_date = start_date.change(:hour=>0).change(:sec=>0)
-                  end_date = end_date.change(:hour=>0).change(:sec=>0)
+                  start_date.change(:hour=>0).change(:sec=>0)
+                  end_date.change(:hour=>0).change(:sec=>0)
                 when MONTH
-                  start_date = start_date.change(:day=>1).change(:hour=>0).change(:sec=>0)
-                  end_date = start_date.change(:day=>1).change(:hour=>0).change(:sec=>0)
+                  start_date.change(:day=>1).change(:hour=>0).change(:sec=>0)
+                  end_date.change(:day=>1).change(:hour=>0).change(:sec=>0)
               end
-              
-              
+
               while start_date <= end_date
                 if data.select{|item| item['date'].to_i == start_date.to_i}.first.nil?
-          		    data << {"date" => "#{start_date.to_i}", @for => 0}
-        		    end
-          		  case grain
+                    data << {"date" => "#{start_date.to_i}", @for => 0}
+                end
+                
+                case grain
                   when HOUR
                     start_date = start_date + 1.hour
                   when DAY
@@ -57,13 +66,12 @@ module Mongoid  #:nodoc:
                   when MONTH
                     start_date = start_date + 1.month
                 end
-          	  end
-        	  end
-        	  # Sort by date
-        	  data = data.sort_by { |hsh| hsh["date"] }
-          	return data
+              end
+            end
+            # Sort by date
+            data = data.sort_by { |hsh| hsh["date"] }
+            return data
         end
-      
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156253380 !ruby/object:Gem::Requirement
+  requirement: &2156222560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156253380
+  version_requirements: *2156222560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156252880 !ruby/object:Gem::Requirement
+  requirement: &2156222060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252880
+  version_requirements: *2156222060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156252340 !ruby/object:Gem::Requirement
+  requirement: &2156221520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252340
+  version_requirements: *2156221520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156251760 !ruby/object:Gem::Requirement
+  requirement: &2156220960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2156251760
+  version_requirements: *2156220960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156251240 !ruby/object:Gem::Requirement
+  requirement: &2156220440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156251240
+  version_requirements: *2156220440
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156250620 !ruby/object:Gem::Requirement
+  requirement: &2156219800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156250620
+  version_requirements: *2156219800
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
   for scalability
 email: kevinjhaight@gmail.com