ettu 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b8d4f4b477b8edc976372932b5e5c84c75635c
-  data.tar.gz: 9505d69bf31f7ea30f4db5912aabd803a86a7863
+  metadata.gz: c9125f73c8efc86a66a108eab2c521353cd8a383
+  data.tar.gz: c178d1a1b0a5615725890740c0cdb1d275689c89
 SHA512:
-  metadata.gz: 2e723799e1ba4d0aea18841debb13e044d8c053adeb1f2e26e06cabfc177873f71ad3927ffdb861df03747e4ead98712d60e590e47d47aa3cdad69f0d3d45af5
-  data.tar.gz: 196e27ab26d3ed7fad871478434303d7d2bdf07095d8be17634eaf75a614d084e40877c284119f16319747f8a311a3091db6ec47ecbb2dd04ce381e8f4ceb47e
+  metadata.gz: 2033518610ee665f280c9b0a76fc8c8c88ee8376e108e60f132992d71389463391cbce274ad74fe7d3c40595bd801360cdef039b8b24e79f221e783919e5e11b
+  data.tar.gz: b9c8c9cb1a316977fd186302bc05cae497298f7b96e1986011f41da48a2ecd5b6d9cb09d03bb690f21aab2383f0fd7d83dde0d60e4642350de4cad287b132ceb

data/lib/ettu/configuration.rb

@@ -13,7 +13,7 @@ class Ettu
     private
 
     def set_defaults
-      self.assets = LateLoadAssets.new
+      self.assets = LateLoadAssets.new(self, :assets)
 
       # Don't actually set view by default.
       # This'll allow #fetch to return the real default
@@ -21,40 +21,25 @@ class Ettu
       # self.view = "#{controller_name}/#{action_name}"
       delete :view if key? :view
 
-      self.template_digestor = LateLoadTemplateDigestor.new(self)
+      self.template_digestor = ActionView::Digestor
     end
 
     class LateLoadAssets
-      def initialize
-        @array = []
-      end
-
-      def to_a
-        ::ActionView::Base.assets_manifest.assets.keys + [*@array]
-      end
-
-      def method_missing(method, *args, &block)
-        @array.send method, *args, &block
-      end
-    end
-
-    class LateLoadTemplateDigestor
-      def initialize(config)
+      def initialize(config, name)
         @config = config
+        @name = name
       end
 
-      def digest(*args)
-        digestor = attempt_late_template_digestor_set
-        digestor.digest(*args)
+      def method_missing(method, *args, &block)
+        assets = Array.new(defaults)
+        @config[@name] = array
+        assets.send method, *args, &block
       end
 
       private
 
-      def attempt_late_template_digestor_set
-        # Attempt to use ActionView::Digestor
-        if defined? ActionView::Digestor
-          @config.template_digestor = ActionView::Digestor
-        end
+      def defaults
+        ::ActionView::Base.assets_manifest.assets.keys
       end
     end
   end

data/lib/ettu/railtie.rb

@@ -1,24 +1,37 @@
 class Ettu
   class Railtie < Rails::Railtie
     config.ettu = ActiveSupport::OrderedOptions.new
-
     initializer 'load' do |app|
 
       unless app.config.ettu.disabled
         require 'ettu'
-        ActiveSupport.on_load :action_controller do
-          ActionController::Base.send :include, FreshWhen
-        end
-
         if app.config.ettu.development_hack
+
           class BlackHole < Hash
             def []=(k, v); end
           end
+          module EtagBuster
+            extend ActiveSupport::Concern
+            included do
+              def fresh_when(*args); end
+            end
+          end
+
           module ::ActionView
             class Digestor
               @@cache = BlackHole.new
             end
           end
+          ActiveSupport.on_load :action_controller do
+            ActionController::Base.send :include, EtagBuster
+          end
+
+        else
+
+          ActiveSupport.on_load :action_controller do
+            ActionController::Base.send :include, FreshWhen
+          end
+
         end
       end
 

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/ettu_spec.rb

@@ -47,7 +47,7 @@ describe Ettu do
 
     context 'can append additional assets' do
       let(:configuration) { Ettu::Configuration.new }
-      let(:random_string) { RandomString.rand }
+      let(:random_string) { SecureRandom.hex }
 
       it 'with +=' do
         configuration.assets += [random_string]

data/spec/fixtures.rb

@@ -61,10 +61,3 @@ ActionView::Base.assets_manifest.assets = Rails.application.assets.keys.reduce({
   hash[asset] = asset.to_s + '.manifest'
   hash
 end
-
-class RandomString
-  @@letters = ('a'..'z').to_a
-  def self.rand(length = 50)
-    (0...length).map{ @@letters.sample }.join
-  end
-end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'date'
 require 'active_support/ordered_options'
+require 'securerandom'
 
 require 'simplecov'
 SimpleCov.start { add_filter '/spec/' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Justin Ridgewell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails