frikandel 1.0.0 → 2.2.2

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/database.yml

@@ -5,21 +5,21 @@
 #   gem 'sqlite3'
 development:
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: ":memory:"
   pool: 5
-  timeout: 5000
+  timeout: 500
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
+  database: ":memory:"
   pool: 5
-  timeout: 5000
+  timeout: 500
 
 production:
   adapter: sqlite3
-  database: db/production.sqlite3
+  database: ":memory:"
   pool: 5
-  timeout: 5000
+  timeout: 500

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

data/spec/rails_helper.rb

@@ -0,0 +1,76 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path("../dummy/config/environment", __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'spec_helper'
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+if Dummy::RAILS_GEM_VERSION > Gem::Version.new('4.1.0')
+  # Checks for pending migration and applies them before tests are run.
+  # If you are not using ActiveRecord, you can remove this line.
+  ActiveRecord::Migration.maintain_test_schema!
+end
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end
+
+
+# some helper methods
+
+def simulate_redirect!(from_action, to_action)
+  get from_action.intern
+  from_flash = request.flash # HACK for RAILS_VERSION=3.2.0
+
+  controller.instance_variable_set(:@_frikandel_did_reset_session, nil) # reset state for redirect request
+
+  get to_action.intern
+  request.flash.update(from_flash.to_hash) # HACK for RAILS_VERSION=3.2.0
+end
+
+def flash
+  request.flash
+end

data/spec/spec_helper.rb

@@ -1,20 +1,101 @@
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require 'rspec/rails'
 require 'pry'
 
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  #config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  #config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 
+  # Frikandel
   config.before(:each) do
     Frikandel::Configuration.defaults!
   end

data/spec/support/application_controller.rb

@@ -1,16 +1,24 @@
-
 Rails.application.routes.draw do
-  get "/home" => "application#home", as: :root
-  get "/customized_controller_home" => "customized_on_expired_session#home", as: :customized_controller_home
+  root to: "application#home"
+  get "/limit_session_lifetime_home" => "limit_session_lifetime#home", :as => :limit_session_lifetime_home
+  get "/limit_session_lifetime_redirect_home" => "limit_session_lifetime#redirect_home"
+  get "/bind_session_to_ip_address_home" => "bind_session_to_ip_address#home", :as => :bind_session_to_ip_address_home
+  get "/bind_session_to_ip_address_redirect_home" => "bind_session_to_ip_address#redirect_home"
+  get "/combined_controller_home" => "combined#home", :as => :combined_home
+  get "/combined_controller_redirect_home" => "combined#redirect_home"
+  get "/customized_controller_home" => "customized_on_invalid_session#home", :as => :customized_controller_home
 end
 
 
 class ApplicationController < ActionController::Base
-  include Frikandel::LimitSessionLifetime
-
   protect_from_forgery with: :exception
 
   def home
-    render text: "testing"
+
+    if Rails::VERSION::MAJOR >= 5
+      render plain: "testing"
+    else
+      render text: "testing"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frikandel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Taktsoft
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,26 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,7 +123,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +133,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: This gem adds a ttl to the session cookie of your application.
 email:
 - developers@taktsoft.com
@@ -125,16 +145,29 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.rails-3.2.x
+- Gemfile.rails-4.0.x
+- Gemfile.rails-4.1.x
+- Gemfile.rails-4.2.x
+- Gemfile.rails-5.0.x
+- Gemfile.rails-5.1.x
+- Gemfile.rails-5.2.x
+- Gemfile.rails-head
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - frikandel.gemspec
 - lib/frikandel.rb
+- lib/frikandel/bind_session_to_ip_address.rb
 - lib/frikandel/configuration.rb
+- lib/frikandel/limit_session_lifetime.rb
+- lib/frikandel/session_invalidation.rb
 - lib/frikandel/version.rb
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/customized_on_expired_cookie_controller_spec.rb
+- spec/controllers/bind_session_to_ip_address_controller_spec.rb
+- spec/controllers/combined_controller_spec.rb
+- spec/controllers/customized_on_invalid_session_controller_spec.rb
+- spec/controllers/limit_session_lifetime_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -167,21 +200,22 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/lib/frikandel/configuration_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/application_controller.rb
 homepage: https://github.com/taktsoft/frikandel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,54 +223,57 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.10
+signing_key:
 specification_version: 4
 summary: This gem adds a ttl to the session cookie of your application.
 test_files:
+- spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
 - spec/dummy/config/routes.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/boot.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config.ru
 - spec/dummy/Rakefile
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
-- spec/dummy/bin/bundle
-- spec/lib/frikandel/configuration_spec.rb
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/customized_on_expired_cookie_controller_spec.rb
-- spec/spec_helper.rb
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/log/test.log
+- spec/dummy/log/development.log
+- spec/dummy/README.rdoc
 - spec/support/application_controller.rb
+- spec/lib/frikandel/configuration_spec.rb
+- spec/controllers/customized_on_invalid_session_controller_spec.rb
+- spec/controllers/bind_session_to_ip_address_controller_spec.rb
+- spec/controllers/combined_controller_spec.rb
+- spec/controllers/limit_session_lifetime_controller_spec.rb
+- spec/rails_helper.rb