ettu 0.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb3c32b01c7ae3b24cd10897e88038efa117886
-  data.tar.gz: e331b5dad2d6327e8c895f401cda36bc15c82e32
+  metadata.gz: 28eeeb019730fdbde0370f53b31ee30dade06adb
+  data.tar.gz: 7b925784197f8e7d9c8009b57563e0d85ce1f49a
 SHA512:
-  metadata.gz: fdcd83e68511b33f2414f605aed004f9a20d99a95979cddea709100c05738ab666cba56536ad5bd82b9e17c0e6039da6962b0606477b80df32e24bc700298529
-  data.tar.gz: 356e81090072df7836020960b1598a2607b7ac4641ab11c0e2e6e54348fe963c82089d03a521a6bb244bd15ff32043971ef2b0affb83c19134284a7251647176
+  metadata.gz: 0c41c23a43c47b53764dbfb531248c6cce4c026461e4277de4c4905ad0928be4de9ac291db68999054c0aa9c3260140a6f86909fc01959f7251db36f092cb29d
+  data.tar.gz: 40f849ff897c470f6af3f8ccef53795cb0263a5c9f7710e2c1f9a03ad28bfaafee3ede974bde2cb5d3db2e7af4339f38d6e7a9a982305d8cd35c6e68f4e60cf0

data/README.md

@@ -1,7 +1,7 @@
 Ettu
 ====
 
-Using Rails `stale?` or `fresh_when`? Are your users seeing old view
+Using Rails 3's `stale?` or `fresh_when`? Are your users seeing old view
 code even after new deploys? The Rails way `fresh_when(@product)`
 doesn't account for changes in your view code, you have to do it
 yourself.
@@ -19,21 +19,10 @@ changes to your view code.
 Installation
 ------------
 
-### Rails 4
-
-Add Ettu to your Gemfile:
-
-    gem 'ettu'
-
-And `$ bundle install`
-
-### Rails 3
-
 Add Ettu and [cache_digests](https://github.com/rails/cache_digests) to
 your Gemfile:
 
-    gem 'ettu'
-    gem 'cache_digests'
+    gem 'ettu', '~> 3.0'
 
 And `$ bundle install`
 
@@ -118,32 +107,13 @@ won't cause problems if it's not installed.
 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
-while in the **development** environment. This is not an issue that
-affects staging or production, because the template cache will be
-recreated after each deploy.
-
-In the mean time, you can enable a monkey-patch with:
-
-```ruby
-# config/environments/development.rb
-My::Application.configure do
-  config.ettu.rails_4_development_hack = true
-end
-```
-
-### Rails 3
-
-The cache_digests gem has already patched issue #10791. All you need to
-do is disable `cache_template_loading`.
+In order for Ettu to detect changes to templates in the **development**
+environment, you must disable `cache_template_loading`.
 
 ```ruby
 # config/environments/development.rb
 My::Application.configure do
-  config.action_view.cache_template_loading
+  config.action_view.cache_template_loading = false
 end
 ```
 

data/ROADMAP.md

@@ -2,4 +2,8 @@ Ettu Roadmap
 ============
 
 1. [x] Decouple Ettu and Configuration
-2. [ ] Default assets to those set in Rails.application.config.assets.precompile
+2. [ ] Remove Rails Version checking
+    - Separate gem into branches
+    - v3 branch will track Rails 3
+    - v4 branch will track Rails 4
+3. [ ] Default assets to those set in Rails.application.config.assets.precompile

data/ettu.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9'
 
-  spec.add_dependency 'rails', '>= 3.0'
+  spec.add_dependency 'rails', '~> 3.0'
+  spec.add_dependency 'cache_digests'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/ettu/configuration.rb

@@ -26,11 +26,11 @@ class Ettu
       # Don't attempt to reset the template_digestor
       # if one has already been found
       unless self.template_digestor
-        self.template_digestor = LateTemplateDigestor.new(self)
+        self.template_digestor = LateLoadTemplateDigestor.new(self)
       end
     end
 
-    class LateTemplateDigestor
+    class LateLoadTemplateDigestor
       def initialize(config)
         @config = config
       end
@@ -43,13 +43,14 @@ class Ettu
       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
+        unless defined? CacheDigests::TemplateDigestor
+          # Attempt to load cache_digets
+          require 'cache_digests'
         end
+        # Attempt to use CacheDigests::TemplateDigestor on Rails 3
+        @config.template_digestor = CacheDigests::TemplateDigestor
+      rescue LoadError
+        raise "Ettu requires the cache_digests gem in Rails v#{Rails::VERSION::STRING}"
       end
     end
   end

data/lib/ettu/railtie.rb

@@ -9,17 +9,6 @@ class Ettu
         ActiveSupport.on_load :action_controller do
           ActionController::Base.send :include, FreshWhen
         end
-
-        if app.config.ettu.rails_4_development_hack
-          class BlackHole < Hash
-            def []=(k, v); end
-          end
-          module ::ActionView
-            class Digestor
-              @@cache = BlackHole.new
-            end
-          end
-        end
       end
 
     end

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '0.1.0'
+  VERSION = '3.0.0'
 end

data/lib/ettu.rb

@@ -89,16 +89,12 @@ class Ettu
   # Jeremy Kemper
   # https://gist.github.com/jeremy/4211803
   def asset_digest(asset)
-    rails_version = Rails::VERSION::MAJOR
     return nil unless asset.present?
     # Check already computed assets (production)
-    # Using the Rails::VERSION is an ugly hack. I'm not happy about it.
-    if rails_version == 4 && digest = ActionView::Base.assets_manifest.assets[asset]
-      digest
-    elsif rails_version == 3 && manifest = Rails.application.config.assets.digests
+    if manifest = Rails.application.config.assets.digests
       manifest[asset]
     else
-      # Compute it in Rails (3|4)
+      # Compute it in
       Rails.application.assets[asset].digest
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Justin Ridgewell
@@ -14,16 +14,30 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: cache_digests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement