gatoroid 0.2.16 → 0.2.17

data/VERSION

@@ -1 +1 @@
-0.2.16
+0.2.17

data/gatoroid.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "gatoroid"
-  s.version = "0.2.16"
+  s.version = "0.2.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Haight"]
   s.date = "2014-07-25"
-  s.description = "Gatoroid is a way to store analytics using the poweful features of MongoDB for scalability.  Supports Mongodb 2.4+"
+  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 = [
     "LICENSE",

data/lib/gator/gatorer.rb

@@ -27,9 +27,10 @@ module Mongoid  #:nodoc:
         # Get collections for
         def collection_for(date,grain,opts={})
           unless date.nil?
+            
             return  @object.collection.group(:keyf => create_fkey(grain,0), 
                     :reduce => "function(obj,prev){prev.#{@for} += obj.#{@for}}",
-                    :cond=>create_query_hash(date,grain,opts),
+                    :cond=>create_query_hash_field(date,grain,@for,opts),
                     :initial => {@for => 0})
           end
         end
@@ -39,7 +40,7 @@ module Mongoid  #:nodoc:
           unless date.nil?
             return  @object.collection.group(:key => create_group_key_hash, 
                     :reduce => "function(obj,prev){prev.#{@for} += obj.#{@for}}",
-                    :cond=>create_query_hash(date,grain,opts),
+                    :cond=>create_query_hash_field(date,grain,@for,opts),
                     :initial => {@for => 0})
           end
         end
@@ -188,6 +189,27 @@ module Mongoid  #:nodoc:
           return key_hash
         end
         
+        # Create Query Hash
+        def create_query_hash_field(date = Time.now, grain, key_field, opts)
+          key_hash = Hash.new { |hash, key| hash[key] = [] }
+          # Set Keys
+          if !opts.empty?
+            @object.gator_keys.each do | gk |
+              raise Errors::ModelNotSaved, "Missing key value #{gk}" if opts[gk].nil?
+              if  opts[gk].kind_of?(Array)
+                key_hash[gk] = {"$in" =>  opts[gk]}
+              else
+                key_hash[gk] = opts[gk]
+              end
+            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[key_field] = {"$ne" => nil}
+          return key_hash
+        end
+        
         # Normalize Dates
         def normalize_date(date)
           case date

data/spec/gatoroid_spec.rb

@@ -125,7 +125,8 @@ describe Mongoid::Gator do
         @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
+      it "should have 1 record using range method for today and yesterday at hour grain", :nantest => true do
+        @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).inspect
         @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(24).record
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatoroid
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70298558044400 !ruby/object:Gem::Requirement
+  requirement: &70209373753160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70298558044400
+  version_requirements: *70209373753160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70298558043920 !ruby/object:Gem::Requirement
+  requirement: &70209373752540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298558043920
+  version_requirements: *70209373752540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70298558043440 !ruby/object:Gem::Requirement
+  requirement: &70209373751840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298558043440
+  version_requirements: *70209373751840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70298558042960 !ruby/object:Gem::Requirement
+  requirement: &70209373751260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70298558042960
+  version_requirements: *70209373751260
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70298558042480 !ruby/object:Gem::Requirement
+  requirement: &70209373750480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298558042480
+  version_requirements: *70209373750480
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70298558042000 !ruby/object:Gem::Requirement
+  requirement: &70209373749800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298558042000
+  version_requirements: *70209373749800
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70298558041520 !ruby/object:Gem::Requirement
+  requirement: &70209373749160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,9 +87,9 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *70298558041520
+  version_requirements: *70209373749160
 description: Gatoroid is a way to store analytics using the poweful features of MongoDB
-  for scalability.  Supports Mongodb 2.4+
+  for scalability
 email: kevinjhaight@gmail.com
 executables: []
 extensions: []