trackoid 0.1.8 → 0.1.9

data/README.rdoc

@@ -187,6 +187,11 @@ For comparison, this README is already 8.5Kb in size.
 
 = Revision History
 
+  0.1.9 - Refactored TrackerAggregates to include all accessor methods
+          (all, last, first, etc.)
+
+  0.1.8 - Another maintenance release. Sorry. :-)
+
   0.1.7 - Maintenance Release: A little error with the index on aggregated fields
 
   0.1.6 - Enabled support for String dates in operators. This string date must

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/trackoid/aggregates.rb

@@ -89,7 +89,7 @@ module Mongoid  #:nodoc:
           define_klass do
             include Mongoid::Document
             include Mongoid::Tracking
-            
+
             # Make the relation to the original class
             belongs_to_related parent.name.demodulize.underscore.to_sym, :class_name => parent.name
 

data/lib/trackoid/tracker.rb

@@ -35,18 +35,22 @@ module Mongoid  #:nodoc:
       def add(how_much = 1, date = Date.today)
         raise Errors::ModelNotSaved, "Can't update a new record. Save first!" if @owner.new_record?
         update_data(data_for(date) + how_much, date)
-        @owner.collection.update( @owner._selector,
+        @owner.collection.update(
+            @owner._selector,
             { (how_much > 0 ? "$inc" : "$dec") => update_hash(how_much.abs, date) },
-            :upsert => true)
+            :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,
+          @owner.aggregate_klass.collection.update(
+              selector,
               { (how_much > 0 ? "$inc" : "$dec") => update_hash(how_much.abs, date) },
-              :upsert => true)
+              :upsert => true
+          )
         end
       end
 
@@ -61,18 +65,22 @@ module Mongoid  #:nodoc:
       def set(how_much, date = Date.today)
         raise Errors::ModelNotSaved, "Can't update a new record" if @owner.new_record?
         update_data(how_much, date)
-        @owner.collection.update( @owner._selector,
+        @owner.collection.update(
+            @owner._selector,
             { "$set" => update_hash(how_much, date) },
-            :upsert => true)
+            :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,
+          @owner.aggregate_klass.collection.update(
+              selector,
               { "$set" => update_hash(how_much, date) },
-              :upsert => true)
+              :upsert => true
+          )
         end
       end
 

data/lib/trackoid/tracker_aggregates.rb

@@ -15,49 +15,29 @@ module Mongoid  #:nodoc:
         @criteria = @owner.send(@accessor).where(@selector)
       end
 
-      # REFACTOR THIS
-      # WE ARE DOING SOMETHING LIKE:
-      #
-      # => browsers("something").visits
-      #
-      # WHILE A BEST APPROACH IS LIKE
-      #
-      # => visits.browsers("something")
-
-      # visits (Tracker) -> browsers (TrackerAggregates) -> count (to Criteria)
-      #                                                  -> today (data)
-
       # Delegate all missing methods to the underlying Mongoid Criteria
       def method_missing(name, *args, &block)
         @criteria.send(name)
-
-        # Delegate all missing methods to the underlying Mongoid Criteria
-        # return @criteria.send(name) unless @owner.tracked_fields.member?(name)
-        # super
-        
-        # Otherwise, it's a track method, so process it
-        # @criteria.collect {|x| x.send(name, *args, &block) }
       end
 
-      def today
-        @criteria.collect {|c|
-          [c.key, c.send(@track_field).today] if @track_field
-        }
+      # Access the aggregation collection with "collection" so that we can
+      # use the original mongoid methods like "all", "first", etc.
+      def collection
+        @criteria
       end
 
-      def yesterday
-        @criteria.collect {|c|
-          [c.key, c.send(@track_field).yesterday] if @track_field
-        }
-      end
-
-      def last_days(how_much = 7)
-        @criteria.collect {|c|
-          [c.key, c.send(@track_field).last_days(how_much)] if @track_field
-        }
-      end
+      # Define all accessors here. Basically we are delegating to the Track
+      # object for every object in the criteria
+      [ :today, :yesterday, :last_days, :all, :first, :last,
+        :first_date, :last_date
+      ].each {|name|
+        define_method(name) do |*args|
+          @criteria.collect {|c|
+            [c.key, c.send(@track_field).send(name)] if @track_field
+          }
+        end
+      }
 
     end
-
   end
 end

data/spec/aggregates_spec.rb

@@ -21,11 +21,12 @@ class SecondTestModel
   include Mongoid::Tracking
 
   field :name   # Dummy field
-  track :visits
+  track :something
 
-  aggregate :browsers do
-    "Chrome".downcase
-  end
+  aggregate :aggregate_one do 1 end
+  aggregate :aggregate_two do "p" end
+  aggregate :aggregate_three do BSON::ObjectID.new("4c4121857bc3cd0d78cb65b2") end
+  aggregate :aggregate_four do Time.now end
 end
 
 describe Mongoid::Tracking::Aggregates do
@@ -150,10 +151,35 @@ describe Mongoid::Tracking::Aggregates do
     }.should raise_error Mongoid::Errors::ClassAlreadyDefined
   end
 
-  describe "when tracking a model with aggregation data" do
+  describe "testing different object class for aggregation key" do
+    before do
+      SecondTestModel.all.map(&:destroy)
+      SecondTestModel.create(:name => "test")
+      @object_id = SecondTestModel.first.id
+      @mock = SecondTestModel.find(@object_id)
+    end
+    
+    it "should correctly save all aggregation keys as strings (inc)" do
+      @mock.something("test").inc
+      @mock.something.aggregate_one.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_two.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_three.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_four.collection.first.key.is_a?(String).should be_true
+    end
+
+    it "should correctly save all aggregation keys as strings (set)" do
+      @mock.something("test").set(5)
+      @mock.something.aggregate_one.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_two.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_three.collection.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_four.collection.first.key.is_a?(String).should be_true
+    end
+
+  end
 
+  describe "when tracking a model with aggregation data" do
     before(:all) do
-      TestModel.delete_all
+      TestModel.all.map(&:destroy)
       TestModel.create(:name => "test")
       @object_id = TestModel.first.id
     end
@@ -216,7 +242,7 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits.today.should == 5
     end
 
-    it "let's chek what happens when sorting the best browser..." do
+    it "let's check what happens when sorting the best browser..." do
       @mock.visits("Google Chrome").inc
       @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 6]]
       @mock.visits.browsers.today.max {|a,b| a.second <=> b.second }.should == ["google", 6]
@@ -232,15 +258,69 @@ describe Mongoid::Tracking::Aggregates do
       visits_today_with_browser = @mock.visits.browsers.today.inject(0) {|total, c| total + c.last }
       visits_today.should == visits_today_with_browser
     end
-
   end
 
+  describe "Testing all accessors" do
+    before do
+      TestModel.all.map(&:destroy)
+      TestModel.create(:name => "test")
+      @object_id = TestModel.first.id
+      @mock = TestModel.first
+
+      # For 'first' values
+      @mock.visits("Mozilla Firefox").set(1, "2010-07-11")
+      @mock.visits("Google Chrome").set(2, "2010-07-12")
+      @mock.visits("Internet Explorer").set(3, "2010-07-13")
+      
+      # For 'last' values
+      @mock.visits("Mozilla Firefox").set(4, "2010-07-14")
+      @mock.visits("Google Chrome").set(5, "2010-07-15")
+      @mock.visits("Internet Explorer").set(6, "2010-07-16")
+    end
 
-  # it "should print methods && their classes to stdout" do
-  #   TestModel.methods.sort.each {|x|
-  #     puts "#{x}"
-  #   }
-  #   should be_true
-  # end
+    it "should return the correct values for .all" do
+      @mock.visits.all.should == [1, 2, 3, 4, 5, 6]
+    end
+    
+    it "should return the all values for every aggregate" do
+      @mock.visits.browsers.all.should == [
+        ["mozilla",  [1, 0, 0, 4]],
+        ["google",   [2, 0, 0, 5]],
+        ["internet", [3, 0, 0, 6]]
+      ]
+    end
+    
+    it "should return the correct first_date for every aggregate" do
+      @mock.visits.browsers.first_date.should == [
+        ["mozilla",  Date.parse("2010-07-11")],
+        ["google",   Date.parse("2010-07-12")],
+        ["internet", Date.parse("2010-07-13")]
+      ]
+    end
 
+    it "should return the correct last_date for every aggregate" do
+      @mock.visits.browsers.last_date.should == [
+        ["mozilla",  Date.parse("2010-07-14")],
+        ["google",   Date.parse("2010-07-15")],
+        ["internet", Date.parse("2010-07-16")]
+      ]
+    end
+
+    it "should return the first value for aggregates" do
+      @mock.visits.browsers.first.should == [
+        ["mozilla",  1],
+        ["google",   2],
+        ["internet", 3]
+      ]
+    end
+
+    it "should return the last value for aggregates" do
+      @mock.visits.browsers.last.should == [
+        ["mozilla",  4],
+        ["google",   5],
+        ["internet", 6]
+      ]
+    end
+    
+  end
 end

data/trackoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackoid}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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-17}
+  s.date = %q{2010-07-18}
   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: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jose Miguel Perez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 +02:00
+date: 2010-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency