trackoid 0.3.6 → 0.3.7

data/Gemfile

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'mongoid', '>= 2.1.0'
+
+group :development do
+  gem 'rake'
+  gem 'jeweler'
+  gem 'rspec', '>= 2.2.0'
+  gem 'mocha'
+end

data/README.rdoc

@@ -47,7 +47,7 @@ Of course, you can also show visits in a time range:
 
     <h1>Visits on last 7 days</h1>
     <ul>
-      <% @page.visits.last_days(7).reverse.each_with_index do |i,d| %>
+      <% @page.visits.last_days(7).reverse.each_with_index do |d, i| %>
       <li><%= (DateTime.now - i).to_s %> : <%= d %></li>
       <% end %>
     </ul>
@@ -315,6 +315,8 @@ Trackoid will correctly translate dates for you (hopefully) if you pass a date t
 
 = Revision History
 
+  0.3.7  - Fixed support for Rails 3.1 and Mongoid 2.2
+
   0.3.6  - Optimization for 'on' reader for ranges. Many times fold quicker.
 
   0.3.5  - BUGFIX: ReaderExtender "+" acted like an accumulator. Problem more

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.email = "josemiguel@perezruiz.com"
     gem.homepage = "http://github.com/twoixter/trackoid"
     gem.authors = ["Jose Miguel Perez"]
-    gem.add_development_dependency "rspec", ">= 2.2.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -28,8 +27,6 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/trackoid/aggregates.rb

@@ -10,7 +10,7 @@ module Mongoid  #:nodoc:
         base.class_eval do
           extend ClassMethods
 
-          class_inheritable_accessor :aggregate_fields, :aggregate_klass
+          class_attribute :aggregate_fields, :aggregate_klass
           self.aggregate_fields = {}
           self.aggregate_klass = nil
           delegate :aggregate_fields, :aggregate_klass, :aggregated?,
@@ -85,7 +85,9 @@ module Mongoid  #:nodoc:
 
         # Defines the aggregation model. It checks for class name conflicts
         def define_aggregate_model
-          raise Errors::ClassAlreadyDefined.new(internal_aggregates_name) if foreign_class_defined?
+          unless defined?(Rails) && Rails.env.development?
+            raise Errors::ClassAlreadyDefined.new(internal_aggregates_name) if foreign_class_defined?
+          end
 
           parent = self
           define_klass do

data/lib/trackoid/tracker.rb

@@ -46,7 +46,7 @@ module Mongoid  #:nodoc:
         #
         update_data(data_for(date) + how_much, date)
         @owner.collection.update(
-            @owner._selector,
+            @owner.atomic_selector,
             { (how_much > 0 ? "$inc" : "$dec") => update_hash(how_much.abs, date) },
             :upsert => true, :safe => false
         )
@@ -76,7 +76,7 @@ module Mongoid  #:nodoc:
         raise Errors::ModelNotSaved, "Can't update a new record" if @owner.new_record?
         update_data(how_much, date)
         @owner.collection.update(
-            @owner._selector, { "$set" => update_hash(how_much, date) },
+            @owner.atomic_selector, { "$set" => update_hash(how_much, date) },
             :upsert => true, :safe => false
         )
         return unless @owner.aggregated?
@@ -116,7 +116,7 @@ module Mongoid  #:nodoc:
 
         remove_data(date)
         @owner.collection.update(
-            @owner._selector,
+            @owner.atomic_selector,
             { "$unset" => update_hash(1, date) },
             :upsert => true, :safe => false
         )

data/lib/trackoid/tracking.rb

@@ -12,7 +12,7 @@ module Mongoid #:nodoc:
         include Aggregates
         extend ClassMethods
         
-        class_inheritable_accessor :tracked_fields
+        class_attribute :tracked_fields
         self.tracked_fields = []
         delegate :tracked_fields, :internal_track_name, :to => "self.class"
       end

data/spec/aggregates_spec.rb

@@ -96,9 +96,9 @@ describe Mongoid::Tracking::Aggregates do
 
   it "should have Mongoid accessors defined" do
     tm = TestModel.create(:name => "Dummy")
-    tm.send(tm.class.send(:internal_accessor_name, "browsers")).class.should == Mongoid::Criteria
-    tm.send(tm.class.send(:internal_accessor_name, "referers")).class.should == Mongoid::Criteria
-    tm.send(tm.class.send(:internal_accessor_name, "quarters")).class.should == Mongoid::Criteria
+    tm.send(tm.class.send(:internal_accessor_name, "browsers")).class.should == Mongoid::Relations::Targets::Enumerable
+    tm.send(tm.class.send(:internal_accessor_name, "referers")).class.should == Mongoid::Relations::Targets::Enumerable
+    tm.send(tm.class.send(:internal_accessor_name, "quarters")).class.should == Mongoid::Relations::Targets::Enumerable
   end
 
   it "should indicate this is an aggregated traking object with aggregated?" do

data/trackoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackoid}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Miguel Perez"]
-  s.date = %q{2011-05-01}
+  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.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    "Gemfile",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -49,28 +50,30 @@ Gem::Specification.new do |s|
   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.test_files = [
-    "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_helper.rb",
-    "spec/timezone_spec.rb",
-    "spec/trackoid_spec.rb"
-  ]
 
   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
+      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"])
     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"])
     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"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Jose Miguel Perez
@@ -14,13 +14,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +02:00
+date: 2011-09-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: mongoid
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,7 +71,21 @@ dependencies:
         - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "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
 email: josemiguel@perezruiz.com
 executables: []
@@ -44,6 +98,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -101,12 +156,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Trackoid is an easy scalable analytics tracker using MongoDB and Mongoid
-test_files: 
-- 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_helper.rb
-- spec/timezone_spec.rb
-- spec/trackoid_spec.rb
+test_files: []
+