diff --git a/app/controllers/impressionist_controller.rb b/app/controllers/impressionist_controller.rb index 1afcd53..c7be098 100644 --- a/app/controllers/impressionist_controller.rb +++ b/app/controllers/impressionist_controller.rb @@ -21,7 +21,8 @@ module ImpressionistController :ip_address=> request.remote_ip, :user_id=> user_id, :controller_name=>controller_name, - :action_name=> action_name) + :action_name=> action_name, + :referrer=>request.referer) else raise "#{obj.class.to_s} is not impressionable!" end @@ -43,7 +44,8 @@ module ImpressionistController :session_hash=> request.session_options[:id], :ip_address=> request.remote_ip, :impressionable_type=> controller_name.singularize.camelize, - :impressionable_id=> params[:id]) + :impressionable_id=> params[:id], + :referrer=>request.referer) end end end diff --git a/lib/generators/impressionist/templates/create_impressions_table.rb b/lib/generators/impressionist/templates/create_impressions_table.rb index 7d69cd2..22b6a90 100644 --- a/lib/generators/impressionist/templates/create_impressions_table.rb +++ b/lib/generators/impressionist/templates/create_impressions_table.rb @@ -11,6 +11,7 @@ class CreateImpressionsTable < ActiveRecord::Migration t.string :session_hash t.string :ip_address t.string :message + t.string :referrer t.timestamps end add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash], :name => "poly_request_index", :unique => false diff --git a/test_app/app/views/articles/show.html.erb b/test_app/app/views/articles/show.html.erb index e69de29..1826f15 100644 --- a/test_app/app/views/articles/show.html.erb +++ b/test_app/app/views/articles/show.html.erb @@ -0,0 +1 @@ +<%=link_to "Same Page", article_url(Article.first)%> \ No newline at end of file diff --git a/test_app/features/step_definitions/web_steps.rb b/test_app/features/step_definitions/web_steps.rb deleted file mode 100644 index 0f0af8a..0000000 --- a/test_app/features/step_definitions/web_steps.rb +++ /dev/null @@ -1,219 +0,0 @@ -# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. -# It is recommended to regenerate this file in the future when you upgrade to a -# newer version of cucumber-rails. Consider adding your own code to a new file -# instead of editing this one. Cucumber will automatically load all features/**/*.rb -# files. - - -require 'uri' -require 'cgi' -require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths")) - -module WithinHelpers - def with_scope(locator) - locator ? within(locator) { yield } : yield - end -end -World(WithinHelpers) - -Given /^(?:|I )am on (.+)$/ do |page_name| - visit path_to(page_name) -end - -When /^(?:|I )go to (.+)$/ do |page_name| - visit path_to(page_name) -end - -When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector| - with_scope(selector) do - click_button(button) - end -end - -When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector| - with_scope(selector) do - click_link(link) - end -end - -When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector| - with_scope(selector) do - fill_in(field, :with => value) - end -end - -When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector| - with_scope(selector) do - fill_in(field, :with => value) - end -end - -# Use this to fill in an entire form with data from a table. Example: -# -# When I fill in the following: -# | Account Number | 5002 | -# | Expiry date | 2009-11-01 | -# | Note | Nice guy | -# | Wants Email? | | -# -# TODO: Add support for checkbox, select og option -# based on naming conventions. -# -When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields| - with_scope(selector) do - fields.rows_hash.each do |name, value| - When %{I fill in "#{name}" with "#{value}"} - end - end -end - -When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector| - with_scope(selector) do - select(value, :from => field) - end -end - -When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| - with_scope(selector) do - check(field) - end -end - -When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| - with_scope(selector) do - uncheck(field) - end -end - -When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector| - with_scope(selector) do - choose(field) - end -end - -When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector| - with_scope(selector) do - attach_file(field, path) - end -end - -Then /^(?:|I )should see JSON:$/ do |expected_json| - require 'json' - expected = JSON.pretty_generate(JSON.parse(expected_json)) - actual = JSON.pretty_generate(JSON.parse(response.body)) - expected.should == actual -end - -Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector| - with_scope(selector) do - if page.respond_to? :should - page.should have_content(text) - else - assert page.has_content?(text) - end - end -end - -Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector| - regexp = Regexp.new(regexp) - with_scope(selector) do - if page.respond_to? :should - page.should have_xpath('//*', :text => regexp) - else - assert page.has_xpath?('//*', :text => regexp) - end - end -end - -Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector| - with_scope(selector) do - if page.respond_to? :should - page.should have_no_content(text) - else - assert page.has_no_content?(text) - end - end -end - -Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector| - regexp = Regexp.new(regexp) - with_scope(selector) do - if page.respond_to? :should - page.should have_no_xpath('//*', :text => regexp) - else - assert page.has_no_xpath?('//*', :text => regexp) - end - end -end - -Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value| - with_scope(selector) do - field = find_field(field) - field_value = (field.tag_name == 'textarea') ? field.text : field.value - if field_value.respond_to? :should - field_value.should =~ /#{value}/ - else - assert_match(/#{value}/, field_value) - end - end -end - -Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value| - with_scope(selector) do - field = find_field(field) - field_value = (field.tag_name == 'textarea') ? field.text : field.value - if field_value.respond_to? :should_not - field_value.should_not =~ /#{value}/ - else - assert_no_match(/#{value}/, field_value) - end - end -end - -Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector| - with_scope(selector) do - field_checked = find_field(label)['checked'] - if field_checked.respond_to? :should - field_checked.should be_true - else - assert field_checked - end - end -end - -Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector| - with_scope(selector) do - field_checked = find_field(label)['checked'] - if field_checked.respond_to? :should - field_checked.should be_false - else - assert !field_checked - end - end -end - -Then /^(?:|I )should be on (.+)$/ do |page_name| - current_path = URI.parse(current_url).path - if current_path.respond_to? :should - current_path.should == path_to(page_name) - else - assert_equal path_to(page_name), current_path - end -end - -Then /^(?:|I )should have the following query string:$/ do |expected_pairs| - query = URI.parse(current_url).query - actual_params = query ? CGI.parse(query) : {} - expected_params = {} - expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} - - if actual_params.respond_to? :should - actual_params.should == expected_params - else - assert_equal expected_params, actual_params - end -end - -Then /^show me the page$/ do - save_and_open_page -end diff --git a/test_app/features/support/env.rb b/test_app/features/support/env.rb deleted file mode 100644 index 04f0218..0000000 --- a/test_app/features/support/env.rb +++ /dev/null @@ -1,67 +0,0 @@ -# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril. -# It is recommended to regenerate this file in the future when you upgrade to a -# newer version of cucumber-rails. Consider adding your own code to a new file -# instead of editing this one. Cucumber will automatically load all features/**/*.rb -# files. - -require 'rubygems' -require 'spork' - -Spork.prefork do - ENV["RAILS_ENV"] ||= "test" - require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') - - require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support - require 'cucumber/rails/rspec' - require 'cucumber/rails/world' - require 'cucumber/rails/active_record' - require 'cucumber/web/tableish' - - - require 'capybara/rails' - require 'capybara/cucumber' - require 'capybara/session' - require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript - # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In - # order to ease the transition to Capybara we set the default here. If you'd - # prefer to use XPath just remove this line and adjust any selectors in your - # steps to use the XPath syntax. - Capybara.default_selector = :css - -end - -Spork.each_run do - # If you set this to false, any error raised from within your app will bubble - # up to your step definition and out to cucumber unless you catch it somewhere - # on the way. You can make Rails rescue errors and render error pages on a - # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag. - # - # If you set this to true, Rails will rescue all errors and render error - # pages, more or less in the same way your application would behave in the - # default production environment. It's not recommended to do this for all - # of your scenarios, as this makes it hard to discover errors in your application. - ActionController::Base.allow_rescue = false - - # If you set this to true, each scenario will run in a database transaction. - # You can still turn off transactions on a per-scenario basis, simply tagging - # a feature or scenario with the @no-txn tag. If you are using Capybara, - # tagging with @culerity or @javascript will also turn transactions off. - # - # If you set this to false, transactions will be off for all scenarios, - # regardless of whether you use @no-txn or not. - # - # Beware that turning transactions off will leave data in your database - # after each scenario, which can lead to hard-to-debug failures in - # subsequent scenarios. If you do this, we recommend you create a Before - # block that will explicitly put your database in a known state. - Cucumber::Rails::World.use_transactional_fixtures = true - # How to clean your database when transactions are turned off. See - # http://github.com/bmabey/database_cleaner for more info. - if defined?(ActiveRecord::Base) - begin - require 'database_cleaner' - DatabaseCleaner.strategy = :truncation - rescue LoadError => ignore_if_database_cleaner_not_present - end - end -end diff --git a/test_app/features/support/paths.rb b/test_app/features/support/paths.rb deleted file mode 100644 index 06b3efb..0000000 --- a/test_app/features/support/paths.rb +++ /dev/null @@ -1,33 +0,0 @@ -module NavigationHelpers - # Maps a name to a path. Used by the - # - # When /^I go to (.+)$/ do |page_name| - # - # step definition in web_steps.rb - # - def path_to(page_name) - case page_name - - when /the home\s?page/ - '/' - - # Add more mappings here. - # Here is an example that pulls values out of the Regexp: - # - # when /^(.*)'s profile page$/i - # user_profile_path(User.find_by_login($1)) - - else - begin - page_name =~ /the (.*) page/ - path_components = $1.split(/\s+/) - self.send(path_components.push('path').join('_').to_sym) - rescue Object => e - raise "Can't find mapping from \"#{page_name}\" to a path.\n" + - "Now, go and add a mapping in #{__FILE__}" - end - end - end -end - -World(NavigationHelpers) diff --git a/test_app/public/index.html b/test_app/public/index.html deleted file mode 100644 index 75d5edd..0000000 --- a/test_app/public/index.html +++ /dev/null @@ -1,239 +0,0 @@ - - - - Ruby on Rails: Welcome aboard - - - - -
- - -
- - - - -
-

Getting started

-

Here’s how to get rolling:

- -
    -
  1. -

    Use rails generate to create your models and controllers

    -

    To see all available options, run it without parameters.

    -
    2. - -
  2. -

    Set up a default route and remove or rename this file

    -

    Routes are set up in config/routes.rb.

    -
    3. - -
  3. -

    Create your database

    -

    Run rake db:migrate to create your database. If you're not using SQLite (the default), edit config/database.yml with your username and password.

    -
    4. -
-
-
- - -
- - diff --git a/test_app/spec/controllers/controller_spec.rb b/test_app/spec/controllers/controller_spec.rb index da0522d..c303671 100644 --- a/test_app/spec/controllers/controller_spec.rb +++ b/test_app/spec/controllers/controller_spec.rb @@ -36,11 +36,18 @@ describe ArticlesController do Article.first.impressions.last.user_id.should eq nil end - it "should log the request_hash, ip_address, and session_hash" do + it "should log the request_hash, ip_address, referrer and session_hash" do get "show", :id=> 1 Impression.last.request_hash.size.should eq 64 Impression.last.ip_address.should eq "0.0.0.0" Impression.last.session_hash.size.should eq 32 + Impression.last.referrer.should eq nil + end + + it "should log the referrer when you click a link" do + visit article_url(Article.first) + click_link "Same Page" + Impression.last.referrer.should eq "http://test.host/articles/1" end end diff --git a/upgrade_migrations/version_0_4_0.rb b/upgrade_migrations/version_0_4_0.rb new file mode 100644 index 0000000..32dcab9 --- /dev/null +++ b/upgrade_migrations/version_0_4_0.rb @@ -0,0 +1,9 @@ +class Version04UpdateImpressionsTable < ActiveRecord::Migration + def self.up + add_column :impressions, :referrer, :string + end + + def self.down + remove_column :impressions, :referrer + end +end \ No newline at end of file