ettu 4.1.4 → 4.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d8d18e525d41372caf60474f3435bc05ff4ba62b
+  data.tar.gz: b2dac6236a6461d688f2f1e60ffaf4dc6cd9965c
+SHA512:
+  metadata.gz: d52066c819518f1414d97a881f674fe520cf1ec063b85807cc93c606ddb726652a008361ae92663faa9c339368d6f5feb1ccef170faf090e4ff3f0fd5f335b9a
+  data.tar.gz: 0e31c5edb6656cebc3bc306f7e65a70c0c373e929c7c6b63570db5e246bc57c39c10e0d4aa37b2eb94cd97d2ed1e627a030f05d91e7746f48b7988f5f8f3f6b2

data/README.md

@@ -1,6 +1,8 @@
 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
@@ -101,11 +103,11 @@ won't cause problems if it's not installed.
 RAILS_ENV=development Issues
 ----------------------------
 
-Until [rails/rails#10791](https://github.com/rails/rails/pull/10791)
+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
-recreated after each deploy.
+flushed after each deploy.
 
 In the mean time, you can enable a monkey-patch with:
 

data/lib/ettu.rb

@@ -2,7 +2,6 @@ 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'

data/lib/ettu/fresh_when.rb

@@ -2,22 +2,12 @@ class Ettu
   module FreshWhen
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :fresh_when, :ettu
-    end
-
-    private
-
-    def fresh_when_with_ettu(record_or_options, additional_options = {})
-      ettu = ettu_instance(record_or_options, additional_options, self)
+    def fresh_when(record_or_options, additional_options = {})
+      ettu = Ettu.new record_or_options, additional_options, self
 
       ettu_params = {etag: ettu.etags, last_modified: ettu.last_modified}
 
-      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
+      super nil, ettu.options.merge(ettu_params)
     end
   end
 end

data/lib/ettu/railtie.rb

@@ -5,34 +5,21 @@ class Ettu
 
       unless app.config.ettu.disabled
         require 'ettu'
-        if app.config.ettu.development_hack
+        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
+            def []=(*); 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
 
     end

data/lib/ettu/version.rb

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

data/spec/fixtures.rb

@@ -13,9 +13,12 @@ class Controller < Nester
     self.action_name = 'action_name'
   end
 
-  def fresh_when(*args)
-    :old_fresh_when
+  module Freshness
+    def fresh_when(*args)
+      [*args]
+    end
   end
+  include Freshness
 
   include ::Ettu::FreshWhen
 end

data/spec/fresh_when_spec.rb

@@ -6,41 +6,19 @@ describe Ettu::FreshWhen do
     Ettu.configure { |config| config.template_digestor = Digestor }
   end
 
-  let(:ettu) { double }
   let(:record) { Record.new(DateTime.now) }
   let(:hash) { { random: true, options: true } }
   subject(:controller) { Controller.new }
 
-  before(:each) do
-    controller.stub(ettu_instance: ettu)
-    ettu.stub(:etags)
-    ettu.stub(:last_modified)
-    ettu.stub(options: {})
-  end
-
-  it 'calls Ettu#etags' do
-    ettu.should_receive(:etags)
-    controller.fresh_when record, hash
-  end
-
-  it 'calls Ettu#last_modified' do
-    ettu.should_receive(:last_modified)
-    controller.fresh_when record, hash
-  end
-
   it 'passes nil as the first argument to original fresh_when' do
-    controller.should_receive(:fresh_when_without_ettu) do |r, h|
-      r.nil?
-    end
-    controller.fresh_when record, hash
+    ret = controller.fresh_when record, hash
+
+    expect(ret[0]).to equal(nil)
   end
 
   it 'passes extra options to original fresh_when' do
-    controller.should_receive(:fresh_when_without_ettu) do |r, h|
-      hash.each_pair.all? do |k, v|
-        h[k] == v
-      end
-    end
-    controller.fresh_when record, hash
+    ret = controller.fresh_when record, hash
+
+    expect(ret[1]).to include_hash(hash)
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,13 @@
 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/' }

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 4.1.4
+  version: 4.1.6
 platform: ruby
 authors:
 - Justin Ridgewell
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Account for js, css, and views when using ETags.
 email: jridgewell@cloudspace.com
 executables: []
@@ -118,7 +107,8 @@ files:
 homepage: http://github.com/cloudspace/ettu
 licenses:
 - MIT
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,18 +117,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.0
+signing_key: 
+specification_version: 4
 summary: Account for view code when using ETags.
 test_files:
 - spec/ettu_spec.rb