trackoid 0.3.8 → 0.4.0

data/spec/embedded_spec.rb

@@ -0,0 +1,97 @@
+#
+# This is a simple spec to check if tracking works within embedded documents
+# If this passes, the rest of the funcionality it's assumed to work (TZ, etc)
+#
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class TestEmbedOne
+  include Mongoid::Document
+  field :name   # Dummy field
+  embeds_one  :embedded_test
+end
+
+class TestEmbedMany
+  include Mongoid::Document
+  field :name   # Dummy field
+  embeds_many  :embedded_test
+end
+
+class EmbeddedTest
+  include Mongoid::Document
+  include Mongoid::Tracking
+  field :name   # Dummy field
+  track :visits
+  embedded_in :test_embed_one
+  embedded_in :test_embed_many
+end
+
+# And Now For Something Completely Different...
+
+class TestEmbedOuter
+  include Mongoid::Document
+  field :name   # Dummy field
+  embeds_one  :test_embed_middle
+end
+
+class TestEmbedMiddle
+  include Mongoid::Document
+  field :name   # Dummy field
+  embedded_in :test_embed_outer
+  embeds_one  :test_embed_final
+end
+
+class TestEmbedFinal
+  include Mongoid::Document
+  include Mongoid::Tracking
+  field :name   # Dummy field
+  track :visits
+  embedded_in :test_embed_middle
+end
+
+
+describe Mongoid::Tracking do
+
+  # Useful to see all MongoDB operations in place while RSpec is working
+  before(:all) do
+    # Moped.logger.level = Logger::DEBUG
+  end
+
+  context "within a document which embeds one or more models with tracking" do
+    let(:today)     { Time.now }
+    let(:mock_one)  { TestEmbedOne.create(:name => "Parent", :embedded_test => {:name => "Child"}) }
+    let(:mock_many) { TestEmbedMany.create(:name => "Parent", :embedded_test => [{:name => "Child1"}, {:name => "Child2"} ]) }
+
+    it "should have the tracking field working and not bleed to the parent" do
+      mock_one.respond_to?(:visits).should be_false
+      mock_one.embedded_test.respond_to?(:visits).should be_true
+
+      mock_many.respond_to?(:visits).should be_false
+      mock_many.embedded_test.first.respond_to?(:visits).should be_true
+      mock_many.embedded_test.last.respond_to?(:visits).should be_true
+    end
+
+    it "the tracking data should work fine" do
+      mock_one.embedded_test.visits.inc(today)
+      mock_one.embedded_test.visits.on(today).should == 1
+
+      mock_many.embedded_test.first.visits.inc(today)
+      mock_many.embedded_test.first.visits.on(today).should == 1
+      mock_many.embedded_test.last.visits.on(today).should == 0
+    end
+  end
+
+  context "within a three level embedded model" do
+    let(:today) { Time.now }
+    let(:outer) { TestEmbedOuter.create(:name => "Outer", :test_embed_middle => {:name => "Middle", :test_embed_final => { :name => "Final" }}) }
+
+    it "should just work..." do
+      outer.respond_to?(:visits).should be_false
+      outer.test_embed_middle.respond_to?(:visits).should be_false
+      outer.test_embed_middle.test_embed_final.respond_to?(:visits).should be_true
+
+      outer.test_embed_middle.test_embed_final.visits.inc(today)
+      outer.test_embed_middle.test_embed_final.visits.on(today).should == 1
+      outer.test_embed_middle.test_embed_final.visits.on(today - 1.day).should == 0
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,28 +1,18 @@
+# FIXME: We should modify the load path here.
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
 
-# What is this doing here?
-# gem 'mocha', '>= 0.9.8'
-
-require 'mocha'
 require 'mongoid'
 require 'trackoid'
-require 'bson'
 require 'rspec'
 require 'rspec/autorun'
 
-Mongoid.configure do |config|
-  name = "trackoid_test"
-  host = "localhost"
-  port = "27017"
-  # config.master = Mongo::Connection.new(host, port, :logger => Logger.new(STDOUT)).db(name)
-  config.master = Mongo::Connection.new.db(name)
-end
-
 RSpec.configure do |config|
-  config.mock_with :mocha
-  config.before :suite do
-    Mongoid.master.collections.reject { |c| c.name =~ /^system\./ }.each(&:drop)
+  config.before(:suite) do
+  	Mongoid.load!(File.expand_path(File.dirname(__FILE__) + "/../config/mongoid.yml"), :test)
+  end
+
+  config.after(:each) do
+    Mongoid::Config.purge!
   end
 end

data/spec/trackoid_spec.rb

@@ -9,25 +9,21 @@ class Test
 end
 
 describe Mongoid::Tracking do
-  before(:all) do
-    @trackoid_version = File.read(File.expand_path("../VERSION", File.dirname(__FILE__)))
+  it "should ensure allow_dynamic_fields option is turned off" do
+    Mongoid::Config.settings[:allow_dynamic_fields].should == false
   end
 
-  it "should expose the same version as the VERSION file" do
-    Mongoid::Tracking::VERSION.should == @trackoid_version
-  end
-  
   it "should raise error when used in a class not of class Mongoid::Document" do
-    lambda {
+    -> {
       class NotMongoidClass
         include Mongoid::Tracking
         track :something
       end
-    }.should raise_error Mongoid::Errors::NotMongoid
+    }.should raise_error Mongoid::Tracking::Errors::NotMongoid
   end
 
   it "should not raise error when used in a class of class Mongoid::Document" do
-    lambda {
+    -> {
       class MongoidedDocument
         include Mongoid::Document
         include Mongoid::Tracking
@@ -37,13 +33,13 @@ describe Mongoid::Tracking do
   end
 
   it "should not raise errors when using to/as_json" do
-    mock = Test.new(:name => "Trackoid")
+    test = Test.new(:name => "Trackoid")
     json_as = {}
     json_to = ""
 
-    lambda {
-      json_as = mock.as_json(:except => :_id)
-      json_to = mock.to_json(:except => :_id)
+    -> {
+      json_as = test.as_json(:except => :_id)
+      json_to = test.to_json(:except => :_id)
     }.should_not raise_error
 
     json_as.should == { "name" => "Trackoid" }
@@ -55,11 +51,6 @@ describe Mongoid::Tracking do
       @mock = Test.new
     end
 
-    it "should deny access to the underlying mongoid field" do
-      lambda { @mock.visits_data }.should raise_error NoMethodError
-      lambda { @mock.visits_data = {} }.should raise_error NoMethodError
-    end
-
     it "should create a method for accesing the stats" do
       @mock.respond_to?(:visits).should be_true
     end
@@ -68,12 +59,6 @@ describe Mongoid::Tracking do
       @mock.class.index_options.should_not include(:visits_data)
     end
 
-    it "should respond 'false' to field_changed? method" do
-      # Ok, this test is not very relevant since it will return false even
-      # if Trackoid does not override it.
-      @mock.visits_changed?.should be_false
-    end
-
     it "should create a method for accesing the stats of the proper class" do
       @mock.visits.class.should == Mongoid::Tracking::Tracker
     end
@@ -90,7 +75,7 @@ describe Mongoid::Tracking do
     end
 
     it "should not update stats when new record" do
-      lambda { @mock.visits.inc }.should raise_error Mongoid::Errors::ModelNotSaved
+      -> { @mock.visits.inc }.should raise_error Mongoid::Tracking::Errors::ModelNotSaved
     end
 
     it "should create an empty hash as the internal representation" do
@@ -113,126 +98,137 @@ describe Mongoid::Tracking 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")
-      @object_id = Test.first.id
-    end
+    let(:test) { Test.create(:name => "test") }
 
     before do
-      @mock = Test.find(@object_id)
       @today = Time.now
     end
 
     it "should increment visits stats for today" do
-      @mock.visits.inc
-      @mock.visits.today.should == 1
+      test.visits.inc
+      test.visits.today.should == 1
     end
 
     it "should increment another visits stats for today for a total of 2" do
-      @mock.visits.inc
-      @mock.visits.today.should == 2
+      test.visits.inc
+      test.visits.inc
+      test.visits.today.should == 2
     end
 
     it "should also work for yesterday" do
-      @mock.visits.inc(@today - 1.day)
-      @mock.visits.yesterday.should == 1
+      test.visits.inc(@today - 1.day)
+      test.visits.yesterday.should == 1
     end
 
     it "should also work for yesterday if adding another visit (for a total of 2)" do
-      @mock.visits.inc(@today - 1.day)
-      @mock.visits.yesterday.should == 2
+      test.visits.inc(@today - 1.day)
+      test.visits.inc(@today - 1.day)
+      test.visits.yesterday.should == 2
     end
-    
+
     it "then, the visits of today + yesterday must be the same" do
-      @mock.visits.last_days(2).should == [2, 2]
+      test.visits.inc
+      test.visits.inc
+      test.visits.inc(@today - 1.day)
+      test.visits.inc(@today - 1.day)
+      test.visits.last_days(2).should == [2, 2]
     end
 
     it "should have 4 visits for this test" do
-      @mock.visits.last_days(2).sum.should == 4
+      test.visits.inc
+      test.visits.inc
+      test.visits.inc(@today - 1.day)
+      test.visits.inc(@today - 1.day)
+      test.visits.last_days(2).sum.should == 4
     end
 
     it "should correctly handle the 7 days" do
-      @mock.visits.last_days.should == [0, 0, 0, 0, 0, 2, 2]
+      test.visits.inc
+      test.visits.inc
+      test.visits.inc(@today - 1.day)
+      test.visits.inc(@today - 1.day)
+      test.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
+      test.visits.inc("2010-07-11")
+      test.visits.on("2010-07-11").should == 1
     end
 
     it "should give the first date with first_date" do
+      test.visits.inc("2010-07-11")
       t = Time.parse("2010-07-11")
-      f = @mock.visits.first_date
+      f = test.visits.first_date
       [f.year, f.month, f.day, f.hour].should == [t.year, t.month, t.day, t.hour]
     end
 
     it "should give the last date with last_date" do
       future = @today + 1.month
-      @mock.visits.set(22, future)
-      f = @mock.visits.last_date
+      test.visits.set(22, future)
+      f = test.visits.last_date
       [f.year, f.month, f.day, f.hour].should == [future.year, future.month, future.day, future.hour]
     end
 
     it "should give the first value" do
-      @mock.visits.first_value.should == 1
+      test.visits.inc("2010-07-11")
+      test.visits.first_value.should == 1
     end
 
     it "should give the last value" do
-      @mock.visits.last_value.should == 22
+      future = @today + 1.month
+      test.visits.set(22, future)
+      test.visits.last_value.should == 22
     end
   end
 
   context "testing reader operations without reloading models" do
-    before(:all) do
-      Test.delete_all
-      Test.create(:name => "test")
-      @object_id = Test.first.id
-    end
-
-    before do
-      @mock = Test.find(@object_id)
-    end
+    let(:test) { Test.create(name: "test") }
+    let(:object_id) { test.id }
 
     it "'set' operator must work" do
-      @mock.visits.set(5)
-      @mock.visits.today.should == 5
-      Test.find(@object_id).visits.today.should == 5
+      test.visits.set(5)
+      test.visits.today.should == 5
+      Test.find(object_id).visits.today.should == 5
     end
 
     it "'set' operator must work on arbitrary days" do
-      @mock.visits.set(5, Time.parse("2010-05-01"))
-      @mock.visits.on(Time.parse("2010-05-01")).should == 5
-      Test.find(@object_id).visits.on(Time.parse("2010-05-01")).should == 5
+      test.visits.set(5, Time.parse("2010-05-01"))
+      test.visits.on(Time.parse("2010-05-01")).should == 5
+      Test.find(object_id).visits.on(Time.parse("2010-05-01")).should == 5
     end
 
     it "'add' operator must work" do
-      @mock.visits.add(5)
-      @mock.visits.today.should == 10   # Remember 5 set on previous test
-      Test.find(@object_id).visits.today.should == 10
+      test.visits.set(5)
+      test.visits.add(5)
+      test.visits.today.should == 10
+      Test.find(object_id).visits.today.should == 10
     end
 
     it "'add' operator must work on arbitrary days" do
-      @mock.visits.add(5, Time.parse("2010-05-01"))
-      @mock.visits.on(Time.parse("2010-05-01")).should == 10
-      Test.find(@object_id).visits.on(Time.parse("2010-05-01")).should == 10
+      test.visits.set(5, Time.parse("2010-05-01"))
+      test.visits.add(5, Time.parse("2010-05-01"))
+      test.visits.on(Time.parse("2010-05-01")).should == 10
+      Test.find(object_id).visits.on(Time.parse("2010-05-01")).should == 10
     end
 
     it "on() accessor must work on dates as String" do
-      # We have data for today as previous tests populated the visits field
-      @mock.visits.on("2010-05-01").should == 10
+      test.visits.set(5, Time.parse("2010-05-01"))
+      test.visits.add(5, Time.parse("2010-05-01"))
+      test.visits.on("2010-05-01").should == 10
     end
 
     it "on() accessor must work on Date descendants" do
-      # We have data for today as previous tests populated the visits field
-      @mock.visits.on(Date.parse("2010-05-01")).should == 10
+      test.visits.set(5, Time.parse("2010-05-01"))
+      test.visits.add(5, Time.parse("2010-05-01"))
+      test.visits.on(Date.parse("2010-05-01")).should == 10
     end
 
     it "on() accessor must work on dates as Ranges" do
-      # We have data for today as previous tests populated the visits field
-      @mock.visits.on(Time.parse("2010-04-30")..Time.parse("2010-05-02")).should == [0, 10, 0]
+      test.visits.set(5, Time.parse("2010-05-01"))
+      test.visits.add(5, Time.parse("2010-05-01"))
+      test.visits.on(Time.parse("2010-04-30")..Time.parse("2010-05-02")).should == [0, 10, 0]
     end
   end
 

data/trackoid.gemspec

@@ -1,78 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+$:.push File.expand_path("../lib", __FILE__)
+
+require "trackoid/version"
 
 Gem::Specification.new do |s|
   s.name = "trackoid"
-  s.version = "0.3.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Trackoid::VERSION
+  s.platform = Gem::Platform::RUBY
   s.authors = ["Jose Miguel Perez"]
-  s.date = "2012-07-07"
-  s.description = "Trackoid uses an embeddable approach to track analytics data using the poweful features of MongoDB for scalability"
   s.email = "josemiguel@perezruiz.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/trackoid.rb",
-    "lib/trackoid/aggregates.rb",
-    "lib/trackoid/core_ext.rb",
-    "lib/trackoid/core_ext/range.rb",
-    "lib/trackoid/core_ext/time.rb",
-    "lib/trackoid/errors.rb",
-    "lib/trackoid/reader_extender.rb",
-    "lib/trackoid/readers.rb",
-    "lib/trackoid/tracker.rb",
-    "lib/trackoid/tracker_aggregates.rb",
-    "lib/trackoid/tracking.rb",
-    "spec/aggregates_spec.rb",
-    "spec/ext/range_spec.rb",
-    "spec/ext/time_spec.rb",
-    "spec/reader_extender_spec.rb",
-    "spec/readers_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/timezone_spec.rb",
-    "spec/trackoid_spec.rb",
-    "trackoid.gemspec"
-  ]
   s.homepage = "http://github.com/twoixter/trackoid"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
   s.summary = "Trackoid is an easy scalable analytics tracker using MongoDB and Mongoid"
+  s.description = "Trackoid uses an embeddable approach to track analytics data using the poweful features of MongoDB for scalability"
+  s.rubyforge_project = "trackoid"
+  s.require_paths = ["lib"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.1.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.2.0"])
-      s.add_development_dependency(%q<mocha>, ["= 0.11.0"])
-    else
-      s.add_dependency(%q<mongoid>, [">= 2.1.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.2.0"])
-      s.add_dependency(%q<mocha>, ["= 0.11.0"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, [">= 2.1.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.2.0"])
-    s.add_dependency(%q<mocha>, ["= 0.11.0"])
-  end
+  s.add_dependency 'mongoid', '~> 3.0.5'
+  s.add_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'mocha'
 end
-