jets 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3aab7667c9ee9aaa2149d30132dbf423516b4195e643dad4f8a2108fe03bfc
-  data.tar.gz: 5e126f386e4d0bba1c3714e66470e692c08c099c932f8f6a1c9a62556487aabe
+  metadata.gz: bccb565973aab7e6793924820d026a97e056a75fc5827f0e227d11d17f2c76d8
+  data.tar.gz: c0935a069903b2406e4c06948d35e679d4a2837dc002bc56168f94a4c441774f
 SHA512:
-  metadata.gz: 3c57ac868b4d54d0eff01884597af16188f59584eb20c8a348ce9bb8936e19dd50cc6f5d2271b7e0a4a0078586b40be9dcb5f47f92a870164482369662831aaa
-  data.tar.gz: 83757df158f81b1447652c1edbe5e684c3cad325a7326a567d6fab391f6bae3ed86b847a87b17a62fb07314053e40e1a10575b8a97d76c8107ff598980ad285d
+  metadata.gz: a0368aad05b5cd49fb3e5f175e672306c62906b9f3909fc8e9df29ca722cff15695a8c9de2a9d5f34bfe404828fc06401f04bc1b63ed6486c57f963191d3de43
+  data.tar.gz: 90eab98e9f5664bb27b67a14f5d3b2cba53f4cdfabd8828629d467cd0c00351746c6425ef5a38080cdec814ebd2d69aa480d132415bf6531bf1775f37bf944d1

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.9] - 2021-06-14
+- fix content type s3 metadata (#564)
+
 ## [3.0.8] - 2021-06-03
 - Update cli.md (#560)
 - respect .jetsignore also (#562)

data/lib/jets/cfn/upload.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'digest'
+require 'rack/mime'
 
 module Jets::Cfn
   class Upload
@@ -8,12 +9,6 @@ module Jets::Cfn
 
     attr_reader :bucket_name
 
-    CONTENT_TYPES_BY_EXTENSION = {
-      '.css' => 'text/css',
-      '.js' => 'application/javascript',
-      '.html' => 'text/html'
-    }
-
     def initialize(bucket_name)
       @bucket_name = bucket_name
     end
@@ -93,16 +88,23 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path)
+      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
 
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
-      puts "Uploading and setting content type for s3://#{bucket_name}/#{key}" # uncomment to see and debug
-      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type_headers(full_path)))
+      content_type = content_type_headers(full_path)
+      puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
+    CONTENT_TYPES_BY_EXTENSION = {
+      '.css'  => 'text/css',
+      '.html' => 'text/html',
+      '.js'   => 'application/javascript',
+    }
     def content_type_headers(full_path)
-      content_type = CONTENT_TYPES_BY_EXTENSION[File.extname(full_path)]
+      ext = File.extname(full_path)
+      content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
         { content_type: content_type }
       else

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer