carrierwave 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35c836a3a970d4f900cc30a3a601199a629a8554
-  data.tar.gz: 22b99a337562f2be3c60731377de38b8a204d73f
+  metadata.gz: e37b68386a3a7becb2363f72f3ce38e8b9049a9a
+  data.tar.gz: 5391ed9991a220136287ad472d243c0ee5164492
 SHA512:
-  metadata.gz: f4602848d9c82f60537acb7e3cfaa0ca7bdffe0a0d737224b62400e52c52277109ee1090aa148755ba5ba84f11fa5cdd11bc4209c533cf5c1df7475feda2ad66
-  data.tar.gz: 95e296300604fc0d41013302cd667d5713f56cb5faa64e5f2ff4d43708e04fdd59c1df6c55414848f526f5eb56618923de9d2a177fb5e2f49be62b383e95b085
+  metadata.gz: 2cfc444237e06625db981b6a502847d9a64bd52dc7a7fd4a5189ffc878914fdf7f252d504b54b49d13cb63b2c7d90afdbabaee3b6fb482a3c8bcec49546a51da
+  data.tar.gz: 637ee1e7a31c735ff3b9fd7035e7cc897e8acfc610eadeb8c96de778c9b8c64d4a9bcb2e80fe1ed63454e35a029a8ea8224eb3022a748f8a8caa134b9f2048c3

data/README.md

@@ -4,8 +4,8 @@ This gem provides a simple and extremely flexible way to upload files from Ruby
 It works well with Rack based web applications, such as Ruby on Rails.
 
 [![Build Status](https://travis-ci.org/carrierwaveuploader/carrierwave.svg?branch=master)](http://travis-ci.org/carrierwaveuploader/carrierwave)
-[![Code Climate](http://img.shields.io/codeclimate/github/carrierwaveuploader/carrierwave.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
-[![git.legal](https://git.legal/projects/1363/badge.svg "Number of libraries approved")](https://git.legal/projects/1363)
+[![Code Climate](https://codeclimate.com/github/carrierwaveuploader/carrierwave.svg)](https://codeclimate.com/github/carrierwaveuploader/carrierwave)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=carrierwave&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=carrierwave&package-manager=bundler&version-scheme=semver)
 
 
 ## Information
@@ -24,7 +24,7 @@ It works well with Rack based web applications, such as Ruby on Rails.
 Install the latest release:
 
 ```
-$ gem install carrierwave -v "1.0.0"
+$ gem install carrierwave
 ```
 
 In Rails, add it to your Gemfile:
@@ -307,7 +307,7 @@ to exactly 200 by 200 pixels.
 
 If you would like to crop images to a specific height and width you
 can use the alternative option of '''resize_to_fill'''. It will make sure
-that the width and height specified are filled, only copping 
+that the width and height specified are filled, only cropping
 if the aspect ratio requires it.
 
 The uploader could be used like this:
@@ -633,6 +633,8 @@ describe MyUploader do
 end
 ```
 
+If you're looking for minitest asserts, checkout [carrierwave_asserts](https://github.com/hcfairbanks/carrierwave_asserts).
+
 Setting the enable_processing flag on an uploader will prevent any of the versions from processing as well.
 Processing can be enabled for a single version by setting the processing flag on the version like so:
 
@@ -667,13 +669,14 @@ CarrierWave.configure do |config|
   config.fog_provider = 'fog/aws'                        # required
   config.fog_credentials = {
     provider:              'AWS',                        # required
-    aws_access_key_id:     'xxx',                        # required
-    aws_secret_access_key: 'yyy',                        # required
+    aws_access_key_id:     'xxx',                        # required unless using use_iam_profile
+    aws_secret_access_key: 'yyy',                        # required unless using use_iam_profile
+    use_iam_profile:       true,                         # optional, defaults to false
     region:                'eu-west-1',                  # optional, defaults to 'us-east-1'
     host:                  's3.example.com',             # optional, defaults to nil
     endpoint:              'https://s3.example.com:8080' # optional, defaults to nil
   }
-  config.fog_directory  = 'name_of_directory'                                   # required
+  config.fog_directory  = 'name_of_bucket'                                      # required
   config.fog_public     = false                                                 # optional, defaults to true
   config.fog_attributes = { cache_control: "public, max-age=#{365.days.to_i}" } # optional, defaults to {}
 end

data/lib/carrierwave/processing/mini_magick.rb

@@ -61,6 +61,13 @@ module CarrierWave
         e.message << " (You may need to install the mini_magick gem)"
         raise e
       end
+
+      prepend Module.new {
+        def initialize(*)
+          super
+          @format = nil
+        end
+      }
     end
 
     module ClassMethods

data/lib/carrierwave/processing/rmagick.rb

@@ -67,6 +67,13 @@ module CarrierWave
         e.message << " (You may need to install the rmagick gem)"
         raise e
       end
+
+      prepend Module.new {
+        def initialize(*)
+          super
+          @format = nil
+        end
+      }
     end
 
     module ClassMethods
@@ -346,7 +353,7 @@ module CarrierWave
       frames = ::Magick::ImageList.new
 
       image.each_with_index do |frame, index|
-        frame = yield *[frame, index, options].take(block.arity) if block_given?
+        frame = yield(*[frame, index, options].take(block.arity)) if block_given?
         frames << frame if frame
       end
       frames.append(true) if block_given?

data/lib/carrierwave/sanitized_file.rb

@@ -20,7 +20,7 @@ module CarrierWave
   #
   class SanitizedFile
 
-    attr_accessor :file
+    attr_reader :file
 
     class << self
       attr_writer :sanitize_regexp
@@ -32,6 +32,7 @@ module CarrierWave
 
     def initialize(file)
       self.file = file
+      @content = nil
     end
 
     ##

data/lib/carrierwave/storage/file.rb

@@ -7,6 +7,10 @@ module CarrierWave
     # pretty much it.
     #
     class File < Abstract
+      def initialize(*)
+        super
+        @cache_called = nil
+      end
 
       ##
       # Move the file to the uploader's store path.

data/lib/carrierwave/storage/fog.rb

@@ -266,7 +266,7 @@ module CarrierWave
         end
 
         def initialize(uploader, base, path)
-          @uploader, @base, @path = uploader, base, path
+          @uploader, @base, @path, @content_type = uploader, base, path, nil
         end
 
         ##
@@ -276,6 +276,16 @@ module CarrierWave
         #
         # [String] contents of file
         def read
+          file_body = file.body
+
+          return if file_body.nil?
+          return file_body unless file_body.is_a?(::File)
+
+          # Fog::Storage::XXX::File#body could return the source file which was upoloaded to the remote server.
+          read_source_file(file_body) if ::File.exist?(file_body.path)
+
+          # If the source file doesn't exist, the remote content is read
+          @file = nil # rubocop:disable Gitlab/ModuleWithInstanceVariables
           file.body
         end
 
@@ -313,7 +323,7 @@ module CarrierWave
             fog_file = new_file.to_file
             @content_type ||= new_file.content_type
             @file = directory.files.create({
-              :body         => (fog_file ? fog_file : new_file).read,
+              :body         => fog_file ? fog_file : new_file.read,
               :content_type => @content_type,
               :key          => path,
               :public       => @uploader.fog_public
@@ -458,6 +468,17 @@ module CarrierWave
         def acl_header
           {'x-amz-acl' => @uploader.fog_public ? 'public-read' : 'private'}
         end
+
+        def read_source_file(file_body)
+          return unless ::File.exist?(file_body.path)
+
+          begin
+            file_body = ::File.open(file_body.path) if file_body.closed? # Reopen if it's already closed
+            file_body.read
+          ensure
+            file_body.close
+          end
+        end
       end
 
     end # Fog

data/lib/carrierwave/uploader.rb

@@ -43,6 +43,15 @@ module CarrierWave
     class Base
       attr_reader :file
 
+      ##
+      # Workaround for class_attribute malfunction when used with Module#prepend
+      #
+      if RUBY_VERSION < '2.1.0'
+        def self.singleton_class?
+          !ancestors.include? self
+        end
+      end
+
       include CarrierWave::Uploader::Configuration
       include CarrierWave::Uploader::Callbacks
       include CarrierWave::Uploader::Proxy

data/lib/carrierwave/uploader/configuration.rb

@@ -117,12 +117,14 @@ module CarrierWave
 
         def add_config(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            @#{name} = nil
+
             def self.eager_load_fog(fog_credentials)
               # see #1198. This will hopefully no longer be necessary after fog 2.0
               require self.fog_provider
               require 'carrierwave/storage/fog'
               Fog::Storage.new(fog_credentials) if fog_credentials.present?
-            end
+            end unless defined? eager_load_fog
 
             def self.#{name}(value=nil)
               @#{name} = value if value

data/lib/carrierwave/uploader/download.rb

@@ -13,6 +13,7 @@ module CarrierWave
         def initialize(uri, remote_headers = {})
           @uri = uri
           @remote_headers = remote_headers
+          @file = nil
         end
 
         def original_filename

data/lib/carrierwave/uploader/store.rb

@@ -7,6 +7,15 @@ module CarrierWave
       include CarrierWave::Uploader::Configuration
       include CarrierWave::Uploader::Cache
 
+      included do
+        prepend Module.new {
+          def initialize(*)
+            super
+            @file, @filename, @cache_id = nil
+          end
+        }
+      end
+
       ##
       # Override this in your Uploader to change the filename.
       #

data/lib/carrierwave/uploader/versions.rb

@@ -19,6 +19,13 @@ module CarrierWave
         after :remove, :remove_versions!
         after :retrieve_from_cache, :retrieve_versions_from_cache!
         after :retrieve_from_store, :retrieve_versions_from_store!
+
+        prepend Module.new {
+          def initialize(*)
+            super
+            @versions = nil
+          end
+        }
       end
 
       module ClassMethods
@@ -77,7 +84,7 @@ module CarrierWave
               # value from the parent class unless explicitly overwritten
               def self.enable_processing(value=nil)
                 self.enable_processing = value if value
-                if !@enable_processing.nil?
+                if defined?(@enable_processing) && !@enable_processing.nil?
                   @enable_processing
                 else
                   superclass.enable_processing

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,19 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-google
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: fog-local
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-rackspace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -243,8 +285,6 @@ files:
 - lib/carrierwave/uploader/extension_blacklist.rb
 - lib/carrierwave/uploader/extension_whitelist.rb
 - lib/carrierwave/uploader/file_size.rb
-- lib/carrierwave/uploader/magic_mime_blacklist.rb
-- lib/carrierwave/uploader/magic_mime_whitelist.rb
 - lib/carrierwave/uploader/mountable.rb
 - lib/carrierwave/uploader/processing.rb
 - lib/carrierwave/uploader/proxy.rb

data/lib/carrierwave/uploader/magic_mime_blacklist.rb

@@ -1,94 +0,0 @@
-module CarrierWave
-  module Uploader
-
-    ##
-    # This modules validates the content type of a file with the use of
-    # ruby-filemagic gem and a blacklist regular expression. If you want
-    # to use this, you'll need to require this file:
-    #
-    #   require 'carrierwave/uploader/magic_mime_blacklist'
-    #
-    # And then include it in your uploader:
-    #
-    #   class MyUploader < CarrierWave::Uploader::Base
-    #     include CarrierWave::Uploader::MagicMimeBlacklist
-    #
-    #     def blacklist_mime_type_pattern
-    #       /image\//
-    #     end
-    #   end
-    #
-    module MagicMimeBlacklist
-      extend ActiveSupport::Concern
-
-      included do
-        begin
-          require "filemagic"
-        rescue LoadError => e
-          e.message << " (You may need to install the ruby-filemagic gem)"
-          raise e
-        end
-
-        before :cache, :check_blacklist_pattern!
-      end
-
-      ##
-      # Override this method in your uploader to provide a black list pattern (regexp)
-      # of content-types which are prohibited to be uploaded.
-      # Compares the file's content-type.
-      #
-      # === Returns
-      #
-      # [Regexp] a black list regexp to match the content_type
-      #
-      # === Examples
-      #
-      #     def blacklist_mime_type_pattern
-      #       /(text|application)\/json/
-      #     end
-      #
-      def blacklist_mime_type_pattern; end
-
-    private
-
-      def check_blacklist_pattern!(new_file)
-        return if blacklist_mime_type_pattern.nil?
-
-        content_type = extract_content_type(new_file)
-
-        if content_type.match(blacklist_mime_type_pattern)
-          raise CarrierWave::IntegrityError,
-            I18n.translate(:"errors.messages.mime_type_pattern_black_list_error",
-                           :content_type => content_type)
-        end
-      end
-
-      ##
-      # Extracts the content type of the given file
-      #
-      # === Returns
-      #
-      # [String] the extracted content type
-      #
-      def extract_content_type(new_file)
-        content_type = nil
-
-        File.open(new_file.path) do |fd|
-          data = fd.read(1024) || ""
-          content_type = filemagic.buffer(data)
-        end
-
-        content_type
-      end
-
-    ##
-    # FileMagic object with the MAGIC_MIME_TYPE flag set
-    #
-    # @return [FileMagic] a filemagic object
-      def filemagic
-        @filemagic ||= FileMagic.new(FileMagic::MAGIC_MIME_TYPE)
-      end
-
-    end # MagicMimeblackList
-  end # Uploader
-end # CarrierWave

data/lib/carrierwave/uploader/magic_mime_whitelist.rb

@@ -1,94 +0,0 @@
-module CarrierWave
-  module Uploader
-
-    ##
-    # This modules validates the content type of a file with the use of
-    # ruby-filemagic gem and a whitelist regular expression. If you want
-    # to use this, you'll need to require this file:
-    #
-    #   require 'carrierwave/uploader/magic_mime_whitelist'
-    #
-    # And then include it in your uploader:
-    #
-    #   class MyUploader < CarrierWave::Uploader::Base
-    #     include CarrierWave::Uploader::MagicMimeWhitelist
-    #
-    #     def whitelist_mime_type_pattern
-    #       /image\//
-    #     end
-    #   end
-    #
-    module MagicMimeWhitelist
-      extend ActiveSupport::Concern
-
-      included do
-        begin
-          require "filemagic"
-        rescue LoadError => e
-          e.message << " (You may need to install the ruby-filemagic gem)"
-          raise e
-        end
-
-        before :cache, :check_whitelist_pattern!
-      end
-
-      ##
-      # Override this method in your uploader to provide a white list pattern (regexp)
-      # of content-types which are allowed to be uploaded.
-      # Compares the file's content-type.
-      #
-      # === Returns
-      #
-      # [Regexp] a white list regexp to match the content_type
-      #
-      # === Examples
-      #
-      #     def whitelist_mime_type_pattern
-      #       /(text|application)\/json/
-      #     end
-      #
-      def whitelist_mime_type_pattern; end
-
-    private
-
-      def check_whitelist_pattern!(new_file)
-        return if whitelist_mime_type_pattern.nil?
-
-        content_type = extract_content_type(new_file)
-
-        if !content_type.match(whitelist_mime_type_pattern)
-          raise CarrierWave::IntegrityError,
-            I18n.translate(:"errors.messages.mime_type_pattern_white_list_error",
-                           :content_type => content_type)
-        end
-      end
-
-      ##
-      # Extracts the content type of the given file
-      #
-      # === Returns
-      #
-      # [String] the extracted content type
-      #
-      def extract_content_type(new_file)
-        content_type = nil
-
-        File.open(new_file.path) do |fd|
-          data = fd.read(1024) || ""
-          content_type = filemagic.buffer(data)
-        end
-
-        content_type
-      end
-
-    ##
-    # FileMagic object with the MAGIC_MIME_TYPE flag set
-    #
-    # @return [FileMagic] a filemagic object
-      def filemagic
-        @filemagic ||= FileMagic.new(FileMagic::MAGIC_MIME_TYPE)
-      end
-
-    end # MagicMimeWhiteList
-  end # Uploader
-end # CarrierWave