pack_rat 1.0.0 → 1.1.0

data/Gemfile

@@ -13,7 +13,6 @@ group :development do
 end
 group :test do
   gem 'rspec'
-  gem 'factory_girl'
 end
 
 gem 'rails'

data/Gemfile.lock

@@ -32,8 +32,6 @@ GEM
     builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (4.1.0)
-      activesupport (>= 3.0.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.1)
@@ -105,7 +103,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  factory_girl
   jeweler
   rails
   rdoc

data/Rakefile

@@ -27,8 +27,8 @@ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << 'lib' << 'spec'
+  test.pattern = 'spec/**/*_spec.rb'
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/pack_rat/cache_helper/cacher.rb

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

data/lib/pack_rat/cache_helper.rb

@@ -6,28 +6,38 @@ module PackRat
     included do
       extend Cacher
       include Cacher
-      cattr_accessor :updated_attribute_name
       self.updated_attribute_name ||= :updated_at
-      cattr_accessor :file_location
       self.file_location = file_location_guesser
     end
 
-    module ClassMethods    
-      # Create cache_key for class, use most recently updated record
-      unless self.respond_to? :cache_key
-        define_method :cache_key do
-          key = order("#{self.updated_attribute_name} DESC").first.cache_key if self.superclass.to_s == "ActiveRecord::Base"
-          key << "/#{self.to_s}"
-        end
+    module ClassMethods
+      def updated_attribute_name
+        @updated_attribute_name
+      end
+      def updated_attribute_name=(name)
+        @updated_attribute_name = name
+      end
+      def file_location
+        @file_location
+      end
+      def file_location=(path)
+        @file_location = path
+        generate_file_digest
       end
-      
       def file_digest
+        @file_digest
+      end
+      def file_digest=(digest)
+        @file_digest = digest
+      end
+      
+      def generate_file_digest
         if self.file_location
           begin
             file = File.read(self.file_location)
-            Digest::MD5.hexdigest(file)
+            self.file_digest = Digest::MD5.hexdigest(file)
           rescue
-            nil
+            self.file_digest = nil
           end
         end
       end
@@ -35,6 +45,13 @@ module PackRat
       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
+          key = order("#{self.updated_attribute_name} DESC").first.cache_key if self.superclass.to_s == "ActiveRecord::Base"
+          key << "/#{self.to_s}" if key
+        end
+      end
   
     end
   end

data/lib/pack_rat.rb

@@ -3,7 +3,4 @@ require 'pack_rat/active_record_extension'
 require 'pack_rat/cache_helper'
 if defined? ActiveRecord::Base
   ActiveRecord::Base.send(:include, PackRat::ActiveRecordExtension)
-end
-  
-  
-  
+end

data/pack_rat.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pack_rat"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Goff"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/pack_rat/cache_helper.rb",
     "lib/pack_rat/cache_helper/cacher.rb",
     "pack_rat.gemspec",
+    "spec/models/test_class_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/cpuguy83/pack_rat"

data/spec/models/test_class_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe TestClass do
+  it 'should respond to cache_key' do
+    TestClass.cache_key
+  end
+  it 'should return the same values with or without cache' do
+    test = TestClass.new
+    test.some_method_with_cache.should == test.some_method_without_cache
+  end
+end

data/spec/spec_helper.rb

@@ -9,16 +9,43 @@ rescue Bundler::BundlerError => e
 end
 require 'rspec'
 require 'rspec/autorun'
-require 'shoulda'
-require 'factory_girl'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'pack_rat'
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.include FactoryGirl::Syntax::Methods
+end
+
+class TestClass
+  include PackRat::CacheHelper
+  self.file_location = '/dev/null'
+  def some_method_with_cache
+    cache do
+      puts 'test'
+    end
+  end
+  
+  def some_method_without_cache
+    puts 'test'
+  end
+
+  def cache_key
+    'stuff'
+  end
+end
+
+class Rails
+  def self.cache
+    Rails::Cache
+  end
+end
+
+class Rails::Cache
+  def self.fetch(*options, &block)
+    block.call
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: pack_rat
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Goff
@@ -112,6 +112,7 @@ files:
 - lib/pack_rat/cache_helper.rb
 - lib/pack_rat/cache_helper/cacher.rb
 - pack_rat.gemspec
+- spec/models/test_class_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cpuguy83/pack_rat
 licenses:
@@ -127,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2074664687036877359
+      hash: -463278824765411924
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: