gatoroid 0.2.13 → 0.2.14

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/gatoroid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]

data/lib/gator/gatorer.rb

@@ -65,27 +65,7 @@ module Mongoid  #:nodoc:
         
         # Create fkey
         def create_fkey(grain,off_set)
-          case grain
-          when HOUR
-            fkey = Javascript.aggregate_hour
-          when 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 = "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
+          fkey = Javascript.aggregate_hour
           return fkey
         end
         

data/lib/gator/javascript/functions.yml

@@ -2,16 +2,4 @@ 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)};
-     }"
-
-aggregate_day:
-    "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)};
-    }"
+     }"

data/lib/gator/readers.rb

@@ -29,7 +29,7 @@ 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,HOUR,opts)
+            data = collection_for(date,grain,opts)
 
             # Add Zero values for dates missing
             # May want to look into a way to get mongo to do this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152253900 !ruby/object:Gem::Requirement
+  requirement: &2152459920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152253900
+  version_requirements: *2152459920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152253120 !ruby/object:Gem::Requirement
+  requirement: &2152459140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152253120
+  version_requirements: *2152459140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152252140 !ruby/object:Gem::Requirement
+  requirement: &2152458180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152252140
+  version_requirements: *2152458180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152251320 !ruby/object:Gem::Requirement
+  requirement: &2152457280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2152251320
+  version_requirements: *2152457280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152250640 !ruby/object:Gem::Requirement
+  requirement: &2152456620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152250640
+  version_requirements: *2152456620
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2152249980 !ruby/object:Gem::Requirement
+  requirement: &2152455960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152249980
+  version_requirements: *2152455960
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152249120 !ruby/object:Gem::Requirement
+  requirement: &2152455100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,7 +87,7 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *2152249120
+  version_requirements: *2152455100
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
   for scalability
 email: kevinjhaight@gmail.com