carrierwave 1.0.0.beta → 1.0.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ebc3c2c8a7083953582084c27f7abd61fbbc31
-  data.tar.gz: c1877d8a5780cf897943b43ed124fa40ff669a7a
+  metadata.gz: c5c60d2300faa43e9ff11717d126919063a15cc5
+  data.tar.gz: 0bfec22f3441f14ad8296124d0854547e32bbe15
 SHA512:
-  metadata.gz: 37f4ed1affddf04996b406fcb201731ec1d52fcb46eb7aa212517604844b3163f88ecdd0733c750d0ea6b5e2c5bf7ccaa6f0e70c4cd288ad2974eb39d0057c69
-  data.tar.gz: d2f91768a496e1b7740838f76d1f7c54f84bc10712ff7894e02b1f75eecbc4a8da246887fb3760decc3ea7131aa7b1a281fec2b39921a862f5cd09feebf02461
+  metadata.gz: 73d5cfaedf2257a0859993eaba33054078f11ed6f0c10340ed16dde8e19811ce89c0b500994eeccaa617c1e06a192272e63a196abdcf63dce91a35a12c400eb8
+  data.tar.gz: 3b0861e37568ee06f45d6de233fc98e8b2f9ed93007b256b2430d086277fe50ec683ee68f11492c21fc914f6bbfd497e5d489e36cb4a95955b3495988809ec4e

data/README.md

@@ -29,13 +29,13 @@ It works well with Rack based web applications, such as Ruby on Rails.
 Install the latest release:
 
 ```
-$ gem install carrierwave -v "1.0.0.beta"
+$ gem install carrierwave -v "1.0.0.rc"
 ```
 
 In Rails, add it to your Gemfile:
 
 ```ruby
-gem 'carrierwave', '>= 1.0.0.beta', '< 2.0'
+gem 'carrierwave', '>= 1.0.0.rc', '< 2.0'
 ```
 
 Finally, restart the server to apply the changes.
@@ -745,7 +745,7 @@ the url to the file on Rackspace Cloud Files.
 
 ```ruby
 gem "fog-google"
-gem "google-api-client", "< 0.9", ">= 0.6.2"
+gem "google-api-client", ">= 0.6.2", "< 0.9"
 gem "mime-types"
 ```
 

data/lib/carrierwave/mount.rb

@@ -166,6 +166,10 @@ module CarrierWave
           _mounter(:#{column}).remote_urls = [url]
         end
 
+        def remote_#{column}_request_header=(header)
+          _mounter(:#{column}).remote_request_headers = [header]
+        end
+
         def write_#{column}_identifier
           return if frozen?
           mounter = _mounter(:#{column})
@@ -316,6 +320,10 @@ module CarrierWave
           _mounter(:#{column}).remote_urls = urls
         end
 
+        def remote_#{column}_request_headers=(headers)
+          _mounter(:#{column}).remote_request_headers = headers
+        end
+
         def write_#{column}_identifier
           return if frozen?
           mounter = _mounter(:#{column})

data/lib/carrierwave/mounter.rb

@@ -3,8 +3,9 @@ module CarrierWave
   # this is an internal class, used by CarrierWave::Mount so that
   # we don't pollute the model with a lot of methods.
   class Mounter #:nodoc:
-    attr_reader :column, :record, :remote_urls, :integrity_error, :processing_error, :download_error
-    attr_accessor :remove
+    attr_reader :column, :record, :remote_urls, :integrity_error,
+      :processing_error, :download_error
+    attr_accessor :remove, :remote_request_headers
 
     def initialize(record, column, options={})
       @record = record
@@ -75,9 +76,9 @@ module CarrierWave
       @download_error = nil
       @integrity_error = nil
 
-      @uploaders = urls.map do |url|
+      @uploaders = urls.zip(remote_request_headers || []).map do |url, header|
         uploader = blank_uploader
-        uploader.download!(url)
+        uploader.download!(url, header || {})
         uploader
       end
 

data/lib/carrierwave/storage/file.rb

@@ -106,7 +106,8 @@ module CarrierWave
 
       def clean_cache!(seconds)
         Dir.glob(::File.expand_path(::File.join(uploader.cache_dir, '*'), CarrierWave.root)).each do |dir|
-          time = dir.scan(/(\d+)-\d+-\d+$/).first.map(&:to_i)
+          # generate_cache_id returns key formated TIMEINT-PID-COUNTER-RND
+          time = dir.scan(/(\d+)-\d+-\d+-\d+/).first.map(&:to_i)
           time = Time.at(*time)
           if time < (Time.now.utc - seconds)
             FileUtils.rm_rf(dir)

data/lib/carrierwave/storage/fog.rb

@@ -136,7 +136,8 @@ module CarrierWave
           :key    => uploader.fog_directory,
           :public => uploader.fog_public
         ).files.all(:prefix => uploader.cache_dir).each do |file|
-          time = file.key.scan(/(\d+)-\d+-\d+/).first.map { |t| t.to_i }
+          # generate_cache_id returns key formated TIMEINT-PID-COUNTER-RND
+          time = file.key.scan(/(\d+)-\d+-\d+-\d+/).first.map { |t| t.to_i }
           time = Time.at(*time)
           file.destroy if time < (Time.now.utc - seconds)
         end
@@ -355,8 +356,8 @@ module CarrierWave
                 end
               end
             when 'Google'
-              file = directory.files.get(encoded_path)
-              file.nil?? "" : file.public_url
+              # https://cloud.google.com/storage/docs/access-public-data
+              "https://storage.googleapis.com/#{@uploader.fog_directory}/#{encoded_path}"
             else
               # avoid a get by just using local reference
               directory.files.new(:key => path).public_url

data/lib/carrierwave/uploader/download.rb

@@ -10,8 +10,9 @@ module CarrierWave
       include CarrierWave::Uploader::Cache
 
       class RemoteFile
-        def initialize(uri)
+        def initialize(uri, remote_headers = {})
           @uri = uri
+          @remote_headers = remote_headers
         end
 
         def original_filename
@@ -35,7 +36,10 @@ module CarrierWave
 
         def file
           if @file.blank?
-            @file = Kernel.open(@uri.to_s, "User-Agent" => "CarrierWave/#{CarrierWave::VERSION}")
+            headers = @remote_headers.
+              reverse_merge('User-Agent' => "CarrierWave/#{CarrierWave::VERSION}")
+
+            @file = Kernel.open(@uri.to_s, headers)
             @file = @file.is_a?(String) ? StringIO.new(@file) : @file
           end
           @file
@@ -62,10 +66,11 @@ module CarrierWave
       # === Parameters
       #
       # [url (String)] The URL where the remote file is stored
+      # [remote_headers (Hash)] Request headers
       #
-      def download!(uri)
+      def download!(uri, remote_headers = {})
         processed_uri = process_uri(uri)
-        file = RemoteFile.new(processed_uri)
+        file = RemoteFile.new(processed_uri, remote_headers)
         raise CarrierWave::DownloadError, "trying to download a file which is not served over HTTP" unless file.http?
         cache!(file)
       end

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "1.0.0.beta"
+  VERSION = "1.0.0.rc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.rc
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport