simple_workflow 1.6.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 347f4e6b9181b3bdb9181f847ec3d42aaf25721f
-  data.tar.gz: 2343af04ef43d5d4059fbf87b0807aab3d7851a5
+SHA256:
+  metadata.gz: f3e6b480412f12b33ab1a43ea40edfd280fcf843e7b48307b79a186ea8dfec18
+  data.tar.gz: '094717e238b6c347acdab6f597b65b1139f1a73dc2646c55ffe3bc702f2074c2'
 SHA512:
-  metadata.gz: aa32bf4b657422f1809c85cc41edd5d9a216606cc935ae024f366433ad2aaae7bd575b5290d436e317159e146c41a77743c1e92cb8c4c630e09d66c3b9870d93
-  data.tar.gz: 1e4e13ef6299d58e656b48202f0111df101681c681c457622cb6554f1a510cf5dc2c75ca7ddbfefc315308fd800499e723561297f4a88570712965d64a41c4a3
+  metadata.gz: aa6f9b54442208aee5c61201b3277862a055c6d5e7cbf462f0abbf2e8d249909505dd684ca2c786fdafaba445ed55a0b3a0dcee4d6d3afffde7edbe47a3ee92a
+  data.tar.gz: 43249992ddb88144cfcc00ced9d9570c2aa722604ae4c2ff6f4d25c23db8f614bf33c0e9b2d197a3d48d92eb06253e35b72e3142d1ec6d090b9e2c380123869b

data/Gemfile.lock

@@ -1,147 +1,178 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.6.0)
-      rails (>= 4.2, < 5.3)
+    simple_workflow (2.1.0)
+      rails (>= 4.2, < 7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailbox (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      mail (>= 2.7.1)
+    actionmailer (6.1.0)
+      actionpack (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
-      rack (~> 2.0)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.0)
+      actionpack (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.0)
+      activesupport (= 6.1.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activestorage (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activesupport (= 6.1.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ansi (1.5.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    docile (1.3.0)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    ast (2.4.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    docile (1.3.3)
+    erubi (1.10.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.0.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    loofah (2.2.2)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    minitest-reporters (1.2.0)
+    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.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.1)
-    rack (2.0.5)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0)
+    rails (6.1.0)
+      actioncable (= 6.1.0)
+      actionmailbox (= 6.1.0)
+      actionmailer (= 6.1.0)
+      actionpack (= 6.1.0)
+      actiontext (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activemodel (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      bundler (>= 1.15.0)
+      railties (= 6.1.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rubocop (0.54.0)
+    rake (13.0.3)
+    regexp_parser (2.0.1)
+    rexml (3.2.4)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.9.1)
+      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.10.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.2)
+      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.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    websocket-driver (0.7.0)
+    thor (1.0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -149,8 +180,7 @@ PLATFORMS
 DEPENDENCIES
   minitest-reporters (~> 1.0)
   rubocop (~> 0.49)
+  rubocop-performance (~> 1.5)
+  rubocop-rails (~> 2.4)
   simple_workflow!
   simplecov (~> 0.9)
-
-BUNDLED WITH
-   1.16.3

data/Rakefile

@@ -3,7 +3,7 @@
 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"
 GEM_SPEC_FILE = 'simple_workflow.gemspec'
@@ -24,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/controller.rb

@@ -31,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
@@ -58,6 +59,7 @@ module SimpleWorkflow::Controller
     end
 
     return unless (other_flashes = response_status_and_flash.delete(:flash))
+
     flash.update(other_flashes)
   end
   private :save_flash
@@ -71,6 +73,6 @@ module SimpleWorkflow::Controller
           </form>
         </body>
       </html>
-     HTML
+    HTML
   end
 end

data/lib/simple_workflow/detour.rb

@@ -3,19 +3,26 @@
 # 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}")
   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

@@ -44,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
@@ -58,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' }
@@ -70,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' }
@@ -84,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)
 
@@ -97,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

@@ -43,6 +43,7 @@ class SimpleWorkflow::Middleware
 
   def remove_old_detours(env)
     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)
@@ -53,7 +54,8 @@ 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?)
+          (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?
@@ -62,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
@@ -71,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
@@ -78,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
@@ -90,8 +94,10 @@ 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)
@@ -105,6 +111,8 @@ class SimpleWorkflow::Middleware
   def store_detour_from_params(env)
     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

@@ -7,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleWorkflow
-  VERSION = '1.6.0'
+  VERSION = '2.1.0'
 end

data/simple_workflow.gemspec

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rake'
+require './lib/simple_workflow/version'
+require 'date'
+
+Gem::Specification.new do |s|
+  s.name = 'simple_workflow'
+  s.version = SimpleWorkflow::VERSION
+  s.date = Date.today.strftime '%Y-%m-%d' # rubocop:disable Rails/Date
+  s.authors = ['Uwe Kubosch']
+  s.email = 'uwe@kubosch.no'
+  s.summary = 'Add simple breadcrumbs "detour" workflow to Ruby On Rails.'
+  s.homepage = 'https://github.com/donv/simple_workflow'
+  s.description = 'Expands Ruby on Rails to allow simple breadcrumb detour workflows.'
+  s.required_ruby_version = '>= 2.5', '<4'
+  s.licenses = %w[MIT]
+  s.files = FileList['[A-Z]*', 'lib/**/*', 'test/**/*'].to_a
+
+  s.add_runtime_dependency('rails', '>=4.2', '<7')
+
+  s.add_development_dependency('minitest-reporters', '~>1.0')
+  s.add_development_dependency('rubocop', '~>1.0')
+  s.add_development_dependency('rubocop-performance', '~>1.5')
+  s.add_development_dependency('rubocop-rails', '~>2.4')
+  s.add_development_dependency('simplecov', '~>0.9')
+end

data/test/controller_test.rb

@@ -18,7 +18,7 @@ class ControllerTest < MiniTest::Test
     @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
 

data/test/helper_test.rb

@@ -10,18 +10,24 @@ class HelperTest < MiniTest::Test
   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('')
+                 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)
+                 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
@@ -33,7 +39,7 @@ class HelperTest < MiniTest::Test
 
     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')
+                 with_detour('', '/dashboard/index?hullo=1#tab_2')
   ensure
     Rails.application = nil
   end
@@ -45,7 +51,7 @@ class HelperTest < MiniTest::Test
           '&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
@@ -56,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
@@ -87,7 +94,7 @@ class HelperTest < MiniTest::Test
   def params
     ActionController::Parameters.new(
         controller: 'mycontroller', action: 'myaction', id: 42, query: { nested: 'criterium' }
-    )
+      )
   end
 
   def session
@@ -102,7 +109,7 @@ class HelperTest < MiniTest::Test
     if defined?(@routing_error) && @routing_error
       e = @routing_error
       @routing_error = nil
-      raise e
+      raise e, 'Error'
     end
     options
   end

data/test/middleware_test.rb

@@ -45,11 +45,13 @@ class MiddlewareTest < MiniTest::Test
     _, 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'])
+                         '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'])
+                       'rack.session' => env['rack.session'],
+                       'rack.session.options' => env['rack.session.options'])
     status, env, response = @stack.call last_env
 
     assert_equal 200, status
@@ -57,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
@@ -77,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
@@ -92,13 +94,14 @@ 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',
     }
-    if Rails.version =~ /^5\.2\./
+    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))

data/test/test_helper.rb

@@ -13,8 +13,10 @@ 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__
+
+module SimpleWorkflow::Controller
+  def self.action_encoding_template(action)
+    false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        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
@@ -91,6 +119,8 @@ files:
 - lib/simple_workflow/railtie.rb
 - lib/simple_workflow/test_helper.rb
 - lib/simple_workflow/version.rb
+- simple_workflow-2.0.0.gem
+- simple_workflow.gemspec
 - test/controller_test.rb
 - test/helper_test.rb
 - test/middleware_test.rb
@@ -100,24 +130,26 @@ 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.5'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: donv/simple_workflow
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.
 test_files: []