simple_workflow 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc2eb7f7486fae6bba42f7acadb84fb2798b82a
-  data.tar.gz: 8fba0bdfe4cb7d7c1ac4a184dc52b66b2f085609
+  metadata.gz: 8d83a47aa996c464e96be5e71195bbb00ec40047
+  data.tar.gz: 2b55806fd6574b7994e8b5ecf3d050f64177aba1
 SHA512:
-  metadata.gz: c5deb94819599f83ddfe674816cff0eff8930165c4a04e8a58f0f09d88b430eecf14a7ef9c596af764b9ff143ab12a39d115367974703f9ef7f6539e9b83f016
-  data.tar.gz: 513196edb3332f82756d838311db12d22bef5886c890c3d93fdcd173ef2d48389b88dde9adbebe1e2adb6dbf428e3e3e6058771a3cc52d3d3262845f9a7ef0cb
+  metadata.gz: 9d84f201c4fa11d82737ad2c30d10ab074955e509337cc3477a6dd2de34621b781e36f6f00f3840d5b327669a20c65e64d265ce8f9a0457ebd2f158cb0f14426
+  data.tar.gz: 76dc75ecd93c8ccc7efebcc64dca28b27ec939c3b469bb223dc51cecf1fd499268a30ed587b8f2e290f62a814076c4993c068700c9ac6668a6b3d8766931a04e

data/Gemfile.lock

@@ -1,110 +1,111 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.2.0)
-      rails (~> 4.0)
+    simple_workflow (1.3.0)
+      rails (>= 4, < 5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    arel (6.0.3)
+    arel (7.1.4)
     ast (2.3.0)
     builder (3.2.2)
-    concurrent-ruby (1.0.2)
-    concurrent-ruby (1.0.2-java)
+    concurrent-ruby (1.0.3)
     docile (1.1.5)
     erubis (2.7.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
-    json (1.8.3-java)
+    json (2.0.2)
+    json (2.0.2-java)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       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.1.0)
-    minitest (5.9.1)
-    minitest-reporters (1.1.12)
+    minitest (5.10.1)
+    minitest-reporters (1.1.13)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.6.8.1-java)
-    parser (2.3.1.4)
+    parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.3.0)
-    rubocop (0.45.0)
+    rake (12.0.0)
+    rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -116,19 +117,21 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.2)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   java

data/Rakefile

@@ -3,8 +3,8 @@ require 'rake/clean'
 require 'rake/testtask'
 require File.dirname(__FILE__) + '/lib/simple_workflow/version'
 
-GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem"
-GEM_SPEC_FILE = 'simple_workflow.gemspec'
+GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem".freeze
+GEM_SPEC_FILE = 'simple_workflow.gemspec'.freeze
 
 CLEAN.include('simple_workflow-*.gem', 'tmp')
 
@@ -13,10 +13,10 @@ task default: :test
 desc 'Generate a gem'
 task gem: GEM_FILE
 
-file(GEM_FILE => GEM_SPEC_FILE) {
+file(GEM_FILE => GEM_SPEC_FILE) do
   puts "Generating #{GEM_FILE}"
   `gem build #{GEM_SPEC_FILE}`
-}
+end
 
 desc 'Push the gem to RubyGems'
 task release: :gem do

data/lib/simple_workflow/controller.rb

@@ -16,7 +16,7 @@ module SimpleWorkflow::Controller
 
   def rjs_redirect_to(options)
     @options = options
-    render :template => 'redirect', :layout => false, :formats => :js
+    render template: 'redirect', layout: false, formats: :js
   end
 
   def store_detour(options, post = false)
@@ -25,17 +25,12 @@ module SimpleWorkflow::Controller
     store_detour_in_session(session, options)
   end
 
-  def store_detour_from_params
-  end
-  deprecate :store_detour_from_params,
-      deprecator: ActiveSupport::Deprecation.new('1.2', 'SimpleWorkflow') # TODO(uwe)
-
   def back(response_status_and_flash)
     return false if session[:detours].nil?
     detour = pop_detour(session)
     post = detour.delete(:request_method) == :post
     if post
-      set_flash(response_status_and_flash)
+      save_flash(response_status_and_flash)
       redirect_to_post(detour)
     else
       redirect_to detour, response_status_and_flash
@@ -46,10 +41,10 @@ module SimpleWorkflow::Controller
   end
 
   def back_or_redirect_to(options = {}, response_status_and_flash = {})
-    back(response_status_and_flash) or redirect_to(options, response_status_and_flash)
+    back(response_status_and_flash) || redirect_to(options, response_status_and_flash)
   end
 
-  def set_flash(response_status_and_flash)
+  def save_flash(response_status_and_flash)
     if (alert = response_status_and_flash.delete(:alert))
       flash[:alert] = alert
     end
@@ -62,11 +57,11 @@ module SimpleWorkflow::Controller
       flash.update(other_flashes)
     end
   end
-  private :set_flash
+  private :save_flash
 
   def redirect_to_post(options)
     url = url_for options
-    render :text => <<EOF, :layout => false
+    render text: <<EOF, layout: false
 <html>
   <body onload="document.getElementById('form').submit()">
     <form id="form" action="#{url}" method="POST">
@@ -75,5 +70,4 @@ module SimpleWorkflow::Controller
 </html>
 EOF
   end
-
 end

data/lib/simple_workflow/helper.rb

@@ -1,8 +1,8 @@
 module SimpleWorkflow::Helper
   def image_button_to(image_source, title, options, html_options = {})
-    image_submit_tag image_source, {:class   => 'image-submit', :alt => title, :title => title,
-                                    :id      => "#{title}_#{options[:id]}", :name => title,
-                                    :onclick => "form.action='#{url_for(options)}'"}.update(html_options)
+    image_submit_tag image_source, { class: 'image-submit', alt: title, title: title,
+                                     id: "#{title}_#{options[:id]}", name: title,
+                                     onclick: "form.action='#{url_for(options)}'" }.update(html_options)
   end
 
   def detour_to(title, options = nil, html_options = nil, &block)
@@ -33,44 +33,44 @@ module SimpleWorkflow::Helper
   end
 
   def origin_options
-    params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }
+    params.reject { |k, _v| [:detour, :return_from_detour].include? k.to_sym }
   end
 
   def image_detour_to(image_source, title, url_options, image_options = nil, link_options = nil)
-    image_options ||= {:class => 'image-submit'}
-    image_options.update :alt => title, :title => title
+    image_options ||= { class: 'image-submit' }
+    image_options.update alt: title, title: title
     detour_to image_tag(image_source, image_options), url_options, link_options
   end
 
   def image_link_to(image_source, title, url_options, image_options = nil, link_options = nil)
     if link_options == true
-      link_options = {:method => :post}
+      link_options = { method: :post }
     elsif link_options == false
       link_options = nil
     end
-    image_options ||= {:class => 'image-submit'}
-    image_options.update :alt => title, :title => title
+    image_options ||= { class: 'image-submit' }
+    image_options.update alt: title, title: title
     link_to image_tag(image_source, image_options), url_options, link_options
   end
 
   def image_link_to_remote(image_source, title, link_options, image_options = nil, html_options = {})
     if html_options == true
-      html_options = {:method => :post}
+      html_options = { method: :post }
     elsif html_options == false
       html_options = {}
     end
-    image_options ||= {:class => 'image-submit'}
-    image_options.update :alt => title, :title => title
-    link_to image_tag(image_source, image_options), link_options, html_options.merge(:remote => true)
+    image_options ||= { class: 'image-submit' }
+    image_options.update alt: title, title: title
+    link_to image_tag(image_source, image_options), link_options, html_options.merge(remote: true)
   end
 
   def detour?
-    not session[:detours].nil?
+    !session[:detours].nil?
   end
 
   def back_or_link_to(title, options = nil, html_options = nil)
     if session[:detours]
-      options      = {:return_from_detour => true}.update(session[:detours].last)
+      options      = { return_from_detour: true }.update(session[:detours].last)
 
       # FIXME(uwe): Write a test to prove this line is needed.
       options['id'] ||= nil
@@ -80,5 +80,4 @@ module SimpleWorkflow::Helper
     end
     link_to(title, options, html_options) if options
   end
-
 end

data/lib/simple_workflow/middleware.rb

@@ -45,11 +45,11 @@ class SimpleWorkflow::Middleware
       cookie_jar = cookie_jar(env)
       encryptor = encryptor(env)
       loop do
-        ser_val = cookie_jar.send(:serialize, nil, session.to_hash)
+        ser_val = serialize_session(cookie_jar, session.to_hash)
         session_size = encryptor.encrypt_and_sign(ser_val).size
-        wf_ser_val = cookie_jar.send(:serialize, nil, session[:detours])
+        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].size > 0)
+        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[:detours].shift
         reset_workflow(session) if session[:detours].empty?
@@ -67,14 +67,24 @@ class SimpleWorkflow::Middleware
     end
   end
 
+  if ActionPack::VERSION::MAJOR == 5
+    def serialize_session(cookie_jar, session)
+      cookie_jar.send(:serialize, session)
+    end
+  else # Rails 4.x
+    def serialize_session(cookie_jar, session)
+      cookie_jar.send(:serialize, nil, session)
+    end
+  end
+
   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)
+                      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')
@@ -90,5 +100,4 @@ class SimpleWorkflow::Middleware
       pop_detour(session(env))
     end
   end
-
 end

data/lib/simple_workflow/test_helper.rb

@@ -1,5 +1,5 @@
 module SimpleWorkflow::TestHelper
-  def add_stored_detour(location = {:controller => :bogus, :action => :location})
+  def add_stored_detour(location = { controller: :bogus, action: :location })
     @request.session[:detours] = [location]
   end
 end

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'.freeze
 end

data/lib/simple_workflow.rb

@@ -1,4 +1,6 @@
-$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+unless $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
+end
 
 require 'action_controller'
 

data/test/controller_test.rb

@@ -6,41 +6,34 @@ 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'}
-    @cookies = ActionDispatch::Cookies::CookieJar.new(ActiveSupport::KeyGenerator.new('secret'), nil, false, options)
+    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)
+    end
     @logger = Rails.logger
     @session = {}
     @bad_route = false
     # TODO(uwe):  Remove when we stop testing Rails 4.1
-    if Rails.version !~ /^4\.1\./
-      Rails.app_class = TestApp
-    end
+    Rails.app_class = TestApp if Rails.version !~ /^4\.1\./
     # ODOT
   end
 
   def test_store_detour
-    location = {controller: :mycontroller, action: :myaction}
+    location = { controller: :mycontroller, action: :myaction }
 
     store_detour(location)
 
-    assert_equal({detours: [location]}, session)
-  end
-
-  # TODO(uwe): Remove.  The method does nothing.  Just a stub for compatability.
-  def test_deprecated_store_detour_from_params
-    store_detour_from_params
-    assert_equal({}, session)
+    assert_equal({ detours: [location] }, session)
   end
-  # ODOT
 
   def test_back
-    store_detour({controller: :mycontroller, action: :myaction})
+    store_detour(controller: :mycontroller, action: :myaction)
     back({})
     assert_equal({}, session)
   end
 
   def test_back_with_invalid_detour # not route
-    store_detour({controller: :mycontroller, action: :missing_in_action})
+    store_detour(controller: :mycontroller, action: :missing_in_action)
     @bad_route = true
     back({})
     assert_equal({}, session)

data/test/helper_test.rb

@@ -8,6 +8,15 @@ class HelperTest < MiniTest::Test
         with_detour('')
   end
 
+  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' }
+    ],
+        detour_to('Link Text', 'Link target', id: 'link_tag_id', title: 'Link title')
+  end
+
   def test_image_button_to
     assert_equal [
       'my_image.png', {
@@ -16,19 +25,23 @@ 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
 
   private
 
   def params
-    {controller: 'mycontroller', action: 'myaction', id: 42, query: {nested: 'criterium'}}
+    { controller: 'mycontroller', action: 'myaction', id: 42, query: { nested: 'criterium' } }
   end
 
   def url_for(options)
     options.to_s
   end
 
+  def link_to(*options)
+    options
+  end
+
   def image_submit_tag(*args)
     args
   end

data/test/middleware_test.rb

@@ -21,10 +21,10 @@ class MiddlewareTest < MiniTest::Test
     status, headers, response = @stack.call env
 
     assert_equal 200, status
-    assert_equal(env, headers)
+    assert_equal env, headers
     assert_equal 'app response', response
-    assert_equal([], headers['rack.session'].to_hash.keys)
-    assert_equal(nil, headers['rack.session'].to_hash['detours'])
+    assert_equal [], headers['rack.session'].to_hash.keys
+    assert_nil headers['rack.session'].to_hash['detours']
   end
 
   def test_detour
@@ -36,27 +36,25 @@ class MiddlewareTest < MiniTest::Test
     assert_equal(env, headers)
     assert_equal 'app response', response
     assert_equal(%w(session_id detours), headers['rack.session'].to_hash.keys)
-    assert_equal([{'controller' => 'test'}], headers['rack.session'].to_hash['detours'])
+    assert_equal([{ 'controller' => 'test' }], headers['rack.session'].to_hash['detours'])
   end
 
   def test_detour_cleanup
-    _, env, _ = @stack.call env_for('/?detour[controller]=test_first')
+    _, env, = @stack.call env_for('/?detour[controller]=test_first')
     (50..99).each do |i|
-      _, env, _ = @stack.call env_for("/?detour[controller]=test_#{i}",
+      _, env, = @stack.call env_for("/?detour[controller]=test_#{i}",
           'rack.session' => env['rack.session'],
-          'rack.session.options' => env['rack.session.options']
-      )
+          'rack.session.options' => env['rack.session.options'])
     end
     status, env, response = @stack.call env_for('/?detour[controller]=test_last',
         'rack.session' => env['rack.session'],
-        'rack.session.options' => env['rack.session.options']
-    )
+        'rack.session.options' => env['rack.session.options'])
 
     assert_equal 200, status
     assert_equal 'app response', response
     assert_equal(%w(session_id detours), env['rack.session'].to_hash.keys)
 
-    assert_equal([{'controller' => 'test_57'}, {'controller' => 'test_58'}, {'controller' => 'test_59'}, {'controller' => 'test_60'}, {'controller' => 'test_61'}, {'controller' => 'test_62'}, {'controller' => 'test_63'}, {'controller' => 'test_64'}, {'controller' => 'test_65'}, {'controller' => 'test_66'}, {'controller' => 'test_67'}, {'controller' => 'test_68'}, {'controller' => 'test_69'}, {'controller' => 'test_70'}, {'controller' => 'test_71'}, {'controller' => 'test_72'}, {'controller' => 'test_73'}, {'controller' => 'test_74'}, {'controller' => 'test_75'}, {'controller' => 'test_76'}, {'controller' => 'test_77'}, {'controller' => 'test_78'}, {'controller' => 'test_79'}, {'controller' => 'test_80'}, {'controller' => 'test_81'}, {'controller' => 'test_82'}, {'controller' => 'test_83'}, {'controller' => 'test_84'}, {'controller' => 'test_85'}, {'controller' => 'test_86'}, {'controller' => 'test_87'}, {'controller' => 'test_88'}, {'controller' => 'test_89'}, {'controller' => "test_90"}, {"controller" => "test_91"}, {"controller" => "test_92"}, {"controller" => "test_93"}, {"controller" => "test_94"}, {"controller" => "test_95"}, {"controller" => "test_96"}, {"controller" => "test_97"}, {"controller" => "test_98"}, {"controller" => "test_99"}, {"controller" => "test_last"}],
+    assert_equal([{ 'controller' => 'test_57' }, { 'controller' => 'test_58' }, { 'controller' => 'test_59' }, { 'controller' => 'test_60' }, { 'controller' => 'test_61' }, { 'controller' => 'test_62' }, { 'controller' => 'test_63' }, { 'controller' => 'test_64' }, { 'controller' => 'test_65' }, { 'controller' => 'test_66' }, { 'controller' => 'test_67' }, { 'controller' => 'test_68' }, { 'controller' => 'test_69' }, { 'controller' => 'test_70' }, { 'controller' => 'test_71' }, { 'controller' => 'test_72' }, { 'controller' => 'test_73' }, { 'controller' => 'test_74' }, { 'controller' => 'test_75' }, { 'controller' => 'test_76' }, { 'controller' => 'test_77' }, { 'controller' => 'test_78' }, { 'controller' => 'test_79' }, { 'controller' => 'test_80' }, { 'controller' => 'test_81' }, { 'controller' => 'test_82' }, { 'controller' => 'test_83' }, { 'controller' => 'test_84' }, { 'controller' => 'test_85' }, { 'controller' => 'test_86' }, { 'controller' => 'test_87' }, { 'controller' => 'test_88' }, { 'controller' => 'test_89' }, { 'controller' => 'test_90' }, { 'controller' => 'test_91' }, { 'controller' => 'test_92' }, { 'controller' => 'test_93' }, { 'controller' => 'test_94' }, { 'controller' => 'test_95' }, { 'controller' => 'test_96' }, { 'controller' => 'test_97' }, { 'controller' => 'test_98' }, { 'controller' => 'test_99' }, { 'controller' => 'test_last' }],
         env['rack.session'].to_hash['detours'])
   end
 
@@ -73,30 +71,28 @@ class MiddlewareTest < MiniTest::Test
   end
 
   def test_return_from_detour
-    _, headers1, _ = @stack.call env_for('/?detour[controller]=test_first')
+    _, 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.options' => headers1['rack.session.options'])
     status, headers, response = @stack.call env
 
     assert_equal 200, status
-    assert_equal(env, headers)
+    assert_equal env, headers
     assert_equal 'app response', response
-    assert_equal(['session_id'], headers['rack.session'].to_hash.keys)
-    assert_equal(nil, headers['rack.session'].to_hash['detours'])
+    assert_equal ['session_id'], headers['rack.session'].to_hash.keys
+    assert_nil headers['rack.session'].to_hash['detours']
   end
 
   private
 
-  def env_for(url, opts={})
+  def env_for(url, opts = {})
     default_opts = {
-        ActionDispatch::Cookies::COOKIES_SERIALIZER => :json,
-        ActionDispatch::Cookies::GENERATOR_KEY => ActiveSupport::KeyGenerator.new('secret'),
-        ActionDispatch::Cookies::SECRET_KEY_BASE => 'secret',
-        # ActionDispatch::Cookies::SECRET_TOKEN => 'secret',
+      ActionDispatch::Cookies::COOKIES_SERIALIZER => :json,
+      ActionDispatch::Cookies::GENERATOR_KEY => ActiveSupport::KeyGenerator.new('secret'),
+      ActionDispatch::Cookies::SECRET_KEY_BASE => 'secret',
+      # ActionDispatch::Cookies::SECRET_TOKEN => 'secret',
     }
     Rack::MockRequest.env_for(url, default_opts.update(opts))
   end
-
 end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 require 'simplecov'
 SimpleCov.start do
   coverage_dir File.expand_path('../coverage', File.dirname(__FILE__))
-  minimum_coverage 75
+  minimum_coverage 76
 end
 require 'minitest/autorun'
 require 'minitest/reporters'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement