frikandel 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42d24cb0a06b01e6592564e93e11684c0b8c717e107764f77a01284379edaef
-  data.tar.gz: f54ad73ae3641f47847babb1ba397560422a05dfcf87243a4515db818fb28eec
+  metadata.gz: cff69b9b86ae896c8ba21d0fc1631bd1068f995da1e047d8601f3eb0e8eeca89
+  data.tar.gz: 894d018d70cbe303e5b41faf17527557ecc9f434c15b2d361921fc1952a6d82d
 SHA512:
-  metadata.gz: 867d39722958752513410306d7d4d7432f4985263cdfa45c84c92774ff8fcd029b3899afe6e52fffe348bdae69d58319299793d8ae6360e5d5752e86cd96d0c4
-  data.tar.gz: e4867b1f8dd9f3fd6c5d94a3e6ec925e2a9fd8db6f1fa3731e6c57d30f9f9fe9803e51e53f6240cda9817e05e67148db3d96a6072cb5790f0593c28f8b816312
+  metadata.gz: 2b8933fe59102ddcc724f081fa5406a0ab1d036b8da7001cbf891c29cb05021815c57ea56d2c0a92860ab7ec5b4b99f52c0857f2cd29b77e6ab32b9930ea493b
+  data.tar.gz: 29cd07195aafcb9830a48ed64053cf6cf633b9e700541ee88f276607c50def9b5ba3552f77df146857c9a88b097c8c8df37ee8ad96d6ea26946a5e6175ce425a

data/.github/workflows/ci.yml

@@ -17,47 +17,28 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', jruby, truffleruby]
-        gemfile: [rails-5.2.x, rails-6.0.x, rails-6.1.x, rails-7.0.x]
-        exclude:
-          # ruby 3 is not compatible with rails < 6
-          - ruby-version: '3.0'
-            gemfile: rails-5.2.x
-          - ruby-version: 'truffleruby'
-            gemfile: rails-5.2.x
-          # ruby 3.1 is not compatible with rails < 7
-          - ruby-version: '3.1'
-            gemfile: rails-5.2.x
-          - ruby-version: '3.1'
-            gemfile: rails-6.0.x
-          - ruby-version: '3.1'
-            gemfile: rails-6.1.x
-          # ruby < 2.7 is not compatible with rails 7
-          - ruby-version: '2.6'
-            gemfile: rails-7.0.x
-          # jruby is not compatible with rails 7 (yet)
-          - ruby-version: 'jruby'
-            gemfile: rails-7.0.x
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
+        gemfile: ['rails_7.2', 'rails_8.0', 'rails_8.1']
+        experimental: [false]
+        include:
+          - ruby-version: '4.0'
+            gemfile: 'rails_head'
+            experimental: true
+    continue-on-error: ${{ matrix.experimental }}
+    env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
-
     name: test (ruby ${{ matrix.ruby-version }}, ${{ matrix.gemfile }})
-
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up Ruby
-      # Using ruby/setup-ruby@v1 will automatically get bug fixes and new Ruby
-      # versions for ruby/setup-ruby (see
-      # https://github.com/ruby/setup-ruby#versioning).
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0"
+end
+
+appraise "rails-8.0" do
+  gem "rails", "~> 8.0.0"
+end
+
+appraise "rails-8.1" do
+  gem "rails", "~> 8.1.0"
+end
+
+appraise "rails-head" do
+  gem "rails", github: "rails/rails", branch: "main"
+end

data/README.md

@@ -16,7 +16,7 @@ By adding a TTL the attack window gets smaller. An stolen has to be used within
 
 ## Requirements
 
-Rails 5.2 and 6.x and 7.0 are currently supported.
+Rails 7.2 and newer are supported, on Ruby 3.2 and newer.
 
 
 ## Installation
@@ -91,6 +91,8 @@ end
 
 ## Changes
 
+* v4.0.0 -- Drop support for Rails < 7.2 and Ruby < 3.2, add support for Rails 7.2, 8.0 and 8.1, rebuild the test suite (RSpec + Appraisal, no ActiveRecord)
+* v3.0.2 -- Add support for Ruby 3.1 and add DevContainer setup for development
 * v3.0.1 -- Add support for Rails v7.x
 * v3.0.0 -- Drop support for Rails < v5.2, add support for Rails v6.1 and switch from TravisCI to GithubActions
 * v2.3.0 -- Add support for Rails v5.1 and Rails v6.0 and fix TravisCI builds
@@ -102,11 +104,11 @@ end
 
 To run the test suite with different rails version by selecting the corresponding gemfile. You can use these one liners:
 
-    $ export BUNDLE_GEMFILE=gemfiles/rails-5.2.x.gemfile && bundle update && bundle exec rake spec
-    $ export BUNDLE_GEMFILE=gemfiles/rails-6.0.x.gemfile && bundle update && bundle exec rake spec
-    $ export BUNDLE_GEMFILE=gemfiles/rails-6.1.x.gemfile && bundle update && bundle exec rake spec
-    $ export BUNDLE_GEMFILE=gemfiles/rails-7.0.x.gemfile && bundle update && bundle exec rake spec
-    $ export BUNDLE_GEMFILE=gemfiles/rails-head.gemfile && bundle update && bundle exec rake spec
+    $ bundle exec appraisal install
+    $ bundle exec appraisal rails-7.2 rake
+    $ bundle exec appraisal rails-8.0 rake
+    $ bundle exec appraisal rails-8.1 rake
+    $ bundle exec appraisal rails-head rake
 
 ## Contributing
 1. Fork it

data/frikandel.gemspec

@@ -16,21 +16,15 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = Dir["spec/**/*"]
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version     = '>= 1.9.3'
-  spec.required_rubygems_version = ">= 1.3.6"
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3" unless RUBY_PLATFORM == 'java'
-  spec.add_development_dependency "jdbc-sqlite3" if RUBY_PLATFORM == 'java'
-  spec.add_development_dependency "activerecord-jdbcsqlite3-adapter" if RUBY_PLATFORM == 'java'
   spec.add_development_dependency "rspec-rails", "> 3.0"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "test-unit"
 
-  spec.add_dependency "rails", ">= 5.2.0", "< 8.0.0"
+  spec.add_dependency "rails", ">= 7.2"
 end

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_head.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", github: "rails/rails", branch: "main"
+
+gemspec path: "../"

data/lib/frikandel/bind_session_to_ip_address.rb

@@ -4,11 +4,7 @@ module Frikandel
     include SessionInvalidation
 
     included do
-      if respond_to?(:before_action)
-        append_before_action :validate_session_ip_address
-      else
-        append_before_filter :validate_session_ip_address
-      end
+      append_before_action :validate_session_ip_address
     end
 
   private

data/lib/frikandel/limit_session_lifetime.rb

@@ -4,11 +4,7 @@ module Frikandel
     include SessionInvalidation
 
     included do
-      if respond_to?(:before_action)
-        append_before_action :validate_session_timestamp
-      else
-        append_before_filter :validate_session_timestamp
-      end
+      append_before_action :validate_session_timestamp
     end
 
   private

data/lib/frikandel/version.rb

@@ -1,3 +1,3 @@
 module Frikandel
-  VERSION = "3.0.2"
+  VERSION = "4.0.0"
 end

data/spec/controllers/bind_session_to_ip_address_controller_spec.rb

@@ -5,18 +5,10 @@ require "support/application_controller"
 class BindSessionToIpAddressController < ApplicationController
   include Frikandel::BindSessionToIpAddress
 
-  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
+  before_action :flash_alert_and_redirect_home, only: [:redirect_home]
 
   def home
-    if Rails::VERSION::MAJOR >= 5
-      render plain: "bind test"
-    else
-      render text: "bind test"
-    end
+    render plain: "bind test"
   end
 
   def redirect_home

data/spec/controllers/combined_controller_spec.rb

@@ -6,18 +6,10 @@ class CombinedController < ApplicationController
   include Frikandel::LimitSessionLifetime
   include Frikandel::BindSessionToIpAddress
 
-  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
+  before_action :flash_alert_and_redirect_home, only: [:redirect_home]
 
   def home
-    if Rails::VERSION::MAJOR >= 5
-      render plain: "combined test"
-    else
-      render text: "combined test"
-    end
+    render plain: "combined test"
   end
 
   def redirect_home

data/spec/controllers/limit_session_lifetime_controller_spec.rb

@@ -5,18 +5,10 @@ require "support/application_controller"
 class LimitSessionLifetimeController < ApplicationController
   include Frikandel::LimitSessionLifetime
 
-  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
+  before_action :flash_alert_and_redirect_home, only: [:redirect_home]
 
   def home
-    if Rails::VERSION::MAJOR >= 5
-      render plain: "ttl test"
-    else
-      render text: "ttl test"
-    end
+    render plain: "ttl test"
   end
 
   def redirect_home

data/spec/dummy/app/views/layouts/application.html.erb

@@ -2,13 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-
-<%= yield %>
-
+  <%= yield %>
 </body>
 </html>

data/spec/dummy/config/application.rb

@@ -1,30 +1,17 @@
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
-require "active_record/railtie"
+# Only the frameworks the gem actually needs.
 require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
 
 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
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    config.load_defaults "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
+    config.eager_load = false
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    # Static secret for the test suite only — not a real credential.
+    config.secret_key_base = "dummy_secret_key_base_for_the_frikandel_test_suite_only"
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -1,29 +1,9 @@
 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
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
+  config.enable_reloading = true
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
 end

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

@@ -1,80 +1,12 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # Code is not reloaded between requests.
-  config.cache_classes = true
-
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
+  config.enable_reloading = false
   config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
+  config.public_file_server.enabled = false
   config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
 end

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

@@ -1,41 +1,17 @@
 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
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
-
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
+  config.enable_reloading = false
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  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
+  config.public_file_server.enabled = true
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = :none
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/spec/rails_helper.rb

@@ -1,74 +1,28 @@
-# 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
+# Prevent accidental runs against 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
+  # Enables `get`/`post` etc. in specs under spec/controllers.
   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
+  from_flash = request.flash
 
   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
+  request.flash.update(from_flash.to_hash)
 end
 
 def flash

data/spec/support/application_controller.rb

@@ -14,11 +14,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   def home
-
-    if Rails::VERSION::MAJOR >= 5
-      render plain: "testing"
-    else
-      render text: "testing"
-    end
+    render plain: "testing"
   end
 end