trackoid 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/trackoid/aggregates.rb

@@ -84,7 +84,7 @@ 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
+          raise Errors::ClassAlreadyDefined.new(internal_aggregates_name) if foreign_class_defined?
           parent_name = self.name.underscore
           define_klass do
             include Mongoid::Document
@@ -106,8 +106,12 @@ module Mongoid  #:nodoc:
 
         # Returns true if there is a class defined with the same name as our
         # aggregate class.
-        def foreign_class_defined
-          Object.const_defined?(internal_aggregates_name.to_sym)
+        def foreign_class_defined?
+          # The following construct doesn't work with namespaced constants.
+          # Object.const_defined?(internal_aggregates_name.to_sym)
+
+          cn = internal_aggregates_name.constantize rescue nil
+          !cn.nil?
         end
 
         # Adds the aggregate field to the array of aggregated fields.

data/lib/trackoid/tracker.rb

@@ -96,29 +96,14 @@ module Mongoid  #:nodoc:
       # Private methods
       private
       def data_for(date)
-        return 0 if @data.nil? ||
-                    @data[date.year.to_s].nil? ||
-                    @data[date.year.to_s][date.month.to_s].nil?
-        @data[date.year.to_s][date.month.to_s][date.day.to_s] || 0
+        @data.try(:[], date.year.to_s).try(:[], date.month.to_s).try(:[], date.day.to_s) || 0
       end
 
-      # TODO: It should be a better way of updating a hash. :-)
       def update_data(value, date)
-        if @data[date.year.to_s]
-          if @data[date.year.to_s][date.month.to_s]
-            @data[date.year.to_s][date.month.to_s][date.day.to_s] = value
-          else
-            @data[date.year.to_s][date.month.to_s] = {
-                date.day.to_s => value
-            }
-          end
-        else
-          @data[date.year.to_s] = {
-            date.month.to_s => {
-              date.day.to_s => value
-            }
-          }
-        end
+        [:year, :month].inject(@data) { |data, period|
+          data[date.send(period).to_s] ||= {}
+        }
+        @data[date.year.to_s][date.month.to_s][date.day.to_s] = value
       end
 
       def year_literal(d);  "#{d.year}"; end

data/trackoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackoid}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Miguel Perez"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-07-14}
   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: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jose Miguel Perez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency