frikandel 2.1.0 → 2.2.0

data/spec/controllers/customized_on_invalid_session_controller_spec.rb

@@ -1,6 +1,7 @@
-require "spec_helper"
+require "rails_helper"
 require "support/application_controller"
 
+
 class SessionInvalidError < StandardError; end
 
 class CustomizedOnInvalidSessionController < ApplicationController
@@ -12,8 +13,8 @@ class CustomizedOnInvalidSessionController < ApplicationController
   alias my_on_invalid_session on_invalid_session
 end
 
-describe CustomizedOnInvalidSessionController do
 
+RSpec.describe CustomizedOnInvalidSessionController do
   it "uses the overwritten on_invalid_cookie function" do
     get :home
     request.session[:max_ttl] = 1.minute.ago

data/spec/controllers/limit_session_lifetime_controller_spec.rb

@@ -1,14 +1,22 @@
-require "spec_helper"
+require "rails_helper"
 require "support/application_controller"
 
 
 class LimitSessionLifetimeController < ApplicationController
   include Frikandel::LimitSessionLifetime
 
-  before_filter :flash_alert_and_redirect_home, only: [:redirect_home]
+  if respond_to?(:before_action)
+    before_action :flash_alert_and_redirect_home, only: [:redirect_home]
+  else
+    before_filter :flash_alert_and_redirect_home, only: [:redirect_home]
+  end
 
   def home
-    render text: "ttl test"
+    if Rails::VERSION::MAJOR >= 5
+      render plain: "ttl test"
+    else
+      render text: "ttl test"
+    end
   end
 
   def redirect_home
@@ -24,7 +32,7 @@ protected
 end
 
 
-describe LimitSessionLifetimeController do
+RSpec.describe LimitSessionLifetimeController do
   context "requests" do
     it "writes ttl and max_ttl to session" do
       expect(session[:ttl]).to be_nil
@@ -45,8 +53,8 @@ describe LimitSessionLifetimeController do
       expect(session[:ttl]).to be_a(Time)
       expect(session[:max_ttl]).to be_a(Time)
 
-      flash.should_not be_empty
-      flash[:alert].should eql("alert test")
+      expect(flash).not_to be_empty
+      expect(flash[:alert]).to eql("alert test")
     end
 
     it "holds the session for at least .1 seconds" do
@@ -57,8 +65,8 @@ describe LimitSessionLifetimeController do
 
       get :home
 
-      session[:user_id].should be_present
-      session[:user_id].should eq 1337
+      expect(session[:user_id]).to be_present
+      expect(session[:user_id]).to eq 1337
     end
 
     it "destroys the session after SESSION_TTL" do
@@ -69,7 +77,7 @@ describe LimitSessionLifetimeController do
 
       get :home
 
-      session[:user_id].should be_blank
+      expect(session[:user_id]).to be_blank
     end
 
     it "destroys the session after SESSION_MAX_TTL" do
@@ -80,7 +88,7 @@ describe LimitSessionLifetimeController do
 
       get :home
 
-      session[:user_id].should be_blank
+      expect(session[:user_id]).to be_blank
     end
 
     it "is configurable" do
@@ -92,7 +100,7 @@ describe LimitSessionLifetimeController do
 
       get :home
 
-      session[:user_id].should be_blank
+      expect(session[:user_id]).to be_blank
     end
 
 
@@ -103,17 +111,17 @@ describe LimitSessionLifetimeController do
         session.delete(:ttl)
         session[:max_ttl] = "SomeMaxTTL"
 
-        controller.should_receive(:reset_session).and_call_original
-        controller.should_receive(:persist_session_timestamp).and_call_original
+        expect(controller).to receive(:reset_session).and_call_original
+        expect(controller).to receive(:persist_session_timestamp).and_call_original
         get :home
 
-        session[:user_id].should be_blank
-        session[:ip_address].should be_blank
-        session[:ttl].should be_present
-        session[:ttl].should be_a(Time)
-        session[:max_ttl].should be_present
-        session[:max_ttl].should_not eql("SomeMaxTTL")
-        session[:max_ttl].should be_a(Time)
+        expect(session[:user_id]).to be_blank
+        expect(session[:ip_address]).to be_blank
+        expect(session[:ttl]).to be_present
+        expect(session[:ttl]).to be_a(Time)
+        expect(session[:max_ttl]).to be_present
+        expect(session[:max_ttl]).not_to eql("SomeMaxTTL")
+        expect(session[:max_ttl]).to be_a(Time)
       end
 
       it "allows the request to be rendered as normal" do
