turbolinks 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc429267a56c52d8ad8e261111ada8235379ad3
-  data.tar.gz: 4ff6f9fbf881ecae991b28c0db0709922143af4f
+  metadata.gz: 3d6b9a579870be137cebb067ea600acc34196de8
+  data.tar.gz: 8d42fb2b61a68595ef627de80ab4e0e899769d8e
 SHA512:
-  metadata.gz: aa72fe1ce6bd6de809645f166696bc23d1da44de6e2b43263dc13477a52057c1c3455c3f7ce61bcc415f4493f5ff8d4946e09dd2ab0e2c3fcc36b6e3d8b751c7
-  data.tar.gz: db5085ab615012760ed1a9d2e31c6aaf33de08a4494788cfa40af5167d8dfdf3fa115ec79f12020e9bc1e59b5d6d063750c325bcdb5d20fa221330ae18f7d3f6
+  metadata.gz: f02d8828f9b479fb9e803f7894605e2a55b3a3770ed106afaeb7de2896232af7e310313237365738f8c591278b267be1983cf6530935b2d2778af52268e005dd
+  data.tar.gz: 9ac399b5e08349a4e4166c8859448a109e9b13f5377993a6c467b2cccdebbcd6a8ebe86d1b7a2aeec2bc61d1fc20f43ed7d2f12ef4f17357d3180ebe2769de41

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Basecamp, LLC
+Copyright 2018 Basecamp, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/turbolinks.rb

@@ -1,5 +1,6 @@
 require 'turbolinks/version'
 require 'turbolinks/redirection'
+require 'turbolinks/assertions'
 require 'turbolinks/source'
 
 module Turbolinks
@@ -14,12 +15,14 @@ module Turbolinks
   class Engine < ::Rails::Engine
     config.turbolinks = ActiveSupport::OrderedOptions.new
     config.turbolinks.auto_include = true
-    config.assets.paths += [Turbolinks::Source.asset_path]
+    config.assets.paths += [Turbolinks::Source.asset_path] if config.respond_to?(:assets)
 
     initializer :turbolinks do |app|
       ActiveSupport.on_load(:action_controller) do
         if app.config.turbolinks.auto_include
           include Controller
+
+          ::ActionDispatch::Assertions.include ::Turbolinks::Assertions
         end
       end
     end

data/lib/turbolinks/assertions.rb

@@ -0,0 +1,46 @@
+module Turbolinks
+  module Assertions
+    TURBOLINKS_VISIT = /Turbolinks\.visit\("([^"]+)", {"action":"([^"]+)"}\)/
+
+    def assert_redirected_to(options = {}, message = nil)
+      if turbolinks_request?
+        assert_turbolinks_visited(options, message)
+      else
+        super
+      end
+    end
+
+    def assert_turbolinks_visited(options = {}, message = nil)
+      assert_response(:ok, message)
+      assert_equal("text/javascript", response.content_type)
+
+      visit_location, visit_action = turbolinks_visit_location_and_action
+
+      redirect_is       = normalize_argument_to_redirection(visit_location)
+      redirect_expected = normalize_argument_to_redirection(options)
+
+      message ||= "Expected response to be a Turbolinks visit to <#{redirect_expected}> but was a visit to <#{redirect_is}>"
+      assert_operator redirect_expected, :===, redirect_is, message
+    end
+
+    # Rough heuristic to detect whether this was a Turbolinks request:
+    # non-GET request with a text/javascript response.
+    #
+    # Technically we'd check that Turbolinks-Referrer request header is
+    # also set, but that'd require us to pass the header from post/patch/etc
+    # test methods by overriding them to provide a `turbolinks:` option.
+    #
+    # We can't check `request.xhr?` here, either, since the X-Requested-With
+    # header is cleared after controller action processing to prevent it
+    # from leaking into subsequent requests.
+    def turbolinks_request?
+      !request.get? && response.content_type == "text/javascript"
+    end
+
+    def turbolinks_visit_location_and_action
+      if response.body =~ TURBOLINKS_VISIT
+        [ $1, $2 ]
+      end
+    end
+  end
+end

data/lib/turbolinks/version.rb

@@ -1,3 +1,3 @@
 module Turbolinks
-  VERSION = '5.0.1'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbolinks
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbolinks-source
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 description: Rails engine for Turbolinks 5 support
 email: david@loudthinking.com
 executables: []
@@ -33,6 +33,7 @@ files:
 - LICENSE
 - README.md
 - lib/turbolinks.rb
+- lib/turbolinks/assertions.rb
 - lib/turbolinks/redirection.rb
 - lib/turbolinks/version.rb
 homepage: https://github.com/turbolinks/turbolinks
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Turbolinks makes navigating your web application faster