jets 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb8cb528f7e05335c066a9239d76b06a57b198cd2fce9fe653aa4a351f8b12b
-  data.tar.gz: d31c7c09ec2e31be38578d0bdfbeb8a687b3df47b0b728e8ab8e3f9e400bcaaf
+  metadata.gz: 7210442948a1180913859f3afbd0aebb049560adfdf53faf02357c4f299bb246
+  data.tar.gz: b94be0bc50ec242e9c6e908050a4ddd342874e9026cdf12f28ae54e465d12303
 SHA512:
-  metadata.gz: 174ef5bc4919d1bb6b9ae6eba16dfdebbebfec44d0501750ada68dfc03fcd119a43de47f85acfbe9a198e3d32eb9b7303f20769f9672a56575e6367520394634
-  data.tar.gz: a540230d02d1570fffc08df01ea0f109994984f242afaf61bbec8d539e24c69996de533e048fff454a608dc32dfe2b7bafe1938bbf7e5d24db8f469c92a230cf
+  metadata.gz: 95f6b7c61d0867b09c6af7f099fc84ec3de07defec86707f8aaadc8aac2da318557260b828142133384350163bd0bcbccc0a0f5bd204eb1c2645be0791e9637e
+  data.tar.gz: 0cb91a7f2593103a557a59f0d3d8b2732f9ba196725ed2825d12b34db2f2879e72bff137e8193411aecb0e31522c704bacbf2bbf9b5329242dad514655f38b5d

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/).
 
+## [2.1.0]
+- #345 upgrade to use rails 6 components
+
 ## [2.0.6]
 - #344 controller `helper_method` macro
 

data/jets.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionmailer", "~> 5.2.1"
-  spec.add_dependency "actionpack", "~> 5.2.1"
-  spec.add_dependency "actionview", "~> 5.2.1"
-  spec.add_dependency "activerecord", "~> 5.2.1"
-  spec.add_dependency "activesupport", "~> 5.2.1"
+  spec.add_dependency "actionmailer", "~> 6.0.0"
+  spec.add_dependency "actionpack", "~> 6.0.0"
+  spec.add_dependency "actionview", "~> 6.0.0"
+  spec.add_dependency "activerecord", "~> 6.0.0"
+  spec.add_dependency "activesupport", "~> 6.0.0"
   spec.add_dependency "aws-sdk-apigateway"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-cloudwatchlogs"
@@ -53,7 +53,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memoist"
   spec.add_dependency "mimemagic"
   spec.add_dependency "rack"
-  spec.add_dependency "railties", "~> 5.2.1" # ActiveRecord database_tasks.rb require this
+  spec.add_dependency "railties", "~> 6.0.0" # for ActiveRecord database_tasks.rb
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
   spec.add_dependency "shotgun"

data/lib/jets/application.rb

@@ -175,15 +175,16 @@ class Jets::Application
     end
   end
 
-  def load_db_config
+  def load_db_config(database_yml="#{Jets.root}/config/database.yml")
     config.database = {}
 
     Jets::Dotenv.load!
-    database_yml = "#{Jets.root}/config/database.yml"
     if File.exist?(database_yml)
+      require "active_record/database_configurations" # lazy require
       text = Jets::Erb.result(database_yml)
-      db_config = YAML.load(text)
-      config.database = db_config
+      db_configs = YAML.load(text)
+      configurations = ActiveRecord::DatabaseConfigurations.new(db_configs)
+      config.database = configurations
     end
   end
 

data/lib/jets/booter.rb

@@ -23,16 +23,48 @@ class Jets::Booter
       run_turbines(:after_initializers)
       Jets.application.finish!
 
-      # Eager load project code. Rather have user find out early than later on AWS Lambda.
-      Jets::Autoloaders.main.eager_load
+      setup_db # establish db connections in Lambda Execution Context.
+      # The eager load calls connects_to in models and establish those connections in Lambda Execution Context also.
+      Jets::Autoloaders.main.eager_load # Eager load project code. Rather have user find out early than later on AWS Lambda.
 
-      setup_db
       # TODO: Figure out how to build middleware during Jets.boot without breaking jets new and webpacker:install
       # build_middleware_stack
 
       @booted = true
     end
 
+    # Using ActiveRecord outside of Rails, so we need to set up the db connection ourself.
+    #
+    # Only connects to database for ActiveRecord and when config/database.yml exists.
+    # Dynomite handles connecting to the clients lazily.
+    def setup_db
+      return unless File.exist?("#{Jets.root}/config/database.yml")
+
+      db_configs = Jets.application.config.database
+      # DatabaseTasks.database_configuration for db:create db:migrate tasks
+      # Documented in DatabaseTasks that this is the right way to set it when
+      # using ActiveRecord rake tasks outside of Rails.
+      ActiveRecord::Tasks::DatabaseTasks.database_configuration = db_configs
+
+      if db_configs[Jets.env].blank?
+        abort("ERROR: config/database.yml exists but no environment section configured for #{Jets.env}")
+      end
+      ActiveRecord::Base.configurations = db_configs
+      connect_db
+    end
+
+    # Eager connect to database, so connections are established in the Lambda Execution Context and get reused.
+    # Interestingly, the connections info is stored in the shared state but the connection doesnt show up on
+    # `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.spec_name == "primary"
+      }
+      primary_config = primary_hash_config.config # config is a normal Ruby Hash
+      ActiveRecord::Base.establish_connection(primary_config)
+    end
+
     def load_internal_turbines
       Dir.glob("#{__dir__}/internal/turbines/**/*.rb").each do |path|
         Jets::Autoloaders.once.preload(path)
@@ -72,27 +104,6 @@ class Jets::Booter
       Jets.application.build_stack
     end
 
-    # Only connects connect to database for ActiveRecord and when
-    # config/database.yml exists.
-    # Dynomite handles connecting to the clients lazily.
-    def setup_db
-      return unless File.exist?("#{Jets.root}/config/database.yml")
-
-      db_configs = Jets.application.config.database
-      # DatabaseTasks.database_configuration for db:create db:migrate tasks
-      # Documented in DatabaseTasks that this is the right way to set it when
-      # using ActiveRecord rake tasks outside of Rails.
-      ActiveRecord::Tasks::DatabaseTasks.database_configuration = db_configs
-
-      current_config = db_configs[Jets.env]
-      if current_config.blank?
-        abort("ERROR: config/database.yml exists but no environment section configured for #{Jets.env}")
-      end
-      # Using ActiveRecord rake tasks outside of Rails, so we need to set up the
-      # db connection ourselves
-      ActiveRecord::Base.establish_connection(current_config)
-    end
-
     # Cannot call this for the jets new
     def confirm_jets_project!
       unless File.exist?("#{Jets.root}/config/application.rb")

data/lib/jets/commands/db/tasks/dummy/app.rb

@@ -0,0 +1,21 @@
+require "recursive-open-struct"
+
+module Jets::Commands::Db::Tasks::Dummy
+  class App
+    def config
+      Config.new(
+        paths: {
+          db: ["db"],
+        }
+      )
+    end
+
+    def paths
+      RecursiveOpenStruct.new(
+        paths: {
+          "db/migrate": ["db/migrate"]
+        }
+      )
+    end
+  end
+end

data/lib/jets/commands/db/tasks/dummy/config.rb

@@ -0,0 +1,14 @@
+require "recursive-open-struct"
+
+module Jets::Commands::Db::Tasks::Dummy
+  class Config < RecursiveOpenStruct
+    def load_database_yaml # :nodoc:
+      require "rails/application/dummy_erb_compiler"
+
+      path = "#{Jets.root}/config/database.yml"
+      yaml = Pathname.new(path)
+      erb = DummyERB.new(yaml.read)
+      YAML.load(erb.result) || {}
+    end
+  end
+end

data/lib/jets/commands/db/tasks.rb

@@ -4,7 +4,6 @@ class Jets::Commands::Db::Tasks
     # Lazy require rails so Rails const is only defined in jets db:* tasks
     require "rails"
     require "active_record"
-    require "recursive-open-struct"
 
     # Jets.boot # Jets.boot here screws up jets -h, the db_config doesnt seem to match exactly
     # but seems to be working anyway.
@@ -15,21 +14,12 @@ class Jets::Commands::Db::Tasks
 
     # Need to mock out the usage of Rails.application in:
     # activerecord-5.1.4/lib/active_record/tasks/database_tasks.rb
-    Rails.application = RecursiveOpenStruct.new(
-      config: {
-        paths: {
-          db: ["db"],
-        }
-      },
-      paths: {
-        "db/migrate": ["db/migrate"]
-      }
-    )
+    Rails.application = Dummy::App.new
     load "active_record/railties/databases.rake"
-
     load File.expand_path("../environment-task.rake", __FILE__)
   end
 
+
   # Thanks: https://stackoverflow.com/questions/19206764/how-can-i-load-activerecord-database-tasks-on-a-ruby-project-outside-rails/24840749
   class Seeder
     def initialize(seed_file)

data/lib/jets/commands/import/templates/config/database.yml

@@ -1,6 +1,6 @@
 default: &default
   adapter:  <%= @adapter %>
-  encoding: utf8
+  encoding: utf8mb4
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
 <% if @adapter == 'postgresql' -%>

data/lib/jets/commands/templates/skeleton/config/database.yml.tt

@@ -1,9 +1,10 @@
 default: &default
   adapter: <%= @database == 'mysql' ? 'mysql2' : 'postgresql' %>
-  encoding: utf8
+  encoding: utf8mb4
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @project_name %>_development' %>
 <% if @database == 'mysql' -%>
+  encoding: utf8mb4
   username: <%%= ENV['DB_USER'] || 'root' %>
 <% else -%>
   username: <%%= ENV['DB_USER'] || ENV['USER'] %>

data/lib/jets/turbo/templates/config/database.yml

@@ -1,6 +1,6 @@
 default: &default
   adapter:  <%= @adapter %>
-  encoding: utf8
+  encoding: utf8mb4
   pool: <%%= ENV["DB_POOL"] || 5  %>
   database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
 <% if @adapter == 'postgresql' -%>

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-apigateway
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -636,6 +636,8 @@ files:
 - lib/jets/commands/db.rb
 - lib/jets/commands/db/environment-task.rake
 - lib/jets/commands/db/tasks.rb
+- lib/jets/commands/db/tasks/dummy/app.rb
+- lib/jets/commands/db/tasks/dummy/config.rb
 - lib/jets/commands/dbconsole.rb
 - lib/jets/commands/delete.rb
 - lib/jets/commands/deploy.rb