simple_workflow 1.5.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d01e8c654f626222800e875ae04d34978579fb8a
-  data.tar.gz: 96c3e66d0b7be9802411f4bac379c51c54c245ea
+SHA256:
+  metadata.gz: 292e69a11faa0584c25618ffaa2bc2c2391e1b42d6e6e0503797fc3c94f6c2af
+  data.tar.gz: 2b57742db3c66f8b9b2edc088dcd8cabf848759556914abc4c3a329543a3e508
 SHA512:
-  metadata.gz: 9a09260158fcd698e35acb0494e1dcbb277601c573605a705f4738cc4b5d36209b8629a16cf9f864e476829b4c9bf54621987df235d6248f2053dcc5ad969a3f
-  data.tar.gz: 3b951b26526a34eb5929db7963268e5c40145477a6f776618ba310865ce4843e39f2eb065f79dcb45e4d6ee0fdb33be9f486ed344bdb4adfa7501e3f98c8f3e0
+  metadata.gz: 3c92b45c2959972fd8bb2d63c14357a10feadd9717268b233fed9bfad6d976c15f187ff3fb55e2737178240ac19ae462fcc96ddfc38db3588b737d3f7bf390e9
+  data.tar.gz: '0954579fb5d60a2be355f71f3cb32bb946eefbcfcf82705958008e1427da344b72a9c6b23c9d49749a323c6c830e2b2ba44d29011a6fa72170d869a1577fbf7b'

data/Gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org/'
 gemspec

data/Gemfile.lock

@@ -1,148 +1,186 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.5.1)
-      rails (>= 4, < 5.2)
+    simple_workflow (2.0.1)
+      rails (>= 4.2, < 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.2)
-      actionpack (= 5.1.2)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.2)
-      actionpack (= 5.1.2)
-      actionview (= 5.1.2)
-      activejob (= 5.1.2)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.2)
-      actionview (= 5.1.2)
-      activesupport (= 5.1.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.2)
-      activesupport (= 5.1.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.2)
-      activesupport (= 5.1.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
       globalid (>= 0.3.6)
-    activemodel (5.1.2)
-      activesupport (= 5.1.2)
-    activerecord (5.1.2)
-      activemodel (= 5.1.2)
-      activesupport (= 5.1.2)
-      arel (~> 8.0)
-    activesupport (5.1.2)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ansi (1.5.0)
-    arel (8.0.0)
-    ast (2.3.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    docile (1.1.5)
-    erubi (1.6.1)
-    globalid (0.4.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    docile (1.3.4)
+    erubi (1.10.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.8.6)
-    json (2.1.0)
-    loofah (2.0.3)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.8.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.2.0)
-    minitest (5.10.2)
-    minitest-reporters (1.1.14)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.2)
-      actioncable (= 5.1.2)
-      actionmailer (= 5.1.2)
-      actionpack (= 5.1.2)
-      actionview (= 5.1.2)
-      activejob (= 5.1.2)
-      activemodel (= 5.1.2)
-      activerecord (= 5.1.2)
-      activesupport (= 5.1.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.2)
-      actionpack (= 5.1.2)
-      activesupport (= 5.1.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rubocop (0.49.1)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rubocop (1.7.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    sprockets (3.7.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.20.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.4)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    websocket-driver (0.6.5)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   minitest-reporters (~> 1.0)
-  rubocop (~> 0.45)
+  rubocop (~> 1.0)
+  rubocop-performance (~> 1.5)
+  rubocop-rails (~> 2.4)
   simple_workflow!
   simplecov (~> 0.9)
 
 BUNDLED WITH
-   1.15.3
+   2.2.3

data/Rakefile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require File.dirname(__FILE__) + '/lib/simple_workflow/version'
+require "#{File.dirname(__FILE__)}/lib/simple_workflow/version"
 
-GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem".freeze
-GEM_SPEC_FILE = 'simple_workflow.gemspec'.freeze
+GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem"
+GEM_SPEC_FILE = 'simple_workflow.gemspec'
 
 CLEAN.include('simple_workflow-*.gem', 'tmp')
 
@@ -22,6 +24,7 @@ desc 'Push the gem to RubyGems'
 task release: :gem do
   output = `git status --porcelain`
   raise "Workspace not clean!\n#{output}" unless output.empty?
+
   sh "git tag #{SimpleWorkflow::VERSION}"
   sh 'git push --tags'
   sh "gem push #{GEM_FILE}"

data/lib/simple_workflow.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 unless $LOAD_PATH.include?(__dir__) || $LOAD_PATH.include?(File.expand_path(__dir__))
   $LOAD_PATH.unshift(__dir__)
 end

data/lib/simple_workflow/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simple_workflow/detour'
 
 # Mixin to add controller methods for workflow navigation.
@@ -29,6 +31,7 @@ module SimpleWorkflow::Controller
 
   def back(response_status_and_flash)
     return false if session[:detours].nil?
+
     detour = pop_detour(session)
     post = detour.delete(:request_method) == :post
     if post
@@ -38,7 +41,7 @@ module SimpleWorkflow::Controller
       redirect_to detour, response_status_and_flash
     end
     true
-  rescue
+  rescue StandardError
     retry
   end
 
@@ -56,19 +59,20 @@ module SimpleWorkflow::Controller
     end
 
     return unless (other_flashes = response_status_and_flash.delete(:flash))
+
     flash.update(other_flashes)
   end
   private :save_flash
 
   def redirect_to_post(options)
     url = url_for options
-    render text: <<EOF.strip_heredoc, layout: false
+    render text: <<~HTML.strip_heredoc, layout: false
       <html>
         <body onload="document.getElementById('form').submit()">
           <form id="form" action="#{url}" method="POST">
           </form>
         </body>
       </html>
-EOF
+    HTML
   end
 end

data/lib/simple_workflow/detour.rb

@@ -1,20 +1,28 @@
+# frozen_string_literal: true
+
 # Utility methods to manage the breadcrumb history
 module SimpleWorkflow::Detour
   def store_detour_in_session(session, options)
-    if session[:detours] && session[:detours].last == options
-      Rails.logger.try(:debug, "Ignored duplicate detour: #{options.inspect}")
-      return
+    if session[:detours]
+      if session[:detours].last == options
+        Rails.logger.try(:debug, "Ignored duplicate detour: #{options.inspect}")
+        return
+      end
+      if session[:detours].delete(options)
+        Rails.logger.try(:debug, "Deleted duplicate detour: #{options.inspect}")
+      end
+    else
+      session[:detours] = []
     end
-    session[:detours] ||= []
     session[:detours] << options
-    Rails.logger
-         .try(:debug, "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}")
+    Rails.logger.try(:debug, "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}")
   end
 
-  def pop_detour(session)
+  def pop_detour(session, origin_options = nil)
     detours = session[:detours]
     return nil unless detours
-    detour = detours.pop
+
+    detour = detours.delete(origin_options) || detours.pop
     Rails.logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
     reset_workflow(session) if detours.empty?
     detour

data/lib/simple_workflow/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'detour'
 
 # View helper methods augmented with breadcrumb management.
@@ -42,7 +44,7 @@ module SimpleWorkflow::Helper
     end
     origin.update(origin_options) if origin.keys == [:anchor]
     url = url_for(options)
-    url + (url =~ /\?/ ? '&' : '?') + origin.to_h.to_param('detour')
+    url + (/\?/.match?(url) ? '&' : '?') + origin.to_h.to_param('detour')
   end
 
   def origin_options
@@ -56,9 +58,10 @@ module SimpleWorkflow::Helper
   end
 
   def image_link_to(image_source, title, url_options, image_options = nil, link_options = nil)
-    if link_options == true
+    case link_options
+    when true
       link_options = { method: :post }
-    elsif link_options == false
+    when false
       link_options = nil
     end
     image_options ||= { class: 'image-submit' }
@@ -68,9 +71,10 @@ module SimpleWorkflow::Helper
 
   def image_link_to_remote(image_source, title, link_options, image_options = nil,
       html_options = {})
-    if html_options == true
+    case html_options
+    when true
       html_options = { method: :post }
-    elsif html_options == false
+    when false
       html_options = {}
     end
     image_options ||= { class: 'image-submit' }
@@ -82,7 +86,12 @@ module SimpleWorkflow::Helper
     !session[:detours].nil?
   end
 
-  def back_or_link_to(title, options = nil, html_options = nil)
+  def back_or_link_to(title, options = nil, html_options = nil, &block)
+    if block
+      html_options = options
+      options = title
+      title = nil
+    end
     if session[:detours]
       link_options = { return_from_detour: true }.update(session[:detours].last)
 
@@ -95,7 +104,13 @@ module SimpleWorkflow::Helper
       link_options = options
     end
 
-    link_to(title, link_options, html_options) if link_options
+    if link_options
+      if block
+        link_to(link_options, html_options, &block)
+      else
+        link_to(title, link_options, html_options)
+      end
+    end
   rescue ActionController::UrlGenerationError => e
     if session[:detours]
       logger.error "Exception linking to origin: #{e.class} #{e}"

data/lib/simple_workflow/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simple_workflow/detour'
 require 'active_support/core_ext/string/strip'
 
@@ -40,8 +42,8 @@ class SimpleWorkflow::Middleware
   end
 
   def remove_old_detours(env)
-    return unless session(env).instance_variable_get('@by')
-                              .is_a?(ActionDispatch::Session::CookieStore)
+    return unless session(env).instance_variable_get('@by').is_a?(ActionDispatch::Session::CookieStore)
+
     session_size = workflow_size = nil
     session = session(env)
     cookie_jar = cookie_jar(env)
@@ -52,10 +54,9 @@ class SimpleWorkflow::Middleware
       wf_ser_val = serialize_session(cookie_jar, session[:detours])
       workflow_size = encryptor.encrypt_and_sign(wf_ser_val).size
       break unless workflow_size >= 2048 ||
-                   (session_size >= 3072 && session[:detours] && !session[:detours].empty?)
-      Rails.logger.warn(
-        "Workflow too large (#{workflow_size}/#{session_size}).  Dropping oldest detour."
-      )
+          (session_size >= 3072 && session[:detours] && !session[:detours].empty?)
+
+      Rails.logger.warn("Workflow too large (#{workflow_size}/#{session_size}).  Dropping oldest detour.")
       session[:detours].shift
       reset_workflow(session) if session[:detours].empty?
     end
@@ -63,6 +64,7 @@ class SimpleWorkflow::Middleware
       session: #{session_size} bytes, workflow(#{session[:detours].try(:size) || 0}): #{workflow_size} bytes
     MSG
     return unless session_size > 4096
+
     Rails.logger.warn <<-MSG.strip_heredoc
       simple_workflow: session exceeds cookie size limit: #{session_size} bytes.  Workflow empty!  Not My Fault!
     MSG
@@ -72,6 +74,7 @@ class SimpleWorkflow::Middleware
 
   def remove_discarded_flashes(session)
     return unless (old_flashes = session[:flash] && session[:flash]['discard'])
+
     Rails.logger.warn <<-MSG.strip_heredoc
       simple_workflow: found discarded flash entries: #{old_flashes}.  Deleting them.
     MSG
@@ -79,7 +82,7 @@ class SimpleWorkflow::Middleware
     Rails.logger.warn "simple_workflow: session: #{session.to_hash}"
   end
 
-  if ActionPack::VERSION::MAJOR == 5
+  if ActionPack::VERSION::MAJOR >= 5
     def serialize_session(cookie_jar, session)
       cookie_jar.send(:serialize, session)
     end
@@ -91,12 +94,13 @@ class SimpleWorkflow::Middleware
 
   def encryptor(env)
     return @simple_workflow_encryptor if @simple_workflow_encryptor
+
     @simple_workflow_encryptor = cookie_jar(env).instance_variable_get(:@encryptor)
     return @simple_workflow_encryptor if @simple_workflow_encryptor
+
     Rails.logger.warn 'simple_workflow: Could not get encryptor from the cookie jar'
-    secret_key_base = Rails.application.config.secret_key_base ||
-                      Rails.application.config.secret_token ||
-                      SecureRandom.hex(64)
+    secret_key_base = Rails.application.config.secret_key_base || Rails.application.config.secret_token ||
+        SecureRandom.hex(64)
     key_generator = ActiveSupport::KeyGenerator.new(secret_key_base, iterations: 1000)
     key_generator = ActiveSupport::CachingKeyGenerator.new(key_generator)
     secret = key_generator.generate_key('encrypted cookie')
@@ -105,10 +109,10 @@ class SimpleWorkflow::Middleware
   end
 
   def store_detour_from_params(env)
-    if params(env)[:detour]
-      store_detour_in_session(session(env), params(env)[:detour])
-    end
+    store_detour_in_session(session(env), params(env)[:detour]) if params(env)[:detour]
     return unless params(env)[:return_from_detour] && session(env)[:detours]
-    pop_detour(session(env))
+
+    params_hash = params(env).to_h.reject { |k, _v| %i[detour return_from_detour].include? k.to_sym }
+    pop_detour(session(env), params_hash)
   end
 end

data/lib/simple_workflow/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleWorkflow
   # Railtie to activate the middleware.
   class Railtie < Rails::Railtie
@@ -5,14 +7,14 @@ module SimpleWorkflow
       app.middleware.insert_before ActionDispatch::Flash, SimpleWorkflow::Middleware
 
       # Make workflow test utility methods available in views
-      ActionView::Base.send :include, SimpleWorkflow::Helper
+      ActionView::Base.include SimpleWorkflow::Helper
 
       # Make workflow test utility methods available in controllers
-      ActionController::Base.send :include, SimpleWorkflow::Helper
-      ActionController::Base.send :include, SimpleWorkflow::Controller
+      ActionController::Base.include SimpleWorkflow::Helper
+      ActionController::Base.include SimpleWorkflow::Controller
 
       # Make workflow test utility methods available in ActiveSupport test cases
-      ActiveSupport::TestCase.send :include, SimpleWorkflow::TestHelper
+      ActiveSupport::TestCase.include SimpleWorkflow::TestHelper
     end
   end
 end

data/lib/simple_workflow/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Utility methods to ease testing.
 module SimpleWorkflow::TestHelper
   def add_stored_detour(location = { controller: :bogus, action: :location })

data/lib/simple_workflow/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleWorkflow
-  VERSION = '1.5.1'.freeze
+  VERSION = '2.0.1'
 end

data/test/controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require 'rails'
 
@@ -6,15 +8,17 @@ class ControllerTest < MiniTest::Test
   attr_accessor :cookies, :logger, :session
 
   def setup
-    options = { encrypted_cookie_salt: 'salt1', encrypted_signed_cookie_salt: 'salt2', secret_key_base: 'secret_key_base' }
+    options = { encrypted_cookie_salt: 'salt1', encrypted_signed_cookie_salt: 'salt2',
+                secret_key_base: 'secret_key_base' }
     if Rails.gem_version < Gem::Version.new('5')
-      @cookies = ActionDispatch::Cookies::CookieJar.new(ActiveSupport::KeyGenerator.new('secret'), nil, false, options)
+      @cookies = ActionDispatch::Cookies::CookieJar
+          .new(ActiveSupport::KeyGenerator.new('secret'), nil, false, options)
     end
     @logger = Rails.logger
     @session = {}
     @bad_route = false
     # TODO(uwe):  Remove when we stop testing Rails 4.1
-    Rails.app_class = TestApp if Rails.version !~ /^4\.1\./
+    Rails.app_class = TestApp unless /^4\.1\./.match?(Rails.version)
     # ODOT
   end
 
@@ -32,7 +36,7 @@ class ControllerTest < MiniTest::Test
     assert_equal({}, session)
   end
 
-  def test_back_with_invalid_detour # not route
+  def test_back_with_invalid_detour
     store_detour(controller: :mycontroller, action: :missing_in_action)
     @bad_route = true
     back({})

data/test/helper_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require 'action_controller/metal/exceptions'
 require 'test_app'
@@ -6,18 +8,26 @@ class HelperTest < MiniTest::Test
   include SimpleWorkflow::Helper
 
   def test_with_detour
-    assert_equal '?detour%5Baction%5D=myaction&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
-        with_detour('')
+    assert_equal '?detour%5Baction%5D=myaction&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42' \
+            '&detour%5Bquery%5D%5Bnested%5D=criterium',
+                 with_detour('')
   end
 
   def test_with_detour_with_origin
     assert_equal '?detour%5Baction%5D=index&detour%5Bcontroller%5D=dashboard',
-        with_detour('', controller: :dashboard, action: :index)
+                 with_detour('', controller: :dashboard, action: :index)
   end
 
   def test_with_detour_with_only_anchor_as_origin
-    assert_equal '?detour%5Baction%5D=myaction&detour%5Banchor%5D=tab_2&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
-        with_detour('', anchor: :tab_2)
+    assert_equal '?detour%5Baction%5D=myaction&detour%5Banchor%5D=tab_2' \
+          '&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
+                 with_detour('', anchor: :tab_2)
+  end
+
+  module SimpleWorkflow::Controller
+    def self.binary_params_for?(_action)
+      false
+    end
   end
 
   def test_with_detour_with_string_origin
@@ -27,8 +37,9 @@ class HelperTest < MiniTest::Test
       get 'dashboard/index' => 'simple_workflow/#index'
     end
 
-    assert_equal '?detour%5Baction%5D=index&detour%5Banchor%5D=tab_2&detour%5Bcontroller%5D=simple_workflow%2F&detour%5Bhullo%5D=1',
-        with_detour('', '/dashboard/index?hullo=1#tab_2')
+    assert_equal '?detour%5Baction%5D=index&detour%5Banchor%5D=tab_2' \
+            '&detour%5Bcontroller%5D=simple_workflow%2F&detour%5Bhullo%5D=1',
+                 with_detour('', '/dashboard/index?hullo=1#tab_2')
   ensure
     Rails.application = nil
   end
@@ -36,10 +47,11 @@ class HelperTest < MiniTest::Test
   def test_detour_to
     assert_equal [
       'Link Text',
-      'Link target?detour%5Baction%5D=myaction&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
-      { id: 'link_tag_id', title: 'Link title' }
+      'Link target?detour%5Baction%5D=myaction&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42' \
+          '&detour%5Bquery%5D%5Bnested%5D=criterium',
+      { id: 'link_tag_id', title: 'Link title' },
     ],
-        detour_to('Link Text', 'Link target', id: 'link_tag_id', title: 'Link title')
+                 detour_to('Link Text', 'Link target', id: 'link_tag_id', title: 'Link title')
   end
 
   def test_image_button_to
@@ -50,26 +62,27 @@ class HelperTest < MiniTest::Test
         onclick: "form.action='{:id=>\"image_tag_id\"}'"
       }
     ],
-        image_button_to('my_image.png', 'Link Title', { id: 'image_tag_id' }, title: 'Image title')
+                 image_button_to('my_image.png', 'Link Title', { id: 'image_tag_id' },
+                                 title: 'Image title')
   end
 
   def test_image_link_to
     assert_equal [
       ['my_image.png', { title: 'Link Title', alt: 'Link Title' }], { id: 'image_tag_id' }, nil
     ],
-        image_link_to('my_image.png', 'Link Title', { id: 'image_tag_id' }, title: 'Image title')
+                 image_link_to('my_image.png', 'Link Title', { id: 'image_tag_id' }, title: 'Image title')
   end
 
   def test_back_or_link_to
     assert_equal ['Link title', { controller: :mycontroller, action: :my_action }, nil],
-        back_or_link_to('Link title', controller: :mycontroller, action: :my_action)
+                 back_or_link_to('Link title', controller: :mycontroller, action: :my_action)
   end
 
   def test_back_or_link_to_with_routing_error
     @session = { detours: [{ controller: :does_not_exist }] }
     @routing_error = ActionController::UrlGenerationError
     assert_equal ['Link title', { controller: :mycontroller, action: :my_action }, nil],
-        back_or_link_to('Link title', controller: :mycontroller, action: :my_action)
+                 back_or_link_to('Link title', controller: :mycontroller, action: :my_action)
   end
 
   private
@@ -80,8 +93,8 @@ class HelperTest < MiniTest::Test
 
   def params
     ActionController::Parameters.new(
-      controller: 'mycontroller', action: 'myaction', id: 42, query: { nested: 'criterium' }
-    )
+        controller: 'mycontroller', action: 'myaction', id: 42, query: { nested: 'criterium' }
+      )
   end
 
   def session

data/test/middleware_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require 'simple_workflow/middleware'
 require_relative 'test_app'
@@ -42,12 +44,14 @@ class MiddlewareTest < MiniTest::Test
   def test_detour_cleanup
     _, env, = @stack.call env_for('/?detour[controller]=test_first')
     (50..99).each do |i|
-      next_env = env_for("/?detour[controller]=test_#{i}", 'rack.session' => env['rack.session'],
-                                                           'rack.session.options' => env['rack.session.options'])
+      next_env = env_for("/?detour[controller]=test_#{i}",
+                         'rack.session' => env['rack.session'],
+                         'rack.session.options' => env['rack.session.options'])
       _, env, = @stack.call next_env
     end
-    last_env = env_for('/?detour[controller]=test_last', 'rack.session' => env['rack.session'],
-                                                         'rack.session.options' => env['rack.session.options'])
+    last_env = env_for('/?detour[controller]=test_last',
+                       'rack.session' => env['rack.session'],
+                       'rack.session.options' => env['rack.session.options'])
     status, env, response = @stack.call last_env
 
     assert_equal 200, status
@@ -55,7 +59,7 @@ class MiddlewareTest < MiniTest::Test
     assert_equal(%w[session_id detours], env['rack.session'].to_hash.keys)
 
     assert_equal(((57..99).to_a + [:last]).map { |i| { 'controller' => "test_#{i}" } },
-        env['rack.session'].to_hash['detours'])
+                 env['rack.session'].to_hash['detours'])
   end
 
   def test_huge_detour_over_4k
@@ -75,8 +79,8 @@ class MiddlewareTest < MiniTest::Test
   def test_return_from_detour
     _, headers1, = @stack.call env_for('/?detour[controller]=test_first')
     env = env_for('/?return_from_detour=true',
-        'rack.session' => headers1['rack.session'],
-        'rack.session.options' => headers1['rack.session.options'])
+                  'rack.session' => headers1['rack.session'],
+                  'rack.session.options' => headers1['rack.session.options'])
     status, headers, response = @stack.call env
 
     assert_equal 200, status
@@ -90,11 +94,16 @@ class MiddlewareTest < MiniTest::Test
 
   def env_for(url, opts = {})
     default_opts = {
+      ActionDispatch::Cookies::COOKIES_ROTATIONS => ActiveSupport::Messages::RotationConfiguration.new,
       ActionDispatch::Cookies::COOKIES_SERIALIZER => :json,
+      ActionDispatch::Cookies::ENCRYPTED_COOKIE_SALT => 'salt',
+      ActionDispatch::Cookies::ENCRYPTED_SIGNED_COOKIE_SALT => 'signed_salt',
       ActionDispatch::Cookies::GENERATOR_KEY => ActiveSupport::KeyGenerator.new('secret'),
       ActionDispatch::Cookies::SECRET_KEY_BASE => 'secret',
-      # ActionDispatch::Cookies::SECRET_TOKEN => 'secret',
     }
+    if /^5\.2\./.match?(Rails.version)
+      default_opts[ActionDispatch::Cookies::COOKIES_ROTATIONS] = Struct.new(:encrypted).new([])
+    end
     Rack::MockRequest.env_for(url, default_opts.update(opts))
   end
 end

data/test/test_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 
 class TestApp < Rails::Application

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 require 'simplecov'
@@ -11,8 +13,4 @@ MiniTest::Reporters.use!
 require 'rails'
 require 'simple_workflow'
 
-if Gem::Requirement.new('~>4.2') =~ Gem::Version.new(Rails.version)
-  ActiveSupport::TestCase.test_order = :random
-end
-
 FileUtils.mkdir_p File.expand_path '../log', __dir__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,36 +16,36 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -59,20 +59,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
-description: Expands Ruby On Rails to allow simple breadcrumb detour workflows.
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+description: Expands Ruby on Rails to allow simple breadcrumb detour workflows.
 email: uwe@kubosch.no
 executables: []
 extensions: []
@@ -100,24 +128,23 @@ homepage: https://github.com/donv/simple_workflow
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: donv/simple_workflow
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.
 test_files: []