ettu 0.0.7 → 0.0.8

data/ettu.gemspec

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

data/lib/ettu.rb

@@ -8,6 +8,7 @@ require 'ettu/configuration'
 require 'ettu/fresh_when'
 require 'ettu/railtie' if defined? Rails::Railtie
 
+
 class Ettu
   attr_reader :options
 
@@ -78,8 +79,8 @@ class Ettu
   def view_digest(view)
     return nil unless view.present?
 
-    if @@config.template_digestor.nil? && Rails::VERSION::MAJOR == 3
-      raise "Ettu requires the cache_digests gem when using Rails v#{Rails::VERSION::STRING}"
+    if @@config.template_digestor.nil?
+      @@config.attempt_late_template_digestor_set
     end
 
     @@config.template_digestor.digest(
@@ -91,14 +92,17 @@ class Ettu
 
   # Jeremy Kemper
   # https://gist.github.com/jeremy/4211803
-  # Check precompiled asset manifest (production) or compute the digest (dev).
   def asset_digest(asset)
+    rails_version = Rails::VERSION::MAJOR
     return nil unless asset.present?
-    # Is Rails.application.config.assets.digests needed?
-    # Seems to always be nil...
-    if manifest = Rails.application.config.assets.digests
+    # 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
       manifest[asset]
     else
+      # Compute it in Rails (3|4)
       Rails.application.assets[asset].digest
     end
   end

data/lib/ettu/configuration.rb

@@ -9,6 +9,16 @@ 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
 
     def set_defaults
@@ -22,13 +32,7 @@ class Ettu
       # self.view = "#{controller_name}/#{action_name}"
       delete :view if key? :view
 
-      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
+      attempt_late_template_digestor_set
     end
   end
 end

data/lib/ettu/railtie.rb

@@ -20,8 +20,8 @@ class Ettu
             end
           end
         end
-
       end
+
     end
   end
 end

data/lib/ettu/version.rb

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

data/spec/fixtures.rb

@@ -35,6 +35,9 @@ class Record
 end
 
 module Rails
+  module VERSION
+    MAJOR = ''
+  end
   def self.application
     @nested ||= Nester.new
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement