simple_workflow 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7561337bcd8f7901c56c282f7ccec7a400669d
-  data.tar.gz: 577ab6a1a4b68888c1d0ebbc09c2bf10560a98d8
+  metadata.gz: 0d6b798b0bc76a844f247ac8e546eb90913326db
+  data.tar.gz: d5e8c3b6e0b38604893d3c1e5da655ac78cd17cd
 SHA512:
-  metadata.gz: b93b823a451398aa2ce55a63ee6a770e3fc50c6da276184c8cbaec396b5fdc13375d44cc29e3bb20426256c7cee67f87a7a964ef1f4b20f17a649fb847a9a69b
-  data.tar.gz: 070c0c1de094db11f4258ac7c78db93c26cca7ac8dd165732361a17bc2c3624d2426c76c07f30a1a6c5027d3db676adc5fc2cfa318c729148ca179a4ca663549
+  metadata.gz: f533f2b1d385ce1c1dd6888985f2a31a39b47e8d4f66e503bcab3b90602cf7ed8eafd07e5c1b53400dbfa9760ef45ae2b3a739e33a7ca63b046e34a1581d51d1
+  data.tar.gz: 41a1d21a8b6bd1bb40382fa6878d6ead98a4ad80392c8bc4e4e7b568c15e678042f8a1e9be43c5e67a5634aeb0def06592491d583c4655b70023a5ef163a7687

data/Gemfile.lock

@@ -1,56 +1,56 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.3.4)
-      rails (>= 4, < 5.1)
+    simple_workflow (1.3.5)
+      rails (>= 4, < 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.3)
-      actionpack (= 5.0.3)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.1)
+      actionpack (= 5.1.1)
+      nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
+    actionmailer (5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.3)
-      activesupport (= 5.0.3)
+    activejob (5.1.1)
+      activesupport (= 5.1.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
-      arel (~> 7.0)
-    activesupport (5.0.3)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    arel (7.1.4)
+    arel (8.0.0)
     ast (2.3.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     docile (1.1.5)
-    erubis (2.7.0)
+    erubi (1.6.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     i18n (0.8.4)
@@ -79,26 +79,26 @@ GEM
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.3)
-      actioncable (= 5.0.3)
-      actionmailer (= 5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
-      activemodel (= 5.0.3)
-      activerecord (= 5.0.3)
-      activesupport (= 5.0.3)
+    rails (5.1.1)
+      actioncable (= 5.1.1)
+      actionmailer (= 5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      activemodel (= 5.1.1)
+      activerecord (= 5.1.1)
+      activesupport (= 5.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.3)
+      railties (= 5.1.1)
       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.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

data/lib/simple_workflow/middleware.rb

@@ -1,4 +1,5 @@
 require 'simple_workflow/detour'
+require 'active_support/core_ext/string/strip'
 
 # Rack middleware to detect and store detours and manage returns from detours.
 class SimpleWorkflow::Middleware
@@ -43,7 +44,6 @@ class SimpleWorkflow::Middleware
                               .is_a?(ActionDispatch::Session::CookieStore)
     session_size = workflow_size = nil
     session = session(env)
-    # env[ActionDispatch::Cookies::COOKIES_SERIALIZER]
     cookie_jar = cookie_jar(env)
     encryptor = encryptor(env)
     loop do
@@ -67,6 +67,10 @@ class SimpleWorkflow::Middleware
       simple_workflow: session exceeds cookie size limit: #{session_size} bytes.  Workflow empty!  Not My Fault!
     MSG
     Rails.logger.warn "simple_workflow: session: #{session.to_hash}"
+    remove_discarded_flashes(session)
+  end
+
+  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.

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/test/middleware_test.rb

@@ -42,13 +42,13 @@ class MiddlewareTest < MiniTest::Test
   def test_detour_cleanup
     _, env, = @stack.call env_for('/?detour[controller]=test_first')
     (50..99).each do |i|
-      _, env, = @stack.call 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
-    status, env, response = @stack.call 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
     assert_equal 'app response', response

data/test/test_app.rb

@@ -5,7 +5,6 @@ class TestApp < Rails::Application
   config.action_dispatch.key_generator = ActiveSupport::KeyGenerator.new('secret')
   config.logger = Logger.new(File.expand_path('../log/test.log', __dir__))
   config.secret_key_base = 'secret key base'
-  # config.secret_token = 'secret token'
 
   Rails.logger = config.logger
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Uwe Kubosch
@@ -19,7 +19,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement