gatoroid 0.2.10 → 0.2.11

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/gatoroid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]
-  s.date = "2012-08-06"
+  s.date = "2012-08-07"
   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

@@ -35,11 +35,11 @@ module Mongoid  #:nodoc:
         end
         
         # Get collections for group
-        def collection_for_group(date,off_set,opts={})
+        def collection_for_group(date,grain,off_set,opts={})
           unless date.nil?
             return  @object.collection.group(:key => create_group_key_hash, 
                     :reduce => "function(obj,prev){for (var key in obj.#{@for}) {prev.#{@for} += obj.#{@for}}}",
-                    :cond=>create_query_hash(date,"HOUR",opts),
+                    :cond=>create_query_hash(date,grain,opts),
                     :initial => {@for => 0})
           end
         end

data/lib/gator/readers.rb

@@ -79,14 +79,14 @@ module Mongoid  #:nodoc:
         
         
         # Group_by - retuns a collection for a specific key
-        def group_by(date, opts={})
+        def group_by(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_group(date,off_set,opts)
+            data = collection_for_group(date,grain,off_set,opts)
             return data
         end
         

data/spec/gatoroid_spec.rb

@@ -124,7 +124,7 @@ describe Mongoid::Gator do
         lambda { @obj.visits.add(1,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         lambda { @obj.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         lambda { @obj.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
-        @obj.visits.group_by(Time.now..Time.now + 1.day).should have(2).record
+        @obj.visits.group_by(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY).should have(2).record
       end
   end
   
@@ -176,7 +176,7 @@ describe Mongoid::Gator do
       end
 
       it "should give 1 for today stats" do
-        Test.visits.today(:siteid=>200).should == 1
+        Test.visits.today(:siteid=>200).should == 3
       end
 
       it "should give 0 for yesterday stats" do
@@ -184,11 +184,11 @@ describe Mongoid::Gator do
       end
 
       it "should give 1 for using on for today stats" do
-        Test.visits.on(Time.now,:siteid=>200).should == 1
+        Test.visits.on(Time.now,:siteid=>200).should == 3
       end
       
       it "should give 1 for last stats" do
-        Test.visits.last(7,:siteid=>200).should ==1
+        Test.visits.last(7,:siteid=>200).should ==3
       end
 
       it "should have 1 record using range method for today and yesterday at day grain" do
@@ -212,7 +212,7 @@ describe Mongoid::Gator do
         lambda { Test.visits.add(1,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         lambda { Test.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         lambda { Test.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
-        Test.visits.group_by(Time.now..Time.now + 1.day).should have(2).record
+        Test.visits.group_by(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY).should have(2).record
       end
       
    end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156253380 !ruby/object:Gem::Requirement
+  requirement: &2164631240 !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: *2164631240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156252880 !ruby/object:Gem::Requirement
+  requirement: &2164630620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252880
+  version_requirements: *2164630620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156252340 !ruby/object:Gem::Requirement
+  requirement: &2164630040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252340
+  version_requirements: *2164630040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156251760 !ruby/object:Gem::Requirement
+  requirement: &2164629380 !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: *2164629380
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156251240 !ruby/object:Gem::Requirement
+  requirement: &2164628800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156251240
+  version_requirements: *2164628800
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156250620 !ruby/object:Gem::Requirement
+  requirement: &2164628220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156250620
+  version_requirements: *2164628220
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
   for scalability
 email: kevinjhaight@gmail.com