jump_back 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e19b6572c0f28169e9d691a3c4a06d2e4ec2d18b
-  data.tar.gz: 4613caae3a14d45a1c6bbc5d412d0dd63fa28b5e
+  metadata.gz: 13b46750e5e152338c99ca95598a07da26f2520c
+  data.tar.gz: bcfc2c6ff049737adca0d7d039ec284e76caae0d
 SHA512:
-  metadata.gz: 6c40a2cbba6764332b545150487e96a07e705d4f9189b83079d13c956b46c6a72d0c893ed5731e6e26a19a7b6305f16796d2835b2c7dc549650b7eff2d0c5de7
-  data.tar.gz: 589cd35d811e8a6ee2fd27c506d2d92e5887c66da9b08ae0cb159b4281a5bb77928c06f79ef65774a802b1a342d79b7817544462cf1a74ac2df1a98c4efc74e4
+  metadata.gz: ae36bde7619da211b1d0277079188c376734124f926ebb65ccce53e5251c742a26ffd37e03651e67e9baea4292f2078ff41be724724fe3ee16c15f35ebc844b0
+  data.tar.gz: 44ec9bd6e00a0fa7f45c9f43ffe603386ae9b8d4cf2978d5a538613831100c013fc9ce1d255f40db3f9d682fdf3c1778520a15a0a323e6f7c258d5f16c500a8a

data/lib/jump_back/engine.rb

@@ -6,7 +6,7 @@ module JumpBack
       g.helper false
     end
     initializer "jump_back.methods" do |app|
-      ApplicationController.send :include, JumpBack
+      ApplicationController.send :include, JumpBack::Redirection
     end
   end
 end

data/lib/jump_back/options_parser.rb

@@ -0,0 +1,19 @@
+module JumpBack
+  
+  class OptionsParser
+    
+    def self.parse(path, options, default)
+      if path.is_a? Hash
+        options = path
+        path = default
+      end
+      
+      jump_back_options = { offsite: options.delete(:offsite) }
+      {
+        redirect_options: options,
+        jump_back_options: jump_back_options,
+        path: path
+      }
+    end
+  end
+end

data/lib/jump_back/redirect_back.rb

@@ -1,24 +1,14 @@
 require 'jump_back/referer_interpreter'
 require 'jump_back/redirection_determiner'
+require 'jump_back/options_parser'
 
 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
+  module Redirection
     
-    jump_back_options = { offsite: options.delete(:offsite) }
-    {
-      redirect_options: options,
-      jump_back_options: jump_back_options,
-      path: path
-    }
+    def redirect_back(path=root_path, options={})
+      parsed_args = OptionsParser.parse(path, options, root_path)
+      redirect_to RedirectionDeterminer.new(request, parsed_args[:path], parsed_args[:jump_back_options]).path, parsed_args[:redirect_options]
+    end
   end
 end

data/lib/jump_back/redirection_determiner.rb

@@ -1,4 +1,5 @@
 module JumpBack
+  
   class RedirectionDeterminer
     attr_reader :path
     
@@ -7,7 +8,7 @@ module JumpBack
     end
     
     def path_determiner(request, path, options)
-      RefererInterpreter.new.back?(request, options) ? :back : path
+      RefererInterpreter.back?(request, options) ? :back : path
     end
   end
 end

data/lib/jump_back/referer_interpreter.rb

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

data/lib/jump_back/return_to_referer.rb

@@ -1,15 +1,20 @@
+require 'jump_back/options_parser'
+
 module JumpBack
   
-  def save_referer
-    session[:jump_back_stored_referer] ||= request.referer
-  end
-
-  def return_to_referer(path=root_path, options={})
-    parsed_args = parse_jump_back_arguments(path, options)
-    session[:jump_back_stored_referer] ? redirect_to(clear_referer, parsed_args[:redirect_options]) : redirect_to(parsed_args[:path], parsed_args[:redirect_options])
-  end
-
-  def clear_referer
-    session.delete(:jump_back_stored_referer)
+  module Redirection
+    
+    def save_referer
+      session[:jump_back_stored_referer] ||= request.referer
+    end
+  
+    def return_to_referer(path=root_path, options={})
+      parsed_args = OptionsParser.parse(path, options, root_path)
+      session[:jump_back_stored_referer] ? redirect_to(clear_referer, parsed_args[:redirect_options]) : redirect_to(parsed_args[:path], parsed_args[:redirect_options])
+    end
+  
+    def clear_referer
+      session.delete(:jump_back_stored_referer)
+    end
   end
 end

data/lib/jump_back/version.rb

@@ -1,3 +1,3 @@
 module JumpBack
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/controller/application_controller_spec.rb

@@ -1,18 +1,36 @@
 describe ApplicationController do
   
-  it 'should have the redirect_back method' do
-    expect(ApplicationController.new).to respond_to :redirect_back
-  end
-
-  it 'should have the save_referer method' do
-    expect(ApplicationController.new).to respond_to :save_referer
-  end
-
-  it 'should have the return_to_referer method' do
-    expect(ApplicationController.new).to respond_to :return_to_referer
+  describe 'jump_back methods' do
+  
+    it 'should have the redirect_back method' do
+      expect(ApplicationController.new).to respond_to :redirect_back
+    end
+  
+    it 'should have the save_referer method' do
+      expect(ApplicationController.new).to respond_to :save_referer
+    end
+  
+    it 'should have the return_to_referer method' do
+      expect(ApplicationController.new).to respond_to :return_to_referer
+    end
+  
+    it 'should have the clear_referer method' do
+      expect(ApplicationController.new).to respond_to :clear_referer
+    end
   end
-
-  it 'should have the clear_referer method' do
-    expect(ApplicationController.new).to respond_to :clear_referer
+  
+  describe 'private jump_back classes' do
+    
+    it 'should not have the OptionsParser class' do
+      expect { ApplicationController::OptionsParser.new }.to raise_error
+    end
+    
+    it 'should not have the RefererInterpreter class' do
+      expect { ApplicationController::RefererInterpreter.new }.to raise_error
+    end
+    
+    it 'should not have the RedirectionDeterminer class' do
+      expect { ApplicationController::RedirectionDeterminer.new }.to raise_error
+    end
   end
 end

data/spec/dummy/config/application.rb

@@ -13,6 +13,7 @@ require "jump_back"
 
 module Dummy
   class Application < Rails::Application
+    config.secret_key_base = '19af9ac3d6f4fdbae6dc48cb0dfb99a825f38c144ce34f456e81da6f87fbf24571f3a79c9999419fe9f26a340b2b4fac202bd3b0cb907146992d6e80bc94309f'
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/spec/dummy/config/environments/development.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Rails.application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # config.serve_static_assets = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # config.serve_static_assets  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/log/development.log

@@ -12,3 +12,94 @@
    (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')
+   (1.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.6ms)  select sqlite_version(*)
+   (1.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (8.5ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.3ms)  select sqlite_version(*)
+   (1.6ms)  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')
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  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.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (9.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (9.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.6ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (3.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (2.2ms)  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.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  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')
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (9.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.6ms)  select sqlite_version(*)
+   (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (9.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.5ms)  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')
+   (8.5ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.3ms)  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.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (3.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.7ms)  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')