ettu 4.1.6 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d18e525d41372caf60474f3435bc05ff4ba62b
-  data.tar.gz: b2dac6236a6461d688f2f1e60ffaf4dc6cd9965c
+  metadata.gz: dd89c40045ea90c43db793ad2f85e69d2b62ba19
+  data.tar.gz: 7767fc54271d478182c3fa0f4969a07cc2336f53
 SHA512:
-  metadata.gz: d52066c819518f1414d97a881f674fe520cf1ec063b85807cc93c606ddb726652a008361ae92663faa9c339368d6f5feb1ccef170faf090e4ff3f0fd5f335b9a
-  data.tar.gz: 0e31c5edb6656cebc3bc306f7e65a70c0c373e929c7c6b63570db5e246bc57c39c10e0d4aa37b2eb94cd97d2ed1e627a030f05d91e7746f48b7988f5f8f3f6b2
+  metadata.gz: 05afbf54e850686a647f82999d4232792b985f8a27cbea0942e5bdebd9fc77bb9981f4a101a11a55ccbfd81c5e9c803e061aa3c05a432f24cb450a8c25d293ac
+  data.tar.gz: 284bccf8fd752796bcbe84d5c5c88ac447727e2a81d98d536011e9c87aad70def0a55fc23aa7987663a6118b76f4e7dc8947dccbc3c2a93039ceb549e96e4319

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 bin/
+gemfiles/*.lock

data/.travis.yml

@@ -3,4 +3,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx
+gemfile:
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+script: 'bundle exec rake'

data/Appraisals

@@ -0,0 +1,7 @@
+appraise '4.0' do
+  gem 'rails', '~> 4.0.0'
+end
+
+appraise '4.1' do
+  gem 'rails', '~> 4.1.0.rc1'
+end

data/README.md

@@ -1,8 +1,6 @@
-Ettu
+Ettu [![Build Status](https://travis-ci.org/cloudspace/ettu.png)](https://travis-ci.org/cloudspace/ettu)
 ====
 
-[![Build Status](https://travis-ci.org/cloudspace/ettu.png?branch=v3)](https://travis-ci.org/cloudspace/ettu)
-
 Using Rails 4'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
@@ -100,21 +98,16 @@ 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
-----------------------------
-
-Until [rails/rails#11768](https://github.com/rails/rails/pull/11768)
-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
-flushed after each deploy.
+RAILS_ENV=development Gotchas
+-----------------------------
 
-In the mean time, you can enable a monkey-patch with:
+In order for Rails to detect changes to templates when testing `perform_caching`
+in the **development** environment, you must disable `cache_template_loading`.
 
 ```ruby
 # config/environments/development.rb
 My::Application.configure do
-  config.ettu.development_hack = true
+  config.action_view.cache_template_loading = false
 end
 ```
 

data/Rakefile

@@ -1,5 +1,7 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'appraisal'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/ettu.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Ettu::VERSION
   spec.author        = 'Justin Ridgewell'
   spec.email         = 'jridgewell@cloudspace.com'
-  spec.description   = %q{Account for js, css, and views when using ETags.}
-  spec.summary       = %q{Account for view code when using ETags.}
+  spec.summary       = %q{Add Assets and Views into the Rails ETag Equation.}
   spec.homepage      = 'http://github.com/cloudspace/ettu'
   spec.license       = 'MIT'
 
@@ -22,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'appraisal'
 end

data/gemfiles/4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path=>"../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0.rc1"
+
+gemspec :path=>"../"

data/lib/ettu/configuration.rb

@@ -21,7 +21,7 @@ class Ettu
       # self.view = "#{controller_name}/#{action_name}"
       delete :view if key? :view
 
-      self.template_digestor = LateLoadTempalteDigestor.new(self, :template_digestor)
+      self.template_digestor = LateLoadTemplateDigestor.new(self, :template_digestor)
     end
 
     class LateLoad
@@ -37,14 +37,7 @@ class Ettu
       end
     end
 
-    class LateLoadTempalteDigestor < LateLoad
-      def defaults
-        ::ActionView::Digestor
-      end
-    end
-
     class LateLoadAssets < LateLoad
-
       def to_a
         super
       end
@@ -53,5 +46,11 @@ class Ettu
         ::ActionView::Base.assets_manifest.assets.keys
       end
     end
+
+    class LateLoadTemplateDigestor < LateLoad
+      def defaults
+        ::ActionView::Digestor
+      end
+    end
   end
 end

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '4.1.6'
+  VERSION = '4.1.7'
 end

data/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe UsersController do
+
+  describe 'Integration Test' do
+    before(:each) { get :index }
+    subject(:hash) { assigns(:user) }
+    subject(:user) { User.instance }
+
+    it 'returns fresh_when hash' do
+      expect(hash).to be_a(Hash)
+    end
+
+    describe 'hash[:etag]' do
+      subject(:etags) { hash[:etag] }
+
+      it 'sets :etag to array' do
+        expect(etags).to be_a(Array)
+      end
+
+      it 'includes records cache_key' do
+        expect(etags).to include(user.cache_key)
+      end
+
+      it 'includes all views digest' do
+        path = controller.request.path_parameters
+        page = ::ActionView::Digestor.cache.keys.first
+
+        expect(page).to match(/#{path['controller']}\/#{path['action']}/)
+        expect(etags).to include(::ActionView::Digestor.cache[page])
+      end
+
+      it 'includes all asset digests' do
+        expect(etags).to include(*(::ActionView::Base.assets_manifest.assets.values))
+      end
+    end
+
+    describe 'hash[:last_modified]' do
+      subject(:last_modified) { hash[:last_modified] }
+
+      it 'sets last_modified to records updated_at' do
+        expect(last_modified).to eq(user.updated_at)
+      end
+    end
+
+  end
+
+end

data/spec/dummy/.gitignore

@@ -0,0 +1,3 @@
+/db/*
+!/db/.keep
+/log/

data/spec/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .
+
+var test = true;

data/spec/dummy/app/assets/javascripts/test.js

@@ -0,0 +1 @@
+var test2 = true;

data/spec/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,13 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end
+
+module ::ActionController
+  module ConditionalGet
+    def fresh_when(*args)
+      [*args].last
+    end
+  end
+end

data/spec/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,9 @@
+class UsersController < ApplicationController
+
+  # GET /users
+  def index
+    user = User.instance
+    @user = fresh_when user
+  end
+
+end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,12 @@
+class User < Struct.new(:user)
+  cattr_reader :instance
+  @@instance = User.new(:test)
+
+  def cache_key
+    user
+  end
+
+  def updated_at
+    @time ||= Time.now.to_i
+  end
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/app/views/users/index.html.erb

@@ -0,0 +1 @@
+<h1>Users Index</h1>

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application

data/spec/dummy/config/application.rb

@@ -0,0 +1,28 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+Bundler.require(*Rails.groups)
+require "ettu"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Dummy::Application.initialize!

data/spec/dummy/config/environments/test.rb

@@ -0,0 +1,36 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+end

data/spec/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Dummy::Application.config.secret_key_base = 'aaf99661e9b1020f700b99f4be4677c0d2d0afeecebbcadb665bc71eb9fe9a9fdd710ba84a3c5467c0a6432feda39eafa6901e987ef6bc18678c3c1cb1f982bf'

data/spec/dummy/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end

data/spec/dummy/config/routes.rb

@@ -0,0 +1,3 @@
+Dummy::Application.routes.draw do
+  get 'users' => 'users#index'
+end

data/spec/dummy/public/assets/application-90b1f92061b701bdbc2f2c364a42eed3.js

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+
+
+var test = true;

data/spec/dummy/public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css

@@ -0,0 +1,14 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+
+
+ */
+

data/spec/dummy/public/assets/manifest-1b849aba8a84c4520cb7bc4fafa638c3.json

@@ -0,0 +1 @@
+{"files":{"application-90b1f92061b701bdbc2f2c364a42eed3.js":{"logical_path":"application.js","mtime":"2014-03-12T14:36:29-04:00","size":599,"digest":"90b1f92061b701bdbc2f2c364a42eed3"},"application-a029bd03bea21da7d02c0e9d272edc3a.css":{"logical_path":"application.css","mtime":"2014-03-12T14:17:39-04:00","size":513,"digest":"a029bd03bea21da7d02c0e9d272edc3a"}},"assets":{"application.js":"application-90b1f92061b701bdbc2f2c364a42eed3.js","application.css":"application-a029bd03bea21da7d02c0e9d272edc3a.css"}}

data/spec/{ettu_spec.rb → ettu/ettu_spec.rb}

@@ -1,19 +1,35 @@
 require 'spec_helper'
 
 describe Ettu do
+  subject(:ettu) { Ettu.new(hash, {}, controller) }
+
   let(:controller) { Controller.new }
   let(:record) { Record.new(DateTime.now) }
   let(:hash) { { etag: record, last_modified: DateTime.now } }
 
-  context 'when supplied with options' do
-    before(:all) do
-      Ettu.configure { |config| config.template_digestor = Digestor }
+  # NOTE: assets were created by running `rake assets:precompile`.
+  # It compiled application.js and application.css (but NOT
+  # test.js)
+  let(:assets) { ::ActionView::Base.assets_manifest.assets }
+  let(:files) { assets.keys }
+  let(:digests) { assets.values }
+
+  before(:each) do
+    Ettu.configure do |config|
+      config.reset
+      config.template_digestor = Digestor
     end
-    let(:hash) { { assets: 'first.ext', view: 'custom/action' } }
-    subject(:ettu) { Ettu.new(hash, {}, controller) }
+  end
+
+  after(:all) do
+    Ettu.configure { |config| config.reset }
+  end
+
+  context 'when supplied with options' do
+    let(:hash) { { assets: files.first, view: 'custom/action' } }
 
     it 'will use :asset option over default' do
-      expect(ettu.asset_etags).to eq(['first.ext.digest'])
+      expect(ettu.asset_etags).to eq([digests.first])
     end
 
     it 'will use :view option over default' do
@@ -21,26 +37,34 @@ describe Ettu do
     end
   end
 
-  describe '.configure' do
-    subject(:ettu) { Ettu.new(nil, {}, controller) }
-    before(:all) do
-      Ettu.configure { |config| config.template_digestor = Digestor }
+  context 'when given asset that is not precompiled' do
+    it 'will digest the file if it exists' do
+      # NOTE: test.js is located at dummy/app/assets/javascripts/test.js
+      # It was added AFTER running `rake assets:precompile` (which compiled
+      # application.js and application.css).
+      def hash; { assets: 'test.js' }; end
+
+      expect(ettu.asset_etags).not_to be_empty
     end
-    after(:all) { Ettu.configure { |config| config.reset } }
 
-    context 'when no options are specified' do
-      before(:all) do
-        Ettu.configure do |config|
-          config.assets = ['first.ext', 'second.ext']
-          config.view = 'custom/view'
-        end
-      end
+    it 'will throw error if file does not exist' do
+      def hash; { assets: 'does_not_exist' }; end
+
+      expect{ ettu.asset_etags }.to raise_error
+    end
+  end
+
+  describe '.configure' do
+    let(:hash) { nil }
 
+    context 'when no options are specified' do
       it 'will use the default asset files' do
-        expect(ettu.asset_etags).to eq(['first.ext.digest', 'second.ext.digest'])
+        expect(ettu.asset_etags).to eq(digests)
       end
 
       it 'will use the default view file' do
+        Ettu.configure { |config| config.view = 'custom/view' }
+
         expect(ettu.view_etag).to eq('custom/view.digest')
       end
     end
@@ -61,43 +85,34 @@ describe Ettu do
     end
 
     context 'when setting default to false' do
-      before(:all) do
-        Ettu.configure do |config|
-          config.assets = false
-          config.view = false
-        end
-      end
-
       it 'will disable asset etags' do
+        Ettu.configure { |config| config.assets = false }
+
         expect(ettu.asset_etags).to eq([nil])
       end
 
       it 'will disable view etags' do
+        Ettu.configure { |config| config.view = false }
+
         expect(ettu.view_etag).to eq(nil)
       end
     end
   end
 
   describe '#etags' do
-    before(:all) do
-      Ettu.configure { |config| config.template_digestor = Digestor }
-    end
-    let(:ettu) { Ettu.new(record, {}, controller) }
+    subject(:ettu) { Ettu.new(record, {}, controller) }
 
     it 'will collect all etags' do
-      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'
-      ]
+      expected = [record, 'controller_name/action_name.digest'] | digests
       result = ettu.etags
+
       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

data/spec/{fresh_when_spec.rb → ettu/fresh_when_spec.rb}

@@ -6,6 +6,10 @@ describe Ettu::FreshWhen do
     Ettu.configure { |config| config.template_digestor = Digestor }
   end
 
+  after(:all) do
+    Ettu.configure { |config| config.reset }
+  end
+
   let(:record) { Record.new(DateTime.now) }
   let(:hash) { { random: true, options: true } }
   subject(:controller) { Controller.new }

data/spec/spec_helper.rb

@@ -1,28 +1,29 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
 require 'date'
 require 'active_support/ordered_options'
 require 'securerandom'
-RSpec::Matchers.define :include_hash do |expected|
-  match do |actual|
-    !actual.nil? && 
-      !actual.empty? && 
-      (actual.to_a & expected.to_a) == expected.to_a
-  end
-end
 
-require 'simplecov'
-SimpleCov.start { add_filter '/spec/' }
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.expand_path('..', __FILE__), 'support/**/*.rb')].each { |f| require f }
 
 require 'ettu'
-require 'fixtures'
+
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
   config.order = 'random'
 end

data/spec/support/fixtures.rb

@@ -0,0 +1,38 @@
+class Nester < ActiveSupport::OrderedOptions
+  def initialize
+    super { |h, k| h[k] = Nester.new }
+  end
+end
+
+class Controller < Nester
+  def initialize
+    super
+
+    self.request.format = 'html'
+    self.controller_name = 'controller_name'
+    self.action_name = 'action_name'
+  end
+
+  module Freshness
+    def fresh_when(*args)
+      [*args]
+    end
+  end
+  include Freshness
+
+  include ::Ettu::FreshWhen
+end
+
+class Digestor
+  def self.method_missing(name, *args, &block)
+    args.first.to_s + '.digest'
+  end
+end
+
+class Record
+  attr_accessor :updated_at
+
+  def initialize(updated_at)
+    @updated_at = updated_at
+  end
+end

data/spec/support/include_hash.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :include_hash do |expected|
+  match do |actual|
+    !actual.nil? && !actual.empty? && (actual.to_a & expected.to_a) == expected.to_a
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors:
 - Justin Ridgewell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Account for js, css, and views when using ETags.
+description: 
 email: jridgewell@cloudspace.com
 executables: []
 extensions: []
@@ -89,21 +89,51 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - ROADMAP.md
 - Rakefile
 - ettu.gemspec
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/ettu.rb
 - lib/ettu/configuration.rb
 - lib/ettu/fresh_when.rb
 - lib/ettu/railtie.rb
 - lib/ettu/version.rb
-- spec/ettu_spec.rb
-- spec/fixtures.rb
-- spec/fresh_when_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/dummy/.gitignore
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/test.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/users_controller.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/users/index.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/db/.keep
+- spec/dummy/public/assets/application-90b1f92061b701bdbc2f2c364a42eed3.js
+- spec/dummy/public/assets/application-90b1f92061b701bdbc2f2c364a42eed3.js.gz
+- spec/dummy/public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css
+- spec/dummy/public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css.gz
+- spec/dummy/public/assets/manifest-1b849aba8a84c4520cb7bc4fafa638c3.json
+- spec/ettu/ettu_spec.rb
+- spec/ettu/fresh_when_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixtures.rb
+- spec/support/include_hash.rb
 homepage: http://github.com/cloudspace/ettu
 licenses:
 - MIT
@@ -124,12 +154,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
-summary: Account for view code when using ETags.
+summary: Add Assets and Views into the Rails ETag Equation.
 test_files:
-- spec/ettu_spec.rb
-- spec/fixtures.rb
-- spec/fresh_when_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/dummy/.gitignore
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/test.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/users_controller.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/users/index.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/db/.keep
+- spec/dummy/public/assets/application-90b1f92061b701bdbc2f2c364a42eed3.js
+- spec/dummy/public/assets/application-90b1f92061b701bdbc2f2c364a42eed3.js.gz
+- spec/dummy/public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css
+- spec/dummy/public/assets/application-a029bd03bea21da7d02c0e9d272edc3a.css.gz
+- spec/dummy/public/assets/manifest-1b849aba8a84c4520cb7bc4fafa638c3.json
+- spec/ettu/ettu_spec.rb
+- spec/ettu/fresh_when_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixtures.rb
+- spec/support/include_hash.rb

data/spec/fixtures.rb

@@ -1,66 +0,0 @@
-class Nester < ActiveSupport::OrderedOptions
-  def initialize
-    super { |h, k| h[k] = Nester.new }
-  end
-end
-
-class Controller < Nester
-  def initialize
-    super
-
-    self.request.format['html?'] = true
-    self.controller_name = 'controller_name'
-    self.action_name = 'action_name'
-  end
-
-  module Freshness
-    def fresh_when(*args)
-      [*args]
-    end
-  end
-  include Freshness
-
-  include ::Ettu::FreshWhen
-end
-
-class Digestor
-  def self.method_missing(name, *args, &block)
-    args.first.to_s + '.digest'
-  end
-end
-
-class Record
-  attr_accessor :updated_at
-
-  def initialize(updated_at)
-    @updated_at = updated_at
-  end
-end
-
-module Rails
-  module VERSION
-    MAJOR = ''
-  end
-  def self.application
-    @nested ||= Nester.new
-  end
-end
-Rails.application.assets['application.js'].digest = 'application.js.digest'
-Rails.application.assets['application.css'].digest = 'application.css.digest'
-Rails.application.assets['custom.js'].digest = 'custom.js.digest'
-Rails.application.assets['custom.css'].digest = 'custom.css.digest'
-Rails.application.assets['first.ext'].digest = 'first.ext.digest'
-Rails.application.assets['second.ext'].digest = 'second.ext.digest'
-Rails.application.config.assets.digests = nil
-
-module ActionView
-  class Base
-    def self.assets_manifest
-      @nested ||= Nester.new
-    end
-  end
-end
-ActionView::Base.assets_manifest.assets = Rails.application.assets.keys.reduce({}) do |hash, asset|
-  hash[asset] = asset.to_s + '.manifest'
-  hash
-end