jump_back 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c25bd37934df5bd36a00c7298d6daecb311a5d
-  data.tar.gz: 260c81ec52405db3d5c7f3f8706042104a0ac180
+  metadata.gz: 78d114e95cd15b64aa87b68a36de33da6b1a9527
+  data.tar.gz: 0a757f3386a15098a7199673177ff82d2e684052
 SHA512:
-  metadata.gz: d774bb9f4e0e6de408df40d3752487100d679d71cbc270fd6f1cdd51d59c136859ed0f10e198a7398268183bd3a57bce2742d42f1f9da7532c05463c4eb996e9
-  data.tar.gz: f3470c7d4c1a021446d0335147a9a14f3e5f70167ed68ec862ebbfc8e30577168b13a599e8094e5ecf97031429521bcaa36ab09c93b37608f68159bf07f6d623
+  metadata.gz: 9fba8920bb3deaa32ccfc7570904da6952ce791f4da0e1fdc53f9cd698c06f89e38f72785068ca43273dae777301d915f7d6523241ba5dc5c581589da84c5184
+  data.tar.gz: 7a47e097f79ec5f89a8b4230b4b88425c0bedc1056224a95ee50123939250b75488f56e611f0b2bd9c57f87908a7b0334cf405a5339df3b1ab9d224572899bbe

data/lib/jump_back/redirect_back.rb

@@ -1,41 +1,24 @@
+require 'jump_back/referer_interpreter'
+require 'jump_back/redirection_determiner'
+
 module JumpBack
+  
   def redirect_back(path=root_path, options={})
+    parsed_args = parse_jump_back_arguments(path, options)
+    redirect_to RedirectionDeterminer.new(request, parsed_args[:path], parsed_args[:jump_back_options]).path, parsed_args[:redirect_options]
+  end
+  
+  def parse_jump_back_arguments(path, options)
     if path.is_a? Hash
       options = path
       path = root_path
     end
-    RefererInterpreter.new.back?(request, options) ? redirect_to(:back) : redirect_to(path)
-  end
-  
-  class RefererInterpreter
-    
-    def back?(request, options)
-      has_referer?(request) ? is_local?(request, options) ? true : false : false
-    end
-    
-    def has_referer?(request)
-      !request.env["HTTP_REFERER"].blank? and request.env["HTTP_REFERER"] != request.env["REQUEST_URI"]
-    end
-    
-    def is_local?(request, options)
-      return true if options[:offsite]
-      host = host(request.env["HTTP_REFERER"])
-      !(host && host != request.host)
-    end
-    
-    private
-    
-      def host(string)
-        return URI.parse(string).host if uri? string
-      end
     
-      def uri?(string)
-        uri = URI.parse(string)
-        %w( http https ).include?(uri.scheme)
-        rescue URI::BadURIError
-        false
-        rescue URI::InvalidURIError
-        false
-      end
+    jump_back_options = { offsite: options.delete(:offsite) }
+    {
+      redirect_options: options,
+      jump_back_options: jump_back_options,
+      path: path
+    }
   end
 end

data/lib/jump_back/redirection_determiner.rb

@@ -0,0 +1,13 @@
+module JumpBack
+  class RedirectionDeterminer
+    attr_reader :path
+    
+    def initialize(request, path, options)
+      @path = path_determiner(request, path, options)
+    end
+    
+    def path_determiner(request, path, options)
+      RefererInterpreter.new.back?(request, options) ? :back : path
+    end
+  end
+end

data/lib/jump_back/referer_interpreter.rb

@@ -0,0 +1,34 @@
+module JumpBack
+  
+  class RefererInterpreter
+    
+    def back?(request, options)
+      has_referer?(request) ? is_local?(request, options) ? true : false : false
+    end
+    
+    def has_referer?(request)
+      !request.env["HTTP_REFERER"].blank? and request.env["HTTP_REFERER"] != request.env["REQUEST_URI"]
+    end
+    
+    def is_local?(request, options)
+      return true if options[:offsite]
+      host = host(request.env["HTTP_REFERER"])
+      !(host && host != request.host)
+    end
+    
+    private
+    
+      def host(string)
+        return URI.parse(string).host if uri? string
+      end
+    
+      def uri?(string)
+        uri = URI.parse(string)
+        %w( http https ).include?(uri.scheme)
+        rescue URI::BadURIError
+        false
+        rescue URI::InvalidURIError
+        false
+      end
+  end
+end

data/lib/jump_back/return_to_referer.rb

@@ -1,4 +1,5 @@
 module JumpBack
+  
   def save_referer
     session[:jump_back_stored_referer] ||= request.referer
   end

data/lib/jump_back/version.rb

@@ -1,3 +1,3 @@
 module JumpBack
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/spec/controller/tests_controller_spec.rb

@@ -46,6 +46,38 @@ describe TestsController, type: :controller do
       get :offsite_without_default
       expect(response).to redirect_to(root_path)
     end
+    
+    it 'should pass additional options to redirect_to' do
+      post :create
+      expect(flash[:notice]).to eq('Created!')
+      expect(response.status).to eq(301)
+    end
+    
+    it 'should pass additional options with offsite set to true with default specified and a referer' do
+      @request.env['HTTP_REFERER'] = 'http://rubyonrails.org/'
+      get :offsite_with_default
+      expect(response).to redirect_to('http://rubyonrails.org/')
+      expect(flash[:alert]).to eq('Offsite with default!')
+    end
+    
+    it 'should pass additional options with offsite set to true without default specified and a referer' do
+      @request.env['HTTP_REFERER'] = 'http://rubyonrails.org/'
+      get :offsite_without_default
+      expect(response).to redirect_to('http://rubyonrails.org/')
+      expect(flash[:alert]).to eq('Offsite without default!')
+    end
+    
+    it 'should pass additional options with offsite set to true with default specified and no referer' do
+      get :offsite_with_default
+      expect(response).to redirect_to(new_test_path)
+      expect(flash[:alert]).to eq('Offsite with default!')
+    end
+    
+    it 'should pass additional options with offsite set to true without default specified and no referer' do
+      get :offsite_without_default
+      expect(response).to redirect_to(root_path)
+      expect(flash[:alert]).to eq('Offsite without default!')
+    end
   end
   
   describe 'save_referer' do

data/spec/dummy/app/controllers/tests_controller.rb

@@ -11,7 +11,7 @@ class TestsController < ApplicationController
   end
 
   def create
-    redirect_back
+    redirect_back notice: 'Created!', status: :moved_permanently
   end
 
   def edit
@@ -29,10 +29,10 @@ class TestsController < ApplicationController
   end
   
   def offsite_with_default
-    redirect_back new_test_path, offsite: true
+    redirect_back new_test_path, offsite: true, alert: 'Offsite with default!'
   end
   
   def offsite_without_default
-    redirect_back offsite: true
+    redirect_back offsite: true, alert: 'Offsite without default!'
   end
 end

data/spec/dummy/log/development.log

@@ -7,3 +7,8 @@
    (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.2ms)  SELECT version FROM "schema_migrations"
    (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')