carrierwave-mongoid 1.2.0 → 1.4.0

data/spec/mongoid_spec.rb

@@ -10,13 +10,6 @@ def reset_mongo_class(uploader = MongoUploader)
   end
 end
 
-def define_mongo_class(class_name, &block)
-  Object.send(:remove_const, class_name) rescue nil
-  klass = Object.const_set(class_name, Class.new)
-  klass.class_eval(&block)
-  klass
-end
-
 class MongoUploader < CarrierWave::Uploader::Base; end
 class AnotherMongoUploader < CarrierWave::Uploader::Base; end
 
@@ -175,7 +168,7 @@ describe CarrierWave::Mongoid do
         expect(@doc.image).to be_an_instance_of(MongoUploader)
       end
 
-      it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
+      it "should write nothing to the database, to prevent overridden filenames to fail because of unassigned attributes" do
         expect(@doc[:image]).to be_nil
       end
 
@@ -400,6 +393,24 @@ describe CarrierWave::Mongoid do
 
   end
 
+  describe '#reload' do
+
+    before do
+      @mongo_user_klass = reset_mongo_class
+      @doc = @mongo_user_klass.new
+      @doc.save
+    end
+
+    it 'reset cached value on reload' do
+      new = @mongo_user_klass.find(@doc.id)
+      new.image = stub_file('test.jpeg')
+      new.save
+
+      expect(@doc.reload.image).to_not be_blank
+    end
+
+  end
+
   describe '#mount_uploader removing old files' do
 
     before do
@@ -409,7 +420,7 @@ describe CarrierWave::Mongoid do
       @doc = @class.new
       @doc.image = stub_file('old.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
     end
 
     after do
@@ -421,33 +432,33 @@ describe CarrierWave::Mongoid do
       it "should remove old file if old file had a different path" do
         @doc.image = stub_file('new.jpeg')
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @doc.image.class.remove_previously_stored_files_after_update = false
         @doc.image = stub_file('new.jpeg')
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @doc.image = stub_file('old.jpeg')
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @doc.image = stub_file('new.jpeg')
         expect(@doc.save).to be_falsey
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
     end
 
-    describe 'with an overriden filename' do
+    describe 'with an overridden filename' do
       before do
         @uploader.class_eval do
           def filename
@@ -458,22 +469,22 @@ describe CarrierWave::Mongoid do
         @doc.image = stub_file('old.jpeg')
         @doc.foo = "test"
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/test.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/test.jpeg'))).to be_truthy
         expect(@doc.image.read).to eq "this is stuff"
       end
 
       it "should not remove file if old file had the same dynamic path" do
         @doc.image = stub_file('test.jpeg')
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/test.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/test.jpeg'))).to be_truthy
       end
 
       it "should remove old file if old file had a different dynamic path" do
         @doc.foo = "new"
         @doc.image = stub_file('test.jpeg')
         expect(@doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/test.jpeg'))).to be_falsey
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/test.jpeg'))).to be_falsey
       end
     end
 
@@ -481,29 +492,29 @@ describe CarrierWave::Mongoid do
       it "should remove old file if old file had a different path" do
         @embedded_doc.image = stub_file('new.jpeg')
         expect(@embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @embedded_doc.image.class.remove_previously_stored_files_after_update = false
         @embedded_doc.image = stub_file('new.jpeg')
         expect(@embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @embedded_doc.image = stub_file('old.jpeg')
         expect(@embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @embedded_doc_class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @embedded_doc.image = stub_file('new.jpeg')
         expect(@embedded_doc.save).to be_falsey
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not touch parent's dirty attributes" do
@@ -519,29 +530,29 @@ describe CarrierWave::Mongoid do
       it "should remove old file if old file had a different path" do
         @double_embedded_doc.image = stub_file('new.jpeg')
         expect(@double_embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
       end
 
       it "should not remove old file if old file had a different path but config is false" do
         @double_embedded_doc.image.class.remove_previously_stored_files_after_update = false
         @double_embedded_doc.image = stub_file('new.jpeg')
         expect(@double_embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if old file had the same path" do
         @double_embedded_doc.image = stub_file('old.jpeg')
         expect(@double_embedded_doc.save).to be_truthy
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
       it "should not remove file if validations fail on save" do
         @double_embedded_doc_class.validate { |r| r.errors.add :textfile, "FAIL!" }
         @double_embedded_doc.image = stub_file('new.jpeg')
         expect(@double_embedded_doc.save).to be_falsey
-        expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+        expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
       end
 
     end
@@ -752,8 +763,8 @@ describe CarrierWave::Mongoid do
       @doc = @class.new
       @doc.image = stub_file('old.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/thumb_old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/thumb_old.jpeg'))).to be_truthy
     end
 
     after do
@@ -763,17 +774,17 @@ describe CarrierWave::Mongoid do
     it "should remove old file if old file had a different path" do
       @doc.image = stub_file('new.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/thumb_new.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
-      expect(File.exists?(public_path('uploads/thumb_old.jpeg'))).to be_falsey
+      expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/thumb_new.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
+      expect(File.exist?(public_path('uploads/thumb_old.jpeg'))).to be_falsey
     end
 
     it "should not remove file if old file had the same path" do
       @doc.image = stub_file('old.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/thumb_old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/thumb_old.jpeg'))).to be_truthy
     end
   end
 
@@ -788,8 +799,8 @@ describe CarrierWave::Mongoid do
       @doc.image = stub_file('old.jpeg')
       @doc.textfile = stub_file('old.txt')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.txt'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.txt'))).to be_truthy
     end
 
     after do
@@ -800,27 +811,27 @@ describe CarrierWave::Mongoid do
       @doc.image = stub_file('new.jpeg')
       @doc.textfile = stub_file('new.txt')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
-      expect(File.exists?(public_path('uploads/new.txt'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.txt'))).to be_falsey
+      expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
+      expect(File.exist?(public_path('uploads/new.txt'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.txt'))).to be_falsey
     end
 
     it "should remove old file1 but not file2 if old file1 had a different path but old file2 has the same path" do
       @doc.image = stub_file('new.jpeg')
       @doc.textfile = stub_file('old.txt')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
-      expect(File.exists?(public_path('uploads/old.txt'))).to be_truthy
+      expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
+      expect(File.exist?(public_path('uploads/old.txt'))).to be_truthy
     end
 
     it "should not remove file1 or file2 if file1 and file2 have the same paths" do
       @doc.image = stub_file('old.jpeg')
       @doc.textfile = stub_file('old.txt')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.txt'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.txt'))).to be_truthy
     end
   end
 
@@ -833,7 +844,7 @@ describe CarrierWave::Mongoid do
       @doc = @class.new
       @doc.avatar = stub_file('old.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
     end
 
     after do
@@ -843,14 +854,14 @@ describe CarrierWave::Mongoid do
     it "should remove old file if old file had a different path" do
       @doc.avatar = stub_file('new.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/new.jpeg'))).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_falsey
+      expect(File.exist?(public_path('uploads/new.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_falsey
     end
 
     it "should not remove file if old file had the same path" do
       @doc.avatar = stub_file('old.jpeg')
       expect(@doc.save).to be_truthy
-      expect(File.exists?(public_path('uploads/old.jpeg'))).to be_truthy
+      expect(File.exist?(public_path('uploads/old.jpeg'))).to be_truthy
     end
   end
 

data/spec/spec_helper.rb

@@ -81,3 +81,10 @@ RSpec.configure do |config|
   config.include CarrierWave::Test::I18nHelpers
   config.color = true
 end
+
+def define_mongo_class(class_name, &block)
+  Object.send(:remove_const, class_name) rescue nil
+  klass = Object.const_set(class_name, Class.new)
+  klass.class_eval(&block)
+  klass
+end

data/spec/storage/grid_fs_spec.rb

@@ -154,11 +154,12 @@ describe CarrierWave::Storage::GridFS do
         @uploader_class.class_eval{
           include CarrierWave::MiniMagick
           storage :grid_fs
+          process resize_to_fill: [200, 200]
         }
 
         @versioned = @uploader_class.new
 
-        @versioned.store! File.open(file_path('portrait.jpg'))
+        @file = File.open(file_path('portrait.jpg'))
       end
 
       after do
@@ -166,9 +167,30 @@ describe CarrierWave::Storage::GridFS do
       end
 
       it "resizes the file with out error" do
-        expect { @versioned.resize_to_fill(200, 200) }.not_to raise_error
+        expect { @versioned.store! @file }.not_to raise_error
       end
     end
+
+    describe "#clean_cache!" do
+      before do
+        @uploader_class = Class.new(CarrierWave::Uploader::Base)
+        @uploader_class.class_eval{
+          storage :grid_fs
+        }
+
+        file = File.open(file_path('portrait.jpg'))
+        @filenames = [Time.now.utc - 3700, Time.now.utc - 3610, Time.now.utc - 3590].map do |time|
+          "#{time.to_i}-1234-5678-9000/portrait.jpg"
+        end
+        @filenames << "not-a-cache/portrait.jpg"
+        @filenames.each { |filename| @grid[filename] = file }
+      end
+
+      it "cleans old cache files" do
+        @uploader_class.clean_cached_files!(3600)
+        expect(@grid.namespace.file_model.all.to_a.map(&:filename)).to eq @filenames[2..3]
+      end
+    end if CarrierWave::VERSION >= '2'
   end
 
   after do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jonas Nicklas
 - Trevor Turk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -20,7 +20,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: mongoid-grid_fs
   requirement: !ruby/object:Gem::Requirement
@@ -77,28 +77,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -146,15 +146,20 @@ files:
 - gemfiles/carrierwave-1.1.gemfile
 - gemfiles/carrierwave-1.2.gemfile
 - gemfiles/carrierwave-1.3.gemfile
+- gemfiles/carrierwave-2.0.gemfile
+- gemfiles/carrierwave-2.1.gemfile
+- gemfiles/carrierwave-2.2.gemfile
 - gemfiles/mongoid-3.gemfile
 - gemfiles/mongoid-4.gemfile
 - gemfiles/mongoid-5.gemfile
 - gemfiles/mongoid-6.gemfile
 - gemfiles/mongoid-7.gemfile
+- gemfiles/mongoid-8.gemfile
 - lib/carrierwave/mongoid.rb
 - lib/carrierwave/mongoid/version.rb
 - lib/carrierwave/storage/grid_fs.rb
 - log/.gitkeep
+- spec/carrierwave/mongoid/mount_uploaders_spec.rb
 - spec/fixtures/new.jpeg
 - spec/fixtures/new.txt
 - spec/fixtures/old.jpeg
@@ -169,7 +174,7 @@ homepage: https://github.com/carrierwaveuploader/carrierwave-mongoid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,11 +189,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: Mongoid support for CarrierWave
 test_files:
+- spec/carrierwave/mongoid/mount_uploaders_spec.rb
 - spec/fixtures/new.jpeg
 - spec/fixtures/new.txt
 - spec/fixtures/old.jpeg

data/.travis.yml

@@ -1,29 +0,0 @@
-sudo: false
-services: mongodb
-
-notifications:
-  email: false
-
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-
-gemfile:
-  - Gemfile
-  - gemfiles/carrierwave-0.10.gemfile
-  - gemfiles/carrierwave-0.11.gemfile
-  - gemfiles/carrierwave-1.1.gemfile
-  - gemfiles/carrierwave-1.2.gemfile
-  - gemfiles/carrierwave-1.3.gemfile
-  - gemfiles/mongoid-3.gemfile
-  - gemfiles/mongoid-4.gemfile
-  - gemfiles/mongoid-5.gemfile
-  - gemfiles/mongoid-6.gemfile
-  - gemfiles/mongoid-7.gemfile
-
-matrix:
-  fast_finish: true