rails_weak_etags 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd86b1f259beec9ba981654ec19351061e58b577
-  data.tar.gz: 04074f89d287e4c956281b837a70c03c10fa454e
+  metadata.gz: 7e82cbaef485bae04e47132fceeabfbab13ebc68
+  data.tar.gz: 9501a45b4dbcb021dc80550df7a23d2d54ed45be
 SHA512:
-  metadata.gz: 88a7d8714e1ade3d979372309828b5ff4fe8dafb5b9946c5a30f503602b85811d90296937c080293dfeece56f63d3d241a19662bf577b171f52eb9cbad264eda
-  data.tar.gz: b50f01ec87cdf2694ef714860486282c4f47a581eb57db29bc301159a051e54cf89515f2c7df9ef06137407ce32c4169bc729e4665250e1a483ddf15df13e5a9
+  metadata.gz: 0017e96eccc1803e4f379712b324e5210bc0642e413bf94ded69ebf5c58d058b4ee509a31564551412ae44d2eba1d6c2b8de47da5f31cea0f99f4b22dce7a25b
+  data.tar.gz: d27f350ac81859637e1b67e6e8d535f79ca302a3c7b5597fe384d629985a6a431697b879541a000cae5f9ae36836fe2b5f5aca58fb67fd98ab3aa5da702f8835

data/lib/rails_weak_etags/middleware.rb

@@ -6,18 +6,24 @@ module RailsWeakEtags
     end
 
     def call(env)
-      # make request etags "strong"
-      etag = env['HTTP_IF_NONE_MATCH']
-      if etag && etag =~ /^W\//
-        env['HTTP_IF_NONE_MATCH'] = etag[2..-1]
-      end
+      status, headers, body = nil, nil, nil
 
-      status, headers, body = @app.call(env)
+      # make request etags "strong" before calling the app.  Restore the original
+      # header before passing control back.  Rack 1.6 added weak e-tag support
+      # for digest bodies, so it needs to see the weak etag.
+      request_etag = env['HTTP_IF_NONE_MATCH']
+      if request_etag && request_etag =~ /^W\//
+        env['HTTP_IF_NONE_MATCH'] = request_etag[2..-1]
+        status, headers, body = @app.call(env)
+        env['HTTP_IF_NONE_MATCH'] = request_etag
+      else
+        status, headers, body = @app.call(env)
+      end
 
-      # make response etags "weak"
-      etag = headers['ETag']
-      if etag && etag !~ /^W\//
-        headers['ETag'] = "W/#{etag}"
+      # make all response etags "weak"
+      response_etag = headers['ETag']
+      if response_etag && response_etag !~ /^W\//
+        headers['ETag'] = "W/#{response_etag}"
       end
 
       [status, headers, body]

data/lib/rails_weak_etags/railtie.rb

@@ -1,7 +1,7 @@
 module RailsWeakEtags
   class Railtie < ::Rails::Railtie
     initializer "rails_weak_etags.configure_rails_initialization" do |app|
-      app.middleware.insert_before(Rack::ConditionalGet, RailsWeakEtags::Middleware)
+      app.middleware.insert_before(Rack::ETag, RailsWeakEtags::Middleware)
     end
   end
 end

data/lib/rails_weak_etags/version.rb

@@ -1,3 +1,3 @@
 module RailsWeakEtags
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_weak_etags
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Naegle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,12 +46,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- Rakefile
+- lib/rails_weak_etags.rb
 - lib/rails_weak_etags/middleware.rb
 - lib/rails_weak_etags/railtie.rb
 - lib/rails_weak_etags/version.rb
-- lib/rails_weak_etags.rb
-- MIT-LICENSE
-- Rakefile
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -60,6 +62,7 @@ files:
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -76,14 +79,11 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
 - test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/rails_weak_etags_test.rb
 - test/test_helper.rb
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Converts strong e-tags to weak.
@@ -146,4 +146,3 @@ test_files:
 - test/integration/navigation_test.rb
 - test/rails_weak_etags_test.rb
 - test/test_helper.rb
-has_rdoc: