simple_workflow 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552d2375c6c63dd25b989ae5d9714ca1ed0fedd0
-  data.tar.gz: 5c19a9f27e95880cfab57a3267d79dd12fa51512
+  metadata.gz: 392190bd79beccb1158f024ce202b030e5562234
+  data.tar.gz: 7461592fb033c2dfda92f728115700bca351807f
 SHA512:
-  metadata.gz: 2bafd8995f8bc31be46553fbfa06bd310ede4d713efe9c7e40e66fdb6360b9d0a59b9a288e9153a61575a57df02ef24d44f3d751a65b5455e27a2e435accd342
-  data.tar.gz: 73a9de4db6f26530a5a5a3c43c72a74c3910c2b98ee1e3dfd95df768d139d8902b71743ce2a94004b8a880e35792dc2584ce92a02743f915ff87e0c47e04efc1
+  metadata.gz: a2810369d12143bec73624433748261a7088091e5f68ea60887a3f5aa0ce77d8b02a6f622a9b7a0f1d7d9014e1299919b3fd5702313aeafc364e73777e4d0603
+  data.tar.gz: 538d592465e224915133d5a8bf2b420ab98642026d00e8c830fcc0f077c80fbc09347d116c8d7d43e6fb38cf2cd08ffb14aef8fc92d0d8a14bfe8333b24b64bf

data/History.rdoc

@@ -1,3 +1,10 @@
+== 1.0.1 2014-02-10
+
+=== Fixes
+
+* The second argument to back_or_redirect_to now allows for setting flash messages.
+
+
 == 1.0.1 2013-12-23
 
 === Fixes

data/lib/simple_workflow/controller.rb

@@ -44,22 +44,38 @@ module SimpleWorkflow::Controller
     end
   end
   
-  def back
+  def back(response_status_and_flash)
     return false if session[:detours].nil?
     detour = pop_detour
     post = detour.delete(:request_method) == :post
     if post
+      set_flash(response_status_and_flash)
       redirect_to_post(detour)
     else
-      redirect_to detour
+      redirect_to detour, response_status_and_flash
     end
     true
   end
   
-  def back_or_redirect_to(*options)
-    back or redirect_to(*options)
+  def back_or_redirect_to(options = {}, response_status_and_flash = {})
+    back(response_status_and_flash) or redirect_to(options, response_status_and_flash)
   end
-  
+
+  def set_flash(response_status_and_flash)
+    if (alert = response_status_and_flash.delete(:alert))
+      flash[:alert] = alert
+    end
+
+    if (notice = response_status_and_flash.delete(:notice))
+      flash[:notice] = notice
+    end
+
+    if (other_flashes = response_status_and_flash.delete(:flash))
+      flash.update(other_flashes)
+    end
+  end
+  private :set_flash
+
   def pop_detour
     detours = session[:detours]
     return nil unless detours

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Expands Ruby On Rails to allow simple breadcrumb detour workflows.
@@ -50,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: donv/simple_workflow
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.