simple_workflow 0.3.4 → 0.3.5

data/lib/simple_workflow/controller.rb

@@ -28,7 +28,7 @@ module SimpleWorkflow::Controller
       ss = ActiveSupport::Base64.encode64(Marshal.dump(session.to_hash)).size
       ws = ActiveSupport::Base64.encode64(Marshal.dump(session[:detours])).size
       break unless ws >= 2048 || (ss >= 3072 && session[:detours].size > 0)
-      logger.info "Workflow too large (#{ws}).  Dropping oldest detour."
+      logger.warn "Workflow too large (#{ws}).  Dropping oldest detour."
       session[:detours].shift
     end
     logger.debug "Added detour: #{options.inspect}, session: #{ss} bytes, workflow(#{session[:detours].size}): #{ws} bytes"

data/lib/simple_workflow/helper.rb

@@ -11,19 +11,8 @@ module SimpleWorkflow::Helper
 
   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 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 => detour_options[:action][0..-11]})
-      end
-      detour_options
-    end
+    url = url_for(options) if options.respond_to? :to_param
+    return url + (url =~ /\?/ ? '&' : '?') + detour_options[:detour].map{|k,v| "detour[#{k}]=#{v}"}.join('&')
   end
 
   def image_detour_to(image_source, title, url_options, image_options = nil, link_options = nil)

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_workflow
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 Z
+date: 2012-11-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-shoppe
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add simple "detour" workflow to Ruby On Rails.