From f1629bbfea7e3c10609f7de1b664db837fab3fae Mon Sep 17 00:00:00 2001
From: Kaisar Arkhan <ykno@protonmail.com>
Date: Sat, 31 Dec 2016 10:00:33 +0700
Subject: [PATCH] DNM: Fix Experiments #10

---
 app/controllers/map_controller.rb       |  2 +-
 app/controllers/notes_controller.rb     |  3 +--
 app/controllers/questions_controller.rb |  2 +-
 app/controllers/wiki_controller.rb      |  2 +-
 app/models/drupal_node.rb               |  4 +---
 app/models/drupal_node_counter.rb       |  6 +-----
 config/initializers/impression.rb       | 10 +++-------
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb
index 559aaaf1bd..6ef5424822 100644
--- a/app/controllers/map_controller.rb
+++ b/app/controllers/map_controller.rb
@@ -20,7 +20,7 @@ def show
 
     # redirect_old_urls
 
-    impressionist(@node.drupal_node_counter, 'view', :unique => [:session_hash])
+    impressionist(@node.drupal_node_counter)
     @title = @node.title
     @tags = @node.tags
     @tagnames = @tags.collect(&:name)
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index ff4d3bbe61..7422f9658b 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -69,8 +69,7 @@ def show
 
     alert_and_redirect_moderated
 
-
-    impressionist(@node.drupal_node_counter, 'view', :unique => [:session_hash])
+    impressionist(@node.drupal_node_counter)
     @title = @node.latest.title
     @tags = @node.tags
     @tagnames = @tags.collect(&:name)
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 0929da17c4..e1ead3f21c 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -30,7 +30,7 @@ def show
 
     alert_and_redirect_moderated
 
-    impressionist(@node.drupal_node_counter, 'view', :unique => [:session_hash])
+    impressionist(@node.drupal_node_counter)
     @title = @node.latest.title
     @tags = @node.power_tag_objects('question')
     @tagnames = @tags.collect(&:name)
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 21d8201d93..624898031b 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -53,7 +53,7 @@ def show
       set_sidebar :tags, @tagnames, {:videos => true}
       @wikis = DrupalTag.find_pages(@node.slug_from_path,30) if @node.has_tag('chapter') || @node.has_tag('tabbed:wikis')
 
-      impressionist(@node.drupal_node_counter, 'view', :unique => [:session_hash])
+      impressionist(@node.drupal_node_counter)
       @revision = @node.latest
       @title = @revision.title
     end
diff --git a/app/models/drupal_node.rb b/app/models/drupal_node.rb
index 609d05ef82..1f0c130da5 100644
--- a/app/models/drupal_node.rb
+++ b/app/models/drupal_node.rb
@@ -473,11 +473,9 @@ def tagnames
     self.tags.collect(&:name)
   end
 
-  # increment view count
+  # view counter is handled by controller
   def view
     DrupalNodeCounter.new({:nid => self.id}).save if self.drupal_node_counter.nil?
-    self.drupal_node_counter.totalcount += 1
-    self.drupal_node_counter.save
   end
 
   # view count
diff --git a/app/models/drupal_node_counter.rb b/app/models/drupal_node_counter.rb
index 027aa406ba..302d709c01 100644
--- a/app/models/drupal_node_counter.rb
+++ b/app/models/drupal_node_counter.rb
@@ -4,9 +4,5 @@ class DrupalNodeCounter < ActiveRecord::Base
 
   belongs_to :drupal_node, :foreign_key => 'nid', :dependent => :destroy
 
-  is_impressionable
-
-  def totalcount
-    impressionist_count(:filter=>:ip_address)
-  end
+  is_impressionable :counter_cache => true, :column_name => :totalcount, :unique => :ip_address
 end
diff --git a/config/initializers/impression.rb b/config/initializers/impression.rb
index 2c8d5d24d6..ccf3cdd94b 100644
--- a/config/initializers/impression.rb
+++ b/config/initializers/impression.rb
@@ -1,8 +1,4 @@
-# Use this hook to configure impressionist parameters
-#Impressionist.setup do |config|
+Impressionist.setup do |config|
   # Define ORM. Could be :active_record (default), :mongo_mapper or :mongoid
-  # config.orm = :active_record
-#end
-
-
-
+  config.orm = :active_record
+end