cache_digests 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035fdb8a71c48c1440431e11341a79de3127a055
-  data.tar.gz: 5e4bbc22c9ab89f076a28075273291830c11856c
+  metadata.gz: b6b191158fb82947743671a747eae7ec82135d1e
+  data.tar.gz: 4b3932dc270e0f102462e72922b59b3932aee880
 SHA512:
-  metadata.gz: 4353fed562cd8a8b595e7fbd15b5f79ac04a457bedb15e01349b0164054f87eb41ce67bc8f1bcba2dfd2e9837f30553656129f83e3932d8bc085b25a8310dc1a
-  data.tar.gz: bb811acb72bf76db5da85c1169205b8a064de985bc84813c605034a34cdbfcf2de020d1e94ab471f29dd5a2c623068ea8887d12b45fa7b61e156ad9b3d570424
+  metadata.gz: 0e3811d2d0a480fca0b2916ffed77813e06337a8df7c978c1ddc4545a085c2829722a3dd54c4e42daf31945cc3e7e8b45704b7ff791ac17fc4fe85a31e9a0b64
+  data.tar.gz: 7db33b78d9600286cd5ae69c40a703de3cf7169eaa922f0de05cbd7ee58c68eed32f903a92d62ec3ca68727fbb6f95b99cdec98522eb87feb960b7a5a24e5bda

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    cache_digests (0.2.0)
+    cache_digests (0.3.0)
       actionpack (>= 3.2)
       thread_safe
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -18,26 +18,26 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    atomic (1.0.1)
+    atomic (1.1.8)
     builder (3.0.4)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.1)
     journey (1.0.4)
-    minitest (2.12.1)
-    multi_json (1.6.1)
+    minitest (4.7.3)
+    multi_json (1.7.2)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
+    rake (10.0.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -45,7 +45,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thread_safe (0.1.0)
       atomic
-    tilt (1.3.3)
+    tilt (1.3.7)
 
 PLATFORMS
   ruby

data/README.md

@@ -63,9 +63,6 @@ Our code from above can just look like:
 
 The caching key for app/views/projects/show.html.erb will be something like `views/projects/605816632-20120810191209/d9fb66b120b61f46707c67ab41d93cb2`. That last bit is a MD5 of the template file itself and all of its dependencies. It'll change if you change either the template or any of the dependencies, and thus allow the cache to expire automatically.
 
-Note that if your application cache is enabled, the template digest will not be recomputed until you restart your application and you will have to restart the app whenever you change template code.
-For development environment you might want to cache your fragments AND have dependent partials changes detected (with the penalty of recomputing the digests for each request). For that you can add `CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new` to your development configuration
-
 You can use these handy rake tasks to see how deep the rabbit hole goes:
 
 ```
@@ -92,6 +89,13 @@ $ rake cache_digests:nested_dependencies TEMPLATE=projects/show
 ```
 Note: this rake task doesn't differentiate between dependencies that are cached and dependencies that aren't - it is meant to show you all the dependencies of your view that cache_digests is able to derive.
 
+Recomputing digests after updating a template
+---------------------------------------------
+
+If your application's environment has caching enabled with `config.action_view.cache_template_loading` (e.g. production) then template digests are only computed once and saved until the application is restarted. Any updates to a template will require an application restart in order for the template source and digest changes to be reflected. If `config.action_view.cache_template_loading` is unset then it is set to the value of `config.cache_classes` by default.
+
+For environments that do not enable `config.action_view.cache_template_loading` (e.g. development) the default `CacheDigests::TemplateDigestor.cache` store is set to `ActiveSupport::Cache::NullStore.new`. This cache implementation doesn't actually store anything which forces template digests to recompute on every request. This is useful for cases where you want to test fragment caching (by enabling `config.action_controller.perform_caching`) or add template digests to your ETags with [rails/etagger](https://github.com/rails/etagger) but still allow templates and digests to reload any time a template is changed.
+
 Implicit dependencies
 ---------------------
 

data/cache_digests.gemspec

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

data/lib/cache_digests/dependency_tracker.rb

@@ -39,7 +39,7 @@ module CacheDigests
         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
+        ([@a-z"'][@\w\/\."']+)        # the template name itself -- 2nd capture
       /x
 
       def self.call(name, template)
@@ -72,7 +72,8 @@ module CacheDigests
             # render(@topic)         => render("topics/topic")
             # render(topics)         => render("topics/topic")
             # render(message.topics) => render("topics/topic")
-            collect { |name| name.sub(/\A@?([a-z]+\.)*([a-z_]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
+            # render(message.topic)  => render("topics/topic")
+            collect { |name| name.sub(/\A@?([a-z_]+\.)*([\w]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
 
             # render("headline") => render("message/headline")
             collect { |name| name.include?("/") ? name : "#{directory}/#{name}" }.

data/lib/cache_digests/engine.rb

@@ -5,6 +5,9 @@ module CacheDigests
 
       ActiveSupport.on_load :action_view do
         ActionView::Base.send :include, CacheDigests::FragmentHelper
+        unless ActionView::Base.cache_template_loading
+          CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new
+        end
       end
 
       ActiveSupport.on_load :action_controller do

data/lib/cache_digests/fragment_helper.rb

@@ -1,6 +1,6 @@
 module CacheDigests
   module FragmentHelper
-    def fragment_name_with_digest(name, dependencies)
+    def fragment_name_with_digest(name, dependencies=[])
       [*name, TemplateDigestor.digest(@virtual_path, formats.last.to_sym, lookup_context, dependencies: dependencies)]
     end
 

data/test/dependency_tracker_test.rb

@@ -14,15 +14,15 @@ module ActionView
   end
 end
 
-class DependencyTrackerTest < MiniTest::Unit::TestCase
-  class FakeTemplate
-    attr_reader :source, :handler
+class FakeTemplate
+  attr_reader :source, :handler
 
-    def initialize(source, handler)
-      @source, @handler = source, handler
-    end
+  def initialize(source, handler)
+    @source, @handler = source, handler
   end
+end
 
+class DependencyTrackerTest < MiniTest::Unit::TestCase
   def tracker
     CacheDigests::DependencyTracker
   end
@@ -47,3 +47,31 @@ class DependencyTrackerTest < MiniTest::Unit::TestCase
     assert_equal [], dependencies
   end
 end
+
+class ERBTrackerTest < MiniTest::Unit::TestCase
+  def make_tracker(name, template)
+    CacheDigests::DependencyTracker::ERBTracker.new(name, template)
+  end
+
+  def test_dependency_of_erb_template_with_number_in_filename
+    template = FakeTemplate.new("<%# render 'messages/message123' %>", :erb)
+    tracker = make_tracker('messages/_message123', template)
+
+    assert_equal ["messages/message123"], tracker.dependencies
+  end
+
+  def test_finds_dependency_in_correct_directory
+    template = FakeTemplate.new("<%# render(message.topic) %>", :erb)
+    tracker = make_tracker('messages/_message', template)
+
+    assert_equal ["topics/topic"], tracker.dependencies
+  end
+
+  def test_finds_dependency_in_correct_directory_with_underscore
+    template = FakeTemplate.new("<%# render(message_type.messages) %>", :erb)
+    tracker = make_tracker('message_types/_message_type', template)
+
+    assert_equal ["messages/message"], tracker.dependencies
+  end
+end
+

data/test/fixtures/messages/show.html.erb

@@ -7,7 +7,8 @@
 <%= render @message.history.events %>
 
 <%# render "something_missing"  %>
+<%# render "message123" %>
 
 <%
   # Template Dependency: messages/form
-%>
+%>

data/test/fragment_helper_test.rb

@@ -58,12 +58,12 @@ class FragmentHelperTest < MiniTest::Unit::TestCase
   end
 
   def test_appends_the_key_with_digest
-    key_with_digest = fragmenter.fragment_name_with_digest("key", [])
+    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"], [])
+    key_with_digest = fragmenter.fragment_name_with_digest(["key1", "key2"])
     assert_equal ['key1', 'key2', 'digest'], key_with_digest
   end
 

data/test/template_digestor_test.rb

@@ -101,6 +101,12 @@ class TemplateDigestorTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_logging_of_missing_template_with_number_in_filename
+    assert_logged "Couldn't find template for digesting: messages/message123.html" do
+      digest("messages/show")
+    end
+  end
+
   def test_nested_template_directory
     assert_digest_difference("messages/show") do
       change_template("messages/actions/_move")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache_digests
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ./cache_digests-0.2.0.gem
 - ./cache_digests.gemspec
 - ./Gemfile
 - ./Gemfile.lock
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Nested fragment caches with (even) less situps