trackoid 0.1.5 → 0.1.6

data/README.rdoc

@@ -183,3 +183,17 @@ MongoDB stores information in BSON format as a binary representation of a JSON s
 A year full of statistical data takes only 2.8Kb, if you store integers. If your statistical data includes floats, a year full of information takes 4.3Kb. I said "a year full of data" because Trackoid does not store information for days without data.
 
 For comparison, this README is already 8.5Kb in size.
+
+
+= Revision History
+
+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.5
+0.1.6

data/lib/trackoid/tracker.rb

@@ -32,8 +32,8 @@ module Mongoid  #:nodoc:
       end
 
       # Update methods
-      def add(how_much = 1, date = DateTime.now)
-        raise Errors::ModelNotSaved, "Can't update a new record" if @owner.new_record?
+      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,
             { (how_much > 0 ? "$inc" : "$dec") => update_hash(how_much.abs, date) },
@@ -50,15 +50,15 @@ module Mongoid  #:nodoc:
         end
       end
 
-      def inc(date = DateTime.now)
+      def inc(date = Date.today)
         add(1, date)
       end
 
-      def dec(date = DateTime.now)
+      def dec(date = Date.today)
         add(-1, date)
       end
 
-      def set(how_much, date = DateTime.now)
+      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,
@@ -78,6 +78,14 @@ 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
@@ -88,24 +96,50 @@ module Mongoid  #:nodoc:
 
       def last_days(how_much = 7)
         return [today] unless how_much > 0
-        date, values = DateTime.now, []
+        date, values = Date.today, []
         (date - how_much.abs + 1).step(date) {|d| values << data_for(d) }
         values
       end
 
       def on(date)
-        date = DateTime.parse(date) if date.is_a?(String)
         return date.collect {|d| data_for(d)} if date.is_a?(Range)
         data_for(date)
       end
 
+      def all
+        on(first_date..last_date) if first_date
+      end
+
+      # Utility methods
+      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...
+        return nil unless _y = @data.keys.min
+        return nil unless _m = @data[_y].keys.min
+        return nil unless _d = @data[_y][_m].keys.min
+        Date.new(_y.to_i, _m.to_i, _d.to_i)
+      end
+      
+      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...
+        return nil unless _y = @data.keys.max
+        return nil unless _m = @data[_y].keys.max
+        return nil unless _d = @data[_y][_m].keys.max
+        Date.new(_y.to_i, _m.to_i, _d.to_i)
+      end
+
       # Private methods
       private
       def data_for(date)
+        return nil if date.nil?
+        date = normalize_date(date)
         @data.try(:[], date.year.to_s).try(:[], date.month.to_s).try(:[], date.day.to_s) || 0
       end
 
       def update_data(value, date)
+        return nil if date.nil?
+        date = normalize_date(date)
         [:year, :month].inject(@data) { |data, period|
           data[date.send(period).to_s] ||= {}
         }
@@ -117,11 +151,21 @@ module Mongoid  #:nodoc:
       def date_literal(d);  "#{d.year}.#{d.month}.#{d.day}"; end
 
       def update_hash(num, date)
+        date = normalize_date(date)
         {
           "#{@for_data}.#{date_literal(date)}" => num
         }
       end
 
+      def normalize_date(date)
+        case date
+        when String
+          Date.parse(date)
+        else
+          date
+        end
+      end
+
       # WARNING: This is +only+ for debugging pourposes (rspec y tal)
       def _original_hash
         @data

data/spec/trackoid_spec.rb

@@ -9,7 +9,6 @@ class Test
 end
 
 describe Mongoid::Tracking do
-
   before(:all) do
     @trackoid_version = File.read(File.expand_path("../VERSION", File.dirname(__FILE__)))
   end
@@ -38,7 +37,6 @@ describe Mongoid::Tracking do
   end
 
   describe "when creating a new field with stats" do
-
     before(:all) do
       @mock = Test.new
     end
@@ -96,11 +94,9 @@ describe Mongoid::Tracking do
     it "should not be aggregated" do
       @mock.aggregated?.should be_false
     end
-
   end
   
   describe "when using a model in the database" do
-    
     before(:all) do
       Test.delete_all
       Test.create(:name => "test")
@@ -143,10 +139,84 @@ describe Mongoid::Tracking do
       @mock.visits.last_days.should == [0, 0, 0, 0, 0, 2, 2]
     end
 
+    it "string dates should work" do
+      @mock.visits.inc("2010-07-11")
+      @mock.visits.on("2010-07-11").should == 1
+    end
+
+    it "should give the first date with first_date" do
+      @mock.visits.first_date.should == Date.parse("2010-07-11")
+    end
+
+    it "should give the last date with last_date" do
+      @mock.visits.last_date.should == Date.today
+    end
+
+    it "should give the first value" do
+      @mock.visits.first.should == 1
+    end
+
+    it "should give the last value" do
+      @mock.visits.last.should == 2
+    end
   end
 
-  context "testing accessor operations without reloading models" do
+  describe "Testing accessors with an empty model" do
+    before do
+      Test.delete_all
+      Test.create(:name => "test")
+      @object_id = Test.first.id
+      @mock = Test.first
+    end
+
+    it "should return nil for .first_date" do
+      @mock.visits.first_date.should be_nil
+    end
+
+    it "should return nil for .last_date" do
+      @mock.visits.last_date.should be_nil
+    end
+
+    it "should return nil for .first" do
+      @mock.visits.first.should be_nil
+    end
 
+    it "should return nil for .last" do
+      @mock.visits.last.should be_nil
+    end
+
+    it "should return nil for .all" do
+      @mock.visits.all.should be_nil
+    end
+  end
+
+  describe "Testing new range accessors with an empty model" do
+    before do
+      Test.delete_all
+      Test.create(:name => "test")
+      @object_id = Test.first.id
+      @mock = Test.first
+    end
+
+    it "should return the correct values for .all" 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]
+    end
+
+    it "should return the correct values for .all (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
+    end
+  end
+
+  context "testing accessor operations without reloading models" do
     before(:all) do
       Test.delete_all
       Test.create(:name => "test")
@@ -195,15 +265,10 @@ describe Mongoid::Tracking do
       # We have data for today as previous tests populated the visits field
       @mock.visits.on(Date.parse("2010-04-30")..Date.parse("2010-05-02")).should == [0, 10, 0]
     end
-
-
   end
 
-
-
   context "regression test for github issues" do
-    
-    it "should not raise undefined method [] for nil:NilClass for objects already saved" do
+    it "should not raise undefined method [] for nil:NilClass when adding a new track into an existing object" do
       class TestModel
         include Mongoid::Document
         include Mongoid::Tracking
@@ -220,7 +285,5 @@ describe Mongoid::Tracking do
       tm.something.inc
       tm.something.today.should == 1
     end
-
   end
-
 end

data/trackoid.gemspec

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