ettu 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7f2d1c82ca3de9107655ad10c97f35e61e889e
-  data.tar.gz: 62f6065fcd7396e83cab33ff66832569e9893123
+  metadata.gz: 77b8d4f4b477b8edc976372932b5e5c84c75635c
+  data.tar.gz: 9505d69bf31f7ea30f4db5912aabd803a86a7863
 SHA512:
-  metadata.gz: 157bffb71c9ebc1d95725b1e172873189132d492e84e5387936d95fb5a8930849bf902ccb73427a48d10ad6abd7447014e184863c84a4603984e7fd17332dfc2
-  data.tar.gz: 7aefae5a7a637a7340cf55f4fc3d5564820ad0cb846f9077ef8ff17435792e24a031c9255bb92936ea801cc98088896d45323848c2cbe8d5a42936fbafc89b52
+  metadata.gz: 2e723799e1ba4d0aea18841debb13e044d8c053adeb1f2e26e06cabfc177873f71ad3927ffdb861df03747e4ead98712d60e590e47d47aa3cdad69f0d3d45af5
+  data.tar.gz: 196e27ab26d3ed7fad871478434303d7d2bdf07095d8be17634eaf75a614d084e40877c284119f16319747f8a311a3091db6ec47ecbb2dd04ce381e8f4ceb47e

data/README.md

@@ -16,6 +16,12 @@ 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.
 
+### Rails 3
+
+Have a Rails 3 project? The [v3 branch]
+(https://github.com/cloudspace/ettu/tree/v3) (and 3.* releases) are set
+up to support it.
+
 Installation
 ------------
 
@@ -45,10 +51,9 @@ end
 ```
 
 Ettu wants you to keep using either syntax, and let it worry about the
-view code. By default, it will add in the asset fingerprints of
-`application.js` and `application.css` along with the cache digest of
-the current action into the calculation for the final ETag sent to the
-browser.
+view code. By default, it will add in the fingerprints of your
+precompiled assets along with the cache digest of the current action
+into the calculation for the final ETag sent to the browser.
 
 ### Configuring
 
@@ -67,34 +72,24 @@ Of course, you can override Ettu's default behavior:
 ```ruby
 # config/initializers/ettu.rb
 Ettu.configure do |config|
-  # Set the default js file
-  config.js = 'app.js'
-  # Or don't account for javascript
-  # config.js = false
-
-  # Set the default css file
-  config.css = 'style.css'
-  # Or don't account for css
-  # config.css = false
-
   # Add in extra assets to account for
-  config.assets = ['first.js', 'second.css']
+  config.assets += ['first.js', 'second.css']
 end
 ```
 
 Or each can be passed on an individual basis:
 
-    fresh_when @product, js: 'app.js', css: 'style.css', assets: 'super.css'
+    fresh_when @product, assets: 'super.css'
 
 Additionally, you can specify a different template to calculate with the
 `view` option:
 
-    fresh_when @product, view: "products/index"
+    fresh_when @product, view: 'products/index'
 
 You can even stop Ettu from accounting for any of them by setting the
 value to `false`:
 
-    fresh_when @product, js: false, css: false, view: false
+    fresh_when @product, assets: false, view: false
 
 ### What about Rails' default `fresh_when`?
 

data/ROADMAP.md

@@ -6,4 +6,4 @@ Ettu Roadmap
     - Separate gem into branches
     - v3 branch will track Rails 3
     - v4 branch will track Rails 4
-- [ ] Default assets to those set in Rails.application.config.assets.precompile
+- [x] Default assets to those set in Rails.application.config.assets

data/lib/ettu/configuration.rb

@@ -13,9 +13,7 @@ class Ettu
     private
 
     def set_defaults
-      self.js = 'application.js'
-      self.css = 'application.css'
-      self.assets = []
+      self.assets = LateLoadAssets.new
 
       # Don't actually set view by default.
       # This'll allow #fetch to return the real default
@@ -23,10 +21,20 @@ class Ettu
       # self.view = "#{controller_name}/#{action_name}"
       delete :view if key? :view
 
-      # Don't attempt to reset the template_digestor
-      # if one has already been found
-      unless self.template_digestor
-        self.template_digestor = LateLoadTemplateDigestor.new(self)
+      self.template_digestor = LateLoadTemplateDigestor.new(self)
+    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
 

data/lib/ettu/fresh_when.rb

@@ -3,18 +3,18 @@ class Ettu
     extend ActiveSupport::Concern
 
     included do
-      alias_method :old_fresh_when, :fresh_when
+      alias_method_chain :fresh_when, :ettu
+    end
 
-      def fresh_when(record_or_options, additional_options = {})
-        ettu = ettu_instance(record_or_options, additional_options, self)
+    private
 
-        ettu_params = {etag: ettu.etags, last_modified: ettu.last_modified}
+    def fresh_when_with_ettu(record_or_options, additional_options = {})
+      ettu = ettu_instance(record_or_options, additional_options, self)
 
-        old_fresh_when nil, ettu.options.merge(ettu_params)
-      end
-    end
+      ettu_params = {etag: ettu.etags, last_modified: ettu.last_modified}
 
-    private
+      fresh_when_without_ettu nil, ettu.options.merge(ettu_params)
+    end
 
     def ettu_instance(record_or_options, additional_options, controller)
       Ettu.new record_or_options, additional_options, controller

data/lib/ettu/version.rb

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

data/lib/ettu.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 require 'active_support/ordered_options'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/module/aliasing'
 
 require 'ettu/version'
 require 'ettu/configuration'
@@ -32,11 +33,8 @@ class Ettu
   def etags
     etags = [*response_etag]
     etags << view_etag
-    if @controller.request.format.try(:html?)
-      etags << js_etag
-      etags << css_etag
-    end
     etags.concat asset_etags
+    etags.compact
   end
 
   def last_modified
@@ -53,16 +51,6 @@ class Ettu
     @view_etag ||= view_digest(view)
   end
 
-  def js_etag
-    js = @options.fetch(:js, @@config.js)
-    asset_etag js
-  end
-
-  def css_etag
-    css = @options.fetch(:css, @@config.css)
-    asset_etag css
-  end
-
   def asset_etags
     assets = @options.fetch(:assets, @@config.assets)
     [*assets].map { |asset| asset_etag(asset) }

data/spec/ettu_spec.rb

@@ -4,21 +4,13 @@ describe Ettu do
   let(:controller) { Controller.new }
   let(:record) { Record.new(DateTime.now) }
   let(:hash) { { etag: record, last_modified: DateTime.now } }
-  before(:all) do
-    Ettu.configure { |config| config.template_digestor = Digestor }
-  end
 
   context 'when supplied with options' do
-    let(:hash) { { js: 'custom.js', css: 'custom.css', assets: 'first.ext', view: 'custom/action' } }
-    subject(:ettu) { Ettu.new(hash, {}, controller) }
-
-    it 'will use :js option over default' do
-      expect(ettu.js_etag).to eq('custom.js.digest')
-    end
-
-    it 'will use :css option over default' do
-      expect(ettu.css_etag).to eq('custom.css.digest')
+    before(:all) do
+      Ettu.configure { |config| config.template_digestor = Digestor }
     end
+    let(:hash) { { assets: 'first.ext', view: 'custom/action' } }
+    subject(:ettu) { Ettu.new(hash, {}, controller) }
 
     it 'will use :asset option over default' do
       expect(ettu.asset_etags).to eq(['first.ext.digest'])
@@ -31,26 +23,19 @@ describe Ettu do
 
   describe '.configure' do
     subject(:ettu) { Ettu.new(nil, {}, controller) }
+    before(:all) do
+      Ettu.configure { |config| config.template_digestor = Digestor }
+    end
     after(:all) { Ettu.configure { |config| config.reset } }
 
     context 'when no options are specified' do
       before(:all) do
         Ettu.configure do |config|
-          config.js = 'custom.js'
-          config.css = 'custom.css'
           config.assets = ['first.ext', 'second.ext']
           config.view = 'custom/view'
         end
       end
 
-      it 'will use the default js file' do
-        expect(ettu.js_etag).to eq('custom.js.digest')
-      end
-
-      it 'will use the default css file' do
-        expect(ettu.css_etag).to eq('custom.css.digest')
-      end
-
       it 'will use the default asset files' do
         expect(ettu.asset_etags).to eq(['first.ext.digest', 'second.ext.digest'])
       end
@@ -60,21 +45,31 @@ describe Ettu do
       end
     end
 
+    context 'can append additional assets' do
+      let(:configuration) { Ettu::Configuration.new }
+      let(:random_string) { RandomString.rand }
+
+      it 'with +=' do
+        configuration.assets += [random_string]
+        expect(configuration.assets).to include(random_string)
+      end
+
+      it 'with <<' do
+        configuration.assets << random_string
+        expect(configuration.assets).to include(random_string)
+      end
+    end
+
     context 'when setting default to false' do
       before(:all) do
         Ettu.configure do |config|
-          config.js = false
-          config.css = false
+          config.assets = false
           config.view = false
         end
       end
 
-      it 'will disable js etag' do
-        expect(ettu.js_etag).to eq(nil)
-      end
-
-      it 'will disable css etag' do
-        expect(ettu.css_etag).to eq(nil)
+      it 'will disable asset etags' do
+        expect(ettu.asset_etags).to eq([nil])
       end
 
       it 'will disable view etags' do
@@ -84,13 +79,27 @@ describe Ettu do
   end
 
   describe '#etags' do
+    before(:all) do
+      Ettu.configure { |config| config.template_digestor = Digestor }
+    end
     let(:ettu) { Ettu.new(record, {}, controller) }
+
     it 'will collect all etags' do
-      expected = [record, 'controller_name/action_name.digest', 'application.js.digest', 'application.css.digest']
+      expected = [
+        record, 'controller_name/action_name.digest',
+       'application.js.manifest', 'application.css.manifest',
+       'custom.js.manifest', 'custom.css.manifest',
+       'first.ext.manifest', 'second.ext.manifest'
+      ]
       result = ettu.etags
-      expect(ettu.etags).to include(*expected)
+      expect(result).to include(*expected)
       expect(expected).to include(*result)
     end
+
+    it 'will not allow nils' do
+      ettu = Ettu.new(nil, {assets: [nil, nil, nil]}, controller )
+      expect(ettu.etags).not_to include(nil)
+    end
   end
 
   context 'when given only a record' do

data/spec/fixtures.rb

@@ -57,5 +57,14 @@ module ActionView
     end
   end
 end
-ActionView::Base.assets_manifest.assets = {}
+ActionView::Base.assets_manifest.assets = Rails.application.assets.keys.reduce({}) do |hash, asset|
+  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/fresh_when_spec.rb

@@ -29,14 +29,14 @@ describe Ettu::FreshWhen do
   end
 
   it 'passes nil as the first argument to original fresh_when' do
-    controller.should_receive(:old_fresh_when) do |r, h|
+    controller.should_receive(:fresh_when_without_ettu) do |r, h|
       r.nil?
     end
     controller.fresh_when record, hash
   end
 
   it 'passes extra options to original fresh_when' do
-    controller.should_receive(:old_fresh_when) do |r, h|
+    controller.should_receive(:fresh_when_without_ettu) do |r, h|
       hash.each_pair.all? do |k, v|
         h[k] == v
       end

metadata

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