gatoroid 0.1.0 → 0.2.0

data/.rvmrc

@@ -0,0 +1,2 @@
+export rvm_trust_rvmrcs_flag=1
+rvm --create use 1.9.3-p125@gatorid

data/Gemfile.lock

@@ -0,0 +1,55 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.6)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.8)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  jeweler
+  mocha
+  mongoid (>= 2.1.0)
+  rake
+  rspec (>= 2.2.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/gatoroid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]
-  s.date = "2012-04-11"
+  s.date = "2012-06-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 = [
@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".rvmrc",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",

data/lib/gator/gatorer.rb

@@ -179,7 +179,7 @@ module Mongoid  #:nodoc:
             end
           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), "$lte" => normalize_date(edate)}
           return key_hash
         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}; 
+        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}; 
+        return {date:   (Date.parse((d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear()) / 1000).toFixed(0)}; 
      }"
     
 aggregate_month:
     "function(doc) { 
     d = new Date(doc.date* 1000); 
-    return {date:   Date.parse((d.getMonth() + 1) + '/1/' + d.getFullYear()) / 1000}; 
+    return {date:   (Date.parse((d.getMonth() + 1) + '/1/' + d.getFullYear()) / 1000).toFixed(0)}; 
     }"

data/lib/gator/readers.rb

@@ -25,7 +25,41 @@ module Mongoid  #:nodoc:
 
         # Range - retuns a collection for a specified range on specified level
         def range(date, grain=DEFAULT_GRAIN, opts={})
-            collection_for(date,grain,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
+            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)
+                when DAY
+                  start_date = start_date.change(:hour=>0).change(:sec=>0)
+                  end_date = 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)
+              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
+                  when HOUR
+                    start_date = start_date + 1.hour
+                  when DAY
+                    start_date = start_date + 1.day
+                  when MONTH
+                    start_date = start_date + 1.month
+                end
+          	  end
+        	  end
+          	return data
         end
       
       end

data/lib/gatoroid.rb

@@ -3,22 +3,11 @@ require 'rubygems'
 
 gem "mongoid", ">= 1.9.0"
 
-#require 'gator/errors'
-#require 'gator/core_ext'
-#require 'gator/reader_extender'
-#require 'gator/readers'
-#require 'gator/gator'
-#require 'gator/aggregates'
-#require 'gator/gator_aggregates'
-#require '../lib/gator/gatoring.rb'
-#require File.expand_path('../gator/errors.rb', __FILE__)
-#require File.expand_path('../gator/reader_extender.rb', __FILE__)
 require File.expand_path('../gator/errors.rb', __FILE__)
 require File.expand_path('../gator/javascript.rb', __FILE__)
 require File.expand_path('../gator/readers.rb', __FILE__)
 require File.expand_path('../gator/gatorer.rb', __FILE__)
 require File.expand_path('../gator/gator.rb', __FILE__)
-#require File.expand_path('../../lib/gator.rb', __FILE__)
 
 module Mongoid
   module Gator

data/spec/gatoroid_spec.rb

@@ -100,15 +100,15 @@ describe Mongoid::Gator do
       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(1).record
+        @obj.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY, :siteid=>100).should have(2).record
       end
       
       it "should have 1 record using range method for today and yesterday at hour grain" do
-        @obj.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>100).should have(1).record
+        @obj.visits.range(Time.now.change(:hour=>0).change(:sec=>0)..Time.now.change(:hour=>0).change(:sec=>0) + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>100).should have(25).record
       end
       
       it "should have 1 record using range method for today and yesterday at month grain" do
-        @obj.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>100).should have(1).record
+        @obj.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::MONTH, :siteid=>100).should have(1).record
       end
       
       it "should reset value to zero" do
@@ -178,15 +178,15 @@ describe Mongoid::Gator do
       end
 
       it "should have 1 record using range method for today and yesterday at day grain" do
-        Test.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY, :siteid=>200).should have(1).record
+        Test.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::DAY, :siteid=>200).should have(2).record
       end
 
       it "should have 1 record using range method for today and yesterday at hour grain" do
-        Test.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>200).should have(1).record
+        Test.visits.range(Time.now.change(:hour=>0).change(:sec=>0)..Time.now.change(:hour=>0).change(:sec=>0) + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>200).should have(25).record
       end
 
       it "should have 1 record using range method for today and yesterday at month grain" do
-        Test.visits.range(Time.now..Time.now + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>200).should have(1).record
+        Test.visits.range(Time.now.change(:hour=>0).change(:sec=>0)..Time.now.change(:hour=>0).change(:sec=>0) + 1.day,Mongoid::Gator::Readers::HOUR, :siteid=>200).should have(25).record
       end
       
       it "should reset value to zero" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2164561420 !ruby/object:Gem::Requirement
+  requirement: &2152378340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164561420
+  version_requirements: *2152378340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164560940 !ruby/object:Gem::Requirement
+  requirement: &2152377740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164560940
+  version_requirements: *2152377740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164560400 !ruby/object:Gem::Requirement
+  requirement: &2152377160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164560400
+  version_requirements: *2152377160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164559640 !ruby/object:Gem::Requirement
+  requirement: &2152376520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2164559640
+  version_requirements: *2152376520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164558740 !ruby/object:Gem::Requirement
+  requirement: &2152375940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164558740
+  version_requirements: *2152375940
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2164557900 !ruby/object:Gem::Requirement
+  requirement: &2152375340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164557900
+  version_requirements: *2152375340
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
   for scalability
 email: kevinjhaight@gmail.com
@@ -87,7 +87,9 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .rspec
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile