From 380f49cf62cf07e2b7c174d628d8cc299a53c24e Mon Sep 17 00:00:00 2001
From: Ross Kaffenberger <rosskaff@gmail.com>
Date: Mon, 19 Mar 2012 14:31:05 -0400
Subject: [PATCH] namespace impressionable model module class methods with
 'impressionist_'

---
 app/models/impressionist/impressionable.rb     | 18 +++++++++---------
 .../models/active_record/impression.rb         |  2 +-
 .../impressionist/impressionable.rb            |  2 +-
 .../initializers_spec.rb                       |  0
 test_app/spec/models/counter_caching_spec.rb   |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename test_app/spec/{intializers => initializers}/initializers_spec.rb (100%)

diff --git a/app/models/impressionist/impressionable.rb b/app/models/impressionist/impressionable.rb
index e09addd..57d5d86 100644
--- a/app/models/impressionist/impressionable.rb
+++ b/app/models/impressionist/impressionable.rb
@@ -3,19 +3,19 @@ module Impressionist
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_accessor :cache_options
-      @cache_options = nil
+      attr_accessor :impressionist_cache_options
+      @impressionist_cache_options = nil
 
-      def counter_cache_options
-        if @cache_options
+      def impressionist_counter_cache_options
+        if @impressionist_cache_options
           options = { :column_name => :impressions_count, :unique => false }
-          options.merge!(@cache_options) if @cache_options.is_a?(Hash)
+          options.merge!(@impressionist_cache_options) if @impressionist_cache_options.is_a?(Hash)
           options
         end
       end
 
-      def counter_caching?
-        counter_cache_options.present?
+      def impressionist_counter_caching?
+        impressionist_counter_cache_options.present?
       end
     end
 
@@ -33,7 +33,7 @@ module Impressionist
     end
 
     def update_counter_cache
-      cache_options = self.class.counter_cache_options
+      cache_options = self.class.impressionist_counter_cache_options
       column_name = cache_options[:column_name].to_sym
       count = cache_options[:unique] ? impressionist_count(:filter => :ip_address) : impressionist_count
       update_attribute(column_name, count)
@@ -56,4 +56,4 @@ module Impressionist
       impressionist_count({:start_date=>start_date, :end_date=>end_date, :filter=> :session_hash})
     end
   end
-end
+end
\ No newline at end of file
diff --git a/lib/impressionist/models/active_record/impression.rb b/lib/impressionist/models/active_record/impression.rb
index 4d13373..707151d 100644
--- a/lib/impressionist/models/active_record/impression.rb
+++ b/lib/impressionist/models/active_record/impression.rb
@@ -10,7 +10,7 @@ class Impression < ActiveRecord::Base
   def update_impressions_counter_cache
     impressionable_class = self.impressionable_type.constantize
 
-    if impressionable_class.counter_cache_options
+    if impressionable_class.impressionist_counter_cache_options
       resouce = impressionable_class.find(self.impressionable_id)
       resouce.try(:update_counter_cache)
     end
diff --git a/lib/impressionist/models/active_record/impressionist/impressionable.rb b/lib/impressionist/models/active_record/impressionist/impressionable.rb
index d9339fb..6100b88 100644
--- a/lib/impressionist/models/active_record/impressionist/impressionable.rb
+++ b/lib/impressionist/models/active_record/impressionist/impressionable.rb
@@ -5,7 +5,7 @@ module Impressionist
     module ClassMethods
       def is_impressionable(options={})
         has_many :impressions, :as => :impressionable, :dependent => :destroy
-        @cache_options = options[:counter_cache]
+        @impressionist_cache_options = options[:counter_cache]
       end
     end
   end
diff --git a/test_app/spec/intializers/initializers_spec.rb b/test_app/spec/initializers/initializers_spec.rb
similarity index 100%
rename from test_app/spec/intializers/initializers_spec.rb
rename to test_app/spec/initializers/initializers_spec.rb
diff --git a/test_app/spec/models/counter_caching_spec.rb b/test_app/spec/models/counter_caching_spec.rb
index 88cbd73..609b88e 100644
--- a/test_app/spec/models/counter_caching_spec.rb
+++ b/test_app/spec/models/counter_caching_spec.rb
@@ -8,13 +8,13 @@ describe Impression do
     Impression.destroy_all
   end
 
-  describe "self#counter_caching?" do
+  describe "self#impressionist_counter_caching?" do
     it "should know when counter caching is enabled" do
-      Widget.should be_counter_caching
+      Widget.should be_impressionist_counter_caching
     end
 
     it "should know when counter caching is disabled" do
-      Article.should_not be_counter_caching
+      Article.should_not be_impressionist_counter_caching
     end
   end