turbolinks 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f0af44179f8e5f1098974870c5d5466f0c55d6
-  data.tar.gz: 9775690715e3c8ed5a33f8d4d90353b958de4243
+  metadata.gz: '0912c3f96e36af55ff15e6090feb8bb5d153c6a2'
+  data.tar.gz: bb11128a5055b2730ddf1133671e7a3975bdad7d
 SHA512:
-  metadata.gz: a6c14d5b31f559268cc7c9f1324f36a861fca1d61f9edb4aae29c52a5294673f6cb1b2d3a2871bd0d08d80afa1c30c2530ce4416abc28c3145dc616ddea18f55
-  data.tar.gz: 9a03541795685a494305c00a384513a9fd5a1b251c77650272549beb7897a651d903fc7704d969817640e1b68485398ac58ccc8af89bfb7ac17733d6c822c0c2
+  metadata.gz: 9d3da852a6f31f86b3b9191ce755fe017450fd663337ab610bca3d3ffd7c31cbdad0d08591df289e30501e91c7076bcbc6e9209e10e768c9b27d00fcf40a9fde
+  data.tar.gz: ec47299dbd6c27caf25b560ed42757fa7006689052fd142ebbb2f4f1f13347bb830d326f847300b806d67d9591f5365126612e9f9b927744716af48f56452f48

data/lib/turbolinks.rb

@@ -11,8 +11,13 @@ module Turbolinks
       ActiveSupport.on_load(:action_controller) do
         ActionController::Base.class_eval do
           include XHRHeaders, Cookies, XDomainBlocker, Redirection
-          before_filter :set_xhr_redirected_to, :set_request_method_cookie
-          after_filter :abort_xdomain_redirect
+          if respond_to?(:before_action)
+            before_action :set_xhr_redirected_to, :set_request_method_cookie
+            after_action :abort_xdomain_redirect
+          else
+            before_filter :set_xhr_redirected_to, :set_request_method_cookie
+            after_filter :abort_xdomain_redirect
+          end
         end
 
         ActionDispatch::Request.class_eval do
@@ -25,7 +30,11 @@ module Turbolinks
 
       ActiveSupport.on_load(:action_view) do
         (ActionView::RoutingUrlFor rescue ActionView::Helpers::UrlHelper).module_eval do
-          include XHRUrlFor
+          if defined?(prepend) && Rails.version >= '4'
+            prepend XHRUrlFor
+          else
+            include LegacyXHRUrlFor
+          end
         end
       end unless RUBY_VERSION =~ /^1\.8/
     end

data/lib/turbolinks/redirection.rb

@@ -3,13 +3,13 @@ module Turbolinks
   # will respond with a JavaScript call to Turbolinks.visit(url).
   module Redirection
     extend ActiveSupport::Concern
-    
+
     def redirect_via_turbolinks_to(url = {}, response_status = {})
       redirect_to(url, response_status)
 
       self.status           = 200
       self.response_body    = "Turbolinks.visit('#{location}');"
-      response.content_type = Mime::JS
+      response.content_type = Mime[:js]
     end
   end
-end
+end

data/lib/turbolinks/version.rb

@@ -1,3 +1,3 @@
 module Turbolinks
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end

data/lib/turbolinks/xhr_url_for.rb

@@ -1,15 +1,22 @@
 module Turbolinks
-  # Corrects the behavior of url_for (and link_to, which uses url_for) with the :back 
-  # option by using the X-XHR-Referer request header instead of the standard Referer 
+  # Corrects the behavior of url_for (and link_to, which uses url_for) with the :back
+  # option by using the X-XHR-Referer request header instead of the standard Referer
   # request header.
-  module XHRUrlFor
+  module LegacyXHRUrlFor
     def self.included(base)
       base.alias_method_chain :url_for, :xhr_referer
     end
- 
+
     def url_for_with_xhr_referer(options = {})
       options = (controller.request.headers["X-XHR-Referer"] || options) if options == :back
       url_for_without_xhr_referer options
     end
   end
+
+  module XHRUrlFor
+    def url_for(options = {})
+      options = (controller.request.headers["X-XHR-Referer"] || options) if options == :back
+      super options
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Turbolinks makes following links in your web application faster (use with