Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
fail-fast: false
matrix:
gemfile:
- rails7.0
- rails7.1
- rails7.2
- rails8.0
- rails8.1
ruby:
- "3.0"
- "3.1"
- "3.2"
- "3.3"
- "3.4"
- "4.0"
backend:
- active_record
- mongoid
Expand All @@ -29,14 +29,14 @@ jobs:
BACKEND: ${{ matrix.backend }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.3.0
uses: supercharge/mongodb-github-action@1.10.0
if: ${{ matrix.backend == 'mongoid' }}
- name: Run tests
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/doc/
/pkg/
/spec/reports/
/spec/rails_app_active_record/tmp/
/spec/rails_app_mongoid/tmp/
/tmp/
*.bundle
*.so
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.6
TargetRubyVersion: 3.3
Include:
- 'lib/**/*.rb'
- 'spec/**/*.rb'
Expand Down
19 changes: 19 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

appraise "rails7.2" do
gem "rails", "~> 7.2"
gem "mongoid", "~> 9"
gem "sqlite3"
end

appraise "rails8.0" do
gem "rails", "~> 8.0.0"
gem "mongoid", "~> 9"
gem "sqlite3"
end

appraise "rails8.1" do
gem "rails", "~> 8.1.0"
gem "mongoid", "~> 9"
gem "sqlite3"
end

8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### [Unreleased]

Minimum supported ruby version is now 3.3

Minimum supported Rails version is now 7.2

Relax devise dependency to >= 4, < 6, thus supporting devise 5

### 1.8.1

Remove Rails 5.2 and 6.0 support
Expand Down
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

gem "rubocop", "~> 1.88"

# Specify your gem's dependencies in tiddle.gemspec
gemspec
7 changes: 0 additions & 7 deletions gemfiles/rails7.0.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails7.1.gemfile

This file was deleted.

10 changes: 10 additions & 0 deletions gemfiles/rails7.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rubocop", "~> 1.88"
gem "rails", "~> 7.2"
gem "mongoid", "~> 9"
gem "sqlite3"

gemspec path: "../"
10 changes: 10 additions & 0 deletions gemfiles/rails8.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rubocop", "~> 1.88"
gem "rails", "~> 8.0.0"
gem "mongoid", "~> 9"
gem "sqlite3"

gemspec path: "../"
10 changes: 10 additions & 0 deletions gemfiles/rails8.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rubocop", "~> 1.88"
gem "rails", "~> 8.1.0"
gem "mongoid", "~> 9"
gem "sqlite3"

gemspec path: "../"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateTables < ActiveRecord::Migration[4.2]
class CreateTables < ActiveRecord::Migration::Current
# rubocop:disable Metrics/AbcSize
# rubocop:disable Metrics/MethodLength
def change
Expand Down
9 changes: 5 additions & 4 deletions spec/support/backend.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ def migrate!
# Do initial migration
path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))

ActiveRecord::MigrationContext.new(
path,
ActiveRecord::SchemaMigration
).migrate
schema_migration = ::ActiveRecord::SchemaMigration.new(
ActiveRecord::Tasks::DatabaseTasks.migration_connection_pool
)

::ActiveRecord::MigrationContext.new(path, schema_migration).migrate
end
end

Expand Down
10 changes: 6 additions & 4 deletions tiddle.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.required_ruby_version = '>= 3.0.0'
spec.required_ruby_version = '>= 3.3.0'

spec.add_dependency "devise", ">= 4.0.0.rc1", "< 6"
spec.add_dependency "activerecord", ">= 6.1.0"
spec.add_development_dependency "rake"
spec.add_dependency "devise", ">= 4.7", "< 6"
spec.add_dependency "activerecord", ">= 7.2.0"
spec.add_development_dependency "rake", "~> 13"
spec.add_development_dependency "rspec-rails"
spec.add_development_dependency "simplecov"
spec.add_development_dependency "appraisal"
spec.add_development_dependency "rubocop"
spec.add_development_dependency "database_cleaner"
spec.add_development_dependency "database_cleaner-active_record"
spec.add_development_dependency "database_cleaner-mongoid"
end