Skip to content

Commit 3b955db

Browse files
committed
Merge branch 'master' into 370-dimension-validator-fails-on-pdf
2 parents 7aec952 + e8285d2 commit 3b955db

26 files changed

+678
-126
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Ruby and install gems
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: 3.1 # same as .rubocop.yml
15+
ruby-version: 3.3 # same as .rubocop.yml, recommended Rails & Ruby version for Gemfile
1616
bundler-cache: true
1717

1818
- name: Run linters
@@ -29,19 +29,29 @@ jobs:
2929
- '3.1'
3030
- '3.2'
3131
- '3.3'
32+
- '3.4'
3233
gemfile:
3334
- rails_7_0
3435
- rails_7_1
3536
- rails_7_2
3637
- rails_8_0
38+
- rails_next
3739
image_processor:
3840
- vips
3941
- mini_magick
4042
exclude:
4143
- ruby: '3.1'
4244
gemfile: rails_8_0
45+
- ruby: '3.1'
46+
gemfile: rails_next
4347
- ruby: '3.3'
4448
gemfile: rails_7_0
49+
- ruby: '3.4'
50+
gemfile: rails_7_0
51+
- ruby: '3.4'
52+
gemfile: rails_7_1
53+
- ruby: '3.4'
54+
gemfile: rails_7_2
4555
include:
4656
- ruby: '3.0'
4757
gemfile: rails_6_1_4

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inherit_gem:
44
rubocop-rails-omakase: rubocop.yml
55

66
AllCops:
7-
TargetRubyVersion: 3.1 # same as .github/workflows/main.yml
7+
TargetRubyVersion: 3.3 # same as .github/workflows/main.yml
88
Exclude:
99
- 'bin/*'
1010
- 'config/locales/*'
@@ -13,7 +13,7 @@ AllCops:
1313
- 'vendor/bundle/**/*'
1414
NewCops: enable
1515

16-
require:
16+
plugins:
1717
- rubocop-performance
1818

1919
# ==============================================================================

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- Unreleased
2+
13
- 3.0.0
24
- Allow to perform dimension / aspect_ratio validations on single page pdf (https://github.com/igorkasyanchuk/active_storage_validations/pull/374)
35
- Added `pages` validator to validate pdf number of pages.
@@ -11,6 +13,10 @@
1113

1214
Note that, if you do not perform dimension / aspect_ratio validations on pdf, the gem will work the same as in version 2 without any breaking change.
1315

16+
- 2.0.4
17+
- Fix issue when updating a child record through a parent (like: parent_model.update(child_attributes: { image: file })) for Rails >= 8.0.2 (https://github.com/igorkasyanchuk/active_storage_validations/pull/378)
18+
- Fix issue causing a stack error too deep edge case (not reproductible) because of the `after: :load_config_initializers` option (https://github.com/igorkasyanchuk/active_storage_validations/pull/382)
19+
1420
- 2.0.3
1521
- Allow to pass an Array, a splatted Array, or a single string for allowing / rejecting content_type matcher methods (https://github.com/igorkasyanchuk/active_storage_validations/pull/372)
1622
- Fix issue when an attachment was missing on a blob (https://github.com/igorkasyanchuk/active_storage_validations/pull/373)

Gemfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ gemspec
1515

1616
# This Rails version will be the one used when running `bundle exec rake test` locally
1717
# Uncomment the line then run `bundle install`
18-
# gem "rails", "7.1.2"
19-
# gem "sqlite3", "~> 1.7"
20-
# gem "nokogiri", "~> 1.16", ">= 1.16.7"
18+
gem "rails", "~> 8.0"
19+
# gem "sqlite3", ">= 2.5"
20+
# gem "nokogiri", ">= 1.18"
2121

2222
group :development, :test do
2323
# To use debugger:
2424
# gem "debug", "~> 1.10", ">= 1.10.0"
2525

26+
# To test S3 services
27+
# gem "aws-sdk-s3", require: false
28+
2629
# Linters
27-
gem "rubocop", "~> 1.71", ">= 1.71.1", require: false
28-
gem "rubocop-performance", "~> 1.23", ">= 1.23.1", require: false
29-
gem "rubocop-rails-omakase", "~> 1.0", ">= 1.0.0", require: false
30+
gem "rubocop", "~> 1.75", ">= 1.75.7", require: false
31+
gem "rubocop-performance", "~> 1.25", ">= 1.25.0", require: false
32+
gem "rubocop-rails-omakase", "~> 1.1", ">= 1.1.0", require: false
3033
end

0 commit comments

Comments
 (0)