@@ -122,7 +130,7 @@ describe LimitSessionLifetimeController do
 
         get :home
 
-        response.body.should eql("ttl test")
+        expect(response.body).to eql("ttl test")
       end
     end
 
@@ -134,17 +142,17 @@ describe LimitSessionLifetimeController do
         session[:ttl] = "SomeTTL"
         session.delete(:max_ttl)
 
-        controller.should_receive(:reset_session).and_call_original
-        controller.should_receive(:persist_session_timestamp).and_call_original
+        expect(controller).to receive(:reset_session).and_call_original
+        expect(controller).to receive(:persist_session_timestamp).and_call_original
         get :home
 
-        session[:user_id].should be_blank
-        session[:ip_address].should be_blank
-        session[:ttl].should be_present
-        session[:ttl].should_not eql("SomeTTL")
-        session[:ttl].should be_a(Time)
-        session[:max_ttl].should be_present
-        session[:max_ttl].should be_a(Time)
+        expect(session[:user_id]).to be_blank
+        expect(session[:ip_address]).to be_blank
+        expect(session[:ttl]).to be_present
+        expect(session[:ttl]).not_to eql("SomeTTL")
+        expect(session[:ttl]).to be_a(Time)
+        expect(session[:max_ttl]).to be_present
+        expect(session[:max_ttl]).to be_a(Time)
       end
 
       it "allows the request to be rendered as normal" do
@@ -153,7 +161,7 @@ describe LimitSessionLifetimeController do
 
         get :home
 
-        response.body.should eql("ttl test")
+        expect(response.body).to eql("ttl test")
       end
     end
 
@@ -165,16 +173,16 @@ describe LimitSessionLifetimeController do
         session.delete(:ttl)
         session.delete(:max_ttl)
 
-        controller.should_receive(:reset_session).and_call_original
-        controller.should_receive(:persist_session_timestamp).and_call_original
+        expect(controller).to receive(:reset_session).and_call_original
+        expect(controller).to receive(:persist_session_timestamp).and_call_original
         get :home
 
-        session[:user_id].should be_blank
-        session[:ip_address].should be_blank
-        session[:ttl].should be_present
-        session[:ttl].should be_a(Time)
-        session[:max_ttl].should be_present
-        session[:max_ttl].should be_a(Time)
+        expect(session[:user_id]).to be_blank
+        expect(session[:ip_address]).to be_blank
+        expect(session[:ttl]).to be_present
+        expect(session[:ttl]).to be_a(Time)
+        expect(session[:max_ttl]).to be_present
+        expect(session[:max_ttl]).to be_a(Time)
       end
 
       it "allows the request to be rendered as normal" do
@@ -183,7 +191,7 @@ describe LimitSessionLifetimeController do
 
         get :home
 
-        response.body.should eql("ttl test")
+        expect(response.body).to eql("ttl test")
       end
     end
   end
@@ -194,10 +202,10 @@ describe LimitSessionLifetimeController do
       session[:ttl] = "SomeTTL"
       session[:max_ttl] = "SomeMaxTTL"
 
-      controller.should_receive(:reached_ttl?).and_return(true)
-      controller.stub(:reached_max_ttl?).and_return(false)
+      expect(controller).to receive(:reached_ttl?).and_return(true)
+      allow(controller).to receive(:reached_max_ttl?).and_return(false)
 
-      controller.should_receive(:on_invalid_session)
+      expect(controller).to receive(:on_invalid_session)
 
       controller.send(:validate_session_timestamp)
     end
@@ -206,10 +214,10 @@ describe LimitSessionLifetimeController do
       session[:ttl] = "SomeTTL"
       session[:max_ttl] = "SomeMaxTTL"
 
-      controller.stub(:reached_ttl?).and_return(false)
-      controller.should_receive(:reached_max_ttl?).and_return(true)
+      allow(controller).to receive(:reached_ttl?).and_return(false)
+      expect(controller).to receive(:reached_max_ttl?).and_return(true)
 
-      controller.should_receive(:on_invalid_session)
+      expect(controller).to receive(:on_invalid_session)
 
       controller.send(:validate_session_timestamp)
     end
@@ -218,10 +226,10 @@ describe LimitSessionLifetimeController do
       session[:ttl] = "SomeTTL"
       session[:max_ttl] = "SomeMaxTTL"
 
-      controller.stub(:reached_ttl?).and_return(true)
-      controller.stub(:reached_max_ttl?).and_return(true)
+      allow(controller).to receive(:reached_ttl?).and_return(true)
+      allow(controller).to receive(:reached_max_ttl?).and_return(true)
 
-      controller.should_receive(:on_invalid_session)
+      expect(controller).to receive(:on_invalid_session)
 
       controller.send(:validate_session_timestamp)
     end
@@ -230,7 +238,7 @@ describe LimitSessionLifetimeController do
       session.delete(:ttl)
       session[:max_ttl] = "SomeMaxTTL"
 
-      controller.should_receive(:reset_session)
+      expect(controller).to receive(:reset_session)
 
       controller.send(:validate_session_timestamp)
     end
@@ -239,7 +247,7 @@ describe LimitSessionLifetimeController do
       session[:ttl] = "SomeTTL"
       session.delete(:max_ttl)
 
-      controller.should_receive(:persist_session_timestamp)
+      expect(controller).to receive(:persist_session_timestamp)
 
       controller.send(:validate_session_timestamp)
     end
@@ -248,7 +256,7 @@ describe LimitSessionLifetimeController do
       session.delete(:ttl)
       session.delete(:max_ttl)
 
-      controller.should_receive(:persist_session_timestamp)
+      expect(controller).to receive(:persist_session_timestamp)
 
       controller.send(:validate_session_timestamp)
     end
@@ -257,10 +265,10 @@ describe LimitSessionLifetimeController do
       session[:ttl] = "SomeTTL"
       session[:max_ttl] = "SomeMaxTTL"
 
-      controller.stub(:reached_ttl?).and_return(false)
-      controller.stub(:reached_max_ttl?).and_return(false)
+      allow(controller).to receive(:reached_ttl?).and_return(false)
+      allow(controller).to receive(:reached_max_ttl?).and_return(false)
 
-      controller.should_receive(:persist_session_timestamp)
+      expect(controller).to receive(:persist_session_timestamp)
 
       controller.send(:validate_session_timestamp)
     end
@@ -270,29 +278,29 @@ describe LimitSessionLifetimeController do
   context ".reached_ttl?" do
     it "returns true if persisted ttl is less than configured ttl seconds ago" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:ttl] = current_time.ago(Frikandel::Configuration.ttl + 1)
 
-      controller.send(:reached_ttl?).should be_true
+      expect(controller.send(:reached_ttl?)).to be_truthy
     end
 
     it "returns false if persisted ttl is equal to configured ttl seconds ago" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:ttl] = current_time.ago(Frikandel::Configuration.ttl)
 
-      controller.send(:reached_ttl?).should be_false
+      expect(controller.send(:reached_ttl?)).to be_falsey
     end
 
     it "returns false if persisted ttl is greater than configured ttl seconds ago" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:ttl] = current_time.ago(Frikandel::Configuration.ttl - 1)
 
-      controller.send(:reached_ttl?).should be_false
+      expect(controller.send(:reached_ttl?)).to be_falsey
     end
   end
 
@@ -300,29 +308,29 @@ describe LimitSessionLifetimeController do
   context ".reached_max_ttl?" do
     it "returns true if persisted max_ttl is less than current time" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:max_ttl] = current_time.ago(1)
 
-      controller.send(:reached_max_ttl?).should be_true
+      expect(controller.send(:reached_max_ttl?)).to be_truthy
     end
 
     it "returns false if persisted max_ttl is equal to current time" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:max_ttl] = current_time
 
-      controller.send(:reached_max_ttl?).should be_false
+      expect(controller.send(:reached_max_ttl?)).to be_falsey
     end
 
     it "returns false if persisted max_ttl is greater than current time" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       session[:max_ttl] = current_time.since(1)
 
-      controller.send(:reached_max_ttl?).should be_false
+      expect(controller.send(:reached_max_ttl?)).to be_falsey
     end
   end
 
@@ -330,7 +338,7 @@ describe LimitSessionLifetimeController do
   context ".persist_session_timestamp" do
     it "sets ttl to current time" do
       current_time = Time.now
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       expect {
         controller.send(:persist_session_timestamp)
@@ -342,7 +350,7 @@ describe LimitSessionLifetimeController do
     it "sets max_ttl to configured max_ttl seconds in future if it's blank" do
       current_time = Time.now
       max_ttl_time = current_time.since(Frikandel::Configuration.max_ttl)
-      Time.stub(:now).and_return(current_time)
+      allow(Time).to receive(:now).and_return(current_time)
 
       expect {
         controller.send(:persist_session_timestamp)
@@ -365,7 +373,7 @@ describe LimitSessionLifetimeController do
 
   context ".reset_session" do
     it "calls persist_session_timestamp" do
-      controller.should_receive(:persist_session_timestamp).and_call_original
+      expect(controller).to receive(:persist_session_timestamp).and_call_original
       controller.send(:reset_session)
     end
   end

data/spec/dummy/config/application.rb

@@ -11,6 +11,8 @@ Bundler.require(*Rails.groups)
 require "frikandel"
 
 module Dummy
+  RAILS_GEM_VERSION = Gem::Version.new(Rails::VERSION::STRING).freeze
+
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

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

@@ -13,8 +13,13 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  if Dummy::RAILS_GEM_VERSION < Gem::Version.new('5.0.0')
+    config.serve_static_assets  = true
+    config.static_cache_control = "public, max-age=3600"
+  else
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/lib/frikandel/configuration_spec.rb

@@ -1,43 +1,43 @@
-require "spec_helper"
+require "rails_helper"
 
-describe Frikandel::Configuration do
+RSpec.describe Frikandel::Configuration do
 
   it "is a singleton" do
-    Frikandel::Configuration.should respond_to :instance
-    Frikandel::Configuration.instance.should be_a Frikandel::Configuration
-    Frikandel::Configuration.instance.should be_equal Frikandel::Configuration.instance
+    expect(Frikandel::Configuration).to respond_to :instance
+    expect(Frikandel::Configuration.instance).to be_a Frikandel::Configuration
+    expect(Frikandel::Configuration.instance).to be_equal Frikandel::Configuration.instance
   end
 
   it "delegates max_ttl and max_ttl= to the singleton instance" do
-    Frikandel::Configuration.instance.should_receive(:max_ttl).and_return(:some_max_ttl)
-    Frikandel::Configuration.instance.should_receive(:max_ttl=).with(:some_value).and_return(:some_max_ttl=)
+    expect(Frikandel::Configuration.instance).to receive(:max_ttl).and_return(:some_max_ttl)
+    expect(Frikandel::Configuration.instance).to receive(:max_ttl=).with(:some_value).and_return(:some_max_ttl=)
 
-    Frikandel::Configuration.max_ttl.should eq :some_max_ttl
-    Frikandel::Configuration.send(:max_ttl=, :some_value).should eq :some_max_ttl=
+    expect(Frikandel::Configuration.max_ttl).to eq :some_max_ttl
+    expect(Frikandel::Configuration.send(:max_ttl=, :some_value)).to eq :some_max_ttl=
   end
 
   it "delegates ttl and ttl= to the singleton instance" do
-    Frikandel::Configuration.instance.should_receive(:ttl).and_return(:some_ttl)
-    Frikandel::Configuration.instance.should_receive(:ttl=).with(:some_value).and_return(:some_ttl=)
+    expect(Frikandel::Configuration.instance).to receive(:ttl).and_return(:some_ttl)
+    expect(Frikandel::Configuration.instance).to receive(:ttl=).with(:some_value).and_return(:some_ttl=)
 
-    Frikandel::Configuration.ttl.should eq :some_ttl
-    Frikandel::Configuration.send(:ttl=, :some_value).should eq :some_ttl=
+    expect(Frikandel::Configuration.ttl).to eq :some_ttl
+    expect(Frikandel::Configuration.send(:ttl=, :some_value)).to eq :some_ttl=
   end
 
   it "has 24 hours as default-max_ttl" do
-    Frikandel::Configuration.max_ttl.should eq 24.hours
+    expect(Frikandel::Configuration.max_ttl).to eq 24.hours
   end
 
   it "has 2 hours as default-ttl" do
-    Frikandel::Configuration.ttl.should eq 2.hours
+    expect(Frikandel::Configuration.ttl).to eq 2.hours
   end
 
   it "ttls can be set" do
     Frikandel::Configuration.max_ttl = 50.hours
     Frikandel::Configuration.ttl = 5.hours
 
-    Frikandel::Configuration.max_ttl.should eq 50.hours
-    Frikandel::Configuration.ttl.should eq 5.hours
+    expect(Frikandel::Configuration.max_ttl).to eq 50.hours
+    expect(Frikandel::Configuration.ttl).to eq 5.hours
   end
 
 end