impressionist 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e54acf13c5302ba85596ef90c1a3a5c62b00600e
-  data.tar.gz: abd480468c4233dc53d90a9c99e33e9c4d8f92df
+  metadata.gz: 21d3757724d47e6661766a7c05a6d356718fe45e
+  data.tar.gz: bd7700838203dbb58c7f73c64315fb7ab85e1f49
 SHA512:
-  metadata.gz: c12ab157990533c5fed66d2db6e7c8ba614d778bc66751c5bf9eaa142464c1d91664571fe8767b0ad29e59f813e68f804c3447a5a09ad8bf26cb8988debef9dd
-  data.tar.gz: 08bfbbe4c048647c2ff2246bf7d0bec789643d26da13344fdb7ac8d0fca11cedc010bd95e6cb82b3e4a7275747bfdab24313045dfba8f955c143b3afffbe528b
+  metadata.gz: 17efd95cec969a5ab546f2e4947c4ea04e2db002c96f335965b562e994c00ec307cb364587a873bdac50c4e1781f030724b988a5ddd66f39c3bbcd4611d81af4
+  data.tar.gz: e574582253eeed54ef6d2d490b123f38bb1c4445db87bf9a281fadaf26914de1b4ead38465aaec9978f0eaab73ab71bee1a9c42b364336bfc8a80519e069f940

data/.gitignore

@@ -8,3 +8,5 @@
 /test_app/test
 /test_app/vendor
 Gemfile.lock
+*.swo
+*.swp

data/README.md

@@ -139,19 +139,19 @@ This will automatically increment the `impressions_count` column in the
 included model. <b>Note: You'll need to add that column to your model. If you'd
 like specific a different column name, you can:</b>
 
-    is_impressionable :counter_cache => { :column_name => :my_column_name }
+    is_impressionable :counter_cache => true, :column_name => :my_column_name
 
 If you'd like to include only unique impressions in your count:
 
     # default will be filtered by ip_address
-    is_impressionable :counter_cache => { :column_name => :my_column_name, :unique => true }
+    is_impressionable :counter_cache => true, :column_name => :my_column_name, :unique => true
 
 If you'd like to specify what sort of unique impression you'd like to save? Fear not,
 Any option you pass to unique, impressionist_count will use it as its filter to update_counters based on that unique option.
 
     # options are any column in the impressions' table.
-    is_impressionable :counter_cache => { :column_name => :my_column_name, :unique => :request_hash }
-    is_impressionable :counter_cache => { :column_name => :my_column_name, :unique => :all }
+    is_impressionable :counter_cache => true, :column_name => :my_column_name, :unique => :request_hash
+    is_impressionable :counter_cache => true, :column_name => :my_column_name, :unique => :all
 
 
 Adding column to model

data/lib/impressionist/counter_cache.rb

@@ -1,10 +1,3 @@
-# Note
-# It is only updatable if
-# impressionist_id && impressionist_type(class) are present &&
-# impressionable_class(which is imp_type.constantize) is counter_caching
-# Defined like so
-# is_impressionable :counter_cache => true
-
 module Impressionist
   module CounterCache
 
@@ -12,43 +5,30 @@ module Impressionist
 
     private
 
-      # if updatable returns true, it must be qualified to update_counters
-      # impressionable_class instance var is set when updatable? is called
+      # A valid impression must
+      # have a valid impressionable class
+      # be counter_caching
+      # have a record saved in the db
+      # then it should give it a try
       def impressionable_counter_cache_updatable?
-         updatable? && impressionable_try
+        updatable? && impressionable_try
       end
 
-      # asks imp_id && imp_class whether it's present or not
-      # so that it is updatable
       def updatable?
-        @impressionable_class = impressionable_class_set
-        impressionable_valid?
-      end
-
-      def impressionable_valid?
-        (self.impressionable_id.present? && impressionable_class)
+        valid_impressionable_class? && impressionable_find
       end
 
-      def impressionable_find
-        exeception_rescuer {
-          @entity = impressionable_class.find(self.impressionable_id)
-        }
-        @entity
-
+      def valid_impressionable_class?
+        set_impressionable_class && counter_caching?
       end
 
-      # imps_type == nil, constantize returns Object
-      # It attemps to return false so it won't be updatable
-      # calls to_s otherwise it would try to constantize nil
-      # and it would raise an exeception
-      # Must be !~ Object and be counter_caching to be qualified as updatable
-      def impressionable_class_set
-        klass = self.impressionable_type.to_s.constantize
-        (klass.to_s !~ /Object/) && klass.impressionist_counter_caching? ? klass : false
+      def set_impressionable_class
+        klass = self.impressionable_type  || false
+        @impressionable_class = klass.
+          to_s.safe_constantize           || false
       end
 
       # default mode is ERROR
-      # ruby 1.8.7 support
       def impressionist_log(str, mode=:error)
         Rails.logger.send(mode.to_s, str)
       end
@@ -57,10 +37,23 @@ module Impressionist
       # counter_cache column
       # entity is a impressionable instance model
       def impressionable_try
-        impressionable_find
         entity.try(:update_impressionist_counter_cache)
       end
 
+      def impressionable_find
+        exeception_rescuer {
+          @entity = impressionable_class.find(self.impressionable_id)
+        }
+        @entity
+
+      end
+
+      def counter_caching?
+        impressionable_class.
+          impressionist_counter_caching?
+      end
+
+
       # Returns false, as it is only handling one exeception
       # It would make updatable to fail thereafter it would not try
       # to update cache_counter

data/lib/impressionist/version.rb

@@ -1,3 +1,3 @@
 module Impressionist
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

data/tests/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130709003307) do
+ActiveRecord::Schema.define(:version => 20130719024021) do
 
   create_table "articles", :force => true do |t|
     t.string   "name"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impressionist
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - johnmcaliley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient