simple_workflow 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98730ae8a0dc257bc752e21b17522e68077937be
-  data.tar.gz: 4ba378f8a83519a7ac7cbf218dd7ead4c85c39ff
+  metadata.gz: 56cb50f2ada0bdf7026441bbe353f10d44c98ec2
+  data.tar.gz: 67633241bf4e65964492d486181c5a179e58db38
 SHA512:
-  metadata.gz: 0603ef92e165afcf6c7cc25cbc26f4a9ddfb34ab5e8f9a952dcc079377ce9dfbe27e7690880e30a838ff99f364f927aa45d39048f371625113495c54fc0d8762
-  data.tar.gz: 2608dc6a44158c2f4d780038882fe7984dd8f0502cecdf72be9f3feed8965b4e12660293e6cca6bf63da161f94841e11665853f939bc8be17c1fb134c1c2f600
+  metadata.gz: 7e3259d655fac64885813683a285c2ae5662caa11f41d60e89a2adc0cc295098ad88b38d6214ec5e599f27e4fa405278b5619c5661db3b9788e0ac830c47d436
+  data.tar.gz: eb5dd5097bbf6daa8befbb91e8245ec166158fd9bf64865f477476a3365dce3faaa6ab19fec0d673a5f0e3d6588c5edb5efe619e1332ce0697311b6411282d0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.1.1)
+    simple_workflow (1.1.2)
       rails (~> 4.0)
 
 GEM
@@ -46,7 +46,6 @@ GEM
     arel (6.0.3)
     builder (3.2.2)
     concurrent-ruby (1.0.1)
-    concurrent-ruby (1.0.1-java)
     docile (1.1.5)
     erubis (2.7.0)
     globalid (0.3.6)
@@ -70,7 +69,6 @@ GEM
       ruby-progressbar
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.2-java)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -114,7 +112,6 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/lib/simple_workflow/controller.rb

@@ -32,7 +32,7 @@ module SimpleWorkflow::Controller
 
   def back(response_status_and_flash)
     return false if session[:detours].nil?
-    detour = pop_detour
+    detour = pop_detour(session)
     post = detour.delete(:request_method) == :post
     if post
       set_flash(response_status_and_flash)
@@ -62,15 +62,6 @@ module SimpleWorkflow::Controller
   end
   private :set_flash
 
-  def pop_detour
-    detours = session[:detours]
-    return nil unless detours
-    detour = detours.pop
-    logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
-    reset_workflow(session) if detours.empty?
-    detour
-  end
-
   def redirect_to_post(options)
     url = url_for options
     render :text => <<EOF, :layout => false

data/lib/simple_workflow/detour.rb

@@ -9,6 +9,15 @@ module SimpleWorkflow::Detour
     Rails.logger.try(:debug, "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}")
   end
 
+  def pop_detour(session)
+    detours = session[:detours]
+    return nil unless detours
+    detour = detours.pop
+    Rails.logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
+    reset_workflow(session) if detours.empty?
+    detour
+  end
+
   def reset_workflow(session)
     session.delete(:detours)
   end

data/lib/simple_workflow/middleware.rb

@@ -75,8 +75,8 @@ class SimpleWorkflow::Middleware
     if params(env)[:detour]
       store_detour_in_session(session(env), params(env)[:detour])
     end
-    if params(env)[:return_from_detour] && session[:detours]
-      pop_detour
+    if params(env)[:return_from_detour] && session(env)[:detours]
+      pop_detour(session(env))
     end
   end
 

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/test/controller_test.rb

@@ -31,6 +31,18 @@ class ControllerTest < MiniTest::Test
     assert_equal({}, session)
   end
   # ODOT
+
+  def test_back
+    store_detour({controller: :mycontroller, action: :myaction})
+    back({})
+    assert_equal({}, session)
+  end
+
+  private
+
+  def redirect_to(path, response_status_and_flash)
+    # NOOP
+  end
 end
 
 class TestApp < Rails::Application

data/test/middleware_test.rb

@@ -72,6 +72,21 @@ class MiddlewareTest < MiniTest::Test
     assert_equal(%w(session_id), headers['rack.session'].to_hash.keys)
   end
 
+  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']
+    )
+    status, headers, response = @stack.call env
+
+    assert_equal 200, status
+    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'])
+  end
+
   private
 
   def env_for(url, opts={})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails