simple_workflow 0.1.1 → 0.2.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.0 2012-03-06
+
+=== Features
+
+* Allow overriding the return point in the with_detour method
+
+
 == 0.1.1 2012-03-06
 
 === Features

data/lib/simple_workflow/helper.rb

@@ -9,18 +9,18 @@ module SimpleWorkflow::Helper
     link_to title, with_detour(options), html_options
   end
 
-  def with_detour(options)
-    detour_options = {:detour => params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }}
+  def with_detour(options, back_options = {})
+    detour_options = {:detour => (params.merge(back_options)).reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }}
     if options.is_a? String
       return options + (options =~ /\?/ ? '&' : '?') + detour_options[:detour].map{|k,v| "detour[#{k}]=#{v}"}.join('&')
     else
       detour_options.update(options)
       if options[:layout] == false
-        if params[:action] !~ /_no_layout$/
-          detour_options[:detour].update({:action => params[:action] + '_no_layout'})
+        if detour_options[:action] !~ /_no_layout$/
+          detour_options[:detour].update({:action => detour_options[:action] + '_no_layout'})
         end
       elsif params[:action] =~ /_no_layout$/
-        detour_options[:detour].update({:action => params[:action][0..-11]})
+        detour_options[:detour].update({:action => detour_options[:action][0..-11]})
       end
       detour_options
     end

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_workflow
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Uwe Kubosch