metry 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.1 / 2009-08-08
+
+* Handle native ObjectID's correctly.
+
 === 2.0.0 / 2009-08-07
 
 * Switched to MongoDB for persistence.

data/Rakefile

@@ -20,4 +20,4 @@ task :radiant_features do
   end
 end
 
-task :test => [:basic_features, :radiant_features]
+task :default => [:basic_features, :radiant_features]

data/lib/metry/rack/tracking.rb

@@ -22,7 +22,7 @@ module Metry
 
         unless env["metry.ignore"] == "true"
           event["status"] = status.to_s
-          event["visitor"] = visitor['_id']
+          event["visitor"] = visitor['_id'].to_s
           @storage.add_event(event)
         end
 
@@ -47,7 +47,7 @@ module Metry
       def save_visitor(response, visitor)
         @storage.save_visitor(visitor)
         response.set_cookie(COOKIE,
-          :value => visitor['_id'],
+          :value => visitor['_id'].to_s,
           :expires => (Time.now+(60*60*24*365*20)),
           :path => '/')
       end

data/lib/metry/storage.rb

@@ -30,7 +30,7 @@ module Metry
     end
 
     def visitor(id)
-      @db.collection('visitors').find(:_id => id).next_object
+      @db.collection('visitors').find(prep_selector('_id' => id)).next_object
     end
 
     def visitor_count
@@ -46,7 +46,7 @@ module Metry
     end
 
     def save_visitor(visitor)
-      @db.collection('visitors').repsert({:_id => visitor["_id"]}, visitor)
+      @db.collection('visitors').repsert(prep_selector('_id' => visitor["_id"]), visitor)
     end
 
     def add_event(event)
@@ -54,7 +54,7 @@ module Metry
     end
 
     def event(id)
-      @db.collection('events').find(:_id => id).next_object
+      @db.collection('events').find(prep_selector('_id' => id)).next_object
     end
 
     def event_count
@@ -62,11 +62,11 @@ module Metry
     end
 
     def events_for(visitor)
-      @db.collection('events').find(:visitor => visitor)
+      @db.collection('events').find('visitor' => visitor)
     end
     
     def last_events(count=1)
-      @db.collection('events').find({}, :limit => count, :sort => {:time => 1}).to_a
+      @db.collection('events').find({}, :limit => count, :sort => {'time' => 1}).to_a
     end
 
     def all_events(*find_options)
@@ -86,6 +86,20 @@ module Metry
       @key_factory.clear if @key_factory
     end
     
+    private
+    
+    def prep_selector(selector)
+      if self.class.predictable_keys?
+        selector
+      elsif id = selector['_id']
+        case id
+        when String
+          selector['_id'] = ObjectID.from_string(id)
+        end
+      end
+      selector
+    end
+    
     class PredictableKeyFactory
       def initialize
         clear

data/lib/metry.rb

@@ -6,7 +6,7 @@ require 'metry/experiment'
 require 'metry/psycho'
 
 module Metry
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
   
   def self.init(dbname)
     @storage = Storage.new(dbname)

data/test/test_storage.rb

@@ -10,5 +10,10 @@ class TestTokyo < Test::Unit::TestCase
     should "be empty" do
       assert_equal 0, @storage.event_count
     end
+    
+    should "handle object ids" do
+      v = @storage.new_visitor
+      assert_equal v, @storage.visitor(v['_id'].to_s)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metry
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Nathaniel Talbott