metry 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.0 / 2009-07-30
+
+* Added Psycho for viewing Metry results.
+* Hooked up Psycho to Radiant authentication.
+
 === 1.1.0 / 2009-07-11
 
 * Moved Radiant initialization into the extension.

data/README.txt

@@ -31,6 +31,7 @@ Metry aims to close the gap between knowing you ought to be making decisions bas
 * Tokyo Cabinet
 * Tokyo Cabinet Ruby Binding
 * Rack
+* ffi gem
 
 == INSTALL:
 

data/TODO

@@ -1,12 +1,12 @@
-More unit tests
+Switch to MongoDB
+Add ability to track goals in Psycho
+Allow ignoring requests in Metry, and have Psycho requests ignored
+Switch to submodules for vendor'd libs
 
-Add a slick Sinatra app for viewing tracking data.
+More unit tests
 
 Add support for non-pageview event tracking
   Via in-process call
   Via web request
 
-Add support for MongoDB
-Add support for Tokyo Tyrant
-
 Metry visitors can be spoofed - fix it

data/example/example.rb

@@ -4,9 +4,9 @@ require 'sinatra'
 require File.dirname(__FILE__) + '/../lib/metry'
 
 configure do
-  Metry.init Metry::Tokyo.new("tracking")
-  #Metry.init Metry::Memory.new
+  Metry.init(ENV["USE_MEMORY"] ? Metry::Memory.new : Metry::Tokyo.new("tracking"))
   use Metry::Rack::Tracking
+  use Metry::Psycho, {:path => "/admin/metry"}
 end
 
 get '/' do

data/features/basic_tracking.feature

@@ -1,5 +1,5 @@
 Feature: Access Tracking
-  In order to how users are using my site
+  In order to know how users are using my site
   As an web application creator
   I want to have all accesses to my application tracked
   
@@ -38,6 +38,7 @@ Feature: Access Tracking
     And there should be a tracking event "2":
       | key     | value |
       | visitor | 1     |
+    And there should be a visitor "1"
 
   Scenario: Two visitors are tracked
     Given I view "/"
@@ -49,6 +50,9 @@ Feature: Access Tracking
     And there should be a tracking event "2":
       | key     | value |
       | visitor | 2     |
+    And there should be 2 visitors
+    And there should be a visitor "1"
+    And there should be a visitor "2"
       
   Scenario: All facets should be tracked
     When I view "/"

data/features/step_definitions/tracking.rb

@@ -6,6 +6,10 @@ Then /^there should be (\d+) tracking events?$/ do |event_count|
   assert_equal(event_count.to_i, Metry.current.event_count)
 end
 
+Then /^there should be (\d+) visitors$/ do |visitor_count|
+  assert_equal(visitor_count.to_i, Metry.current.visitor_count)
+end
+
 When /^there should be a tracking event "(\d+)":$/ do |id, table|
   event = Metry.current[id]
   assert event, "Unable to lookup event #{id}."
@@ -33,3 +37,7 @@ Then /^there should be a visitor "([^\"]*)":$/ do |id, table|
     end
   end
 end
+
+Then /^there should be a visitor "([^\"]*)"$/ do |id|
+  assert Metry.current.visitor(id)
+end

data/features/support/env.rb

@@ -16,7 +16,5 @@ World(Webrat::Matchers)
 
 require File.dirname(__FILE__) + '/../../example/example.rb'
 def app
-  Rack::Builder.new do
-    run Sinatra::Application
-  end
+  Sinatra::Application
 end

data/lib/metry.rb

@@ -5,9 +5,10 @@ require 'metry/rack/tracking'
 require 'metry/memory'
 require 'metry/tokyo'
 require 'metry/experiment'
+require 'metry/psycho'
 
 module Metry
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
   
   def self.init(storage)
     @storage = storage

data/lib/metry/rack/tracking.rb

@@ -41,6 +41,7 @@ module Metry
       end
     
       def save_visitor(response, visitor)
+        @storage.save_visitor(visitor)
         response.set_cookie(COOKIE,
           :value => visitor,
           :expires => (Time.now+(60*60*24*365*20)),

data/lib/metry/tokyo.rb

@@ -17,43 +17,71 @@ module Metry
     end
     
     def next_visitor
-      write do |storage|
+      access do |storage|
         storage.incr("#{META_PREFIX}visitor")
       end
     end
     
     def visitor(id)
-      read do |storage|
+      access do |storage|
         (storage[visitor_id(id)] || {})
       end
     end
     
-    def save_visitor(id, hash)
-      write do |storage|
-        storage[visitor_id(id)] = hash
+    def visitor_count
+      access do |storage|
+        storage.query do |q|
+          q.add '', :starts_with, VISITOR_PREFIX
+          q.pk_only
+        end.size
+      end
+    end
+    
+    def visitors
+      access do |storage|
+        r = storage.query do |q|
+          q.add '', :starts_with, VISITOR_PREFIX
+        end.to_a
+        r.each{|e| e[:pk].sub!(/^#{VISITOR_PREFIX}/, '')}
+        r
+      end
+    end
+    
+    def save_visitor(id, hash={})
+      access do |storage|
+        storage[visitor_id(id)] = (visitor(id) || {}).merge(hash)
       end
     end
     
     def <<(event)
-      write do |storage|
+      access do |storage|
         storage[next_event_id(storage)] = event.inject({}){|a,(k,v)| a[k] = v.to_s; a}
       end
     end
     
     def [](id)
-      read do |storage|
+      access do |storage|
         storage[event_id(id)]
       end
     end
     
     def event_count
-      read do |storage|
+      access do |storage|
         storage.keys(:prefix => EVENT_PREFIX).size
       end
     end
     
+    def events_for(visitor)
+      access do |storage|
+        storage.query do |q|
+          q.add '', :starts_with, EVENT_PREFIX
+          q.add 'visitor', :eq, visitor
+        end.to_a
+      end
+    end
+    
     def last_events(count=1)
-      read do |storage|
+      access do |storage|
         storage.query do |q|
           q.add '', :starts_with, EVENT_PREFIX
           q.order_by "time", :numdesc
@@ -63,7 +91,7 @@ module Metry
     end
     
     def all_events
-      read do |storage|
+      access do |storage|
         storage.query do |q|
           q.add '', :starts_with, EVENT_PREFIX
         end.to_a
@@ -71,7 +99,7 @@ module Metry
     end
     
     def clear
-      write do |storage|
+      access do |storage|
         storage.clear
       end
     end
@@ -82,24 +110,24 @@ module Metry
       event_id(storage.incr("#{META_PREFIX}event"))
     end
     
-    def access(mode)
-      storage = @store.new(@file, :mode => mode)
+    def access
+      key = "metry_storage"
+      created_storage ||= false
+      unless storage = Thread.current[key]
+        created_storage = true
+        Thread.current[key] = storage = @store.new(@file, :mode => "wc")
+      end
       begin
         result = yield(storage)
       ensure
-        storage.close
+        if created_storage
+          storage.close
+          Thread.current[key] = nil
+        end
       end
       result
     end
     
-    def read(&block)
-      access("rc", &block)
-    end
-    
-    def write(&block)
-      access("wc", &block)
-    end
-    
     def visitor_id(id)
       "#{VISITOR_PREFIX}#{id}"
     end

data/radiant/example/features/metry.feature

@@ -6,7 +6,6 @@ Feature: Radiant support
   Background:
     Given an empty tracking database
     And I am a new visitor
-    And I have a layout
     And there is an empty Radiant cache
   
   Scenario: Basic Tracking

data/radiant/example/features/step_definitions/radiant.rb

@@ -1,9 +1,3 @@
-Given /^I have a layout$/ do
-  Layout.create!(:name => "basic", :content => <<EOC)
-<r:content />
-EOC
-end
-
 Given /^a page at "([^\"]*)" containing:$/ do |path, content|
   page = Page.create!(:title => "test", :breadcrumb => "test", :slug => path, :status_id => 100)
   page.parts.create!(:name => "body", :content => content)
@@ -11,4 +5,16 @@ end
 
 When /^there is an empty Radiant cache$/ do
   Radiant::Cache.clear
+end
+
+Given /^I log in as an admin$/ do
+  visit '/admin/login'
+  fill_in 'Username', :with => 'admin'
+  fill_in 'Password', :with => 'radiant'
+  click_button 'Login'
+  Then(%(I should be on "/admin/pages"))
+end
+
+When /^I log out$/ do
+  visit "/admin/logout"
 end

data/radiant/example/features/step_definitions/tracking.rb

@@ -6,6 +6,10 @@ Then /^there should be (\d+) tracking events?$/ do |event_count|
   assert_equal(event_count.to_i, Metry.current.event_count)
 end
 
+Then /^there should be (\d+) visitors$/ do |visitor_count|
+  assert_equal(visitor_count.to_i, Metry.current.visitor_count)
+end
+
 When /^there should be a tracking event "(\d+)":$/ do |id, table|
   event = Metry.current[id]
   assert event, "Unable to lookup event #{id}."
@@ -33,3 +37,7 @@ Then /^there should be a visitor "([^\"]*)":$/ do |id, table|
     end
   end
 end
+
+Then /^there should be a visitor "([^\"]*)"$/ do |id|
+  assert Metry.current.visitor(id)
+end

data/radiant/example/features/step_definitions/web.rb

@@ -20,3 +20,7 @@ end
 Then /^I should see "([^\"]*)"$/ do |content|
   assert_contain(content)
 end
+
+Then /^I should be on "([^\"]*)"$/ do |path|
+  assert_equal path, URI.parse(current_url).path
+end

data/radiant/example/features/support/env.rb

@@ -19,6 +19,7 @@ World(Rack::Test::Methods)
 
 $: << RAILS_ROOT + '/../../vendor/webrat/lib'
 require 'webrat'
+require 'webrat/rack_test'
 
 Webrat.configure do |config|
   config.mode = :rack_test
@@ -40,6 +41,11 @@ Before do
   end
   @__cucumber_ar_connection.begin_db_transaction
   ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
+
+  Layout.create!(:name => "basic", :content => <<EOC)
+<r:content />
+EOC
+  User.create!(:name => "Administrator", :login => "admin", :password => "radiant", :password_confirmation => "radiant", :admin => true)
 end
 
 After do

data/radiant/extension/metry_extension.rb

@@ -1,5 +1,7 @@
 require 'metry'
 
+load 'metry_authenticator.rb'
+
 class MetryExtension < Radiant::Extension
   version "1.0"
   description "Provides Metry support to Radiant."
@@ -25,5 +27,10 @@ class MetryExtension < Radiant::Extension
 
     Metry.init Metry::Tokyo.new(RAILS_ROOT + '/tracking/tracking')
     Rails.configuration.middleware.insert_after ActionController::Failsafe, Metry::Rack::Tracking
+    Rails.configuration.middleware.use proc{Metry::Psycho}, {
+      :path => "/admin/metry",
+      :authorize => proc{|env| MetryAuthenticator.new(env).authorized?},
+      :on_deny => proc {|env| MetryAuthenticator.new(env).redirect},
+    }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metry
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Nathaniel Talbott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-11 00:00:00 -04:00
+date: 2009-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency