carrierwave 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a985080c1432e2d6d27cbe46b823f4ca5bdbc75
-  data.tar.gz: e3e60a7159815499f0559f9574480633e73d68ed
+  metadata.gz: 35c836a3a970d4f900cc30a3a601199a629a8554
+  data.tar.gz: 22b99a337562f2be3c60731377de38b8a204d73f
 SHA512:
-  metadata.gz: 9e027080e1e7fcc86a2f6e0b74cb0d4db2d1f955b733c9bf47354fb74da0707c0017a9305fdc6f090825a7203b319f25bcd61ecc2fa84f123da19a9b9d784d6c
-  data.tar.gz: 2c8d16ca3353952282e9ffb97d37d44477c5a22f4744f99a84d0fde7bc0ee9d6b456698aa386d0664e8b734f9b8edf155a8034b15efb5b60831579a610d09b67
+  metadata.gz: f4602848d9c82f60537acb7e3cfaa0ca7bdffe0a0d737224b62400e52c52277109ee1090aa148755ba5ba84f11fa5cdd11bc4209c533cf5c1df7475feda2ad66
+  data.tar.gz: 95e296300604fc0d41013302cd667d5713f56cb5faa64e5f2ff4d43708e04fdd59c1df6c55414848f526f5eb56618923de9d2a177fb5e2f49be62b383e95b085

data/README.md

@@ -301,8 +301,16 @@ end
 ```
 
 When this uploader is used, an uploaded image would be scaled to be no larger
-than 800 by 800 pixels. A version called thumb is then created, which is scaled
-and cropped to exactly 200 by 200 pixels. The uploader could be used like this:
+than 800 by 800 pixels. The original aspect ratio will be kept.
+A version called thumb is then created, which is scaled
+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 
+if the aspect ratio requires it.
+
+The uploader could be used like this:
 
 ```ruby
 uploader = AvatarUploader.new
@@ -665,9 +673,9 @@ CarrierWave.configure do |config|
     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_public     = false                                        # optional, defaults to true
-  config.fog_attributes = { cache_control: "public, max-age=#{365.day.to_i}" } # optional, defaults to {}
+  config.fog_directory  = 'name_of_directory'                                   # 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

@@ -303,6 +303,7 @@ module CarrierWave
 
         if @format
           move_to = current_path.chomp(File.extname(current_path)) + ".#{@format}"
+          file.content_type = ::MIME::Types.type_for(move_to).first.to_s
           file.move_to(move_to, permissions, directory_permissions)
         end
 

data/lib/carrierwave/processing/rmagick.rb

@@ -356,6 +356,7 @@ module CarrierWave
       if options[:format] || @format
         frames.write("#{options[:format] || @format}:#{current_path}", &write_block)
         move_to = current_path.chomp(File.extname(current_path)) + ".#{options[:format] || @format}"
+        file.content_type = ::MIME::Types.type_for(move_to).first.to_s
         file.move_to(move_to, permissions, directory_permissions)
       else
         frames.write(current_path, &write_block)

data/lib/carrierwave/version.rb

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

data/lib/generators/templates/uploader.rb

@@ -1,5 +1,4 @@
 class <%= class_name %>Uploader < CarrierWave::Uploader::Base
-
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
@@ -45,5 +44,4 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport