pack_rat 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/pack_rat/cache_helper/cacher.rb

@@ -13,9 +13,8 @@ module PackRat
           end
         end
         puts key if options[:debug]
-        filtered_options = options.dup
-        filtered_options.delete(:debug)
-        filtered_options.delete(:overwrite_key)
+        filtered_options = options.except(:debug, :overwrite_key)
+        
         Rails.cache.fetch key, filtered_options do
           block.call
         end

data/lib/pack_rat/cache_helper.rb

@@ -6,11 +6,14 @@ module PackRat
     included do
       extend Cacher
       include Cacher
-      self.updated_attribute_name ||= :updated_at
-      self.file_location = file_location_guesser
     end
 
     module ClassMethods
+      def extended(base)
+        base.send(:file_location=, file_location_guesser)
+        base.send(:updated_attribute_name=, :updated_at) unless base.updated_attribute_name
+      end
+
       def updated_attribute_name
         @updated_attribute_name
       end
@@ -31,6 +34,7 @@ module PackRat
         @file_digest = digest
       end
       
+      # Creates MD5 Digest of the set file_location attribute
       def generate_file_digest
         if self.file_location
           begin
@@ -42,9 +46,11 @@ module PackRat
         end
       end
       
+      # Uses Rails conventions to determine location of the defined class
       def file_location_guesser
         "#{Rails.root}/app/models/#{self.to_s.split('::').join('/').underscore.downcase}.rb" if defined? Rails
       end
+
       # Create cache_key for class, use most recently updated record
       unless self.respond_to? :cache_key
         define_method :cache_key do

data/lib/pack_rat/extensions/active_record.rb

@@ -0,0 +1,20 @@
+module PackRat
+  module Extensions
+    module ActiveRecord
+      def inherited(child_class)
+        child_class.send(:include, PackRat::CacheHelper)
+        super
+      end
+    end
+  end
+end
+
+# Lazy load AR Extension into AR if ActiveSupport is there
+if defined? ActiveSupport
+  ActiveSupport.on_load :active_record do
+    extend PackRat::Extensions::ActiveRecord
+  end
+else
+  # Load immediately if no ActiveSupport loaded
+  ActiveRecord::Base.send(:extend, PackRat::Extensions::ActiveRecord) if defined? ActiveRecord::Base
+end

data/lib/pack_rat/extensions.rb

@@ -0,0 +1 @@
+require 'pack_rat/extensions/active_record'

data/lib/pack_rat.rb

@@ -1,6 +1,3 @@
-require 'active_support'
-require 'pack_rat/active_record_extension'
+require 'active_support/core_ext'
 require 'pack_rat/cache_helper'
-if defined? ActiveRecord::Base
-  ActiveRecord::Base.send(:include, PackRat::ActiveRecordExtension)
-end
+require 'pack_rat/extensions'

data/pack_rat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pack_rat"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Goff"]
-  s.date = "2013-01-12"
+  s.date = "2013-01-14"
   s.description = "Helper method to simplify Rails caching, do Russian-doll caching outside your views"
   s.email = "cpuguy83@gmail.com"
   s.extra_rdoc_files = [
@@ -25,9 +25,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/pack_rat.rb",
-    "lib/pack_rat/active_record_extension.rb",
     "lib/pack_rat/cache_helper.rb",
     "lib/pack_rat/cache_helper/cacher.rb",
+    "lib/pack_rat/extensions.rb",
+    "lib/pack_rat/extensions/active_record.rb",
     "pack_rat.gemspec",
     "spec/models/test_class_spec.rb",
     "spec/spec_helper.rb"

data/spec/spec_helper.rb

@@ -23,14 +23,15 @@ end
 class TestClass
   include PackRat::CacheHelper
   self.file_location = '/dev/null'
+  @test_string = 'testing'
   def some_method_with_cache
     cache do
-      puts 'test'
+      @test_string
     end
   end
   
   def some_method_without_cache
-    puts 'test'
+    @test_string
   end
 
   def cache_key

metadata

@@ -2,14 +2,14 @@
 name: pack_rat
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Goff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -108,9 +108,10 @@ files:
 - Rakefile
 - VERSION
 - lib/pack_rat.rb
-- lib/pack_rat/active_record_extension.rb
 - lib/pack_rat/cache_helper.rb
 - lib/pack_rat/cache_helper/cacher.rb
+- lib/pack_rat/extensions.rb
+- lib/pack_rat/extensions/active_record.rb
 - pack_rat.gemspec
 - spec/models/test_class_spec.rb
 - spec/spec_helper.rb
@@ -128,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -463278824765411924
+      hash: -2786484823164904458
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:

data/lib/pack_rat/active_record_extension.rb

@@ -1,12 +0,0 @@
-module PackRat
-  module ActiveRecordExtension
-    extend ActiveSupport::Concern
-  
-    module ClassMethods
-      def inherited(child_class)
-        child_class.send(:include, PackRat::CacheHelper)
-        super
-      end
-    end
-  end
-end