trackoid 0.1.9 → 0.1.10

data/README.rdoc

@@ -187,20 +187,35 @@ 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
-          be DateTime parseable.
-          For example:  @spain.world_cups.inc("2010-07-11")
-        - Normalized Date and DateTime objects to use only Date methods.
-        - Added "first" / "first_date" / "last" / "last_date" accessors.
-        - Added "all" accessor.
-
-  0.1.5 - Added support for namespaced models and aggregations
-        - Enabled "set" operations on aggregates
+  0.1.10 -  Renamed accessor methods from "all", "last", "first" to
+            "all_values", "first_value" and "last_value" so as not to
+            conflict with traditional ActiveRecord accessors.
+         -  Aggregate methods with a key returns a single instance, not an
+            Array. For example:
+            
+              @page.visits.browser("mozilla").today
+              # Returns now a number instead of an Array
+
+         -  Arguments are now passed thru aggregator accessors. For example:
+         
+              @page.visits.brosers("mozilla").last_days(15)
+              # Should correctly return now an array with 15 elements.
+
+  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 be DateTime parseable.
+            For example:  @spain.world_cups.inc("2010-07-11")
+         -  Normalized Date and DateTime objects to use only Date methods.
+         -  Added "first" / "first_date" / "last" / "last_date" accessors.
+         -  Added "all" accessor.
+
+  0.1.5  -  Added support for namespaced models and aggregations
+         -  Enabled "set" operations on aggregates
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/trackoid/tracker.rb

@@ -86,14 +86,6 @@ module Mongoid  #:nodoc:
 
 
       # Access methods
-      def first
-        data_for(first_date)
-      end
-
-      def last
-        data_for(last_date)
-      end
-      
       def today
         data_for(Date.today)
       end
@@ -102,6 +94,14 @@ module Mongoid  #:nodoc:
         data_for(Date.today - 1)
       end
 
+      def first_value
+        data_for(first_date)
+      end
+
+      def last_value
+        data_for(last_date)
+      end
+      
       def last_days(how_much = 7)
         return [today] unless how_much > 0
         date, values = Date.today, []
@@ -114,7 +114,7 @@ module Mongoid  #:nodoc:
         data_for(date)
       end
 
-      def all
+      def all_values
         on(first_date..last_date) if first_date
       end
 
@@ -122,6 +122,7 @@ module Mongoid  #:nodoc:
       def first_date
         # We are guaranteed _m and _d to exists unless @data is a malformed
         # hash, so we need to do this nasty "return nil", sorry...
+        # TODO: I'm open to change this to a cleaner algorithm :-)
         return nil unless _y = @data.keys.min
         return nil unless _m = @data[_y].keys.min
         return nil unless _d = @data[_y][_m].keys.min
@@ -131,6 +132,7 @@ module Mongoid  #:nodoc:
       def last_date
         # We are guaranteed _m and _d to exists unless @data is a malformed
         # hash, so we need to do this nasty "return nil", sorry...
+        # TODO: I'm open to change this to a cleaner algorithm :-)
         return nil unless _y = @data.keys.max
         return nil unless _m = @data[_y].keys.max
         return nil unless _d = @data[_y][_m].keys.max

data/lib/trackoid/tracker_aggregates.rb

@@ -6,12 +6,12 @@ module Mongoid  #:nodoc:
 
       def initialize(owner, token, key_selector, track_field = nil)
         @owner, @token = owner, token
-        @key = key_selector
+        @key = key_selector.first
         @track_field = track_field
 
         @accessor = @owner.class.send(:internal_accessor_name, @token)
         @selector = {:ns => @token}
-        @selector.merge!(:key => @key.first) if @key.first
+        @selector.merge!(:key => @key) if @key
         @criteria = @owner.send(@accessor).where(@selector)
       end
 
@@ -20,21 +20,21 @@ module Mongoid  #:nodoc:
         @criteria.send(name)
       end
 
-      # Access the aggregation collection with "collection" so that we can
-      # use the original mongoid methods like "all", "first", etc.
-      def collection
-        @criteria
-      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,
+      [ :today, :yesterday, :last_days, :all_values, :first_value, :last_value,
         :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
-          }
+          return nil unless @track_field
+          if @key
+            res = @criteria.first
+            res.send(@track_field).send(name, *args) if res
+          else
+            @criteria.collect {|c|
+              [c.key, c.send(@track_field).send(name, *args)]
+            }
+          end
         end
       }
 

data/spec/aggregates_spec.rb

@@ -161,18 +161,18 @@ describe Mongoid::Tracking::Aggregates do
     
     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
+      @mock.something.aggregate_one.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_two.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_three.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_four.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
+      @mock.something.aggregate_one.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_two.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_three.first.key.is_a?(String).should be_true
+      @mock.something.aggregate_four.first.key.is_a?(String).should be_true
     end
 
   end
@@ -217,8 +217,8 @@ describe Mongoid::Tracking::Aggregates do
     end
 
     it "should have 0 visits yesterday" do
-      @mock.visits.browsers.today.should == [["mozilla", 1]]
-      @mock.visits.referers.today.should == [["firefox", 1]]
+      @mock.visits.browsers.yesterday.should == [["mozilla", 0]]
+      @mock.visits.referers.yesterday.should == [["firefox", 0]]
     end
 
     it "should have 1 visits last 7 days" do
@@ -226,6 +226,11 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits.referers.last_days(7).should == [["firefox", [0, 0, 0, 0, 0, 0, 1]]]
     end
 
+    it "should work also for arbitrary days" do
+      @mock.visits.browsers.last_days(15).should == [["mozilla", [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]]]
+      @mock.visits.referers.last_days(15).should == [["firefox", [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]]]
+    end
+
     it "should work adding 1 visit with different aggregation data" do
       @mock.visits("Google Chrome").inc
       @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 1]]
@@ -235,6 +240,10 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits.browsers.today.inject(0) {|total, c| total + c.last }.should == 2
     end
 
+    it "should return only values when specifying the aggregation key" do
+      @mock.visits.browsers("mozilla").today.should == 1
+    end
+
     it "should work also with set" do
       @mock.visits("Google Chrome").set(5)
       @mock.visits.browsers.today.should == [["mozilla", 1], ["google", 5]]
@@ -278,12 +287,12 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits("Internet Explorer").set(6, "2010-07-16")
     end
 
-    it "should return the correct values for .all" do
-      @mock.visits.all.should == [1, 2, 3, 4, 5, 6]
+    it "should return the correct values for .all_values" do
+      @mock.visits.all_values.should == [1, 2, 3, 4, 5, 6]
     end
     
     it "should return the all values for every aggregate" do
-      @mock.visits.browsers.all.should == [
+      @mock.visits.browsers.all_values.should == [
         ["mozilla",  [1, 0, 0, 4]],
         ["google",   [2, 0, 0, 5]],
         ["internet", [3, 0, 0, 6]]
@@ -307,7 +316,7 @@ describe Mongoid::Tracking::Aggregates do
     end
 
     it "should return the first value for aggregates" do
-      @mock.visits.browsers.first.should == [
+      @mock.visits.browsers.first_value.should == [
         ["mozilla",  1],
         ["google",   2],
         ["internet", 3]
@@ -315,7 +324,7 @@ describe Mongoid::Tracking::Aggregates do
     end
 
     it "should return the last value for aggregates" do
-      @mock.visits.browsers.last.should == [
+      @mock.visits.browsers.last_value.should == [
         ["mozilla",  4],
         ["google",   5],
         ["internet", 6]

data/spec/spec_helper.rb

@@ -22,6 +22,6 @@ end
 Spec::Runner.configure do |config|
   config.mock_with :mocha
   config.before :suite do
-    Mongoid.master.collections.each(&:drop)
+    Mongoid.master.collections.reject { |c| c.name =~ /^system\./ }.each(&:drop)
   end
 end

data/spec/trackoid_spec.rb

@@ -153,11 +153,11 @@ describe Mongoid::Tracking do
     end
 
     it "should give the first value" do
-      @mock.visits.first.should == 1
+      @mock.visits.first_value.should == 1
     end
 
     it "should give the last value" do
-      @mock.visits.last.should == 2
+      @mock.visits.last_value.should == 2
     end
   end
 
@@ -177,16 +177,16 @@ describe Mongoid::Tracking do
       @mock.visits.last_date.should be_nil
     end
 
-    it "should return nil for .first" do
-      @mock.visits.first.should be_nil
+    it "should return nil for .first_date" do
+      @mock.visits.first_value.should be_nil
     end
 
-    it "should return nil for .last" do
-      @mock.visits.last.should be_nil
+    it "should return nil for .last_value" do
+      @mock.visits.last_value.should be_nil
     end
 
-    it "should return nil for .all" do
-      @mock.visits.all.should be_nil
+    it "should return nil for .all_values" do
+      @mock.visits.all_values.should be_nil
     end
   end
 
@@ -198,21 +198,21 @@ describe Mongoid::Tracking do
       @mock = Test.first
     end
 
-    it "should return the correct values for .all" do
+    it "should return the correct values for .all_values" do
       @mock.visits.set(1, "2010-07-11")
       @mock.visits.set(2, "2010-07-12")
       @mock.visits.set(3, "2010-07-13")
       
-      @mock.visits.all.should == [1, 2, 3]
+      @mock.visits.all_values.should == [1, 2, 3]
     end
 
-    it "should return the correct values for .all (Take II)" do
+    it "should return the correct values for .all_values (Take II)" do
       @mock.visits.set(5, "2010-07-01")
       @mock.visits.set(10, "2010-07-30")
     
-      @mock.visits.all.should == [5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10]
-      @mock.visits.last.should == 10
-      @mock.visits.first.should == 5
+      @mock.visits.all_values.should == [5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10]
+      @mock.visits.last_value.should == 10
+      @mock.visits.first_value.should == 5
     end
   end
 

data/trackoid.gemspec

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