carrierwave 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e8aa98fa4de1f1cb517138ae11e7bfbd574638e
-  data.tar.gz: 5456c89662d0ca78e61cc12c8d9305b23175172e
+  metadata.gz: 637cc1f96fe4f41cc4468837e5f3ea358e80ed6e
+  data.tar.gz: 7e160616b11d78c39bee758a90412dbadb588c04
 SHA512:
-  metadata.gz: d4ba35c722eeef4ccdf925adf951c1323dad0c116e0f4cbf7e567cbeefacb538e7259e5a59c771d17e05ced3a0d182bfb15000ca982edb3bce6f51fa288255eb
-  data.tar.gz: d9dbc8490ce0637ab6aa828eb695170637317141e0b3d901fefb15dfdf8b1f52094e4d7911e34182f607a185b5ebb06d460f047fb7a080f850da5d8a482c9321
+  metadata.gz: 9757ab08f11fee70c9337f706dce60d20f12200890ed1816f6eedc0fb2939e282c9290d724ccaa592f3c78bf91f5f643b3af0bd27240bd7ced5132068af1e45e
+  data.tar.gz: 768e9c140fba9bd1f3dd299cdf83b94cc4348a1888801793a638d6a20220c2eff152916a6066bcb0b586f96080039e7594c13c89b352d4711699502110772293

data/README.md

@@ -16,7 +16,7 @@ It works well with Rack based web applications, such as Ruby on Rails.
 
 ## Getting Help
 
-* Please ask the community on [Stack Overflow](http://stackoverflow.com/) for help if you have any questions. Please do not post usage questions on the issue tracker.
+* Please ask the community on [Stack Overflow](https://stackoverflow.com/questions/tagged/carrierwave) for help if you have any questions. Please do not post usage questions on the issue tracker.
 * Please report bugs on the [issue tracker](http://github.com/carrierwaveuploader/carrierwave/issues) but read the "getting help" section in the wiki first.
 
 ## Installation
@@ -131,9 +131,6 @@ Other ORM support has been extracted into separate gems:
 There are more extensions listed in [the wiki](https://github.com/carrierwaveuploader/carrierwave/wiki)
 
 ## Multiple file uploads
-**Note:** You must specify using the master branch to enable this feature:
-
-`gem 'carrierwave', github: 'carrierwaveuploader/carrierwave'`.
 
 CarrierWave also has convenient support for multiple file upload fields.
 
@@ -144,14 +141,25 @@ column for example. Your choice depends on what your database supports. For
 example, create a migration like this:
 
 
+#### For databases with ActiveRecord json data type support (e.g. PostgreSQL, MySQL)
+
 	rails g migration add_avatars_to_users avatars:json
 	rake db:migrate
 
+#### For database without ActiveRecord json data type support (e.g. SQLite)
+
+	rails g migration add_avatars_to_users avatars:string
+	rake db:migrate
+
+__Note__: JSON datatype doesn't exists in SQLite adapter, that's why you can use a string datatype which will be serialized in model.
+
 Open your model file and mount the uploader:
 
+
 ```ruby
 class User < ActiveRecord::Base
   mount_uploaders :avatars, AvatarUploader
+  serialize :avatars, JSON # If you use SQLite, add this line.
 end
 ```
 
@@ -659,7 +667,7 @@ CarrierWave.configure do |config|
   }
   config.fog_directory  = 'name_of_directory'                          # required
   config.fog_public     = false                                        # optional, defaults to true
-  config.fog_attributes = { 'Cache-Control' => "max-age=#{365.day.to_i}" } # optional, defaults to {}
+  config.fog_attributes = { cache_control: "public, max-age=#{365.day.to_i}" } # optional, defaults to {}
 end
 ```
 
@@ -740,7 +748,7 @@ the url to the file on Rackspace Cloud Files.
 
 ```ruby
 gem "fog-google"
-gem "google-api-client", ">= 0.6.2", "< 0.9"
+gem "google-api-client", "> 0.8.5", "< 0.9"
 gem "mime-types"
 ```
 

data/lib/carrierwave/mount.rb

@@ -186,7 +186,8 @@ module CarrierWave
         end
 
         def store_previous_changes_for_#{column}
-          @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
+          attribute_changes = ::ActiveRecord.version.to_s.to_f >= 5.1 ? saved_changes : changes
+          @_previous_changes_for_#{column} = attribute_changes[_mounter(:#{column}).serialization_column]
         end
 
         def remove_previously_stored_#{column}
@@ -340,7 +341,8 @@ module CarrierWave
         end
 
         def store_previous_changes_for_#{column}
-          @_previous_changes_for_#{column} = changes[_mounter(:#{column}).serialization_column]
+          attribute_changes = ::ActiveRecord.version.to_s.to_f >= 5.1 ? saved_changes : changes
+          @_previous_changes_for_#{column} = attribute_changes[_mounter(:#{column}).serialization_column]
         end
 
         def remove_previously_stored_#{column}

data/lib/carrierwave/mounter.rb

@@ -123,6 +123,7 @@ module CarrierWave
     end
 
     def remove_previous(before=nil, after=nil)
+      after ||= []
       return unless before
 
       # both 'before' and 'after' can be string when 'mount_on' option is set

data/lib/carrierwave/processing/mini_magick.rb

@@ -303,8 +303,7 @@ module CarrierWave
         image.destroy!
       end
     rescue ::MiniMagick::Error, ::MiniMagick::Invalid => e
-      default = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :locale => :en)
-      message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e, :default => default)
+      message = I18n.translate(:"errors.messages.mini_magick_processing_error", :e => e)
       raise CarrierWave::ProcessingError, message
     end
 
@@ -312,7 +311,11 @@ module CarrierWave
 
       def append_combine_options(cmd, combine_options)
         combine_options.each do |method, options|
-          cmd.send(method, options)
+          if options.nil?
+            cmd.send(method)
+          else
+            cmd.send(method, options)
+          end
         end
       end
 

data/lib/carrierwave/processing/rmagick.rb

@@ -355,7 +355,7 @@ module CarrierWave
 
       destroy_image(frames)
     rescue ::Magick::ImageMagickError => e
-      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :default => I18n.translate(:"errors.messages.rmagick_processing_error", :e => e, :locale => :en))
+      raise CarrierWave::ProcessingError, I18n.translate(:"errors.messages.rmagick_processing_error", :e => e)
     end
 
   private

data/lib/carrierwave/sanitized_file.rb

@@ -186,9 +186,9 @@ module CarrierWave
       move!(new_path)
       chmod!(new_path, permissions)
       if keep_filename
-        self.file = {:tempfile => new_path, :filename => original_filename}
+        self.file = {:tempfile => new_path, :filename => original_filename, :content_type => content_type}
       else
-        self.file = new_path
+        self.file = {:tempfile => new_path, :content_type => content_type}
       end
       self
     end

data/lib/carrierwave/storage/fog.rb

@@ -16,6 +16,8 @@ module CarrierWave
     # [:fog_authenticated_url_expiration] (optional) time (in seconds) that authenticated urls
     #   will be valid, when fog_public is false and provider is AWS or Google, defaults to 600
     # [:fog_use_ssl_for_aws]              (optional) #public_url will use https for the AWS generated URL]
+    # [:fog_aws_accelerate]               (optional) #public_url will use s3-accelerate subdomain
+    #   instead of s3, defaults to false
     #
     #
     # AWS credentials contain the following keys:
@@ -349,7 +351,8 @@ module CarrierWave
                 protocol = @uploader.fog_use_ssl_for_aws ? "https" : "http"
                 # if directory is a valid subdomain, use that style for access
                 if @uploader.fog_directory.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\d{1,3}){3}$))(?:[a-z0-9\.]|(?![\-])|\-(?![\.])){1,61}[a-z0-9]$/
-                  "#{protocol}://#{@uploader.fog_directory}.s3.amazonaws.com/#{encoded_path}"
+                  s3_subdomain = @uploader.fog_aws_accelerate ? "s3-accelerate" : "s3"
+                  "#{protocol}://#{@uploader.fog_directory}.#{s3_subdomain}.amazonaws.com/#{encoded_path}"
                 else
                   # directory is not a valid subdomain, so use path style for access
                   "#{protocol}://s3.amazonaws.com/#{@uploader.fog_directory}/#{encoded_path}"

data/lib/carrierwave/uploader/cache.rb

@@ -190,7 +190,7 @@ module CarrierWave
       def cache_id=(cache_id)
         # Earlier version used 3 part cache_id. Thus we should allow for
         # the cache_id to have both 3 part and 4 part formats.
-        raise CarrierWave::InvalidParameter, "invalid cache id" unless cache_id =~ /\A[\d]+\-[\d]+(\-[\d]{4})?\-[\d]{4}\z/
+        raise CarrierWave::InvalidParameter, "invalid cache id" unless cache_id =~ /\A(-)?[\d]+\-[\d]+(\-[\d]{4})?\-[\d]{4}\z/
         @cache_id = cache_id
       end
 

data/lib/carrierwave/uploader/configuration.rb

@@ -30,6 +30,7 @@ module CarrierWave
         add_config :fog_public
         add_config :fog_authenticated_url_expiration
         add_config :fog_use_ssl_for_aws
+        add_config :fog_aws_accelerate
 
         # Mounting
         add_config :ignore_integrity_errors
@@ -177,6 +178,7 @@ module CarrierWave
             config.fog_public = true
             config.fog_authenticated_url_expiration = 600
             config.fog_use_ssl_for_aws = true
+            config.fog_aws_accelerate = false
             config.store_dir = 'uploads'
             config.cache_dir = 'uploads/tmp'
             config.delete_tmp_file_after_storage = true
@@ -200,4 +202,3 @@ module CarrierWave
     end
   end
 end
-

data/lib/carrierwave/uploader/processing.rb

@@ -71,15 +71,17 @@ module CarrierWave
       def process!(new_file=nil)
         return unless enable_processing
 
-        self.class.processors.each do |method, args, condition|
-          if(condition)
-            if condition.respond_to?(:call)
-              next unless condition.call(self, :args => args, :method => method, :file => new_file)
-            else
-              next unless self.send(condition, new_file)
+        with_callbacks(:process, new_file) do
+          self.class.processors.each do |method, args, condition|
+            if(condition)
+              if condition.respond_to?(:call)
+                next unless condition.call(self, :args => args, :method => method, :file => new_file)
+              else
+                next unless self.send(condition, new_file)
+              end
             end
+            self.send(method, *args)
           end
-          self.send(method, *args)
         end
       end
 

data/lib/carrierwave/uploader/url.rb

@@ -15,8 +15,8 @@ module CarrierWave
       # [String] the location where this file is accessible via a url
       #
       def url(options = {})
-        if file.respond_to?(:url) and not file.url.blank?
-          file.method(:url).arity == 0 ? file.url : file.url(options)
+        if file.respond_to?(:url) and not (tmp_url = file.url).blank?
+          file.method(:url).arity == 0 ? tmp_url : file.url(options)
         elsif file.respond_to?(:path)
           path = encode_path(file.path.sub(File.expand_path(root), ''))
 

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/generators/templates/uploader.rb

@@ -15,7 +15,7 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
+  # def default_url(*args)
   #   # For Rails 3.1+ asset pipeline compatibility:
   #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby file upload library