carrierwave 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 418e6b0903adc403510724ba7a5764e8edaa5b4bc96d5313e8f01572bf26ceac
-  data.tar.gz: 0bbac560a7928ce059afccb2280a1f77d17c9bca418a3f471097a3e3375fc6d0
+  metadata.gz: 558934b4dcea4b5aed9f60fe4cf4f87d3c1963e9f3e2a835117b226d01996462
+  data.tar.gz: 0d8933eafbc965bfd9f482f7978f5f45ff803115cc470a9e63eb05a41763b969
 SHA512:
-  metadata.gz: 253d7d3f2e78fd169e347042c6eae2d5ab70f1383dc159988387215cb669ca905232817484f168816c21bcfb6733221a69c6ae02d7a463df920446ee53ae8efd
-  data.tar.gz: 7640c8c67f2bb11025a42c9b05752a167a3da4d3452dc3359ffc51e5cb5ea8460fd23be401446734daa573e77f9a0639b7f2cf053288d8c5360e63907a80f08c
+  metadata.gz: 4852bd015f5bae013c9da67d48d121998e6a77d08dc52674b24ca96b276b5ce272bbdf480cc062f30159e1ef0b6a47e4ddbfc5659c575cd358e7000aca86029b
+  data.tar.gz: 75eaf047f5ec552fc0ede4acad3947671f1429a8e982044aceba6c6452a6c213eef7db14ef41c254762e3d74e7ed8e0c2d733026586c0d583b4e535185161cd2

data/lib/carrierwave/orm/activerecord.rb

@@ -51,7 +51,7 @@ module CarrierWave
           super
           @_mounters[:"#{column}"] = nil
           # The attribute needs to be cleared to prevent it from picked up as identifier
-          write_attribute(_mounter(:#{column}).serialization_column, nil)
+          write_uploader(_mounter(:#{column}).serialization_column, nil)
           _mounter(:"#{column}").cache(old_uploaders)
         end
 

data/lib/carrierwave/processing/mini_magick.rb

@@ -293,7 +293,7 @@ module CarrierWave
 
       ::MiniMagick::Image.new(current_path).identify
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      raise e if e.message =~ /(You must have .+ installed|is not installed|executable not found)/
+      raise e if e.message =~ /(You must have .+ installed|is not installed|executable not found|delegate failed)/
       message = I18n.translate(:"errors.messages.processing_error")
       raise CarrierWave::ProcessingError, message
     ensure

data/lib/carrierwave/sanitized_file.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'active_support/core_ext/string/multibyte'
 require 'marcel'
 
 module CarrierWave
@@ -129,24 +128,35 @@ module CarrierWave
     # [String] contents of the file
     #
     def read(*args)
-      if @content
-        if args.empty?
+      if args.empty?
+        if @content
           @content
+        elsif is_path?
+          File.open(@file, "rb") {|file| file.read }
         else
-          length, outbuf = args
-          raise ArgumentError, "outbuf argument not supported since the content is already loaded" if outbuf
-          @content[0, length]
+          @file.try(:rewind)
+          @content = @file.read
+          @file.try(:close) unless @file.class.ancestors.include?(::StringIO) || @file.try(:closed?)
+          @content
         end
-      elsif is_path?
-        File.open(@file, "rb") {|file| file.read(*args)}
       else
-        @file.try(:rewind)
-        @content = @file.read(*args)
-        @file.try(:close) unless @file.class.ancestors.include?(::StringIO) || @file.try(:closed?)
-        @content
+        if is_path?
+          @file = File.open(path, "rb")
+        elsif @file.is_a?(CarrierWave::Uploader::Base)
+          @file = StringIO.new(@file.read)
+        end
+
+        @file.read(*args)
       end
     end
 
+    ##
+    # Rewinds the underlying file.
+    #
+    def rewind
+      @file.rewind if @file.respond_to?(:rewind)
+    end
+
     ##
     # Moves the file to the given path
     #
@@ -301,7 +311,7 @@ module CarrierWave
       name = name.gsub(sanitize_regexp, "_")
       name = "_#{name}" if name =~ /\A\.+\z/
       name = "unnamed" if name.size.zero?
-      name.mb_chars.to_s
+      name.to_s
     end
 
     def declared_content_type

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "3.1.0".freeze
+  VERSION = "3.1.1".freeze
 end

data/lib/generators/templates/uploader.rb.erb

@@ -1,7 +1,8 @@
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
-  # Include RMagick or MiniMagick support:
+  # Include RMagick, MiniMagick, or Vips support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
+  # include CarrierWave::Vips
 
   # Choose what kind of storage to use for this uploader:
   storage :file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-14 00:00:00.000000000 Z
+date: 2025-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,16 +112,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Ruby file upload library