impressionist 1.4.1 → 1.4.2

data/{test_app → tests/test_app}/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '3.2.12'
 
-gem 'impressionist', :path => '../'
+gem 'impressionist', :path => '../../'
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
@@ -13,6 +13,9 @@ end
 platforms :ruby, :mswin, :mingw do
   gem 'pg'
   gem 'sqlite3'
+  gem 'mysql2'
+  gem "mongoid", "~> 3.1.4"
+  gem 'bson_ext'
 end
 
 gem 'json'
@@ -43,17 +46,3 @@ end
 
 gem 'jquery-rails'
 
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'

data/tests/test_app/config/initializers/impression.rb

@@ -0,0 +1,2 @@
+# Define ORM. Could be :active_record (default) and :mongo_mapper
+#Impressionist.config.orm = :mongoid

data/tests/test_app/db/schema.rb

@@ -0,0 +1,60 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20130709003307) do
+
+  create_table "articles", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "impressions", :force => true do |t|
+    t.string   "impressionable_type"
+    t.integer  "impressionable_id"
+    t.integer  "user_id"
+    t.string   "controller_name"
+    t.string   "action_name"
+    t.string   "view_name"
+    t.string   "request_hash"
+    t.string   "ip_address"
+    t.string   "session_hash"
+    t.text     "message"
+    t.text     "referrer"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "impressions", ["controller_name", "action_name", "ip_address"], :name => "controlleraction_ip_index"
+  add_index "impressions", ["controller_name", "action_name", "request_hash"], :name => "controlleraction_request_index"
+  add_index "impressions", ["controller_name", "action_name", "session_hash"], :name => "controlleraction_session_index"
+  add_index "impressions", ["impressionable_type", "impressionable_id", "ip_address"], :name => "poly_ip_index"
+  add_index "impressions", ["impressionable_type", "impressionable_id", "request_hash"], :name => "poly_request_index"
+  add_index "impressions", ["impressionable_type", "impressionable_id", "session_hash"], :name => "poly_session_index"
+  add_index "impressions", ["impressionable_type", "message", "impressionable_id"], :name => "impressionable_type_message_index"
+  add_index "impressions", ["user_id"], :name => "index_impressions_on_user_id"
+
+  create_table "posts", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "widgets", :force => true do |t|
+    t.string   "name"
+    t.integer  "impressions_count", :default => 0
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
+  end
+
+end

data/{test_app → tests/test_app}/spec/controllers/impressionist_uniqueness_spec.rb

@@ -16,14 +16,14 @@ describe DummyController do
     end
 
     it "should recognize unique session" do
-      controller.stub!(:session_hash).and_return(request.session_options[:id])
+      controller.stub(:session_hash).and_return(request.session_options[:id])
       controller.impressionist_subapp_filter(nil, [:session_hash])
       controller.impressionist_subapp_filter(nil, [:session_hash])
       Impression.should have(@impression_count + 1).records
     end
 
     it "should recognize unique ip" do
-      controller.request.stub!(:remote_ip).and_return("1.2.3.4")
+      controller.request.stub(:remote_ip).and_return("1.2.3.4")
       controller.impressionist_subapp_filter(nil, [:ip_address])
       controller.impressionist_subapp_filter(nil, [:ip_address])
       Impression.should have(@impression_count + 1).records
@@ -36,35 +36,35 @@ describe DummyController do
     end
 
     it "should recognize unique action" do
-      controller.stub!(:action_name).and_return("test_action")
+      controller.stub(:action_name).and_return("test_action")
       controller.impressionist_subapp_filter(nil, [:action_name])
       controller.impressionist_subapp_filter(nil, [:action_name])
       Impression.should have(@impression_count + 1).records
     end
 
     it "should recognize unique controller" do
-      controller.stub!(:controller_name).and_return("post")
+      controller.stub(:controller_name).and_return("post")
       controller.impressionist_subapp_filter(nil, [:controller_name])
       controller.impressionist_subapp_filter(nil, [:controller_name])
       Impression.should have(@impression_count + 1).records
     end
 
     it "should recognize unique user" do
-      controller.stub!(:user_id).and_return(42)
+      controller.stub(:user_id).and_return(42)
       controller.impressionist_subapp_filter(nil, [:user_id])
       controller.impressionist_subapp_filter(nil, [:user_id])
       Impression.should have(@impression_count + 1).records
     end
 
     it "should recognize unique referer" do
-      controller.request.stub!(:referer).and_return("http://foo/bar")
+      controller.request.stub(:referer).and_return("http://foo/bar")
       controller.impressionist_subapp_filter(nil, [:referrer])
       controller.impressionist_subapp_filter(nil, [:referrer])
       Impression.should have(@impression_count + 1).records
     end
 
     it "should recognize unique id" do
-      controller.stub!(:params).and_return({:id => "666"}) # for correct impressionable id in filter
+      controller.stub(:params).and_return({:id => "666"}) # for correct impressionable id in filter
       controller.impressionist_subapp_filter(nil, [:impressionable_id])
       controller.impressionist_subapp_filter(nil, [:impressionable_id])
       Impression.should have(@impression_count + 1).records
@@ -72,88 +72,88 @@ describe DummyController do
 
     # extra redundant test for important controller and action combination.
     it "should recognize different controller and action" do
-      controller.stub!(:controller_name).and_return("post")
-      controller.stub!(:action_name).and_return("test_action")
+      controller.stub(:controller_name).and_return("post")
+      controller.stub(:action_name).and_return("test_action")
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:action_name).and_return("another_action")
+      controller.stub(:action_name).and_return("another_action")
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       Impression.should have(@impression_count + 2).records
-      controller.stub!(:controller_name).and_return("article")
+      controller.stub(:controller_name).and_return("article")
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       controller.impressionist_subapp_filter(nil, [:controller_name, :action_name])
       Impression.should have(@impression_count + 3).records
     end
 
     it "should recognize different action" do
-      controller.stub!(:action_name).and_return("test_action")
+      controller.stub(:action_name).and_return("test_action")
       controller.impressionist_subapp_filter(nil, [:action_name])
       controller.impressionist_subapp_filter(nil, [:action_name])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:action_name).and_return("another_action")
+      controller.stub(:action_name).and_return("another_action")
       controller.impressionist_subapp_filter(nil, [:action_name])
       controller.impressionist_subapp_filter(nil, [:action_name])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different controller" do
-      controller.stub!(:controller_name).and_return("post")
+      controller.stub(:controller_name).and_return("post")
       controller.impressionist_subapp_filter(nil, [:controller_name])
       controller.impressionist_subapp_filter(nil, [:controller_name])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:controller_name).and_return("article")
+      controller.stub(:controller_name).and_return("article")
       controller.impressionist_subapp_filter(nil, [:controller_name])
       controller.impressionist_subapp_filter(nil, [:controller_name])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different session" do
-      controller.stub!(:session_hash).and_return("foo")
+      controller.stub(:session_hash).and_return("foo")
       controller.impressionist_subapp_filter(nil, [:session_hash])
       controller.impressionist_subapp_filter(nil, [:session_hash])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:session_hash).and_return("bar")
+      controller.stub(:session_hash).and_return("bar")
       controller.impressionist_subapp_filter(nil, [:session_hash])
       controller.impressionist_subapp_filter(nil, [:session_hash])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different ip" do
-      controller.request.stub!(:remote_ip).and_return("1.2.3.4")
+      controller.request.stub(:remote_ip).and_return("1.2.3.4")
       controller.impressionist_subapp_filter(nil, [:ip_address])
       controller.impressionist_subapp_filter(nil, [:ip_address])
       Impression.should have(@impression_count + 1).records
-      controller.request.stub!(:remote_ip).and_return("5.6.7.8")
+      controller.request.stub(:remote_ip).and_return("5.6.7.8")
       controller.impressionist_subapp_filter(nil, [:ip_address])
       controller.impressionist_subapp_filter(nil, [:ip_address])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different referer" do
-      controller.request.stub!(:referer).and_return("http://foo/bar")
+      controller.request.stub(:referer).and_return("http://foo/bar")
       controller.impressionist_subapp_filter(nil, [:referrer])
       controller.impressionist_subapp_filter(nil, [:referrer])
       Impression.should have(@impression_count + 1).records
-      controller.request.stub!(:referer).and_return("http://bar/fo")
+      controller.request.stub(:referer).and_return("http://bar/fo")
       controller.impressionist_subapp_filter(nil, [:referrer])
       controller.impressionist_subapp_filter(nil, [:referrer])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different id" do
-      controller.stub!(:params).and_return({:id => "666"}) # for correct impressionable id in filter
+      controller.stub(:params).and_return({:id => "666"}) # for correct impressionable id in filter
       controller.impressionist_subapp_filter(nil, [:impressionable_type, :impressionable_id])
       controller.impressionist_subapp_filter(nil, [:impressionable_type, :impressionable_id])
-      controller.stub!(:params).and_return({:id => "42"}) # for correct impressionable id in filter
+      controller.stub(:params).and_return({:id => "42"}) # for correct impressionable id in filter
       controller.impressionist_subapp_filter(nil, [:impressionable_type, :impressionable_id])
       controller.impressionist_subapp_filter(nil, [:impressionable_type, :impressionable_id])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize combined uniqueness" do
-      controller.stub!(:action_name).and_return("test_action")
+      controller.stub(:action_name).and_return("test_action")
       controller.impressionist_subapp_filter(nil, [:ip_address, :request_hash, :action_name])
       controller.impressionist_subapp_filter(nil, [:request_hash, :ip_address, :action_name])
       controller.impressionist_subapp_filter(nil, [:request_hash, :action_name])
@@ -166,11 +166,11 @@ describe DummyController do
     end
 
     it "should recognize combined non-uniqueness" do
-      controller.stub!(:action_name).and_return(nil)
+      controller.stub(:action_name).and_return(nil)
       controller.impressionist_subapp_filter(nil, [:ip_address, :action_name])
-      controller.stub!(:action_name).and_return("test_action")
+      controller.stub(:action_name).and_return("test_action")
       controller.impressionist_subapp_filter(nil, [:ip_address, :action_name])
-      controller.stub!(:action_name).and_return("another_action")
+      controller.stub(:action_name).and_return("another_action")
       controller.impressionist_subapp_filter(nil, [:ip_address, :action_name])
       Impression.should have(@impression_count + 3).records
     end
@@ -189,7 +189,7 @@ describe DummyController do
     end
 
     it "should recognize unique session" do
-      controller.stub!(:session_hash).and_return(request.session_options[:id])
+      controller.stub(:session_hash).and_return(request.session_options[:id])
       impressionable = Post.create
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
@@ -197,7 +197,7 @@ describe DummyController do
     end
 
     it "should recognize unique ip" do
-      controller.request.stub!(:remote_ip).and_return("1.2.3.4")
+      controller.request.stub(:remote_ip).and_return("1.2.3.4")
       impressionable = Post.create
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
@@ -212,7 +212,7 @@ describe DummyController do
     end
 
     it "should recognize unique user" do
-      controller.stub!(:user_id).and_return(666)
+      controller.stub(:user_id).and_return(666)
       impressionable = Post.create
       controller.impressionist(impressionable, nil, :unique => [:user_id])
       controller.impressionist(impressionable, nil, :unique => [:user_id])
@@ -220,7 +220,7 @@ describe DummyController do
     end
 
     it "should recognize unique referer" do
-      controller.request.stub!(:referer).and_return("http://foo/bar")
+      controller.request.stub(:referer).and_return("http://foo/bar")
       impressionable = Post.create
       controller.impressionist(impressionable, nil, :unique => [:referrer])
       controller.impressionist(impressionable, nil, :unique => [:referrer])
@@ -229,23 +229,23 @@ describe DummyController do
 
     it "should recognize different session" do
       impressionable = Post.create
-      controller.stub!(:session_hash).and_return("foo")
+      controller.stub(:session_hash).and_return("foo")
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:session_hash).and_return("bar")
+      controller.stub(:session_hash).and_return("bar")
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
       controller.impressionist(impressionable, nil, :unique => [:session_hash])
       Impression.should have(@impression_count + 2).records
     end
 
     it "should recognize different ip" do
-      controller.request.stub!(:remote_ip).and_return("1.2.3.4")
+      controller.request.stub(:remote_ip).and_return("1.2.3.4")
       impressionable = Post.create
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
       Impression.should have(@impression_count + 1).records
-      controller.request.stub!(:remote_ip).and_return("5.6.7.8")
+      controller.request.stub(:remote_ip).and_return("5.6.7.8")
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
       controller.impressionist(impressionable, nil, :unique => [:ip_address])
       Impression.should have(@impression_count + 2).records
@@ -253,11 +253,11 @@ describe DummyController do
 
     it "should recognize different user" do
       impressionable = Post.create
-      controller.stub!(:user_id).and_return(666)
+      controller.stub(:user_id).and_return(666)
       controller.impressionist(impressionable, nil, :unique => [:user_id])
       controller.impressionist(impressionable, nil, :unique => [:user_id])
       Impression.should have(@impression_count + 1).records
-      controller.stub!(:user_id).and_return(42)
+      controller.stub(:user_id).and_return(42)
       controller.impressionist(impressionable, nil, :unique => [:user_id])
       controller.impressionist(impressionable, nil, :unique => [:user_id])
       Impression.should have(@impression_count + 2).records
@@ -265,7 +265,7 @@ describe DummyController do
 
     it "should recognize combined uniqueness" do
       impressionable = Post.create
-      controller.stub!(:session_hash).and_return("foo")
+      controller.stub(:session_hash).and_return("foo")
       controller.impressionist(impressionable, nil, :unique => [:ip_address, :request_hash, :session_hash])
       controller.impressionist(impressionable, nil, :unique => [:request_hash, :ip_address, :session_hash])
       controller.impressionist(impressionable, nil, :unique => [:request_hash, :session_hash])
@@ -279,11 +279,11 @@ describe DummyController do
 
     it "should recognize combined non-uniqueness" do
       impressionable = Post.create
-      controller.stub!(:session_hash).and_return(nil)
+      controller.stub(:session_hash).and_return(nil)
       controller.impressionist(impressionable, nil, :unique => [:ip_address, :session_hash])
-      controller.stub!(:session_hash).and_return("foo")
+      controller.stub(:session_hash).and_return("foo")
       controller.impressionist(impressionable, nil, :unique => [:ip_address, :session_hash])
-      controller.stub!(:session_hash).and_return("bar")
+      controller.stub(:session_hash).and_return("bar")
       controller.impressionist(impressionable, nil, :unique => [:ip_address, :session_hash])
       Impression.should have(@impression_count + 3).records
     end
@@ -294,10 +294,10 @@ describe DummyController do
 
     it "should recognize uniqueness" do
       impressionable = Post.create
-      controller.stub!(:controller_name).and_return("posts") # for correct impressionable type in filter
-      controller.stub!(:params).and_return({:id => impressionable.id.to_s}) # for correct impressionable id in filter
-      controller.stub!(:session_hash).and_return("foo")
-      controller.request.stub!(:remote_ip).and_return("1.2.3.4")
+      controller.stub(:controller_name).and_return("posts") # for correct impressionable type in filter
+      controller.stub(:params).and_return({:id => impressionable.id.to_s}) # for correct impressionable id in filter
+      controller.stub(:session_hash).and_return("foo")
+      controller.request.stub(:remote_ip).and_return("1.2.3.4")
       # order of the following methods is important for the test!
       controller.impressionist_subapp_filter(nil, [:ip_address, :request_hash, :session_hash])
       controller.impressionist(impressionable, nil, :unique => [:ip_address, :request_hash, :session_hash])