ettu 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef8439712642b81f9f07146bdd3c29b74eac133e
+  data.tar.gz: ed0d3d4c69d0964d55bcbb449a8216ba5ab88e40
+SHA512:
+  metadata.gz: cb22213115f68d8b8450263af84aaafc7bcd8bff2f199158630b7720e15de96a8c7cc8ecf94f9bec7ab0d7864908f3bd593ba6c4811ac622cb1b0c182210223e
+  data.tar.gz: 8ba4e03604d6b4f8dd7367b9c1a1431048e6eda87ecf9a13e6df08679b81d1e1080aa9fe8172389527856c1f72e98757e39cca048a60e4caa2fd45771375f1bb

data/README.md

@@ -1,4 +1,5 @@
-# Ettu
+Ettu
+====
 
 Using Rails `stale?` or `fresh_when`? Are your users seeing old view
 code even after new deploys? The Rails way `fresh_when(@product)`
@@ -15,7 +16,8 @@ all of this while allowing you to use the same syntax you're already
 accustomed to. So keep doing what you're doing, and let Ettu worry about
 changes to your view code.
 
-## Installation
+Installation
+------------
 
 ### Rails 4
 
@@ -27,14 +29,16 @@ And `$ bundle install`
 
 ### Rails 3
 
-Add Ettu and CacheDigests to your Gemfile:
+Add Ettu and [cache_digests](https://github.com/rails/cache_digests) to
+your Gemfile:
 
     gem 'ettu'
     gem 'cache_digests'
 
 And `$ bundle install`
 
-## Usage
+Usage
+-----
 
 Rails ETags can be used in the following way:
 
@@ -111,7 +115,10 @@ implementation. Ettu makes sure to pass all the options you specify to
 Rails (like the `public` option). It's even coded as a drop-in gem that
 won't cause problems if it's not installed.
 
-## RAILS_ENV=development Issues
+RAILS_ENV=development Issues
+----------------------------
+
+### Rails 4
 
 Until [rails/rails#10791](https://github.com/rails/rails/pull/10791)
 gets merged in, Ettu will not be able to detect changes in templates
@@ -128,7 +135,20 @@ My::Application.configure do
 end
 ```
 
-## Contributing
+### Rails 3
+
+The cache_digests gem has already patched issue #10791. All you need to
+do is disable `cache_template_loading`.
+
+```ruby
+# config/environments/development.rb
+My::Application.configure do
+  config.action_view.cache_template_loading
+end
+```
+
+Contributing
+------------
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/ROADMAP.md

@@ -0,0 +1,5 @@
+Ettu Roadmap
+============
+
+1. [x] Decouple Ettu and Configuration
+2. [ ] Default assets to those set in Rails.application.config.assets.precompile

data/lib/ettu/configuration.rb

@@ -9,15 +9,6 @@ class Ettu
       set_defaults
     end
 
-    def attempt_late_template_digestor_set
-      if defined? ActionView::Digestor
-        # Attempt to use ActionView::Digestor on Rails 4
-        self.template_digestor = ActionView::Digestor
-      elsif defined? CacheDigests::TemplateDigestor
-        # Attempt to use CacheDigests::TemplateDigestor on Rails 3
-        self.template_digestor = CacheDigests::TemplateDigestor
-      end
-    end
 
     private
 
@@ -32,7 +23,34 @@ class Ettu
       # self.view = "#{controller_name}/#{action_name}"
       delete :view if key? :view
 
-      attempt_late_template_digestor_set
+      # Don't attempt to reset the template_digestor
+      # if one has already been found
+      unless self.template_digestor
+        self.template_digestor = LateTemplateDigestor.new(self)
+      end
+    end
+
+    class LateTemplateDigestor
+      def initialize(config)
+        @config = config
+      end
+
+      def self.digest(*args)
+        digestor = attempt_late_template_digestor_set
+        digestor.digest(*args)
+      end
+
+      private
+
+      def attempt_late_template_digestor_set
+        # Attempt to use ActionView::Digestor on Rails 4
+        if defined? ActionView::Digestor
+          @config.template_digestor = ActionView::Digestor
+        elsif defined? CacheDigests::TemplateDigestor
+          # Attempt to use CacheDigests::TemplateDigestor on Rails 3
+          @config.template_digestor = CacheDigests::TemplateDigestor
+        end
+      end
     end
   end
 end

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/ettu.rb

@@ -79,10 +79,6 @@ class Ettu
   def view_digest(view)
     return nil unless view.present?
 
-    if @@config.template_digestor.nil?
-      @@config.attempt_late_template_digestor_set
-    end
-
     @@config.template_digestor.digest(
       view,
       @controller.request.format.try(:to_sym),

data/spec/ettu_spec.rb

@@ -31,6 +31,7 @@ describe Ettu do
 
   describe '.configure' do
     subject(:ettu) { Ettu.new(nil, {}, controller) }
+    after(:all) { Ettu.configure { |config| config.reset } }
 
     context 'when no options are specified' do
       before(:all) do
@@ -41,7 +42,6 @@ describe Ettu do
           config.view = 'custom/view'
         end
       end
-      after(:all) { Ettu.configure { |config| config.reset } }
 
       it 'will use the default js file' do
         expect(ettu.js_etag).to eq('custom.js.digest')
@@ -68,7 +68,6 @@ describe Ettu do
           config.view = false
         end
       end
-      after(:all) { Ettu.configure { |config| config.reset } }
 
       it 'will disable js etag' do
         expect(ettu.js_etag).to eq(nil)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Justin Ridgewell
@@ -14,23 +13,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,49 +41,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Account for js, css, and views when using ETags.
@@ -103,6 +92,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- ROADMAP.md
 - Rakefile
 - ettu.gemspec
 - lib/ettu.rb
@@ -117,27 +107,26 @@ files:
 homepage: http://github.com/cloudspace/ettu
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Account for view code when using ETags.
 test_files:
 - spec/ettu_spec.rb