carrierwave-mongoid 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d352163a5884a2d049f679726257062179c252456e3ca79bd51d74f9eddc5c
-  data.tar.gz: ae0662582c29b0f1b1dc1d8ef66f8d055019289a1af50496ea3f95aa611ec987
+  metadata.gz: 695a0d096fa1477e3034c1d1e265f43064edd398e33a683ef664e16af964f4f6
+  data.tar.gz: 72b97b4845445ef2378dfc565f3f70fd7d151b027fcd42d0e932c35a1027bd46
 SHA512:
-  metadata.gz: 1bab73849cf2ee4b2fae2eca787b1511dbc421ad1b0bc9c46c8b0463e74c42d897a9868fe754bdf4198057a21cf8403a408be5acff676518affe371a5df36659
-  data.tar.gz: 07c1ba5af2b570b0f9d210c4002d56a8089f3c5f1d5f194cf0a54d60af84f6f54860bf8deea4b9c640de23b7d3940b9c72fee05573f1fc7bbb3bfe0066780c59
+  metadata.gz: e0c6bc4f88cfe2f136c6fa3e2dc99fb94c530ef8c1b85ba9932b36bf82d268a480892f76e063be6163ed98b94764f622161025f13df70a3743bb7ee720e79600
+  data.tar.gz: 7087b901685c9f7b09b933aa0ccbc7154d7611ab4b1b0e95042d24c23c1b0f358b71f9b888b27f0c3e3d17c3938ed3ff65db517558cd9b63bd0cb72616b06fd9

data/.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mongodb: [4.4]
+        ruby: [2.7, 3.0, 3.1]
+        gemfile:
+          - carrierwave-2.1
+          - carrierwave-2.2
+          - mongoid-7
+          - mongoid-8
+        include:
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-0.10" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-0.11" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-1.1" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-1.2" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-1.3" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "carrierwave-2.0" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "mongoid-3" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "mongoid-4" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "mongoid-5" }
+          - { mongodb: "4.4", ruby: "2.6", gemfile: "mongoid-6" }
+    name: Ruby ${{ matrix.ruby }} with ${{ matrix.gemfile }}
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - name: Set up MongoDB ${{ matrix.mongodb }}
+        uses: supercharge/mongodb-github-action@1.3.0
+        with:
+          mongodb-version: ${{ matrix.mongodb }}
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - 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
+        if: ${{ failure() }}
+      - run: cat /home/runner/work/carrierwave-mongoid/carrierwave-mongoid/vendor/bundle/ruby/3.0.0/gems/mimemagic-0.4.3/ext/mimemagic/Rakefile
+        if: ${{ failure() }}
+      - name: Run tests
+        run: bundle exec rake

data/README.md

@@ -1,8 +1,7 @@
 # CarrierWave for Mongoid
 
 [![Gem Version](http://img.shields.io/gem/v/carrierwave-mongoid.svg)](https://rubygems.org/gems/carrierwave-mongoid)
-[![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave-mongoid.svg)](http://travis-ci.org/carrierwaveuploader/carrierwave-mongoid)
-[![Code Climate](http://img.shields.io/codeclimate/github/carrierwaveuploader/carrierwave-mongoid.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave-mongoid)
+[![Build Status](https://github.com/carrierwaveuploader/carrierwave-mongoid/workflows/CI/badge.svg?branch=master)](https://github.com/carrierwaveuploader/carrierwave-mongoid/actions?query=workflow%3ACI)
 [![Gem Downloads](https://img.shields.io/gem/dt/carrierwave-mongoid.svg)](https://rubygems.org/gems/carrierwave-mongoid)
 
 This gem adds support for Mongoid and MongoDB's GridFS to
@@ -230,4 +229,4 @@ class User
 end
 ```
 
-You can read more about this [here](https://github.com/carrierwaveuploader/carrierwave/issues#issue/81)
+You can read more about this [here](https://github.com/carrierwaveuploader/carrierwave/issues/81)

data/carrierwave-mongoid.gemspec

@@ -20,12 +20,12 @@ 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 "mongoid", [">= 3.0", "< 8.0"]
+  s.add_dependency "carrierwave", [">= 0.8", "< 3"]
+  s.add_dependency "mongoid", [">= 3.0", "< 9.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
-  s.add_development_dependency "rspec", "~>3.4.0"
-  s.add_development_dependency "rake", "~>11.1.2"
+  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "rake", ">= 12.3.3"
   s.add_development_dependency "mini_magick"
   s.add_development_dependency "pry"
 end

data/gemfiles/carrierwave-1.1.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "carrierwave", "~> 1.1.0"
+gem "mongoid", "> 5.0"
 
 gemspec path: "../"

data/gemfiles/carrierwave-1.2.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "carrierwave", "~> 1.2.0"
+gem "mongoid", "> 5.0"
 
 gemspec path: "../"

data/gemfiles/carrierwave-1.3.gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "carrierwave", "~> 1.3.0"
+gem "mongoid", "> 5.0"
 
 gemspec path: "../"

data/gemfiles/carrierwave-2.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "carrierwave", "~> 2.0.0"
+gem "mongoid", "> 5.0"
+
+gemspec path: "../"

data/gemfiles/carrierwave-2.1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "carrierwave", "~> 2.1.0"
+gem "mongoid", "> 5.0"
+
+gemspec path: "../"

data/gemfiles/carrierwave-2.2.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "carrierwave", "~> 2.2.0"
+gem "mongoid", "> 5.0"
+
+gemspec path: "../"

data/gemfiles/mongoid-7.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 7.0"
-gem "carrierwave", "~> 1.3"
+gem "carrierwave", "~> 2.2"
 
 gemspec path: "../"

data/gemfiles/mongoid-8.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "mongoid", "~> 8.0"
+gem "carrierwave", "~> 2.2"
+
+gemspec path: "../"

data/lib/carrierwave/mongoid/version.rb

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

data/lib/carrierwave/mongoid.rb

@@ -109,11 +109,14 @@ module CarrierWave
 
         def find_previous_model_for_#{column}
           if self.embedded?
-            if self.respond_to?(:__metadata) # Mongoid >= 4.0.0.beta1
-              ancestors = [[ self.__metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.__metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
-            else # Mongoid < 4.0.0.beta1
-              ancestors = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
-            end
+            ancestors =
+              if self.respond_to?(:_association) # Mongoid >= 7.0.0.beta
+                [[ self._association.key, self._parent ]].tap { |x| x.unshift([ x.first.last._association.key, x.first.last._parent ]) while x.first.last.embedded? }
+              elsif self.respond_to?(:__metadata) # Mongoid >= 4.0.0.beta1 < 7.0.0.beta
+                [[ self.__metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.__metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+              else # Mongoid < 4.0.0.beta1
+                [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+              end
             first_parent = ancestors.first.last
             reloaded_parent = first_parent.class.unscoped.find(first_parent.to_key.first)
             association = ancestors.inject(reloaded_parent) { |parent,(key,ancestor)| (parent.is_a?(Array) ? parent.find(ancestor.to_key.first) : parent).send(key) }
@@ -141,8 +144,104 @@ module CarrierWave
           end
           super(options).merge(hash)
         end
+
+        # Reset cached mounter on mongoid reload
+        def reload
+          @_mounters = nil
+          super
+        end
       RUBY
     end
+
+    if Gem::Version.new(CarrierWave::VERSION) >= Gem::Version.new('1.0.beta')
+      def mount_uploaders(column, uploader = nil, options = {}, &block)
+        field (options[:mount_on] || column), type: Array, default: []
+
+        super
+
+        alias_method :read_uploader, :read_attribute
+        alias_method :write_uploader, :write_attribute
+        public :read_uploader
+        public :write_uploader
+
+        include CarrierWave::Validations::ActiveModel
+
+        validates_integrity_of column if uploader_option(column.to_sym, :validate_integrity)
+        validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+
+        before_update :"store_previous_changes_for_#{column}"
+        before_save :"write_#{column}_identifier"
+        after_save :"store_#{column}!"
+        after_save :"remove_previously_stored_#{column}"
+        after_destroy :"remove_#{column}!"
+
+        class_eval <<-RUBY, __FILE__, (__LINE__ + 1)
+          def #{column}=(new_files)
+            column = _mounter(:#{column}).serialization_column
+  
+            previous_uploader_value = read_uploader(column)
+            @_previous_uploader_value_for_#{column} = previous_uploader_value
+  
+            write_uploader(column, []) if self.persisted? && read_uploader(column).nil?
+  
+            send(:"\#{column}_will_change!")
+
+            super
+          end
+
+          def #{column}_changed?
+            changed_attributes.has_key?("#{column}")
+          end
+
+          def remove_#{column}=(value)
+            if ['1', true].include?(value)
+              column = _mounter(:#{column}).serialization_column
+
+              send(:"\#{column}_will_change!")
+            end
+
+            super
+          end
+
+          # The default Mongoid attribute_will_change! method is not enough
+          # when we want to upload a new file in an existing embedded document.
+          # The custom version of that method forces the callbacks to be
+          # ran and so does the upload.
+          def #{column}_will_change!
+            changed_attributes["#{column}"] = ['_new_']
+          end
+
+          def remove_previously_stored_#{column}
+            before, after = @_previous_changes_for_#{column}
+            # Don't delete if the files had the same name
+            return if before.nil? && after.nil?
+            # Proceed to remove the file, use the original name instead of '_new_'
+            before = @_previous_uploader_value_for_#{column} || before
+            _mounter(:#{column}).remove_previous(Array.wrap(before), Array.wrap(after))
+          end
+
+          def serializable_hash(options = nil)
+            hash = {}
+  
+            except = options && options[:except] && Array.wrap(options[:except]).map(&:to_s)
+            only = options && options[:only] && Array.wrap(options[:only]).map(&:to_s)
+  
+            self.class.uploaders.each do |column, _uploader|
+              if (!only && !except) || (only && only.include?(column.to_s)) || (except && !except.include?(column.to_s))
+                next if _mounter(column.to_sym).uploaders.blank?
+                hash[column.to_s] = _mounter(column.to_sym).uploaders.map(&:serializable_hash)
+              end
+            end
+
+            super(options).merge(hash)
+          end
+
+          def store_previous_changes_for_#{column}
+            @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
+          end
+        RUBY
+      end
+    end
   end # Mongoid
 end # CarrierWave
 

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