action-segue 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69556f8e5237a6c112f20962f608f174f37cbc7
-  data.tar.gz: 999a724ac87d3ccbcd19606066e522cf12209c79
+  metadata.gz: 69ca200905097fba816b0117484140d14a6dbd16
+  data.tar.gz: 78024cea61aad887d0d6e2dc7f2158554f079d11
 SHA512:
-  metadata.gz: fabc1c0a66b0002846f37e7bd8a4f13dfa9d29d323a6d714b930e3d23366cd8125bdbeed92467156c4c06831d4dbd92b1600cf2131c0b0c0a1ee706db2f6750c
-  data.tar.gz: 4fe3ed51cb51b1a32a1203172f212aaa56f07a945178d2a20cbb8f32630474d9420977ae540cae0b20a84dfedf52f9a06eda239ede7ba69290c2e00ba8872dd5
+  metadata.gz: ca68de33beeafee6644fc7404dfd86f745d69cbc4c2ed6fc767cc62084cd547e8dda3401177bda9ab36f561fdab70db15d432609500af4f09ef4eb3cb7beeb93
+  data.tar.gz: 84a622e9266e88721f248d74564b244e5801d22145856f5595d72689024ad2811246c4d9f8d29cd90a160a811805e7945a401e73cc384efcdd04efd117031dea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    action-segue (1.0.1)
+    action-segue (1.1.0)
       railties (>= 4.2.0, < 5)
 
 GEM

data/README.md

@@ -17,7 +17,7 @@ end
 Then, at any point in the future, you can return to this segue start point. You must also pass in a fallback location which is used in the event no segue with the id is in progress.
 
 ```ruby
-complete_segue_with_redirect :looking_at_index, or_redirect_to: dashboard_path
+redirect_to complete_segue_url(:looking_at_index, fallback: dashboard_path)
 ```
 
 If you just want to clear a segue to remove it from the stack, you can use `clear_segue`:
@@ -29,7 +29,7 @@ clear_segue :looking_at_index
 If you don't know (or care) what current segue is in progress (useful in situations where many actions could lead away from their flow, and you just want to return to the original flow), you can just complete the current segue. This also requires a fallback location in case there is no current segue in progress.
 
 ```ruby
-complete_current_segue_with_redirect or_redirect_to: dashboard_path
+redirect_to complete_current_segue_url(fallback: dashboard_path)
 ```
 
 ## TODO

data/action-segue.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "action-segue"
-  s.version     = "1.0.1"
+  s.version     = "1.1.0"
   s.authors     = ["Damien Timewell"]
   s.email       = ["mail@damientimewell.com"]
   s.licenses    = ['MIT']

data/lib/action_segue/segue_registration.rb

@@ -12,29 +12,28 @@ module ActionSegue
       end
     end
 
-    # Completes the segue named ++id++ and redirects back to the start point, or
-    # fallback url.
-    def complete_segue_with_redirect(id, or_redirect_to:)
+    # Completes the segue and returns either the params to redirect to the segue start point,
+    # all the fallback if the segue is not in progress.
+    def complete_segue_url(id, fallback:)
       if session[:action_segues].present? && session[:action_segues][id].present?
-        segue = session[:action_segues].delete(id)
-        Rails.logger.debug "[ActionSegue] completed '#{id}'. Redirecting to #{or_redirect_to}"
-        redirect_to url_for(segue.params)
+        segue = clear_segue id
+        Rails.logger.debug "[ActionSegue] completed '#{id}'"
+        url_for segue.params
       else
-        Rails.logger.debug "[ActionSegue] no segue matched '#{id}'. Redirecting to #{or_redirect_to}"
-        redirect_to or_redirect_to
+        Rails.logger.debug "[ActionSegue] no segue matched '#{id}'"
+        fallback
       end
     end
 
     # Remove a segue from the stack
     def clear_segue(id)
       Rails.logger.debug "[ActionSegue] clearing segue '#{id}'"
-      session[:action_segues].delete(id)
+      session[:action_segues].delete id
     end
 
-    # Completes the last segue, regardless of what it was, or redirects to the fallback
-    # if no segues are in progress.
-    def complete_current_segue_with_redirect(or_redirect_to:)
-      complete_segue_with_redirect session[:action_segues].try(:keys).try(:last), or_redirect_to: or_redirect_to
+    # Completes the last segue, regardless of what it was
+    def complete_current_segue_url(fallback:)
+      complete_segue_url session[:action_segues].try(:keys).try(:last), fallback: fallback
     end
 
   end

data/spec/fixtures/fake_application.rb

@@ -35,7 +35,7 @@ class NamedSeguesController < ActionController::Base
   end
 
   def segue_complete_page
-    complete_segue_with_redirect :named_segue, or_redirect_to: { action: :normal_page }
+    redirect_to complete_segue_url(:named_segue, fallback: { action: :normal_page })
   end
 
   def segue_clear_page
@@ -48,7 +48,7 @@ class NamedSeguesController < ActionController::Base
   end
 
   def segue_complete_last_page
-    complete_current_segue_with_redirect or_redirect_to: { action: :normal_page }
+    redirect_to complete_current_segue_url(fallback: { action: :normal_page })
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action-segue
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Damien Timewell