Skip to content

Commit 4f649ef

Browse files
authored
Merge pull request #214 from eqladios/chore/bump-mongoid-9-support-ruby-3.3
Chore: bump mongoid 9 and support ruby 3.3
2 parents fb33721 + ccb44b5 commit 4f649ef

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ jobs:
66
strategy:
77
matrix:
88
mongodb: [4.4]
9-
ruby: [2.7, "3.0", 3.1, 3.2]
9+
ruby: [2.7, "3.0", 3.1, 3.2, 3.3]
1010
gemfile:
1111
- carrierwave-2.1
1212
- carrierwave-2.2
1313
- mongoid-7
1414
- mongoid-8
15+
- mongoid-9
1516
include:
1617
- { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-0.10" }
1718
- { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-0.11" }
@@ -31,15 +32,15 @@ jobs:
3132
uses: supercharge/[email protected]
3233
with:
3334
mongodb-version: ${{ matrix.mongodb }}
34-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v4
3536
- name: Set up Ruby
3637
uses: ruby/setup-ruby@v1
3738
with:
3839
ruby-version: ${{ matrix.ruby }}
3940
bundler-cache: true
40-
- run: cat /home/runner/work/carrierwave-mongoid/carrierwave-mongoid/vendor/bundle/ruby/3.0.0/extensions/x86_64-linux/3.0.0/mimemagic-0.4.3/gem_make.out
41+
- run: cat /home/runner/work/carrierwave-mongoid/carrierwave-mongoid/vendor/bundle/ruby/${{ matrix.ruby }}/extensions/x86_64-linux/${{ matrix.ruby }}/mimemagic-0.4.3/gem_make.out
4142
if: ${{ failure() }}
42-
- run: cat /home/runner/work/carrierwave-mongoid/carrierwave-mongoid/vendor/bundle/ruby/3.0.0/gems/mimemagic-0.4.3/ext/mimemagic/Rakefile
43+
- run: cat /home/runner/work/carrierwave-mongoid/carrierwave-mongoid/vendor/bundle/ruby/${{ matrix.ruby }}/gems/mimemagic-0.4.3/ext/mimemagic/Rakefile
4344
if: ${{ failure() }}
4445
- name: Run tests
4546
run: bundle exec rake

carrierwave-mongoid.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
2121
s.require_paths = ["lib"]
2222

2323
s.add_dependency "carrierwave", [">= 0.8", "< 3"]
24-
s.add_dependency "mongoid", [">= 3.0", "< 9.0"]
24+
s.add_dependency "mongoid", [">= 3.0", "< 10.0"]
2525
s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
2626
s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9
2727
s.add_development_dependency "rspec", "~> 3.4"
2828
s.add_development_dependency "rake", ">= 12.3.3"
29-
s.add_development_dependency "mini_magick"
29+
s.add_development_dependency "mini_magick", "< 5"
3030
s.add_development_dependency "pry"
3131
end

gemfiles/mongoid-9.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source "https://rubygems.org"
2+
3+
gem "mongoid", "~> 9.0"
4+
gem "carrierwave", "~> 2.2"
5+
6+
gemspec path: "../"

spec/mongoid_spec.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,11 +623,13 @@ def filename
623623

624624
it "attaches a new file to an existing document that had no file at first" do
625625
doc = @class.new
626-
doc.mongo_locations.build
626+
new_file = doc.mongo_locations.build
627+
expect(new_file.save).to be_truthy
627628
expect(doc.save).to be_truthy
628629
doc.reload
629630

630-
doc.mongo_locations.first.image = stub_file('test.jpeg')
631+
new_file.image = stub_file('test.jpeg')
632+
expect(new_file.save).to be_truthy
631633
expect(doc.save).to be_truthy
632634
doc.reload
633635

0 commit comments

Comments
 (0)