simple_workflow 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 347f4e6b9181b3bdb9181f847ec3d42aaf25721f
-  data.tar.gz: 2343af04ef43d5d4059fbf87b0807aab3d7851a5
+SHA256:
+  metadata.gz: 7ebe25ee6377081e1645abaf25fd641880185acbb47f82dc7a8bd4215d3f17c6
+  data.tar.gz: 74a3bb2743303b8975a1b4635a942992b5aa043686c728f3147c5d4cc5f17e2e
 SHA512:
-  metadata.gz: aa32bf4b657422f1809c85cc41edd5d9a216606cc935ae024f366433ad2aaae7bd575b5290d436e317159e146c41a77743c1e92cb8c4c630e09d66c3b9870d93
-  data.tar.gz: 1e4e13ef6299d58e656b48202f0111df101681c681c457622cb6554f1a510cf5dc2c75ca7ddbfefc315308fd800499e723561297f4a88570712965d64a41c4a3
+  metadata.gz: 92b56c0557b9d76f13790f456bff4ee44fe01e23d4b10dc21e8e17267bb386f074d767b57c46c074146b58d6c0b7a7f8e322e60b93b6fd8e09005a2ed86786de
+  data.tar.gz: 6beb61cb7cd7649d36d38f9e53cf290cd6220089fdd6533159a8b11452c00522b75dd74b14aa03b555735eb45cd032eb9efa28a8366d987907b79b9bda8225ce

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.6.0)
+    simple_workflow (1.6.1)
       rails (>= 4.2, < 5.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
       rack (~> 2.0)
       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)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
       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)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
       arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -58,7 +58,7 @@ GEM
     erubi (1.7.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     loofah (2.2.2)
@@ -70,7 +70,7 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     minitest-reporters (1.2.0)
@@ -88,30 +88,30 @@ GEM
     rack (2.0.5)
     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)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.0)
+      railties (= 5.2.1)
       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)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
     rubocop (0.54.0)

data/lib/simple_workflow/detour.rb

@@ -3,19 +3,25 @@
 # 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/middleware.rb

@@ -105,6 +105,6 @@ 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))
+    pop_detour(session(env), params(env).to_h.reject { |k, _v| %i[detour return_from_detour].include? k.to_sym })
   end
 end

data/lib/simple_workflow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: donv/simple_workflow
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.