cache_digests 0.1.0 → 0.2.0

data/README.md

@@ -39,7 +39,7 @@ Now if I change app/views/comments/_comment.html.erb, I'll be forced to manually
 
 That puts a serious cramp in our rocking caching style.
 
-Enter Cache Digests: With this plugin, all calls to #cache in the view will automatically append a digest of that template _and_ all of it's dependencies! So you no longer need to manually increment versions in the specific templates you're working on or care about what other templates are depending on the change you make.
+Enter Cache Digests: With this plugin, all calls to #cache in the view will automatically append a digest of that template _and_ all of its dependencies! So you no longer need to manually increment versions in the specific templates you're working on or care about what other templates are depending on the change you make.
 
 Our code from above can just look like:
 

data/cache_digests.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'cache_digests'
-  s.version = '0.1.0'
+  s.version = '0.2.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Nested fragment caches with (even) less situps'

data/lib/cache_digests/fragment_helper.rb

@@ -1,10 +1,14 @@
 module CacheDigests
   module FragmentHelper
+    def fragment_name_with_digest(name)
+      [*name, TemplateDigestor.digest(@virtual_path, formats.last.to_sym, lookup_context)]
+    end
+
     private
       # Automatically include this template's digest -- and its childrens' -- in the cache key.
       def fragment_for(key, options = nil, &block)
         if !explicitly_versioned_cache_key?(key)
-          super [*key, TemplateDigestor.digest(@virtual_path, formats.last.to_sym, lookup_context)], options, &block
+          super fragment_name_with_digest(key), options, &block
         else
           super
         end

data/lib/cache_digests/template_digestor.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext'
+require 'active_support/cache'
 require 'logger'
 
 module CacheDigests
@@ -15,17 +16,21 @@ module CacheDigests
     #   render(topics)         => render("topics/topic")
     #   render(message.topics) => render("topics/topic")
     RENDER_DEPENDENCY = /
-      render\s?                # render, followed by an optional space
-      \(?                      # start a optional parenthesis for the render call
-      (partial:)?\s?           # naming the partial, used with collection -- 1st capture
-      ([@a-z"'][@a-z_\/\."']+) # the template name itself -- 2nd capture
+      render\s*                     # render, followed by optional whitespace
+      \(?                           # start an optional parenthesis for the render call
+      (partial:|:partial\s+=>)?\s*  # naming the partial, used with collection -- 1st capture
+      ([@a-z"'][@a-z_\/\."']+)      # the template name itself -- 2nd capture
     /x
 
-    cattr_accessor(:cache)  { Hash.new }
+    cattr_accessor(:cache) { ActiveSupport::Cache::MemoryStore.new }
+    cattr_accessor(:cache_prefix)
+
     cattr_accessor(:logger, instance_reader: true)
 
     def self.digest(name, format, finder, options = {})
-      cache["#{name}.#{format}"] ||= new(name, format, finder, options).digest
+      cache.fetch([ "digestor", cache_prefix, name, format ].compact.join("/")) do
+        new(name, format, finder, options).digest
+      end
     end
 
     attr_reader :name, :format, :finder, :options
@@ -35,7 +40,7 @@ module CacheDigests
     end
 
     def digest
-      Digest::MD5.hexdigest("#{name}.#{format}-#{source}-#{dependency_digest}").tap do |digest|
+      Digest::MD5.hexdigest("#{source}-#{dependency_digest}").tap do |digest|
         logger.try :info, "Cache digest for #{name}.#{format}: #{digest}"
       end
     rescue ActionView::MissingTemplate
@@ -94,7 +99,7 @@ module CacheDigests
           collect { |name| name.include?("/") ? name : "#{directory}/#{name}" }.
           
           # replace quotes from string renders
-          collect { |name| name.gsub(%r|["']|, "") }
+          collect { |name| name.gsub(/["']/, "") }
       end
 
       def explicit_dependencies

data/test/fragment_helper_test.rb

@@ -1,4 +1,53 @@
 require 'cache_digests/test_helper'
 
+class Fragmenter
+  include CacheDigests::FragmentHelper
+  attr_accessor :virtual_path, :formats, :lookup_context
+  def initialize
+    @virtual_path = ''
+    @formats = [:html]
+  end
+end
+
 class FragmentHelperTest < MiniTest::Unit::TestCase
+  def setup
+    # would love some mocha here
+    @old_digest = CacheDigests::TemplateDigestor.method(:digest)
+    CacheDigests::TemplateDigestor.send(:define_singleton_method, :digest) do |p,f,lc|
+      "digest"
+    end
+  end
+  def teardown
+    CacheDigests::TemplateDigestor.send(:define_singleton_method, :digest, &@old_digest)
+    @fragmenter = nil
+  end
+
+  def test_passes_correct_parameters_to_digestor
+    CacheDigests::TemplateDigestor.send(:define_singleton_method, :digest) do |p,f,lc|
+      extend MiniTest::Assertions
+      assert_equal 'path', p
+      assert_equal :formats, f
+      assert_equal 'lookup context', lc
+    end
+    fragmenter.virtual_path = 'path'
+    fragmenter.formats = ['formats']
+    fragmenter.lookup_context = 'lookup context'
+
+    fragmenter.fragment_name_with_digest("key")
+  end
+
+  def test_appends_the_key_with_digest
+    key_with_digest = fragmenter.fragment_name_with_digest("key")
+    assert_equal ['key', 'digest'], key_with_digest
+  end
+
+  def test_appends_the_array_key_with_digest
+    key_with_digest = fragmenter.fragment_name_with_digest(["key1", "key2"])
+    assert_equal ['key1', 'key2', 'digest'], key_with_digest
+  end
+
+  private
+  def fragmenter
+    @fragmenter ||= Fragmenter.new
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_digests
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -65,7 +65,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./bin/bundle
 - ./cache_digests.gemspec
 - ./Gemfile
 - ./Gemfile.lock

data/bin/bundle

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby-local-exec
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'rubygems'
-load Gem.bin_path('bundler', 'bundle')