action-segue 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90ce3d4469b84001c3943b782e42fd6cfdf1b95
-  data.tar.gz: e892a1627ab29669d3f66c7d1148d8a2dd7b38a7
+  metadata.gz: d69556f8e5237a6c112f20962f608f174f37cbc7
+  data.tar.gz: 999a724ac87d3ccbcd19606066e522cf12209c79
 SHA512:
-  metadata.gz: 8efd253601337c233e0bb5a4cd94edf3c141f96567db1f9688eda0093784c58fd4209db6b3d8e4618f83b29dffac428c38ed0d64a12bfedb39d020ec9ceaa767
-  data.tar.gz: 384ba41ad591820698b6cd81bfcde02d76bd0b2165772ea14ac2c87a15f3fd317b93b645d4d7eda24f380086ac16f0e85dcb59b5adc383e6714a1c304c2dbb6f
+  metadata.gz: fabc1c0a66b0002846f37e7bd8a4f13dfa9d29d323a6d714b930e3d23366cd8125bdbeed92467156c4c06831d4dbd92b1600cf2131c0b0c0a1ee706db2f6750c
+  data.tar.gz: 4fe3ed51cb51b1a32a1203172f212aaa56f07a945178d2a20cbb8f32630474d9420977ae540cae0b20a84dfedf52f9a06eda239ede7ba69290c2e00ba8872dd5

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.1.0
+  - 2.2.0
+script: bundle exec rspec spec

data/Gemfile.lock

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

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.0"
+  s.version     = "1.0.1"
   s.authors     = ["Damien Timewell"]
   s.email       = ["mail@damientimewell.com"]
   s.licenses    = ['MIT']

data/lib/action_segue/segue_registration.rb

@@ -15,7 +15,8 @@ module ActionSegue
     # Completes the segue named ++id++ and redirects back to the start point, or
     # fallback url.
     def complete_segue_with_redirect(id, or_redirect_to:)
-      if segue = session[:action_segues].delete(id)
+      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)
       else
@@ -33,7 +34,7 @@ module ActionSegue
     # 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].keys.last, or_redirect_to: or_redirect_to
+      complete_segue_with_redirect session[:action_segues].try(:keys).try(:last), or_redirect_to: or_redirect_to
     end
 
   end

data/spec/action_segue/integration_spec.rb

@@ -6,30 +6,60 @@ describe NamedSeguesController, type: :controller do
     session[:action_segues] = nil
   end
 
-  it "should store the segue on the first page" do
-    get :segue_start_page
-    expect(session[:action_segues][:named_segue].params).to eq({ "controller" => "named_segues", "action" => "segue_start_page" })
-  end
+  describe "selecting a particular segue" do
+    it "should store the segue on the first page" do
+      get :segue_start_page
+      expect(session[:action_segues][:named_segue].params).to eq({ "controller" => "named_segues", "action" => "segue_start_page" })
+    end
+
+    it "should redirect to the segue entry point" do
+      get :segue_start_page
+      get :normal_page
+      get :segue_complete_page
+      expect(response).to redirect_to(segue_start_page_named_segue_path)
+    end
 
-  it "should redirect to the segue entry point" do
-    get :segue_start_page
-    get :normal_page
-    get :segue_complete_page
-    expect(response).to redirect_to(segue_start_page_named_segue_path)
+    it "should redirect to the fallback if the segue doesn't exist" do
+      get :second_segue_start_page
+      get :segue_complete_page
+      expect(response).to redirect_to(normal_page_named_segue_path)
+    end
   end
 
-  it "should remove the segue from the stack after it is completed" do
-    get :segue_start_page
-    get :normal_page
-    get :segue_complete_page
-    expect(session[:action_segues]).to eq({})
+  describe "completing any segue" do
+    it "should complete the most resent segue in the stack" do
+      get :segue_start_page
+      get :second_segue_start_page
+      get :segue_complete_last_page
+      expect(response).to redirect_to(second_segue_start_page_named_segue_path)
+    end
+
+    it "should remove the segue after it is completed" do
+      get :second_segue_start_page
+      get :segue_complete_last_page
+      expect(session[:action_segues]).to eq({})
+    end
+
+    it "should redirect to the fallback if the stack is empty" do
+      get :segue_complete_last_page
+      expect(response).to redirect_to(normal_page_named_segue_path)
+    end
   end
 
-  it "should be possible to remove the segue" do
-    get :segue_start_page
-    get :segue_clear_page
-    get :segue_complete_page
-    expect(response).to redirect_to(normal_page_named_segue_path)
+  describe "cleaning up" do
+    it "should remove the segue from the stack after it is completed" do
+      get :segue_start_page
+      get :normal_page
+      get :segue_complete_page
+      expect(session[:action_segues]).to eq({})
+    end
+
+    it "should be possible to remove the segue" do
+      get :segue_start_page
+      get :segue_clear_page
+      get :segue_complete_page
+      expect(response).to redirect_to(normal_page_named_segue_path)
+    end
   end
 
 end

data/spec/fixtures/fake_application.rb

@@ -7,7 +7,8 @@ module Rails
       @routes.draw do
         resource :named_segue, only: [] do
           collection do
-            get :segue_start_page, :normal_page, :segue_complete_page, :segue_clear_page
+            get :segue_start_page, :normal_page, :segue_complete_page, :segue_clear_page,
+               :second_segue_start_page, :segue_complete_last_page
           end
         end
       end
@@ -18,3 +19,36 @@ module Rails
     @app ||= App.new
   end
 end
+
+class NamedSeguesController < ActionController::Base
+  include Rails.application.routes.url_helpers
+
+  register_segue action: :segue_start_page, as: :named_segue
+  register_segue action: :second_segue_start_page, as: :another_segue
+
+  def segue_start_page
+    render text: "Start page"
+  end
+
+  def normal_page
+    render text: "Normal page"
+  end
+
+  def segue_complete_page
+    complete_segue_with_redirect :named_segue, or_redirect_to: { action: :normal_page }
+  end
+
+  def segue_clear_page
+    clear_segue :named_segue
+    render text: "Clear page"
+  end
+
+  def second_segue_start_page
+    render text: "Second start page"
+  end
+
+  def segue_complete_last_page
+    complete_current_segue_with_redirect or_redirect_to: { action: :normal_page }
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ ActionSegue.load_action_segue
 
 require "rspec/rails"
 require "fixtures/fake_application"
-require "fixtures/controllers"
 
 Rails.logger = Logger.new(STDOUT)
 Rails.logger.level = Logger::ERROR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action-segue
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Damien Timewell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -82,6 +82,7 @@ files:
 - ".editorconfig"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -91,7 +92,6 @@ files:
 - lib/action_segue/segue.rb
 - lib/action_segue/segue_registration.rb
 - spec/action_segue/integration_spec.rb
-- spec/fixtures/controllers.rb
 - spec/fixtures/fake_application.rb
 - spec/spec_helper.rb
 homepage: https://github.com/iZettle/action-segue
@@ -120,6 +120,5 @@ specification_version: 4
 summary: Control Rails redirect flows with smarter redirect logic
 test_files:
 - spec/action_segue/integration_spec.rb
-- spec/fixtures/controllers.rb
 - spec/fixtures/fake_application.rb
 - spec/spec_helper.rb

data/spec/fixtures/controllers.rb

@@ -1,23 +0,0 @@
-class NamedSeguesController < ActionController::Base
-  include Rails.application.routes.url_helpers
-
-  register_segue action: :segue_start_page, as: :named_segue
-
-  def segue_start_page
-    render text: "Start page"
-  end
-
-  def normal_page
-    render text: "Normal page"
-  end
-
-  def segue_complete_page
-    complete_segue_with_redirect :named_segue, or_redirect_to: { action: :normal_page }
-  end
-
-  def segue_clear_page
-    clear_segue :named_segue
-    render text: "Clear page"
-  end
-
-end