simple_workflow 0.3.3 → 0.3.4

data/lib/simple_workflow/controller.rb

@@ -4,28 +4,36 @@ module SimpleWorkflow::Controller
     store_detour(params)
     redirect_to(options)
   end
-
+  
   def rjs_detour_to(options)
     store_detour(params, request.post?)
     rjs_redirect_to(options)
   end
-
+  
   def rjs_redirect_to(options)
     @options = options
     render :template => 'redirect', :layout => false, :formats => :js
   end
-
+  
   def store_detour(options, post = false)
     options[:request_method] = :post if post
     if session[:detours] && session[:detours].last == options
-      logger.debug "duplicate detour: #{options.inspect}"
+      logger.debug "Ignored duplicate detour: #{options.inspect}"
       return
     end
-    logger.debug "adding detour: #{options.inspect}"
     session[:detours] ||= []
     session[:detours] << options
+    ss = ws = nil
+    loop do
+      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."
+      session[:detours].shift
+    end
+    logger.debug "Added detour: #{options.inspect}, session: #{ss} bytes, workflow(#{session[:detours].size}): #{ws} bytes"
   end
-
+  
   def store_detour_from_params
     if params[:detour]
       store_detour(params[:detour])
@@ -34,7 +42,7 @@ module SimpleWorkflow::Controller
       pop_detour
     end
   end
-
+  
   def back
     return false if session[:detours].nil?
     detour = pop_detour
@@ -46,22 +54,24 @@ module SimpleWorkflow::Controller
     end
     true
   end
-
+  
   def back_or_redirect_to(*options)
     back or redirect_to(*options)
   end
-
+  
   def pop_detour
     detours = session[:detours]
     return nil unless detours
     detour = detours.pop
     logger.debug "popped detour: #{detour.inspect} #{session[:detours].size} more"
-    if detours.empty?
-      session[:detours] = nil
-    end
+    reset_workflow if detours.empty?
     detour
   end
 
+  def reset_workflow
+    session.delete(:detours)
+  end
+
   def redirect_to_post(options)
     url = url_for options
     render :text => <<EOF, :layout => false
@@ -73,5 +83,5 @@ module SimpleWorkflow::Controller
 </html>
 EOF
   end
-
+    
 end

data/lib/simple_workflow/helper.rb

@@ -49,13 +49,13 @@ module SimpleWorkflow::Helper
     not session[:detours].nil?
   end
 
-  def back_or_link_to(title, options = nil)
+  def back_or_link_to(title, options = nil, html_options = nil)
     if session[:detours]
       options = {:return_from_detour => true}.update(session[:detours].last)
       options[:id] ||= nil
       logger.debug "linked return from detour: #{options.inspect}"
     end
-    link_to(title, options) if options
+    link_to(title, options, html_options) if options
   end
 
 end

data/lib/simple_workflow/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_workflow
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails