jets 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e281f1856a1a82508629d805afe52156c44dc360f38d49528ca67e586ae8a4
-  data.tar.gz: ee5c33fe1a4f6929d1b285ba6a16acbfedcba1f229f34501f45c0983d4c71d6f
+  metadata.gz: fc8976a98ceaa55f97512b3b0e78cec5f28e1d0ade29d23270894cbcfa1ef5c3
+  data.tar.gz: 149caed9e86daea3f45e745e6f32c28aa0a15b6b938237305e41bc85c774adc4
 SHA512:
-  metadata.gz: 531f6ccbc1f750cd08b4ac8575017c12de6f21104d014b983a14270e9b6a2760e097a03c5672de4ec989cbbefb52cf6f25d37a2a2459743c2c49e72c1b715985
-  data.tar.gz: 116483cc99bb26c464de5665a7abfaba09c95710a298026a25acfbcb4c42bfce0df48a6efba6f937031fb54db7b91485f83e18b0c048ec4c10837682c89d8076
+  metadata.gz: e9a49470b973e8b927c5921a5e373f18d66141d2af0c288fa6a2d0cac4f59fa7a534e1e52bf949d56482f8987843b9f5628d3699f0c27cf4c9cc9f271d6a33c8
+  data.tar.gz: 43e8734b1f3e7b2a7cfb16a1c4d74957fac5e4c1deb090d816d003655775374a8e3c03d473dbd7bc2166a05412562d74f811fe6dbe944237a958c9428f76167a

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.1.5] - 2022-08-08
+- [#628](https://github.com/boltops-tools/jets/pull/628) Multiple Databases
+- [#629](https://github.com/boltops-tools/jets/pull/629) loosen zeitwerk dependency in generated project Gemfile
+- [#630](https://github.com/boltops-tools/jets/pull/630) compile assets with WEBPACKER_ASSET_HOST as s3 endpoint url
+
 ## [3.1.4] - 2022-07-02
 - [#627](https://github.com/boltops-tools/jets/pull/627) use >= for most gem dependencies
 

data/lib/jets/application/defaults.rb

@@ -77,10 +77,11 @@ class Jets::Application
       config.inflections.irregular = {}
 
       config.assets = ActiveSupport::OrderedOptions.new
-      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.
+      config.assets.folders = %w[assets images packs]
+      config.assets.max_age = 3600
+      config.assets.webpacker_asset_host = "s3_endpoint"  # true = use conventional by default
 
       config.ruby = ActiveSupport::OrderedOptions.new
 

data/lib/jets/booter.rb

@@ -94,11 +94,23 @@ class Jets::Booter
     # `show processlist` until after a query. Have confirmed that the connection is reused and the connection count stays
     # the same.
     def connect_db
-      primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
-        hash_config.name == "primary"
-      }
-      primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
-      ActiveRecord::Base.establish_connection(primary_config)
+      if ActiveRecord::Base.legacy_connection_handling
+        primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
+          hash_config.name == "primary"
+        }
+  
+        primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
+
+        ActiveRecord::Base.establish_connection(primary_config)
+      else
+        configs = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env, include_replicas: true)
+
+        databases = { }
+        databases[:writing] = :primary if configs.any? { |config| config.name == "primary" }
+        databases[:reading] = :primary_replica if configs.any? { |config| config.name == "primary_replica" }
+
+        ActiveRecord::Base.connects_to database: databases
+      end
     end
 
     def load_internal_turbines

data/lib/jets/builders/code_builder.rb

@@ -205,12 +205,45 @@ module Jets::Builders
       return unless webpacker_included?
 
       sh("yarn install")
+
+      ENV['WEBPACKER_ASSET_HOST'] = webpacker_asset_host if Jets.config.assets.webpacker_asset_host
       webpack_command = File.exist?("#{Jets.root}/bin/webpack") ?
           "bin/webpack" :
           `which webpack`.strip
       sh "JETS_ENV=#{Jets.env} #{webpack_command}"
     end
 
+    # Different url for these. Examples:
+    #
+    #   webpacker_asset_host https://demo-dev-s3bucket-lw5vq7ht8ip4.s3.us-west-2.amazonaws.com/jets/public/packs/media/images/boltops-0dd1c6bd.png
+    #   s3_base_url          https://s3-us-west-2.amazonaws.com/demo-dev-s3bucket-lw5vq7ht8ip4/jets/packs/media/images/boltops-0dd1c6bd.png
+    #
+    # Interesting: webpacker_asset_host works but s3_base_url does not for CORs. IE: reactjs or vuejs requests
+    # Thinking AWS configures the non-subdomain url endpoint to be more restrictive.
+    #
+    def webpacker_asset_host
+      # Allow user to set assets.webpacker_asset_host
+      #
+      #   Jets.application.configure do
+      #     config.assets.webpacker_asset_host = "https://cloudfront.com/my/base/path"
+      #   end
+      #
+      assets = Jets.config.assets
+      return assets.webpacker_asset_host if assets.webpacker_asset_host && assets.webpacker_asset_host != "s3_endpoint"
+      return assets.base_url if assets.base_url
+
+      # By default, will use the s3 url endpoint directly by convention
+      return unless assets.webpacker_asset_host == "s3_endpoint"
+
+      region = Jets.aws.region
+
+      asset_base_url = region == 'us-east-1' ?
+        "https://#{s3_bucket}.s3.amazonaws.com" :
+        "https://#{s3_bucket}.s3.#{region}.amazonaws.com"
+
+      "#{asset_base_url}/jets/public" # s3_base_url
+    end
+
     def webpacker_included?
       # Old code, leaving around for now:
       # Thanks: https://stackoverflow.com/questions/4195735/get-list-of-gems-being-used-by-a-bundler-project

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -18,7 +18,7 @@ gem "mysql2", "~> 0.5.3"
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"
 <% end -%>
-gem "zeitwerk", "~> 2.5.0"
+gem "zeitwerk", ">= 2.5.0"
 
 # development and test groups are not bundled as part of the deployment
 group :development, :test do

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer