dpl 1.8.17.travis.1460.4 → 1.8.17.travis.1464.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjljNGI4OTY4ZGZkMWUxYzg5NTI5Mjk3NDQ2YWQ4ODk2ZjY2ZGZjNg==
+    ZGRhOWVkOGU4NTIyNGI3MTNjMTcxNWFiOWY1OTZmMzcwZGZlNTFjMg==
   data.tar.gz: !binary |-
-    MGRlNzZjMDdhZTk4ZDU2YjA5OGVkYTc2OWQxY2E5NWE1NTIyM2U1OQ==
+    NjdjMTZmNDk4YmQ5MDkxMTMwOGM5N2JlYjRmNjVhNDJlZDg5ZDc3NQ==
 SHA512:
   metadata.gz: !binary |-
-    NmE3ZWRhMGQwMmE3NTIxODRkMTVkMGIyZjU2Y2ZmZDI1OTI3ZDNiM2E3Nzk4
-    MjY3YWNlNzlhZWJkMTA5MWIyZDk0ZTAzZGQzZDQ0NGIxYTU0ODNkZTQyZDhm
-    ZGZkZDRjYjRiOWRlNzJjMDc2ZDliOGE0MmVhYzdiNjFiY2U2Zjc=
+    Njk3MzVjMzc2OTgzOGFjNGQ5ZTZlNmVjNGVmMjM2Zjk1OWMyMTQzM2YxNGU0
+    Yzk0YThhOTNjMWUzNzhkNjA0Mzg5NzBhMmE4NDU1ZGM2MjJhZWM5ZGIyNGY1
+    ZTUxMTNhOGJmYmJhYmJiNjI5MmQ1ZmU2YmYzNjgzOGZjM2RkNTU=
   data.tar.gz: !binary |-
-    ZTM5NzIwZTBmZmJiY2U0NmRkYTVkNGNiYjE2NGZlMTg4ZWZkYjFhNTdiY2Uw
-    MTkxNzZmZjNkZDBjMmViMWRjNDg1NjA4NTE2MWRkNjVkODE0YTRlZjkwNmE5
-    MjU0NjMxMzkwZDJhOTI3MDIwMTIyMTU1ZmIzODdlOGE1YTRjNWQ=
+    NTllYjczNTY0OWE2Mjc2YWFjYWE0YzE2NzI3NmNlN2QwZWZiYTBhMmNmOTRi
+    MGI5NGU0MjJlNGNhZjRlNzk2MDVmNTJkN2IzNTNmMmJkMGMzM2Q5YTg5NTYz
+    YWZkZjVjMjg5ZTFmYTAwNGUyNmI0Mzg4Y2QwN2IyYWMzODkxMDM=

data/README.md

@@ -321,6 +321,7 @@ For authentication you can also use Travis CI secure environment variable:
 * **acl**: Sets the access control for the uploaded objects. Defaults to `private`. Valid options are `private`, `public_read`, `public_read_write`, `authenticated_read`, `bucket_owner_read`, `bucket_owner_full_control`.
 * **dot_match**: When set to `true`, upload files starting a `.`.
 * **index_document_suffix**: Set the index document of a S3 website.
+* **default_text_charset**: Set the default character set to append to the content-type of text files you are uploading.
 
 #### File-specific `Cache-Control` and `Expires` headers
 

data/lib/dpl/provider.rb

@@ -212,6 +212,14 @@ module DPL
       options[:detect_encoding]
     end
 
+    def default_text_charset?
+      options[:default_text_charset]
+    end
+
+    def default_text_charset
+      options[:default_text_charset].downcase
+    end
+
     def encoding_for(path)
       file_cmd_output = `file '#{path}'`
       case file_cmd_output
@@ -219,6 +227,10 @@ module DPL
         'gzip'
       when /compress'd/
         'compress'
+      when /text/
+        'text'
+      when /data/
+        # Shrugs?
       end
     end
 

data/lib/dpl/provider/s3.rb

@@ -46,13 +46,12 @@ module DPL
         glob_args << File::FNM_DOTMATCH if options[:dot_match]
         Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
           Dir.glob(*glob_args) do |filename|
-            content_type = MIME::Types.type_for(filename).first.to_s
-            opts         = { :content_type => content_type }.merge(encoding_option_for(filename))
+            opts                 = content_data_for(filename)
             opts[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
             opts[:acl]           = options[:acl].gsub(/_/, '-') if options[:acl]
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
             unless File.directory?(filename)
-              log "uploading %p" % filename
+              log "uploading #{filename.inspect} with #{opts.inspect}"
               api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)
             end
           end
@@ -80,12 +79,21 @@ module DPL
       end
 
       private
-      def encoding_option_for(path)
-        if detect_encoding? && encoding_for(path)
-          {:content_encoding => encoding_for(path)}
-        else
-          {}
+      def content_data_for(path)
+        content_data = {}
+        content_type = MIME::Types.type_for(path).first
+        content_data[:content_type] = content_type.to_s
+
+        encoding = encoding_for(path)
+        if detect_encoding?
+          content_data[:content_encoding] = encoding if encoding
+        end
+
+        if encoding == 'text' && default_text_charset?
+          content_data[:content_type] = "#{content_data[:content_type]}; charset=#{default_text_charset}"
         end
+
+        return content_data
       end
 
       def get_option_value_by_filename(option_values, filename)

data/spec/provider_spec.rb

@@ -159,6 +159,19 @@ describe DPL::Provider do
       expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: empty")
       expect(provider.encoding_for(path)).to be_nil
     end
+
+    example do
+      path = 'foo.js'
+      expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: ASCII text, with very long line")
+      expect(provider.encoding_for(path)).to eq('text')
+    end
+
+    example do
+      path = 'foo.js'
+      provider.options.update(:default_text_charset => 'UTF-8')
+      expect(provider).to receive(:`).at_least(1).times.with("file '#{path}'").and_return("#{path}: ASCII text, with very long line")
+      expect(provider.encoding_for(path)).to eq('text')
+    end
   end
 
   describe "#log" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.17.travis.1460.4
+  version: 1.8.17.travis.1464.4
 platform: ruby
 authors:
 - Konstantin Haase