impressionist 1.2.0 → 1.3.0

data/.travis.yml

@@ -1,10 +1,9 @@
 before_install: gem install bundler
-before_script: "cd test_app && bundle install && ./script/rails generate impressionist && bundle exec rake db:migrate && cd .."
+before_script: "cd test_app && bundle install && ./script/rails generate impressionist -f && bundle exec rake db:migrate && cd .."
 language: ruby
 rvm:
   - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
   - 1.8.7
   - 1.9.2
   - 1.9.3

data/README.md

@@ -164,14 +164,22 @@ Or you can use the `impressionist` method directly:
 
     impressionist(impressionable, "some message", :unique => [:session_hash])
 
-Development Roadmap
--------------------
-* Automatic impression logging in views.  For example, log initial view, and
-  any partials called from initial view
-* Customizable black list for user-agents or IP addresses.  Impressions will be
-  ignored.  Web admin as part of the Engine.
-* Reporting engine
-* AB testing integration
+Are you using Mongoid?
+---------------------
+
+Execute this command on your terminal/console:
+
+    rails g impressionist --orm mongoid
+    
+This command create a file `impression.rb` on `config/initializer` folder. Add `config.orm = :mongoid` to this file:
+
+    # Use this hook to configure impressionist parameters
+    Impressionist.setup do |config|
+      # Define ORM. Could be :active_record (default), :mongo_mapper or :mongoid
+      # config.orm = :active_record
+      config.orm = :mongoid
+    end
+    
 
 Contributing to impressionist
 -----------------------------

data/app/controllers/impressionist_controller.rb

@@ -78,7 +78,7 @@ module ImpressionistController
     # creates a statment hash that contains default values for creating an impression.
     def direct_create_statement(query_params={})
       query_params.reverse_merge!(
-        :impressionable_type => controller_name.singularize.camelize,
+        :impressionable_type => controller_path.singularize.camelize,
         :impressionable_id=> params[:id]
         )
       associative_create_statement(query_params)

data/lib/generators/active_record/templates/create_impressions_table.rb

@@ -14,7 +14,7 @@ class CreateImpressionsTable < ActiveRecord::Migration
       t.text :referrer
       t.timestamps
     end
-    add_index :impressions, [:impressionable_type, :message, :impressionable_id], :name => "impressionable_type_message_index", :unique => false
+    add_index :impressions, [:impressionable_type, :message, :impressionable_id], :name => "impressionable_type_message_index", :unique => false, :length => {:message => 255 }
     add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash], :name => "poly_request_index", :unique => false
     add_index :impressions, [:impressionable_type, :impressionable_id, :ip_address], :name => "poly_ip_index", :unique => false
     add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false

data/lib/impressionist/controllers/mongoid/impressionist_controller.rb

@@ -3,8 +3,8 @@ ImpressionistController::InstanceMethods.send(:define_method, :direct_create_sta
 	# if :impressionable_id is a valid ObjectId then convert it into one
 	base = (defined? Moped) ? Moped::BSON : BSON
 	query_params.reverse_merge!(
-		:impressionable_type => controller_name.singularize.camelize,
+		:impressionable_type => controller_path.singularize.camelize,
 		:impressionable_id=> !base::ObjectId.legal?(params[:id]) ? params[:id] : base::ObjectId.from_string(params[:id])
 	)
 	associative_create_statement(query_params)
-end
+end

data/lib/impressionist/engine.rb

@@ -3,31 +3,46 @@ require "rails"
 
 module Impressionist
   class Engine < Rails::Engine
-    initializer 'impressionist.model' do |app|
-      require "#{root}/app/models/impressionist/impressionable.rb"
-      if Impressionist.orm == :active_record && defined? ActiveRecord
-        require "impressionist/models/active_record/impression.rb"
-        require "impressionist/models/active_record/impressionist/impressionable.rb"
-        ActiveRecord::Base.send(:include, Impressionist::Impressionable)
-      elsif Impressionist.orm == :mongo_mapper
-        require "impressionist/models/mongo_mapper/impression.rb"
-        require "impressionist/models/mongo_mapper/impressionist/impressionable.rb"
-        MongoMapper::Document.plugin Impressionist::Impressionable
-      elsif Impressionist.orm == :mongoid
-        require 'impressionist/models/mongoid/impression.rb'
-        require 'impressionist/models/mongoid/impressionist/impressionable.rb'
-        Mongoid::Document.send(:include, Impressionist::Impressionable)
-      end
-    end
-
-    initializer 'impressionist.controller' do
-      if Impressionist.orm == :mongoid
-          require 'impressionist/controllers/mongoid/impressionist_controller.rb'
-      end
-      ActiveSupport.on_load(:action_controller) do
-        include ImpressionistController::InstanceMethods
-        extend ImpressionistController::ClassMethods
-      end
-    end
+    attr_accessor :orm
+
+  def initialize
+    define_orm_type(Impressionist.orm)
+  end
+
+  initializer 'impressionist.model' do |app|
+    require_orm
+    ActiveRecord::Base.send(:include, Impressionist::Impressionable)
+
+  end
+
+
+  initializer 'impressionist.controller' do
+    require "impressionist/controllers/mongoid/impressionist_controller.rb" if orm == :mongoid.to_s
+
+    ActiveSupport.on_load(:action_controller) do
+     include ImpressionistController::InstanceMethods
+     extend ImpressionistController::ClassMethods
+   end
+  end
+
+
+ private
+  def require_orm
+    require "#{root}/app/models/impressionist/impressionable.rb"
+    require "impressionist/models/#{orm}/impression.rb"
+    require "impressionist/models/#{orm}/impressionist/impressionable.rb"
+
+  end
+
+  def define_orm_type(str)
+    @orm = matcher(str.to_s)
+  end
+
+   def matcher(str)
+    matched = str.match(/active_record|mongo_mapper|mongoid|/)
+    matched[0]
+   end
+
+
   end
 end

data/lib/impressionist/models/active_record/impression.rb

@@ -10,11 +10,12 @@ class Impression < ActiveRecord::Base
   private
 
   def update_impressions_counter_cache
-    impressionable_class = self.impressionable_type.constantize
-
-    if impressionable_class.impressionist_counter_cache_options
-      resouce = impressionable_class.find(self.impressionable_id)
-      resouce.try(:update_impressionist_counter_cache)
+    if self.impressionable_type && self.impressionable_id
+      impressionable_class = self.impressionable_type.constantize
+      if impressionable_class.impressionist_counter_cache_options
+        resouce = impressionable_class.find(self.impressionable_id)
+        resouce.try(:update_impressionist_counter_cache)
+      end
     end
   end
 end

data/lib/impressionist/models/mongoid/impressionist/impressionable.rb

@@ -37,7 +37,8 @@ module Impressionist
     def impressionist_count(options={})
       options.reverse_merge!(:filter=>:request_hash, :start_date=>nil, :end_date=>Time.now)
       imps = options[:start_date].blank? ? impressions : impressions.between(created_at: options[:start_date]..options[:end_date])
-      options[:filter] == :all ? imps.count : imps.where(options[:filter].ne => nil).count
+      filter = options[:filter]
+      filter == :all ? imps.count : imps.where(filter.ne => nil).distinct(filter).count
     end
 
     def update_impressionist_counter_cache
@@ -49,4 +50,4 @@ module Impressionist
     end
 
   end
-end
+end

data/lib/impressionist/version.rb

@@ -1,3 +1,3 @@
 module Impressionist
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test_app/app/controllers/dummy_controller.rb

@@ -3,4 +3,6 @@ class DummyController < ActionController::Base
 
   impressionist
 
+  def index
+  end
 end

data/test_app/config/routes.rb

@@ -1,3 +1,3 @@
 TestApp::Application.routes.draw do
-  resources :articles, :posts, :widgets
+  resources :articles, :posts, :widgets, :dummy
 end

data/test_app/spec/controllers/controller_spec.rb

@@ -123,3 +123,12 @@ describe WidgetsController do
   end
 
 end
+describe DummyController do
+  fixtures :impressions
+  render_views
+
+  it "should log impression at the per action level on non-restful controller" do
+    get "index"
+    Impression.all.size.should eq 12
+  end
+end

data/test_app/spec/controllers/impressionist_uniqueness_spec.rb

@@ -294,7 +294,7 @@ 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!(:controller_path).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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: impressionist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -232,6 +232,7 @@ files:
 - test_app/app/models/widget.rb
 - test_app/app/views/articles/index.html.erb
 - test_app/app/views/articles/show.html.erb
+- test_app/app/views/dummy/index.html.erb
 - test_app/app/views/layouts/application.html.erb
 - test_app/app/views/posts/edit.html.erb
 - test_app/app/views/posts/index.html.erb
@@ -296,7 +297,6 @@ files:
 - test_app/spec/spec_helper.rb
 - upgrade_migrations/version_0_3_0.rb
 - upgrade_migrations/version_0_4_0.rb
-- upgrade_migrations/version_1_1_2.rb
 homepage: https://github.com/charlotte-ruby/impressionist
 licenses:
 - MIT
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2760039112118904693
+      hash: -3654668397609165147
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy way to log impressions
@@ -348,6 +348,7 @@ test_files:
 - test_app/app/models/widget.rb
 - test_app/app/views/articles/index.html.erb
 - test_app/app/views/articles/show.html.erb
+- test_app/app/views/dummy/index.html.erb
 - test_app/app/views/layouts/application.html.erb
 - test_app/app/views/posts/edit.html.erb
 - test_app/app/views/posts/index.html.erb

data/upgrade_migrations/version_1_1_2.rb

@@ -1,9 +0,0 @@
-class Version04UpdateImpressionsTable < ActiveRecord::Migration
-  def self.up
-    add_index :impressions, [:impressionable_type, :message, :impressionable_id], :name => "impressionable_type_message_index", :unique => false
-  end
-
-  def self.down
-    remove_index :impressions, :impressionable_type_message_index
-  end
-end