mongo_session_store 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36be9eaa92de394d6043638ea782f956dc46229268b6c66b78e8a67679aa1a11
-  data.tar.gz: f0120d1d11b913549e187b5e33348c1ef0d69c7d353976849c5e0b47205cb303
+  metadata.gz: d43ac777d775e4cb749414668819d70cf193f0e2ba5095671efecb49217d3988
+  data.tar.gz: 2b7adfc073d06d392a28f8c9625ea53b1a80c083bdc23c59c2726fb57032984d
 SHA512:
-  metadata.gz: 2cef75325cc7d8d12a0a2b46dc3642e4d37ea0e411e33632bcd4943783ca7b9051ccd8d4d87bdc203924596c1b744a8bea343d3081a87ce7dded073c424e3f7f
-  data.tar.gz: 38d8cf76247a7ad29171d53c20b547aea36c057a1665953eecf33a581f6eb48c19678a40c8dd83787f23d7c55effee60401c28c4c0e917ba28a479185a857ea4
+  metadata.gz: 3190b6a8071c1c141c5ce81f7e362ea6350790ff8338769bcc0730dbc12bc277d80b5be37c5cf4bd6680042353fb0fd483785feb200f37e9f6dcd6dec4478763
+  data.tar.gz: 2d194275cc082008d673860b7c3b750e1224922e84ff0a641255959f5e290baedf904dfd619c0adb3b70c441ae9d3ce203e29d3dfabfd8d42a17767cd2e5380d

data/.github/workflows/ci.yml

@@ -0,0 +1,100 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: "${{ !contains(github.ref, 'main')}}"
+
+jobs:
+  test:
+    name: "Run tests"
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: 
+          - "3.4"
+          - "3.3"
+        gemfile:
+          - gemfiles/rails-6.0-mongo.gemfile
+          - gemfiles/rails-6.0-mongoid.gemfile
+        include:
+          - gemfile: gemfiles/rails-8.1-mongo.gemfile
+            ruby: "3.4"
+            mongodb: "8.0"
+          - gemfile: gemfiles/rails-8.1-mongoid.gemfile
+            ruby: "3.4"
+            mongodb: "8.0"
+          - gemfile: gemfiles/rails-8.1-mongo.gemfile
+            ruby: "4.0"
+            mongodb: "8.0"
+          - gemfile: gemfiles/rails-8.1-mongoid.gemfile
+            ruby: "4.0"
+            mongodb: "8.0"
+          - gemfile: gemfiles/rails-5.2-mongo.gemfile
+            ruby: "2.7"
+          - gemfile: gemfiles/rails-5.2-mongoid.gemfile
+            ruby: "2.7"
+          - gemfile: gemfiles/rails-5.1-mongo.gemfile
+            ruby: "2.6"
+          - gemfile: gemfiles/rails-5.1-mongoid.gemfile
+            ruby: "2.6"
+          - gemfile: gemfiles/rails-5.0-mongo.gemfile
+            ruby: "2.6"
+          - gemfile: gemfiles/rails-5.0-mongoid.gemfile
+            ruby: "2.6"
+
+    services:
+      mongodb:
+        image: mongo:${{ matrix.mongodb || '4.4' }}
+        ports:
+          - 27017:27017
+        options: >-
+          --health-cmd "mongosh --quiet --eval 'db.adminCommand({ping: 1})' || mongo --quiet --eval 'db.adminCommand({ping: 1})'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v7
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake test
+
+  rubocop:
+    name: "RuboCop"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v7
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          gemfile: gemfiles/rails-6.0-mongo.gemfile
+          bundler-cache: true
+
+      - name: Run RuboCop
+        run: bundle exec rubocop

data/.github/workflows/danger-comment.yml

@@ -0,0 +1,11 @@
+name: Danger Comment
+
+on:
+  workflow_run:
+    workflows: [Danger]
+    types: [completed]
+
+jobs:
+  comment:
+    uses: numbata/danger-pr-comment/.github/workflows/danger-comment.yml@v0.1.0
+    secrets: inherit

data/.github/workflows/danger.yml

@@ -0,0 +1,45 @@
+name: Danger
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
+jobs:
+  danger:
+    runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_GEMFILE: Gemfile.danger
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4'
+          bundler-cache: true
+
+      - name: Run Danger
+        id: danger
+        continue-on-error: true
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN || github.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN || github.token }}
+          DANGER_REPORT_PATH: ${{ runner.temp }}/danger-report.json
+        run: bundle exec danger dry_run
+
+      - name: Upload Danger report
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: danger-report
+          path: ${{ runner.temp }}/danger-report.json
+          if-no-files-found: error
+
+      - name: Fail if Danger failed
+        if: ${{ steps.danger.outcome == 'failure' }}
+        run: exit 1

data/.rubocop.yml

@@ -21,19 +21,19 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
-Style/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
-Style/AlignHash:
+Layout/HashAlignment:
   EnforcedLastArgumentHashStyle: ignore_implicit
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 Style/FormatString:

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## (unreleased)
+## 3.2.2 (2026/10/14)
 
-* Your contribution here.
+* [#51](https://github.com/mongoid/mongo_session_store/pull/51): Modernize CI through Ruby 4.0, Rails 8.1, Mongoid 9 and MongoDB 8 while retaining legacy Rails combinations - [@dblock](https://github.com/dblock).
+* [#51](https://github.com/mongoid/mongo_session_store/pull/51): Explicitly load ActionDispatch before defining the session store.
+* [#48](https://github.com/mongoid/mongo_session_store/pull/48): Migrate Danger to danger-pr-comment - [@dblock](https://github.com/dblock).
 
 ## 3.2.1
 

data/Dangerfile

@@ -1 +1,5 @@
-danger.import_dangerfile(gem: "mongoid-danger")
+# frozen_string_literal: true
+
+danger.import_dangerfile(gem: 'danger-pr-comment')
+
+changelog.check!

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "rubocop", "1.84.1"

data/Gemfile.danger

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "danger"
+gem "danger-changelog"
+gem "danger-pr-comment"

data/README.md

@@ -11,7 +11,7 @@ MongoSessionStore is a [Rails][rails]-compatible session store for
 Driver][mongo]. It also allows for custom Mongo session store that works with
 any (or no!) Mongo ODM.
 
-MongoSessionStore version 3 is compatible with Rails 4.0 through 5.2. For Rails
+MongoSessionStore version 3 is compatible with Rails 5.0+. For Rails
 3 support please check out issue [#17][issue-rails3] for options and let us
 know if you need support.
 
@@ -70,11 +70,21 @@ MongoStore::Session.where("updated_at" => { "$gt" => 2.days.ago })
 
 ## Development
 
+### Test environment
+
+Start MongoDB with this script:
+
+```
+script/testenv
+```
+
 ### Testing
 
 To run the tests for a specific store. You must first set a `BUNDLE_GEMFILE` in
 the environment.
 
+You can also use Docker, see the section below this one.
+
 ```sh
 bundle exec rake
 ```
@@ -82,12 +92,6 @@ bundle exec rake
 Examples:
 
 ```sh
-BUNDLE_GEMFILE=gemfiles/rails-4.0-mongo.gemfile bundle exec rake
-BUNDLE_GEMFILE=gemfiles/rails-4.0-mongoid.gemfile bundle exec rake
-BUNDLE_GEMFILE=gemfiles/rails-4.1-mongo.gemfile bundle exec rake
-BUNDLE_GEMFILE=gemfiles/rails-4.1-mongoid.gemfile bundle exec rake
-BUNDLE_GEMFILE=gemfiles/rails-4.2-mongo.gemfile bundle exec rake
-BUNDLE_GEMFILE=gemfiles/rails-4.2-mongoid.gemfile bundle exec rake
 BUNDLE_GEMFILE=gemfiles/rails-5.0-mongo.gemfile bundle exec rake
 BUNDLE_GEMFILE=gemfiles/rails-5.0-mongoid.gemfile bundle exec rake
 BUNDLE_GEMFILE=gemfiles/rails-5.1-mongo.gemfile bundle exec rake
@@ -98,6 +102,20 @@ BUNDLE_GEMFILE=gemfiles/rails-6.0-mongo.gemfile bundle exec rake
 BUNDLE_GEMFILE=gemfiles/rails-6.0-mongoid.gemfile bundle exec rake
 ```
 
+#### Docker testing
+
+To run tests in a Docker container with a specific Ruby version and gemfile:
+
+```sh
+BUNDLE_GEMFILE=gemfiles/rails-6.0-mongo.gemfile script/test
+```
+
+The `BUNDLE_GEMFILE` environment variable is required. Ruby version defaults to 3.4 but can be customized:
+
+```sh
+RUBY_VERSION=2.7 BUNDLE_GEMFILE=gemfiles/rails-6.0-mongo.gemfile script/test
+```
+
 ### Performance benchmark
 
 The repository includes a performance benchmark. It runs against all available
@@ -143,3 +161,6 @@ Released under the MIT license. See the [LICENSE](LICENSE) file.
 [rails]: http://rubyonrails.org/
 
 [issue-rails3]: https://github.com/mongoid/mongo_session_store/issues/17
+## CI compatibility
+
+CI retains the Rails 5.0–6.0 dependency files and exercises both Mongo and Mongoid session stores with Rails 8.1, Mongoid 9, Ruby 3.4/4.0 and MongoDB 8.0; use `BUNDLE_GEMFILE=gemfiles/rails-8.1-mongoid.gemfile bundle exec rake test` for the modern Mongoid suite, which shares the minimal Rails 6 integration app.

data/RELEASING.md

@@ -0,0 +1,37 @@
+# Releasing
+
+Release from a clean local checkout of the upstream repository, not a fork. You need push access, RubyGems ownership with MFA, and an authenticated GitHub CLI.
+
+## Prepare
+
+1. Run `git switch main`, `git pull --ff-only`, and confirm that `origin` points to `mongoid/mongo_session_store`.
+2. Choose the next semantic version, update `lib/mongo_session_store/version.rb`, and replace the unreleased changelog heading with the version and release date. Remove the contribution placeholder.
+3. With MongoDB running, install dependencies and run `bundle exec rake test` using each supported adapter's `BUNDLE_GEMFILE`, for example `gemfiles/rails-6.0-mongo.gemfile` and `gemfiles/rails-6.0-mongoid.gemfile`. Run `bundle exec rubocop` with the default Gemfile.
+4. Commit the preparation, push `main`, and wait for the complete GitHub Actions matrix to pass for that commit.
+
+## Publish
+
+Do not use the legacy `rake release` task: it assumes `master` and performs interactive edits. Build and publish the prepared version explicitly:
+
+```sh
+version=3.2.2 # Replace with the version being released.
+gem build mongo_session_store.gemspec
+git tag "v$version"
+git push origin "v$version"
+gem push "mongo_session_store-$version.gem"
+```
+
+Enter a fresh RubyGems MFA code when prompted. Create a GitHub release from the same tag, using the matching changelog section as the release notes:
+
+```sh
+gh release create "v$version" --repo mongoid/mongo_session_store \
+  --verify-tag --title "$version" --notes-file /path/to/release-notes.md --latest
+```
+
+Verify the exact version at `https://rubygems.org/gems/mongo_session_store/versions/VERSION` and inspect `gh release view "v$version" --repo mongoid/mongo_session_store` to confirm a published, non-draft release.
+
+If publication is interrupted, check the remote tag, RubyGems version, and GitHub release first. Resume only the missing step; never move a published tag or rebuild an already published version. If the gem push needs a new code, retry that command with `--otp CODE`.
+
+## Next development version
+
+Increment the patch version in `lib/mongo_session_store/version.rb`, add a new `## (unreleased)` section with a contribution placeholder, and commit and push the changes to `main`. Remove the local built gem after successful publication.

data/docker-compose.yml

@@ -0,0 +1,5 @@
+services:
+  mongodb:
+    image: mongo:3.6
+    ports:
+      - "27017:27017"

data/gemfiles/rails-5.1-mongoid.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "mongoid"
+gem "mongoid", "~> 7.0"
 
 gem "rails", "~> 5.1.0"
 gem "devise", ">= 4.2"

data/gemfiles/rails-6.0-mongo.gemfile

@@ -4,6 +4,9 @@ gem "mongo"
 
 gem "rails", "~> 6.0.0"
 gem "devise", "~> 4.7.0"
-gem "sqlite3", "~> 1.4.0"
+gem "sqlite3", "~> 1.4"
+gem "bigdecimal"
+gem "mutex_m"
+gem "drb"
 
 gemspec :path => "../"

data/gemfiles/rails-6.0-mongoid.gemfile

@@ -4,6 +4,9 @@ gem "mongoid"
 
 gem "rails", "~> 6.0.0"
 gem "devise", "~> 4.7.0"
-gem "sqlite3", "~> 1.4.0"
+gem "sqlite3", "~> 1.4"
+gem "bigdecimal"
+gem "mutex_m"
+gem "drb"
 
 gemspec :path => "../"

data/gemfiles/rails-8.1-mongo.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "mongo", "~> 2.0"
+gem "rails", "~> 8.1.0"
+gem "devise", "~> 5.0"
+gem "sqlite3", "~> 2.0"
+gem "bigdecimal"
+gem "mutex_m"
+gem "drb"
+gem "base64"
+gem "benchmark"
+gem "ostruct"
+
+gemspec :path => "../"

data/gemfiles/rails-8.1-mongoid.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem "mongoid", "~> 9.0"
+gem "rails", "~> 8.1.0"
+gem "devise", "~> 5.0"
+gem "sqlite3", "~> 2.0"
+gem "bigdecimal"
+gem "mutex_m"
+gem "drb"
+gem "base64"
+gem "benchmark"
+gem "ostruct"
+
+gemspec :path => "../"

data/lib/mongo_session_store/mongo_store_base.rb

@@ -1,3 +1,4 @@
+require "action_dispatch"
 require "action_dispatch/middleware/session/abstract_store"
 
 module ActionDispatch

data/lib/mongo_session_store/mongoid_store.rb

@@ -38,6 +38,7 @@ module ActionDispatch
 
         def unpack(packed)
           return unless packed
+
           if packed.respond_to? :data
             Marshal.load(packed.data)
           else

data/lib/mongo_session_store/version.rb

@@ -1,3 +1,3 @@
 module MongoSessionStore
-  VERSION = "3.2.1".freeze
+  VERSION = "3.2.2".freeze
 end

data/mongo_session_store.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path("../lib/mongo_session_store/version", __FILE__)
+require File.expand_path("lib/mongo_session_store/version", __dir__)
 
 Gem::Specification.new do |s|
   s.name = "mongo_session_store"
@@ -17,10 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "actionpack", ">= 4.0"
   s.add_dependency "mongo", "~> 2.0"
 
-  s.add_development_dependency "rspec-rails", "~> 3.6"
-  s.add_development_dependency "capybara", "~> 2.15.0"
-  s.add_development_dependency "pry", "~> 0.10"
-  s.add_development_dependency "rake", "~> 11"
-  s.add_development_dependency "rubocop", "0.45.0"
-  s.add_development_dependency "mongoid-danger", "~> 0.1.0"
+  s.add_development_dependency "capybara", ">= 2.15"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec-rails", ">= 4.0"
 end

data/script/test

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -eu
+
+if [ -z "${BUNDLE_GEMFILE:-}" ]; then
+  echo "Error: BUNDLE_GEMFILE environment variable is required"
+  echo "Example: BUNDLE_GEMFILE=gemfiles/rails-6.0-mongo.gemfile script/test"
+  exit 1
+fi
+
+RUBY_VERSION=${RUBY_VERSION:-3.4}
+
+docker run --rm -it \
+  --network mongo_session_store_default \
+  -e MONGODB_HOST=mongodb \
+  -e BUNDLE_GEMFILE="${BUNDLE_GEMFILE}" \
+  -v "$(pwd):/app" \
+  -w /app \
+  "ruby:${RUBY_VERSION}" \
+  /app/script/test_inner

data/script/test_inner

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -eu
+
+export BUNDLE_GEMFILE
+export BUNDLE_PATH="/app/tmp/bundler/$RUBY_VERSION/$BUNDLE_GEMFILE"
+
+ruby_version=$(ruby -e 'puts RUBY_VERSION')
+major=$(echo "$ruby_version" | cut -d. -f1)
+minor=$(echo "$ruby_version" | cut -d. -f2)
+
+if [ "$major" -lt 2 ] || ([ "$major" -eq 2 ] && [ "$minor" -le 7 ]); then
+  gem install bundler -v 1.17.3
+else
+  gem install bundler
+fi
+
+bundle install
+bundle exec rspec

data/script/testenv

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+echo "Starting test environment..."
+docker compose up

data/spec/integrations/devise_spec.rb

@@ -15,7 +15,7 @@ describe Devise::SessionsController, :type => :request do
   end
 
   def create_user
-    post "/users", prepare_request_params(
+    post "/users", **prepare_request_params(
       "user[email]" => "person@example.com",
       "user[password]" => "secret",
       "user[password_confirmation]" => "secret"
@@ -23,7 +23,7 @@ describe Devise::SessionsController, :type => :request do
   end
 
   def sign_in
-    post "/users/sign_in", prepare_request_params(
+    post "/users/sign_in", **prepare_request_params(
       "user[email]" => "person@example.com",
       "user[password]" => "secret",
       "user[password_confirmation]" => "secret"

data/spec/rails_helper.rb

@@ -1,5 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 rails_version = Gem.loaded_specs["rails"].version.to_s[/^\d\.\d/]
+# Modern Rails uses the same minimal integration app as Rails 6.
+rails_version = "6.0" if Gem.loaded_specs["rails"].version >= Gem::Version.new("7.0")
 if Gem.loaded_specs["rails"].version >= Gem::Version.new("5.2")
   require "active_support/message_encryptor"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require "logger"
 require "mongo"
 require "mongoid" if Gem.loaded_specs["mongoid"]
 require "mongo_session_store"
@@ -27,6 +28,7 @@ RSpec.configure do |config|
   config.before :suite do
     Mongo::Logger.logger.level = ::Logger::INFO
 
+    mongodb_host = ENV["MONGODB_HOST"] || "127.0.0.1"
     if mongo_orm == "mongoid"
       Mongoid.logger.level = Logger::INFO
       Mongoid.configure do |c|
@@ -34,14 +36,14 @@ RSpec.configure do |config|
           "clients" => {
             "default" => {
               "database" => TestDatabaseHelper.test_database_name,
-              "hosts" => ["127.0.0.1:27017"]
+              "hosts" => ["#{mongodb_host}:27017"]
             }
           }
         )
       end
     else
       MongoStore::Session.database = Mongo::Client.new(
-        ["127.0.0.1:27017"],
+        ["#{mongodb_host}:27017"],
         :database => TestDatabaseHelper.test_database_name
       )
     end

data/spec/support/apps/rails_6.0_app/config/database.yml

@@ -10,16 +10,22 @@ default: &default
   timeout: 5000
 
 development:
-  <<: *default
+  adapter: sqlite3
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
   database: db/development.sqlite3
 
 # 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:
-  <<: *default
+  adapter: sqlite3
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
   database: db/test.sqlite3
 
 production:
-  <<: *default
+  adapter: sqlite3
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
   database: db/production.sqlite3

data/spec/support/apps/rails_6.0_app/config/environments/test.rb

@@ -31,7 +31,7 @@ Rails.application.configure do
   config.action_controller.allow_forgery_protection = false
 
   # Print deprecation notices to the stderr.
-  config.active_support.deprecation = :stderr
+  config.active_support.deprecation = :stderr if Rails.gem_version < Gem::Version.new("7.1")
 
   # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true

data/spec/support/rack_app.rb

@@ -9,6 +9,8 @@ class MyApp
 end
 
 MyAppWrapped = Rack::Builder.new do |builder|
-  builder.use Rack::Session::Cookie, :secret => "Very secret secret"
+  if defined?(Rack::Session::Cookie)
+    builder.use Rack::Session::Cookie, :secret => "Very secret secret"
+  end
   builder.run MyApp.new
 end