carrierwave-mongoid 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d352163a5884a2d049f679726257062179c252456e3ca79bd51d74f9eddc5c
-  data.tar.gz: ae0662582c29b0f1b1dc1d8ef66f8d055019289a1af50496ea3f95aa611ec987
+  metadata.gz: 638d1c8b7b6ec017fd506e049a70aae4cbc5d865f3636f59a112fec019b2773b
+  data.tar.gz: 25bccea5eeb663d2045bb7d5cc63aef878bfed879012c88621021e3a1671d5c9
 SHA512:
-  metadata.gz: 1bab73849cf2ee4b2fae2eca787b1511dbc421ad1b0bc9c46c8b0463e74c42d897a9868fe754bdf4198057a21cf8403a408be5acff676518affe371a5df36659
-  data.tar.gz: 07c1ba5af2b570b0f9d210c4002d56a8089f3c5f1d5f194cf0a54d60af84f6f54860bf8deea4b9c640de23b7d3940b9c72fee05573f1fc7bbb3bfe0066780c59
+  metadata.gz: 2e91e464455cfa5505927ba89e0bdd70cb9135b7842226fbf16d4b216d6254e57fb8f86307c7e360f08419cf857fdf1bf743e2f8274daf178d2f355271b698fc
+  data.tar.gz: 509158075089695fc731384507d1508db950cb06895f3720ebffdded4955cf12a70c02d1d0141a2866e807742a9d7f3ff01e47d0ef0ee24b9b44de3eb1368c8e

data/.travis.yml

@@ -7,10 +7,10 @@ notifications:
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 
 gemfile:
   - Gemfile
@@ -19,6 +19,7 @@ gemfile:
   - gemfiles/carrierwave-1.1.gemfile
   - gemfiles/carrierwave-1.2.gemfile
   - gemfiles/carrierwave-1.3.gemfile
+  - gemfiles/carrierwave-2.0.gemfile
   - gemfiles/mongoid-3.gemfile
   - gemfiles/mongoid-4.gemfile
   - gemfiles/mongoid-5.gemfile

data/carrierwave-mongoid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "carrierwave", [">= 0.8", "< 1.4"]
+  s.add_dependency "carrierwave", [">= 0.8", "< 3"]
   s.add_dependency "mongoid", [">= 3.0", "< 8.0"]
   s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
   s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9

data/gemfiles/carrierwave-2.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "carrierwave", [">= 2.0.0.rc", "< 3"]
+
+gemspec path: "../"

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/carrierwave/storage/grid_fs.rb

@@ -44,7 +44,7 @@ module CarrierWave
         end
 
         def write(file)
-          grid[@uploader.store_path] = file
+          grid[path] = file
         ensure
           @grid_file = nil
         end
@@ -109,6 +109,55 @@ module CarrierWave
         CarrierWave::Storage::GridFS::File.new(uploader, uploader.store_path(identifier))
       end
 
+      ##
+      # Cache the file in MongoDB's GridFS GridStore
+      #
+      # === Parameters
+      #
+      # [file (CarrierWave::SanitizedFile)] the file to store
+      #
+      # === Returns
+      #
+      # [CarrierWave::SanitizedFile] a sanitized file
+      #
+      def cache!(file)
+        stored = CarrierWave::Storage::GridFS::File.new(uploader, uploader.cache_path)
+        stored.write(file)
+        stored
+      end
+
+      ##
+      # Retrieve the cached file from MongoDB's GridFS GridStore
+      #
+      # === Parameters
+      #
+      # [identifier (String)] uniquely identifies a cache file
+      #
+      # === Returns
+      #
+      # [CarrierWave::Storage::GridFS::File] a sanitized file
+      #
+      def retrieve_from_cache!(identifier)
+        CarrierWave::Storage::GridFS::File.new(uploader, uploader.cache_path(identifier))
+      end
+
+      def delete_dir!(path)
+        # do nothing, because there's no such things as 'empty directory'
+      end
+
+      ##
+      # Clean old caches
+      #
+      # === Parameters
+      #
+      # [seconds (Integer)] duration in seconds, caches older than this will be deleted
+      #
+      def clean_cache!(seconds)
+        File.grid.namespace.
+          where(filename: /\d+-\d+-\d+(?:-\d+)?\/.+/).
+          and(:filename.lt => (Time.now.utc - seconds).to_i.to_s).
+          delete
+      end
     end # GridFS
   end # Storage
 end # CarrierWave

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-06-23 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
@@ -146,6 +146,7 @@ files:
 - gemfiles/carrierwave-1.1.gemfile
 - gemfiles/carrierwave-1.2.gemfile
 - gemfiles/carrierwave-1.3.gemfile
+- gemfiles/carrierwave-2.0.gemfile
 - gemfiles/mongoid-3.gemfile
 - gemfiles/mongoid-4.gemfile
 - gemfiles/mongoid-5.gemfile
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mongoid support for CarrierWave