ettu 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 239a634c699a8dd6bc7e5bf8639121858852402d
-  data.tar.gz: 40d6f53bcab2f4963308720e9b591ba62ce3371b
+  metadata.gz: b1a5e5a4fa5edd6f0599a6fc900eae50f7cf25c0
+  data.tar.gz: bacdad06438bbc50ae3fb847a6f649dba2fa7b82
 SHA512:
-  metadata.gz: 25d08b35bab26c22c31e31d6aa4bd5091a360f4b426933a8307aa80c16afcd0a4711c0c67de7344112676bdc76ee9d12446a05e86db1c79a1a4929c9eeb5ecf7
-  data.tar.gz: 9aefc9b359b8c8e7a6169134648647b07ee9c8cf723cd7d3aa4f3107ae93d554e405603b3e18dd1aed9063430185984c2fd7b7bff8b6aef0ebb2fbdb5ca7a39e
+  metadata.gz: 8b195b10a8128e2d0ac5fd5449e95c51f4c4ac7fee5a2f14bf7560ed72d6bed06205d2a5d755213ea3fe82f6281c4f64518be10d16d489be92aa4856fd52c3e7
+  data.tar.gz: b6f133486cdc146eefd50ec7a788045e9547e032e95d8553674eb31fd85038b12d3325e12e1f2b3e289f29b1d7b084a794bbf4ef2b51d6acd88cfae6dc20cd98

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx

data/README.md

@@ -1,8 +1,6 @@
-Ettu
+Ettu [![Build Status](https://travis-ci.org/cloudspace/ettu.png?branch=v3)](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 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

data/ettu.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cache_digests'
   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'
 end

data/lib/ettu.rb

@@ -78,8 +78,9 @@ class Ettu
   def asset_digest(asset)
     return nil unless asset.present?
     # Check already computed assets (production)
-    if manifest = Rails.application.config.assets.digests
-      manifest[asset]
+    manifest = Rails.application.config.assets.digests
+    if digest = manifest.try(:[], asset)
+      digest
     else
       # Compute it in
       Rails.application.assets[asset].digest

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 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 = ::CacheDigests::TemplateDigestor.cache.keys.first
+
+        expect(page).to match(/#{path['controller']}\/#{path['action']}/)
+        expect(etags).to include(::CacheDigests::TemplateDigestor.cache.fetch(page))
+      end
+
+      it 'includes all asset digests' do
+        expect(etags).to include(*(Rails.application.config.assets.digests.values.uniq))
+      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,7 @@
+#!/usr/bin/env rake
+# 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
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= 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,11 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+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" %>
+  <%= javascript_include_tag "application" %>
+  <%= 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 Dummy::Application

data/spec/dummy/config/application.rb

@@ -0,0 +1,65 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/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.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # 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
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+  end
+end
+

data/spec/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -0,0 +1,9 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!
+
+Dummy::Application.configure do
+  config.assets.digest = true
+end

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

@@ -0,0 +1,35 @@
+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
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # 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,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key 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.
+Dummy::Application.config.secret_token = 'c73defd757d28e3dcebf7d902e6acbb1ec4f5b3587ba7218092142a469af71e50d8cbac772c8963ac4eace9945e6d570cbf6526ca48a76eba528f8e4d0dd9b5f'

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

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store

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

@@ -0,0 +1,10 @@
+# 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]
+end
+

data/spec/dummy/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

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-5d535630590bf232c0d869f6b8fa6479.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
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+
+
+var test = true;

data/spec/dummy/public/assets/application-e1e25f5530998b76317739a1762b3401.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/application.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/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
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+
+
+var test = true;

data/spec/dummy/public/assets/manifest.yml

@@ -0,0 +1,5 @@
+---
+application.js: application-5d535630590bf232c0d869f6b8fa6479.js
+application/index.js: application-5d535630590bf232c0d869f6b8fa6479.js
+application.css: application-e1e25f5530998b76317739a1762b3401.css
+application/index.css: application-e1e25f5530998b76317739a1762b3401.css

data/spec/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

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) { Rails.application.config.assets.digests }
+  let(:files) { assets.keys.reject { |f| f[/index/] } }
+  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.manifest'])
+      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.manifest', 'second.ext.manifest'])
+        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

data/spec/support/memory_store.rb

@@ -0,0 +1,9 @@
+class ActiveSupport::Cache::MemoryStore
+  def keys
+    @data.keys
+  end
+
+  def values
+    @data.values.map(&:value)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Justin Ridgewell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -114,10 +100,44 @@ files:
 - 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/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/.keep
+- spec/dummy/public/assets/application-5d535630590bf232c0d869f6b8fa6479.js
+- spec/dummy/public/assets/application-5d535630590bf232c0d869f6b8fa6479.js.gz
+- spec/dummy/public/assets/application-e1e25f5530998b76317739a1762b3401.css
+- spec/dummy/public/assets/application-e1e25f5530998b76317739a1762b3401.css.gz
+- spec/dummy/public/assets/application.css
+- spec/dummy/public/assets/application.css.gz
+- spec/dummy/public/assets/application.js
+- spec/dummy/public/assets/application.js.gz
+- spec/dummy/public/assets/manifest.yml
+- spec/dummy/script/rails
+- spec/ettu/ettu_spec.rb
+- spec/ettu/fresh_when_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixtures.rb
+- spec/support/include_hash.rb
+- spec/support/memory_store.rb
 homepage: http://github.com/cloudspace/ettu
 licenses:
 - MIT
@@ -138,12 +158,46 @@ 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: 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/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/.keep
+- spec/dummy/public/assets/application-5d535630590bf232c0d869f6b8fa6479.js
+- spec/dummy/public/assets/application-5d535630590bf232c0d869f6b8fa6479.js.gz
+- spec/dummy/public/assets/application-e1e25f5530998b76317739a1762b3401.css
+- spec/dummy/public/assets/application-e1e25f5530998b76317739a1762b3401.css.gz
+- spec/dummy/public/assets/application.css
+- spec/dummy/public/assets/application.css.gz
+- spec/dummy/public/assets/application.js
+- spec/dummy/public/assets/application.js.gz
+- spec/dummy/public/assets/manifest.yml
+- spec/dummy/script/rails
+- spec/ettu/ettu_spec.rb
+- spec/ettu/fresh_when_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixtures.rb
+- spec/support/include_hash.rb
+- spec/support/memory_store.rb

data/spec/fixtures.rb

@@ -1,57 +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 = Rails.application.assets.keys.reduce({}) do |hash, asset|
-  hash[asset.to_s] = asset.to_s + '.manifest'
-  hash
-end