gatoroid 0.2.12 → 0.2.13

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem 'rspec', '>= 2.2.0'
   gem 'mocha'
   gem 'bson_ext'
+  gem 'database_cleaner', '0.8.0'
 end

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
     bson_ext (1.6.2)
       bson (~> 1.6.2)
     builder (3.0.0)
+    database_cleaner (0.8.0)
     diff-lcs (1.1.3)
     git (1.2.5)
     i18n (0.6.0)
@@ -48,6 +49,7 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext
+  database_cleaner (= 0.8.0)
   jeweler
   mocha
   mongoid (>= 2.1.0)

data/VERSION

@@ -1 +1 @@
-0.2.12
+0.2.13

data/gatoroid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.2.12"
+  s.version = "0.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]
-  s.date = "2012-09-04"
+  s.date = "2012-11-13"
   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 = [
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 2.2.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<bson_ext>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, ["= 0.8.0"])
     else
       s.add_dependency(%q<mongoid>, [">= 2.1.0"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 2.2.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, ["= 0.8.0"])
     end
   else
     s.add_dependency(%q<mongoid>, [">= 2.1.0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 2.2.0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, ["= 0.8.0"])
   end
 end
 

data/lib/gator/gatorer.rb

@@ -25,9 +25,9 @@ module Mongoid  #:nodoc:
         end
         
         # Get collections for
-        def collection_for(date,grain,off_set,opts={})
+        def collection_for(date,grain,opts={})
           unless date.nil?
-            return  @object.collection.group(:keyf => create_fkey(grain,off_set), 
+            return  @object.collection.group(:keyf => create_fkey(grain,0), 
                     :reduce => "function(obj,prev){for (var key in obj.#{@for}) {prev.#{@for} += obj.#{@for}}}",
                     :cond=>create_query_hash(date,grain,opts),
                     :initial => {@for => 0})
@@ -204,7 +204,7 @@ module Mongoid  #:nodoc:
           end
           
           sdate,edate = convert_date_by_level(date,grain) # Set Dates
-          key_hash[:date] = {"$gte" => normalize_date(sdate), "$lt" => normalize_date(edate)}
+          key_hash[:date] = {"$gte" => normalize_date(sdate), "$lt" => normalize_date(edate + 1.day)}
           return key_hash
         end
         

data/lib/gator/readers.rb

@@ -29,15 +29,7 @@ module Mongoid  #:nodoc:
 
         # Range - retuns a collection for a specified range on specified level
         def range(date, grain=DEFAULT_GRAIN, opts={})
-            # Get Offset
-            if date.is_a?(Range)
-                off_set = date.last.utc_offset
-            else
-                off_set = date.utc_offset
-            end
-
-
-            data = collection_for(date,grain,off_set,opts)
+            data = collection_for(date,HOUR,opts)
 
             # Add Zero values for dates missing
             # May want to look into a way to get mongo to do this
@@ -49,17 +41,26 @@ module Mongoid  #:nodoc:
                 when HOUR
                   start_date = start_date.change(:sec=>0).change(:min => 0)
                   end_date = end_date.change(:sec=>0).change(:min => 0) - 1.hour
+                  data = data.group_by {|d| (Time.zone.at(d["date"].to_i).change(:sec=>0).change(:min => 0)).to_i }
                 when DAY
                   start_date = start_date.change(:hour=>0).change(:sec=>0).change(:min => 0)
                   end_date = end_date.change(:hour=>0).change(:sec=>0).change(:min => 0)
+                  data = data.group_by {|d| (Time.zone.at(d["date"].to_i).change(:hour=>0).change(:sec=>0).change(:min => 0)).to_i }
                 when MONTH
                   start_date = start_date.change(:day=>1).change(:hour=>0).change(:sec=>0).change(:min => 0)
                   end_date = end_date.change(:day=>1).change(:hour=>0).change(:sec=>0).change(:min => 0)
+                  data = data.group_by {|d| (Time.zone.at(d["date"].to_i).change(:day=>1).change(:hour=>0).change(:sec=>0).change(:min => 0)).to_i }
               end
 
+              # Initialize result set array
+              result_set = []
+              
+              # Build Result Set by Time Zone
               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}
+                if data[start_date.to_i].nil?
+                   result_set << {"date" => "#{start_date.to_i}", @for => 0}
+                else
+                  result_set << {"date" => "#{start_date.to_i}", @for => data[start_date.to_i].map{|di| di[@for.to_s].to_i}.inject(0, :+)}
                 end
                 
                 case grain
@@ -72,9 +73,8 @@ module Mongoid  #:nodoc:
                 end
               end
             end
-            # Sort by date
-            data = data.sort_by { |hsh| hsh["date"] }
-            return data
+
+            return result_set
         end
         
         
@@ -82,11 +82,11 @@ module Mongoid  #:nodoc:
         def group_by(date,grain,opts={})
             # Get Offset
             if date.is_a?(Range)
-                off_set = date.first.utc_offset
+                off_set = date.last.utc_offset
             else
                 off_set = date.utc_offset
             end
-            data = collection_for_group(date,grain,off_set,opts)
+            data = collection_for_group(date,HOUR,0,opts)
             return data
         end
         

data/spec/gatoroid_spec.rb

@@ -10,6 +10,7 @@ end
 describe Mongoid::Gator do
   before(:all) do
     @gatoroid_version = File.read(File.expand_path("../VERSION", File.dirname(__FILE__)))
+    Time.zone = 'UTC'
   end
 
   it "should expose the same version as the VERSION file" do
@@ -88,23 +89,40 @@ describe Mongoid::Gator do
 
 
       it "should give 1 for today stats" do
+        lambda { @obj.visits.add(1,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         @obj.visits.today(:siteid=>100).should == 1
       end
       
-      it "should give 0 for yesterday stats" do
-        @obj.visits.yesterday(:siteid=>100).should == 0
+      it "should give 1 for yesterday stats" do
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 1.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        @obj.visits.yesterday(:siteid=>100).should == 1
       end
       
       it "should give 1 for using on for today stats" do
+        lambda { @obj.visits.add(1,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
         @obj.visits.on(Time.now,:siteid=>100).should == 1
       end
       
       it "should give 1 for last stats" do
-        @obj.visits.last(7,:siteid=>100).should == 1
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 6.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 5.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 4.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 3.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 2.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now - 1.day) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { @obj.visits.add(1,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        @obj.visits.last(7,:siteid=>100).should == 7
       end
       
-      it "should have 1 record using range method for today and yesterday at day grain" do
-        @obj.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY, :siteid=>100).should have(2).record
+      it "should have 1 record using range method for today and yesterday at day grain", :kevtest => true do
+        lambda { @obj.visits.add(100,:siteid=>100) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        1.upto(365){ | x |  
+          1.upto(2){ |y| 
+            lambda { @obj.visits.add(1,:siteid=>100, :date=>Time.now + x.days + y.hours) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+          }
+        }
+        Time.zone = "Pacific Time (US & Canada)"
+        @obj.visits.range(Time.zone.now..Time.zone.now + 365.day,Mongoid::Gator::Readers::DAY, :siteid=>100).should have(366).record
       end
       
       it "should have 1 record using range method for today and yesterday at hour grain" do
@@ -176,19 +194,28 @@ describe Mongoid::Gator do
       end
 
       it "should give 1 for today stats" do
-        Test.visits.today(:siteid=>200).should == 3
+        lambda { Test.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        Test.visits.today(:siteid=>200).should == 1
       end
 
       it "should give 0 for yesterday stats" do
         Test.visits.yesterday(:siteid=>200).should == 0
       end
 
-      it "should give 1 for using on for today stats" do
-        Test.visits.on(Time.now,:siteid=>200).should == 3
+      it "should give 1 for using ON for today stats" do
+        lambda { Test.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        Test.visits.on(Time.now,:siteid=>200).should == 1
       end
       
       it "should give 1 for last stats" do
-        Test.visits.last(7,:siteid=>200).should ==3
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 6.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 5.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 4.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 3.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 2.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200, :date => Time.now - 1.days) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        lambda { Test.visits.add(1,:siteid=>200) }.should_not raise_error Mongoid::Errors::ModelNotSaved
+        Test.visits.last(7,:siteid=>200).should ==7
       end
 
       it "should have 1 record using range method for today and yesterday at day grain" do

data/spec/spec_helper.rb

@@ -21,7 +21,21 @@ end
 
 RSpec.configure do |config|
   config.mock_with :mocha
-  config.before :suite do
-    Mongoid.master.collections.reject { |c| c.name =~ /^system\./ }.each(&:drop)
+
+  # keep our mongo DB all shiney and new between tests
+  require 'database_cleaner'
+  
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.orm = "mongoid"
+  end
+  
+  config.before(:each) do
+    DatabaseCleaner.clean
+  end
+  
+  config.after(:each) do
+    DatabaseCleaner.clean
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156253340 !ruby/object:Gem::Requirement
+  requirement: &2152253900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156253340
+  version_requirements: *2152253900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156252860 !ruby/object:Gem::Requirement
+  requirement: &2152253120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252860
+  version_requirements: *2152253120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156252320 !ruby/object:Gem::Requirement
+  requirement: &2152252140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156252320
+  version_requirements: *2152252140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156251740 !ruby/object:Gem::Requirement
+  requirement: &2152251320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2156251740
+  version_requirements: *2152251320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156251220 !ruby/object:Gem::Requirement
+  requirement: &2152250640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156251220
+  version_requirements: *2152250640
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156250600 !ruby/object:Gem::Requirement
+  requirement: &2152249980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156250600
+  version_requirements: *2152249980
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &2152249120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: *2152249120
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
   for scalability
 email: kevinjhaight@gmail.com