metry 2.0.3 → 2.0.4

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.0.4 / 2009-08-09
+
+* Improved goal display.
+* Properly submoduled webrat.
+* Goal paths are now Regexp's.
+* Added goal editing.
+
 === 2.0.3 / 2009-08-08
 
 * Really ignore events generated by Psycho.

data/TODO

@@ -1,5 +1,3 @@
-Figure out why Psycho events are not being ignored in production
-Allow goals to have N paths
 Limit visitors on dashboard to 10 most recent
 Add full listing of visitors
 Show more details about visitors
@@ -8,8 +6,6 @@ Add display of last 10 events to dashboard
 Show goal conversion for each experiment
 Allow manually viewing a particular alternatively
 
-Switch to submodules for vendor'd libs
-
 More unit tests
 
 Add support for non-pageview event tracking

data/features/psycho/goals.feature

@@ -11,14 +11,43 @@ Feature: Track Goals
   Scenario: Create a goal
     Given I view "/admin/metry"
     And I follow "New Goal"
-    And I fill in "name" with "Cool goal"
+    And I fill in "name" with "Cool"
     And I fill in "path" with "/goal"
     And I press "Create"
-    Then I should be on "/admin/metry/"
-    And the page should have "#goals .goal"
+    Then I should be on "/admin/metry/goals/1"
+    And I should see "Cool"
   
   Scenario: Goal count
     Given I add a goal named "My Goal" with path "/"
     And I view "/"
     When I view "/admin/metry"
-    Then I should see "My Goal: 1 visits"
+    Then I should see "My Goal: 1 visits"
+  
+  Scenario: Goal Regexp
+    Given I add a goal named "Subpage" with path "/subpage/?"
+    When I view "/subpage"
+    And I view "/subpage/"
+    And I view "/admin/metry"
+    Then I should see "Subpage: 2 visits"
+  
+  Scenario: View Goal Detail
+    Given I add a goal named "Root" with path "/"
+    And I view "/"
+    And I view "/"
+    When I view "/admin/metry"
+    And I follow "Root"
+    Then I should see "Root"
+    And I should see "Path: /"
+    And I should see "Visitor 1"
+    
+  Scenario: Edit a Goal
+    Given I add a goal named "Bogus" with path "/"
+    When I view "/admin/metry"
+    And I follow "Bogus"
+    And I follow "Edit"
+    And I fill in "name" with "Right"
+    And I fill in "path" with "/subpage"
+    And I press "Save"
+    Then I should be on "/admin/metry/goals/1"
+    And I should see "Right"
+    And I should see "Path: /subpage"

data/lib/metry.rb

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

data/lib/metry/psycho.rb

@@ -30,46 +30,88 @@ module Metry
           erb :dashboard
         end
       
-        get "#{path}/visitor/:id" do
+        get "#{path}/visitors/:id" do
           @visitor = Visitor.find(params["id"])
           erb :visitor
         end
         
         post "#{path}/goals" do
-          Goal.create!(params[:name], params[:path])
-          redirect url('/')
+          goal = Goal.create!(params[:name], params[:path])
+          redirect url("/goals/#{goal.id}")
         end
         
         get "#{path}/goals/new" do
           erb :new_goal
         end
+        
+        get "#{path}/goals/:id" do
+          @goal = Goal.find(params[:id])
+          erb :goal
+        end
+        
+        get "#{path}/goals/:id/edit" do
+          @goal = Goal.find(params[:id])
+          erb :edit_goal
+        end
+        
+        post "#{path}/goals/:id" do
+          goal = Goal.find(params[:id])
+          goal.name = params[:name]
+          goal.path = params[:path]
+          goal.save
+          redirect url("/goals/#{goal.id}")
+        end
       
         helpers do
           define_method(:url) do |url|
             "#{path}#{url}"
           end
+
+          include ::Rack::Utils
+          alias_method :h, :escape_html
         end
       end
     end
     
     class Goal
+      def self.find(id)
+        new(Metry.current.goal(id))
+      end
+      
       def self.create!(name, path)
-        Metry.current.add_goal('name' => name, 'path' => path)
+        new(Metry.current.add_goal('name' => name, 'path' => path))
       end
       
       def self.all
         Metry.current.goals.collect{|e| new(e)}
       end
       
-      attr_reader :name, :path
+      attr_accessor :path, :id, :name
       
       def initialize(hash)
+        @id = hash['_id'].to_s
         @name = hash['name']
         @path = hash['path']
       end
       
+      def save
+        Metry.current.save_goal({'_id' => id, 'name' => name, 'path' => path})
+      end
+      
+      def path_regexp
+        Regexp.new("^#{path}$")
+      end
+      
       def visits
-        Metry.current.all_events({'path' => @path}).size
+        events.size
+      end
+      
+      def events
+        Metry.current.all_events({'path' => path_regexp})
+      end
+      
+      def visitors
+        events.collect{|e| e['visitor']}.uniq.collect{|e| Visitor.find(e)}
       end
     end
     

data/lib/metry/psycho/dashboard.erb

@@ -1,7 +1,7 @@
 <h1>Goals</h1>
 <ul id="goals">
   <% @goals.each do |goal| %>
-    <li class="goal"><%= goal.name %>: <%= goal.visits %> visits</li>
+    <li class="goal"><a href="<%= url "/goals/#{goal.id}" %>"><%= goal.name %></a>: <%= goal.visits %> visits</li>
   <% end %>
 </ul>
 <p><a href="<%= url "/goals/new" %>">New Goal</a></p>
@@ -9,6 +9,6 @@
 <h1>Recent Visitors</h1>
 <ul>
   <% @visitors.each do |v| %>
-    <li><a href="<%= url "/visitor/#{v.id}" %>">Visitor <%= v.id %></a> (<%= v.events.size %> events)</li>
+    <li><a href="<%= url "/visitors/#{v.id}" %>">Visitor <%= v.id %></a> (<%= v.events.size %> events)</li>
   <% end %>
 </ul>

data/lib/metry/psycho/new_goal.erb

@@ -1,9 +1,9 @@
 <h1>New Goal</h1>
 
-<form action="<%= url "/goals" %>" method="POST">
+<form action="<%= url "/goals" %>" method="post">
   <fieldset>
-    <p><label for="name">Name</label><input type="text" name="name" /></p>
-    <p><label for="path">Path</label><input type="text" name="path" /></p>
+    <p><label for="name">Name</label> <input type="text" name="name" /></p>
+    <p><label for="path">Path</label> <input type="text" name="path" /></p>
     <p><input type="submit" value="Create" /></p>
   </fieldset>
 </form>

data/lib/metry/storage.rb

@@ -74,12 +74,20 @@ module Metry
     end
     
     def add_goal(goal)
-      @db.collection('goals') << goal
+      goal(@db.collection('goals').insert(goal))
     end
     
     def goals
       @db.collection('goals').find.to_a
     end
+    
+    def goal(id)
+      @db.collection('goals').find(prep_selector('_id' => id)).next_object
+    end
+    
+    def save_goal(goal)
+      @db.collection('goals').repsert(prep_selector('_id' => goal['_id']), goal)
+    end
 
     def clear
       %w(visitors events goals).each{|e| @db.drop_collection(e)}

data/vendor/webrat/History.txt

@@ -9,6 +9,8 @@
 
 * Minor enhancements
 
+  * Upgrade to selenium-client to 1.2.16 (Brian Landau)
+  * Upgrade selenium-server.jar to 1.0.1 (Brian Landau)
   * Make redirect detection work in the face of rational maths (like when ruby-units is active) (Piers Cawley)
   * Use Launchy to handle opening pages in the browser with cross-platform compatibility (Bryan Helmkamp)
   * Added support for field_labeled_locators ending in non word characters

data/vendor/webrat/lib/webrat/rack_test.rb

@@ -23,8 +23,14 @@ module Webrat
     def process_request(http_method, url, data = {}, headers = {})
       headers ||= {}
       data    ||= {}
-
-      env = headers.merge(:params => data, :method => http_method.to_s.upcase)
+      
+      params = data.inject({}) do |data, (key,value)|
+        data[key] = Rack::Utils.unescape(value)
+        data
+      end
+
+      headers["HTTP_HOST"] = "www.example.com"
+      env = headers.merge(:params => params, :method => http_method.to_s.upcase)
       @rack_test_session.request(url, env)
     end
 

data/vendor/webrat/lib/webrat/selenium.rb

@@ -1,5 +1,5 @@
 require "webrat"
-gem "selenium-client", ">=1.2.14"
+gem "selenium-client", ">=1.2.16"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"

data/vendor/webrat/lib/webrat/selenium/selenium_rc_server.rb

@@ -34,7 +34,7 @@ module Webrat
 
         @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
                                                                        Webrat.configuration.selenium_server_port,
-                                                                       Webrat.configuration.selenium_browser_startup_timeout)
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -74,7 +74,9 @@ module Webrat
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop
+          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
+                                                       Webrat.configuration.selenium_server_port, 
+                                                       :timeout => 5).stop
         end
       end
 

data/vendor/webrat/spec/integration/rack/rack_app.rb

@@ -2,8 +2,74 @@ require "rubygems"
 require "sinatra/base"
 
 class RackApp < Sinatra::Default
+  template :layout do
+<<TEMPLATE
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <title>sinatra testing with webrat</title>
+  <body>
+    <%= yield %>
+  </body>
+</html>
+TEMPLATE
+  end
+
+  template :home do
+<<TEMPLATE
+<p> visit <a href="/go">there</a></p>
+
+<form>
+  <label>
+    Prefilled
+    <input type="text" name="prefilled" value="text" />
+  </label>
+</form>
+TEMPLATE
+  end
+
+  template :go do
+<<TEMPLATE
+<form method="post" action="/go">
+  <div>
+    <label for="name">Name</label>
+    <input type="text" name="name" id="name">
+  </div>
+  <div>
+    <label for="email">Email</label>
+    <input type="text" name="email" id="email">
+  </div>
+  <input type="submit" value="Submit" />
+</form>
+TEMPLATE
+  end
+
+  template :hello do
+<<TEMPLATE
+<p>Hello, <%= @user %></p>
+<p>Your email is: <%= @email %></p>
+TEMPLATE
+  end
+
   get "/" do
-    "Hello World"
+    erb :home
+  end
+
+  get "/go" do
+    erb :go
+  end
+
+  get "/internal_redirect" do
+    redirect "/"
+  end
+
+  get "/external_redirect" do
+    redirect "http://google.com"
+  end
+
+  post "/go" do
+    @user = params[:name]
+    @email = params[:email]
+    erb :hello
   end
 
   get "/redirect_absolute_url" do

data/vendor/webrat/spec/integration/rack/test/test_helper.rb

@@ -14,6 +14,8 @@ class Test::Unit::TestCase
   include Webrat::Methods
   include Webrat::Matchers
 
+  Webrat::Methods.delegate_to_session :response_code, :response_body
+
   def app
     RackApp.new
   end

data/vendor/webrat/spec/integration/rack/test/webrat_rack_test.rb

@@ -2,66 +2,40 @@ require File.dirname(__FILE__) + "/test_helper"
 require File.dirname(__FILE__) + "/../rack_app"
 
 class WebratRackTest < Test::Unit::TestCase
-  def test_visit_returns_response
-    response = visit "/"
-    assert response.ok?
+    def test_visits_pages
+    visit "/"
+    assert response_body.include?("visit")
+
+    click_link "there"
+    assert response_body.include?('<form method="post" action="/go">')
   end
 
-  def test_last_response_is_available
-    visit "/"
-    assert last_response.ok?
+  def test_submits_form
+    visit "/go"
+    fill_in "Name", :with => "World"
+    fill_in "Email", :with => "world@example.org"
+    click_button "Submit"
+    assert response_body.include?("Hello, World")
+    assert response_body.include?("Your email is: world@example.org")
   end
 
-  def test_last_request_is_available
+  def test_check_value_of_field
     visit "/"
-    assert_equal "/", last_request.env["PATH_INFO"]
+    assert field_labeled("Prefilled").value, "text"
   end
 
-  # def test_redirects
-  #   visit "/redirect_absolute_url"
-  #   assert_equal "spam", response_body
-  # end
-
-  def test_assertions_after_visit
-    visit "/"
-    assert_contain "Hello World"
+  def test_follows_internal_redirects
+    visit "/internal_redirect"
+    assert response_body.include?("visit")
   end
 
-  def test_assertions_after_visit
-    get "/"
-    assert_contain "Hello World"
+  def test_does_not_follow_external_redirects
+    visit "/external_redirect"
+    assert response_code == 302
   end
 
-  # def test_visits_pages
-  #   visit "/"
-  #   assert response_body.include?("visit")
-  #
-  #   click_link "there"
-  #   assert response_body.include?('<form method="post" action="/go">')
-  # end
-  #
-  # def test_submits_form
-  #   visit "/go"
-  #   fill_in "Name", :with => "World"
-  #   fill_in "Email", :with => "world@example.org"
-  #   click_button "Submit"
-  #
-  #   assert response_body.include?("Hello, World")
-  #   assert response_body.include?("Your email is: world@example.org")
-  # end
-  #
-  # def test_check_value_of_field
-  #   visit "/"
-  #   assert field_labeled("Prefilled").value, "text"
-  # end
-  #
-  # def test_follows_internal_redirects
-  #   visit "/internal_redirect"
-  #   assert response_body.include?("visit")
-  # end
-  #
-  # def test_does_not_follow_external_redirects
-  #   visit "/external_redirect"
-  #   assert response_code == 302
-  # end
+  def test_redirects
+    visit "/redirect_absolute_url"
+    assert_equal "spam", response_body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metry
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Nathaniel Talbott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 -04:00
+date: 2009-08-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency