jets 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c7b4bf4a3af04ba9de3ddafc8e8483303c50eca8cddc28cb70830eb941bde6a
-  data.tar.gz: 38a3ee6c6fabd939ae3f4ab76639363c3cce222ff85f080cffb7f4652bc3a9e7
+  metadata.gz: b42f210be712ede74491d7b1b377d5e742405e2a4f226b07e4dd6709cc76f191
+  data.tar.gz: 97d7f47d8d600d9b86ecf19390c055101e887fc2afe30d004b4e17b61f62bd57
 SHA512:
-  metadata.gz: 30b7009d55779a5aa79d4d72b760dc1cfaba6b363112ae30c4e4504df145f6e3acd075a93ddccc9608a5d0f0549c5dbe5ac925e21cbdeb07f907c79135649d1a
-  data.tar.gz: 3981e12eb19f182d874915b17510c31fe03b5107bbc35d8ee1c097e15d5e534e9ddbf95ecd16c3ae8720f645faa6e649fec3d913535d0d48edf13f12355b95e7
+  metadata.gz: 6368f3cca7ffd7303e5b1bbbf055e4b0aab97f29dad3e4e4f79c77980260ff6bfcea91248481068ca0a8962623da4d4db9a5c4ba04b0142dd46cc67184843ed2
+  data.tar.gz: e17af44278ad7ed8f7f6a65f88d3aef0c3bfa465389bf07e6463d5e1c42cd3701bb20538ced03f15d10efc69bcdca008f9f0cbf4a13021311f83f0183b9b3467

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/), even before v1.0.
 
+## [1.4.4]
+- #116 from tongueroo/assets: fix public assets folders to serve directly from s3
+
 ## [1.4.3]
 - fix webpacker:compile on jets build and allow jets deploy to work standalone
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.4.3)
+    jets (1.4.4)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/application.rb

@@ -59,7 +59,7 @@ class Jets::Application
     config.inflections.irregular = {}
 
     config.assets = ActiveSupport::OrderedOptions.new
-    config.assets.folders = %w[public]
+    config.assets.folders = %w[assets images packs]
     config.assets.base_url = nil # IE: https://cloudfront.com/my/base/path
     config.assets.max_age = 3600
     config.assets.cache_control = nil # IE: public, max-age=3600 , max_age is a shorter way to set cache_control.

data/lib/jets/cfn/upload.rb

@@ -57,16 +57,16 @@ class Jets::Cfn
     end
 
     def upload_public_assets
-      asset_folders = Jets.config.assets.folders # IE: %w[public]
-      asset_folders = add_rack_assets(asset_folders)
-      asset_folders.each do |folder|
+      public_folders = %w[public]
+      public_folders = add_rack_assets(public_folders)
+      public_folders.each do |folder|
         upload_asset_folder(folder)
       end
     end
 
-    def add_rack_assets(asset_folders)
-      return asset_folders unless Jets.rack?
-      asset_folders + %w[rack/public]
+    def add_rack_assets(public_folders)
+      return public_folders unless Jets.rack?
+      public_folders + %w[rack/public]
     end
 
     def upload_asset_folder(folder)

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -36,8 +36,9 @@ Jets.application.configure do
   # Underscored format can be used for keys to make it look more ruby-ish.
 
   # Assets settings
-  # config.assets.folders files are uploaded to s3 and are set to public-read to be served directly
-  # config.assets.folders = %w[public] # defaults to public
+  # The config.assets.folders are folders within the public folder that will be set
+  # to public-read on s3 and served directly. IE: public/assets public/images public/packs
+  # config.assets.folders = %w[assets images packs]
   # config.assets.max_age = 3600 # when to expire assets
   # config.assets.cache_control = nil # IE: "public, max-age=3600" # override max_age for more fine-grain control.
   # config.assets.base_url = nil # IE: https://cloudfront.com/my/base/path, defaults to the s3 bucket url

data/lib/jets/overrides/rails/asset_tag_helper.rb

@@ -39,6 +39,13 @@ module Jets::AssetTagHelper
     # mimic original behavior to get /images in source
     source = "/images/#{source}" unless source.starts_with?('/') || source.starts_with?('http')
 
+    # Examples to help understand:
+    #
+    #   puts "AssetTagHelper#asset_path source #{source}"
+    #   puts "AssetTagHelper#asset_path asset_folder?(source) #{asset_folder?(source).inspect}"
+    #   AssetTagHelper#asset_path source /packs/images/myimage-e5f675d1ba26865fd65e919beb5bb86b.png
+    #   AssetTagHelper#asset_path asset_folder?(source) "images"
+    #
     if on_aws? && asset_folder?(source) && !source.starts_with?('http')
       source = "#{s3_public}#{source}"
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack