trackoid 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/trackoid/aggregates.rb

@@ -109,9 +109,9 @@ module Mongoid  #:nodoc:
         def foreign_class_defined?
           # The following construct doesn't work with namespaced constants.
           # Object.const_defined?(internal_aggregates_name.to_sym)
-
-          cn = internal_aggregates_name.constantize rescue nil
-          !cn.nil?
+          internal_aggregates_name.constantize && true
+        rescue NameError
+          false
         end
 
         # Adds the aggregate field to the array of aggregated fields.
@@ -123,7 +123,10 @@ module Mongoid  #:nodoc:
         # the original class model but with "Aggregates" appended.
         # Example:  TestModel ==> TestModelAggregates
         def define_klass(&block)
-          klass = Object.const_set(internal_aggregates_name, Class.new)
+          scope = internal_aggregates_name.split('::')
+          klass = scope.pop
+          scope = scope.inject(Kernel) {|scope, const_name| scope.const_get(const_name)}
+          klass = scope.const_set(klass, Class.new)
           klass.class_eval(&block)
         end
 

data/lib/trackoid/tracker.rb

@@ -35,16 +35,13 @@ module Mongoid  #:nodoc:
       def add(how_much = 1, date = DateTime.now)
         raise Errors::ModelNotSaved, "Can't update a new record" if @owner.new_record?
         update_data(data_for(date) + how_much, date)
-
         @owner.collection.update( @owner._selector,
             { (how_much > 0 ? "$inc" : "$dec") => update_hash(how_much.abs, date) },
             :upsert => true)
-
         return unless @owner.aggregated?
 
         @owner.aggregate_fields.each do |(k,v)|
           next unless token = v.call(@aggregate_data)
-          
           fk = @owner.class.name.to_s.foreign_key.to_sym
           selector = { fk => @owner.id, :ns => k, :key => token.to_s }
           @owner.aggregate_klass.collection.update( selector,
@@ -63,11 +60,20 @@ module Mongoid  #:nodoc:
 
       def set(how_much, date = DateTime.now)
         raise Errors::ModelNotSaved, "Can't update a new record" if @owner.new_record?
-
         update_data(how_much, date)
         @owner.collection.update( @owner._selector,
             { "$set" => update_hash(how_much, date) },
             :upsert => true)
+        return unless @owner.aggregated?
+
+        @owner.aggregate_fields.each do |(k,v)|
+          next unless token = v.call(@aggregate_data)
+          fk = @owner.class.name.to_s.foreign_key.to_sym
+          selector = { fk => @owner.id, :ns => k, :key => token.to_s }
+          @owner.aggregate_klass.collection.update( selector,
+              { "$set" => update_hash(how_much, date) },
+              :upsert => true)
+        end
       end
 
 

data/spec/aggregates_spec.rb

@@ -209,21 +209,28 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits.browsers.today.inject(0) {|total, c| total + c.last }.should == 2
     end
 
+    it "should work also with set" do
+      @mock.visits("Google Chrome").set(5)
+      @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 5]]
+      @mock.visits.referers.today.should == [["firefox", 1], ["chrome", 5]]
+      @mock.visits.today.should == 5
+    end
+
     it "let's chek what happens when sorting the best browser..." do
       @mock.visits("Google Chrome").inc
-      @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 2]]
-      @mock.visits.browsers.today.max {|a,b| a.second <=> b.second }.should == ["google", 2]
+      @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 6]]
+      @mock.visits.browsers.today.max {|a,b| a.second <=> b.second }.should == ["google", 6]
     end
 
     it "should work without aggregation information" do
       @mock.visits.inc
-      @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 2]]
-      @mock.visits.referers.today.should == [["firefox", 1], ["chrome", 2]]
+      @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 6]]
+      @mock.visits.referers.today.should == [["firefox", 1], ["chrome", 6]]
       
       # A more throughout test would check totals...
       visits_today = @mock.visits.today
       visits_today_with_browser = @mock.visits.browsers.today.inject(0) {|total, c| total + c.last }
-      visits_today.should == visits_today_with_browser + 1
+      visits_today.should == visits_today_with_browser
     end
 
   end

data/trackoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackoid}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Miguel Perez"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-07-15}
   s.description = %q{Trackoid uses an embeddable approach to track analytics data using the poweful features of MongoDB for scalability}
   s.email = %q{josemiguel@perezruiz.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trackoid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jose Miguel Perez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 +02:00
+date: 2010-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency