trackoid 0.3.7 → 0.3.8

data/Gemfile

@@ -6,5 +6,5 @@ group :development do
   gem 'rake'
   gem 'jeweler'
   gem 'rspec', '>= 2.2.0'
-  gem 'mocha'
+  gem 'mocha', '0.11.0'
 end

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/trackoid/aggregates.rb

@@ -2,9 +2,9 @@
 module Mongoid  #:nodoc:
   module Tracking #:nodoc:
     module Aggregates
-      
+
       DEPRECATED_TOKENS = ['hour', 'hours']
-      
+
       # This module includes aggregate data extensions to Trackoid instances
       def self.included(base)
         base.class_eval do
@@ -21,7 +21,7 @@ module Mongoid  #:nodoc:
       module ClassMethods
         # Defines an aggregate token to an already tracked model. It defines
         # a new mongoid model named after the original model.
-        # 
+        #
         # Example:
         #
         # <tt>class Page</tt>
@@ -36,7 +36,7 @@ module Mongoid  #:nodoc:
         # A new model is defined as <tt>class PageAggregates</tt>
         #
         # This model has the following structure:
-        # 
+        #
         # <tt>belongs_to :page</tt>
         # <tt>field :ns, :type => String</tt>
         # <tt>field :key, :type => String</tt>
@@ -132,7 +132,7 @@ module Mongoid  #:nodoc:
         def define_klass(&block)
           scope = internal_aggregates_name.split('::')
           klass = scope.pop
-          scope = scope.inject(Kernel) {|scope, const_name| scope.const_get(const_name)}
+          scope = scope.inject(Object) {|scope, const_name| scope.const_get(const_name)}
           klass = scope.const_set(klass, Class.new)
           klass.class_eval(&block)
         end
@@ -152,7 +152,7 @@ module Mongoid  #:nodoc:
           end
         end
       end
-      
+
     end
   end
 end

data/lib/trackoid/tracking.rb

@@ -7,8 +7,10 @@ module Mongoid #:nodoc:
     # field named after :field
     def self.included(base)
       base.class_eval do
-        raise Errors::NotMongoid, "Must be included in a Mongoid::Document" unless self.ancestors.include? Mongoid::Document
-
+        unless self.ancestors.include? Mongoid::Document
+          raise Errors::NotMongoid, "Must be included in a Mongoid::Document"
+        end
+        
         include Aggregates
         extend ClassMethods
         

data/spec/aggregates_spec.rb

@@ -7,7 +7,7 @@ class TestModel
   field :name   # Dummy field
 
   # Note that references to "track" and "aggregate" in this test are mixed
-  # for testing pourposes. Trackoid does not make any difference in the
+  # for testing purposes. Trackoid does not make any difference in the
   # declaration order of tracking fields and aggregate tokens.
   track :visits
   aggregate :browsers do |b| b.split.first.downcase if b; end
@@ -29,6 +29,34 @@ class SecondTestModel
   aggregate :aggregate_four do Time.now end
 end
 
+# Namespaced models to test avoid name collisions
+# Collitions may happen when declaring internal aggregate classes for a model
+# which has the same name as other models in another namespace
+module MyCompany
+  class TestPerson
+    include Mongoid::Document
+    include Mongoid::Tracking
+
+    field :my_name
+
+    track :logins
+    aggregate :initials do |n| n.to_s[0]; end
+  end
+end
+
+module YourCompany
+  class TestPerson
+    include Mongoid::Document
+    include Mongoid::Tracking
+
+    field :your_name
+
+    track :logins
+    aggregate :initials do |n| n.to_s[0]; end
+  end
+end
+
+
 describe Mongoid::Tracking::Aggregates do
 
   before(:all) do
@@ -244,7 +272,7 @@ describe Mongoid::Tracking::Aggregates do
       @mock.visits("Google Chrome").inc
       @mock.visits.browsers.today.should =~ [["mozilla", 1], ["google", 1]]
       @mock.visits.referers.today.should =~ [["firefox", 1], ["chrome", 1]]
-      
+
       # Just for testing array manipulations
       @mock.visits.browsers.today.inject(0) {|total, c| total + c.last }.should == 2
     end
@@ -440,4 +468,31 @@ describe Mongoid::Tracking::Aggregates do
       ]
     end
   end
+
+  describe "When using models with same name on different namespaces" do
+    before do
+      MyCompany::TestPerson.all.map(&:destroy)
+      MyCompany::TestPerson.create(:my_name => "twoixter")
+      @my_object_id = MyCompany::TestPerson.first.id
+      @my_mock = MyCompany::TestPerson.first
+      @my_mock.logins("ASCII").set(1, "2012-07-07")
+      @my_mock.logins("EBCDIC").set(1, "2012-07-07")
+
+      YourCompany::TestPerson.all.map(&:destroy)
+      YourCompany::TestPerson.create(:your_name => "test")
+      @your_object_id = YourCompany::TestPerson.first.id
+      @your_mock = YourCompany::TestPerson.first
+      @your_mock.logins("UTF8").set(1, "2012-07-07")
+      @your_mock.logins("LATIN1").set(1, "2012-07-07")
+    end
+
+    it "should be different objects" do
+      @my_mock.my_name.should_not == @your_mock.your_name
+    end
+
+    it "should yield different aggregates" do
+      @my_mock.logins.initials.on("2012-07-07").should =~ [["A", 1], ["E", 1]]
+      @your_mock.logins.initials.on("2012-07-07").should =~ [["U", 1], ["L", 1]]
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 
-gem 'mocha', '>= 0.9.8'
+# What is this doing here?
+# gem 'mocha', '>= 0.9.8'
 
 require 'mocha'
 require 'mongoid'

data/spec/trackoid_spec.rb

@@ -36,6 +36,20 @@ describe Mongoid::Tracking do
     }.should_not raise_error
   end
 
+  it "should not raise errors when using to/as_json" do
+    mock = Test.new(:name => "Trackoid")
+    json_as = {}
+    json_to = ""
+
+    lambda {
+      json_as = mock.as_json(:except => :_id)
+      json_to = mock.to_json(:except => :_id)
+    }.should_not raise_error
+
+    json_as.should == { "name" => "Trackoid" }
+    json_to.should == "{\"name\":\"Trackoid\"}"
+  end
+
   describe "when creating a new field with stats" do
     before(:all) do
       @mock = Test.new
@@ -56,7 +70,7 @@ describe Mongoid::Tracking do
 
     it "should respond 'false' to field_changed? method" do
       # Ok, this test is not very relevant since it will return false even
-      # if Trackid does not override it.
+      # if Trackoid does not override it.
       @mock.visits_changed?.should be_false
     end
 
@@ -79,7 +93,7 @@ describe Mongoid::Tracking do
       lambda { @mock.visits.inc }.should raise_error Mongoid::Errors::ModelNotSaved
     end
 
-    it "shold create an empty hash as the internal representation" do
+    it "should create an empty hash as the internal representation" do
       @mock.visits.send(:_original_hash).should == {}
     end
 

data/trackoid.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{trackoid}
-  s.version = "0.3.7"
+  s.name = "trackoid"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Miguel Perez"]
-  s.date = %q{2011-09-05}
-  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.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"
@@ -46,13 +46,12 @@ Gem::Specification.new do |s|
     "spec/trackoid_spec.rb",
     "trackoid.gemspec"
   ]
-  s.homepage = %q{http://github.com/twoixter/trackoid}
+  s.homepage = "http://github.com/twoixter/trackoid"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Trackoid is an easy scalable analytics tracker using MongoDB and Mongoid}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Trackoid is an easy scalable analytics tracker using MongoDB and Mongoid"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -60,20 +59,20 @@ Gem::Specification.new do |s|
       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"])
+      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"])
+      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"])
+    s.add_dependency(%q<mocha>, ["= 0.11.0"])
   end
 end
 

metadata

@@ -1,101 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trackoid
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 7
-  version: 0.3.7
+version: !ruby/object:Gem::Version
+  version: 0.3.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jose Miguel Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-05 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-description: Trackoid uses an embeddable approach to track analytics data using the poweful features of MongoDB for scalability
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+description: Trackoid uses an embeddable approach to track analytics data using the
+  poweful features of MongoDB for scalability
 email: josemiguel@perezruiz.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -124,37 +128,28 @@ files:
 - spec/timezone_spec.rb
 - spec/trackoid_spec.rb
 - trackoid.gemspec
-has_rdoc: true
 homepage: http://github.com/twoixter/trackoid
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Trackoid is an easy scalable analytics tracker using MongoDB and Mongoid
 test_files: []
-