jets 1.9.7 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6e7b6b9b9d45a93c29db948c614b8b7a3d3b165b77ee9840a758e335ae3702
-  data.tar.gz: 6e80e53b5e966f5b8cb0d55887f33c796d24b1f808ed6f23ac7c45f054bccdb2
+  metadata.gz: a7bab088510c9c8a596fa24fa94baddca4dd859f0b470fb969540a685670b3a8
+  data.tar.gz: bebc19de833c38e74904438a3f86b145dcef9dd67b4619bf0d53e9ab2adeb2d3
 SHA512:
-  metadata.gz: d2054ef9e8261cdd1348b1135659cbb19ea3f2b4af55025dd8c64f6db5d7be9a67432c4f4efaa6f7171ece9dfd7ecf9050f265a556ae50b0789d54c360d75cfb
-  data.tar.gz: f327acc8bd139f3b1eb3d6c43a5a7fd55d56e6202fa7ac158aa4425eef55f0f85f6fda2ca398f249b9b7ba3910c362dfa6c0310821002ed3b1db97309c05b716
+  metadata.gz: 02cd9b07b8493dbd85fb366007f8a933c994b616067d8dcd87bf28ca0585898be6737a742c6c1436964f27ac858d01b7d653fb9b3dadb15bca6584b6380960e6
+  data.tar.gz: 840432ac737e3fc43537f89255dad2a94f904f988d93c7776d3f4ac959c5793f26baa01e83b292c20f41ce5e7334f4990897eddcfaa0b10f54e670a5f4a8d979

data/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "vendor/jets-gems"]
-	path = vendor/jets-gems
-	url = https://github.com/tongueroo/jets-gems
-[submodule "vendor/rails"]
-	path = vendor/rails
-	url = https://github.com/tongueroo/rails.git

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/).
 
+## [1.9.8]
+- #272 Jets Autoloaders with zeitwerk
+- #273 remove need for forked rails
+- #274 remove jets-gems as vendor dependency
+
 ## [1.9.7]
 - #271 fix deploy for job mode with no config/routes.rb file
 

data/Rakefile

@@ -1,3 +1,5 @@
+require "bundler/setup"
+Bundler.setup
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
@@ -8,6 +10,7 @@ RSpec::Core::RakeTask.new
 require_relative "lib/jets"
 desc "Generates cli reference docs as markdown"
 task :docs do
+  Jets::Autoloaders.once.eager_load
   Jets::Commands::Markdown::Creator.create_all
 end
 

data/jets.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency "actionpack", "~> 5.2.1" # using vendor/rails version
-  # spec.add_dependency "actionview", "~> 5.2.1" # using vendor/rails version
   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 "aws-sdk-apigateway"
@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
+  spec.add_dependency "jets-gems"
   spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "json"
   spec.add_dependency "kramdown"

data/lib/jets.rb

@@ -6,79 +6,18 @@ require "active_support/dependencies"
 require "active_support/ordered_hash"
 require "active_support/ordered_options"
 require "fileutils"
-require "jets/camelizer"
-require "jets/version"
 require "memoist"
 require "rainbow/ext/string"
+require "jets/gems"
 
-# Looks like for zeitwerk module autovivification to work `bundle exec` must be called.
-# We run Bundle.setup initially which is what `bundle exec does.
-# This allows zeitwork module autovivification to work even if the user has not called jets with `bundle exec jets`.
-# We check for Afterburner mode since in that mode jets is a standalone tool.
-#
-require "jets/turbo"
-if Jets::Turbo.new.jets?
-  require "bundler/setup"
-  Bundler.setup # Same as Bundler.setup(:default)
-end
-require "zeitwerk"
+require "jets/autoloaders"
+Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
+Jets::Autoloaders.once.setup
 
 module Jets
   RUBY_VERSION = "2.5.3"
   class Error < StandardError; end
-
-  autoload :Application, "jets/application"
-  autoload :AwsInfo, "jets/aws_info"
-  autoload :AwsServices, "jets/aws_services"
-  autoload :Booter, 'jets/booter'
-  autoload :Builders, 'jets/builders'
-  autoload :Call, "jets/call"
-  autoload :Cfn, 'jets/cfn'
-  autoload :CLI, "jets/cli"
-  autoload :Commands, "jets/commands"
-  autoload :Controller, 'jets/controller'
-  autoload :Core, "jets/core"
-  autoload :Db, 'jets/db'
-  autoload :Dotenv, 'jets/dotenv'
-  autoload :Erb, "jets/erb"
-  autoload :Generator, "jets/generator"
-  autoload :Inflections, "jets/inflections"
-  autoload :IO, "jets/io"
-  autoload :Job, 'jets/job'
-  autoload :Klass, 'jets/klass'
-  autoload :Lambda, 'jets/lambda'
-  autoload :Logger, "jets/logger"
-  autoload :Mailer, "jets/mailer"
-  autoload :Mega, "jets/mega"
-  autoload :Middleware, "jets/middleware"
-  autoload :Naming, 'jets/naming'
-  autoload :PolyFun, 'jets/poly_fun'
-  autoload :Preheat, "jets/preheat"
-  autoload :Processors, 'jets/processors'
-  autoload :RackServer, "jets/rack_server"
-  autoload :Rdoc, "jets/rdoc"
-  autoload :Resource, "jets/resource"
-  autoload :Route, "jets/route"
-  autoload :Router, "jets/router"
-  autoload :Rule, 'jets/rule'
-  autoload :Stack, "jets/stack"
-  autoload :TmpLoader, "jets/tmp_loader"
-  autoload :Turbine, 'jets/turbine'
-  autoload :Turbo, 'jets/turbo'
-  autoload :Util, "jets/util"
-
   extend Core # root, logger, etc
 end
 
-require "jets/core_ext/kernel"
-
-root = File.expand_path("..", File.dirname(__FILE__))
-
-$:.unshift("#{root}/vendor/jets-gems/lib")
-require "jets-gems"
-
-$:.unshift("#{root}/vendor/rails/actionpack/lib")
-$:.unshift("#{root}/vendor/rails/actionview/lib")
-# will require action_controller, action_pack, etc later when needed
-
-Jets::Db # trigger autoload
+Jets::Autoloaders.once.preload("#{__dir__}/jets/db.rb") # required for booter.rb: setup_db

data/lib/jets/application.rb

@@ -4,8 +4,8 @@ require "rack"
 class Jets::Application
   include Singleton
   extend Memoist
-  autoload :Middleware, "jets/middleware"
   include Jets::Middleware
+  include DefaultConfig
 
   def configure(&block)
     instance_eval(&block) if block
@@ -13,7 +13,8 @@ class Jets::Application
 
   def setup!
     load_default_config
-    setup_auto_load_paths
+    autoload_paths = config.autoload_paths + config.extra_autoload_paths
+    setup_auto_load_paths(autoload_paths)
   end
 
   def configs!
@@ -36,6 +37,8 @@ class Jets::Application
     deprecated_configs_message
     load_inflections
     load_routes
+
+    Jets::Controller::Rendering::RackRenderer.setup! # Sets up ActionView etc
     # Load libraries at the end to trigger onload so we can defined options in any order.
     # Only action_mailer library have been used properly this way so far.
     require 'action_mailer'
@@ -49,98 +52,6 @@ class Jets::Application
     @config ||= ActiveSupport::OrderedOptions.new # dont use memoize since we reset @config later
   end
 
-  def default_config
-    config = ActiveSupport::OrderedOptions.new
-    config.project_name = parse_project_name # must set early because other configs requires this
-    config.cors = false
-    config.autoload_paths = default_autoload_paths
-    config.extra_autoload_paths = []
-    config.logger = Jets::Logger.new($stderr)
-
-    # function properties defaults
-    config.function = ActiveSupport::OrderedOptions.new
-    config.function.timeout = 30
-    # default memory setting based on:
-    # https://medium.com/epsagon/how-to-make-lambda-faster-memory-performance-benchmark-be6ebc41f0fc
-    config.function.memory_size = 1536
-
-    config.prewarm = ActiveSupport::OrderedOptions.new
-    config.prewarm.enable = true
-    config.prewarm.rate = '30 minutes'
-    config.prewarm.concurrency = 2
-    config.prewarm.public_ratio = 3
-    config.prewarm.rack_ratio = 5
-
-    config.gems = ActiveSupport::OrderedOptions.new
-    config.gems.sources = [
-      Jets.default_gems_source
-    ]
-
-    config.inflections = ActiveSupport::OrderedOptions.new
-    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.ruby = ActiveSupport::OrderedOptions.new
-
-    config.middleware = Jets::Middleware::Configurator.new
-
-    config.session = ActiveSupport::OrderedOptions.new
-    config.session.store = Rack::Session::Cookie # note when accessing it use session[:store] since .store is an OrderedOptions method
-    config.session.options = {}
-
-    config.api = ActiveSupport::OrderedOptions.new
-    config.api.authorization_type = "NONE"
-    config.api.cors_authorization_type = nil # nil so ApiGateway::Cors#cors_authorization_type handles
-    config.api.binary_media_types = ['multipart/form-data']
-    config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
-
-    config.domain = ActiveSupport::OrderedOptions.new
-    # config.domain.name = "#{Jets.project_namespace}.coolapp.com" # Default is nil
-    # config.domain.cert_arn = "..."
-    config.domain.endpoint_type = "REGIONAL" # EDGE or REGIONAL. Default to EDGE because CloudFormation update is faster
-    config.domain.route53 = true # controls whether or not to create the managed route53 record.
-      # Useful to disable this when user wants to manage the route themself like pointing
-      # it to CloudFront for blue-green deployments instead.
-
-    # Custom user lambda layers
-    config.lambda = ActiveSupport::OrderedOptions.new
-    config.lambda.layers = []
-
-    # Only used for Jets Afterburner, Mega Mode currently. This is a fallback default
-    # encoding.  Usually, the Rails response will return a content-type header and
-    # the encoding in there is used when possible. Example Content-Type header:
-    #   Content-Type    text/html; charset=utf-8
-    config.encoding = ActiveSupport::OrderedOptions.new
-    config.encoding.default = "utf-8"
-
-    config.s3_event = ActiveSupport::OrderedOptions.new
-    # These notification_configuration properties correspond to the ruby aws-sdk
-    #   s3.put_bucket_notification_configuration
-    # in jets/s3_bucket_config.rb, not the CloudFormation Bucket properties. The CloudFormation
-    # bucket properties have a similiar structure but is slightly different so it can be confusing.
-    #
-    #   Ruby aws-sdk S3 Docs: https://amzn.to/2N7m5Lr
-    config.s3_event.configure_bucket = true
-    config.s3_event.notification_configuration = {
-      topic_configurations: [
-        {
-          events: ["s3:ObjectCreated:*"],
-          topic_arn: "!Ref SnsTopic", # must use this logical id
-        },
-      ],
-    }
-
-    # So tried to defined this in the jets/mailer.rb Turbine only but jets new requires it
-    # config.action_mailer = ActiveSupport::OrderedOptions.new
-
-    config
-  end
-
   # Double evaling config/application.rb causes subtle issues:
   #   * double loading of shared resources: Jets::Stack.subclasses will have the same
   #   class twice when config is called when declaring a function
@@ -158,12 +69,12 @@ class Jets::Application
 
   def load_default_config
     @config = default_config
-    set_dependent_configs! # things like project_namespace that need project_name
-    eval_app_config # this overwrites Jets.config.project_name
+    set_computed_configs! # things like project_namespace that need project_name
+    load_config_application # this overwrites Jets.config.project_name
     Jets.config.project_name = parse_project_name # Must set again because JETS_PROJECT_NAME is possible
   end
 
-  def eval_app_config
+  def load_config_application
     app_config = "#{Jets.root}/config/application.rb"
     load app_config # use load instead of require so reload_configs! works
   end
@@ -172,7 +83,7 @@ class Jets::Application
     env_file = "#{Jets.root}/config/environments/#{Jets.env}.rb"
     if File.exist?(env_file)
       code = IO.read(env_file)
-      instance_eval(code)
+      instance_eval(code, env_file)
     end
   end
 
@@ -187,15 +98,14 @@ class Jets::Application
     end
   end
 
-  def setup_auto_load_paths
-    autoload_paths = config.autoload_paths + config.extra_autoload_paths
-    autoload_paths += internal_autoload_paths # internal_autoload_paths are last
+  def setup_auto_load_paths(autoload_paths=default_autoload_paths)
+    loader = Jets::Autoloaders.main
     autoload_paths.each do |path|
       next unless File.exist?(path)
-      Jets.loader.push_dir(path)
+      loader.push_dir(path)
     end
-    Jets.loader.enable_reloading if Jets.env.development?
-    Jets.loader.setup
+    loader.enable_reloading if Jets.env.development?
+    loader.setup
   end
 
   # Essentially folders under app folder will be the default_autoload_paths. Example:
@@ -211,14 +121,12 @@ class Jets::Application
   #   app/controllers/concerns
   def default_autoload_paths
     paths = []
-    Dir.glob("#{Jets.root}/app/*").each do |p|
-      p.sub!('./','')
-      paths << p unless exclude_autoload_path?(p)
+    each_app_autoload_path("#{Jets.root}/app/*") do |path|
+      paths << path
     end
     # Handle concerns folders
-    Dir.glob("#{Jets.root}/app/**/concerns").each do |p|
-      p.sub!('./','')
-      paths << p unless exclude_autoload_path?(p)
+    each_app_autoload_path("#{Jets.root}/app/**/concerns") do |path|
+      paths << path
     end
 
     paths << "#{Jets.root}/app/shared/resources"
@@ -227,8 +135,17 @@ class Jets::Application
     paths
   end
 
+  def each_app_autoload_path(expression)
+    Dir.glob(expression).each do |p|
+      p.sub!('./','')
+      yield(p) unless exclude_autoload_path?(p)
+    end
+  end
+
   def exclude_autoload_path?(path)
-    path =~ %r{app/javascript} || path =~ %r{app/views}
+    path =~ %r{app/javascript} ||
+    path =~ %r{app/views} ||
+    path =~ %r{/functions} # app and shared
   end
 
   def internal_autoload_paths
@@ -254,7 +171,7 @@ class Jets::Application
     production: 'prod',
     staging: 'stag',
   }
-  def set_dependent_configs!
+  def set_computed_configs!
     # env_extra can be also be set with JETS_ENV_EXTRA.
     # JETS_ENV_EXTRA higher precedence than config.env_extra
     config.env_extra = ENV['JETS_ENV_EXTRA'] if ENV['JETS_ENV_EXTRA']

data/lib/jets/application/default_config.rb

@@ -0,0 +1,95 @@
+class Jets::Application
+  module DefaultConfig
+    def default_config
+      config = ActiveSupport::OrderedOptions.new
+      config.project_name = parse_project_name # must set early because other configs requires this
+      config.cors = false
+      config.autoload_paths = default_autoload_paths
+      config.extra_autoload_paths = []
+      config.logger = Jets::Logger.new($stderr)
+
+      # function properties defaults
+      config.function = ActiveSupport::OrderedOptions.new
+      config.function.timeout = 30
+      # default memory setting based on:
+      # https://medium.com/epsagon/how-to-make-lambda-faster-memory-performance-benchmark-be6ebc41f0fc
+      config.function.memory_size = 1536
+
+      config.prewarm = ActiveSupport::OrderedOptions.new
+      config.prewarm.enable = true
+      config.prewarm.rate = '30 minutes'
+      config.prewarm.concurrency = 2
+      config.prewarm.public_ratio = 3
+      config.prewarm.rack_ratio = 5
+
+      config.gems = ActiveSupport::OrderedOptions.new
+      config.gems.sources = [
+        Jets.default_gems_source
+      ]
+
+      config.inflections = ActiveSupport::OrderedOptions.new
+      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.ruby = ActiveSupport::OrderedOptions.new
+
+      config.middleware = Jets::Middleware::Configurator.new
+
+      config.session = ActiveSupport::OrderedOptions.new
+      config.session.store = Rack::Session::Cookie # note when accessing it use session[:store] since .store is an OrderedOptions method
+      config.session.options = {}
+
+      config.api = ActiveSupport::OrderedOptions.new
+      config.api.authorization_type = "NONE"
+      config.api.cors_authorization_type = nil # nil so ApiGateway::Cors#cors_authorization_type handles
+      config.api.binary_media_types = ['multipart/form-data']
+      config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
+
+      config.domain = ActiveSupport::OrderedOptions.new
+      # config.domain.name = "#{Jets.project_namespace}.coolapp.com" # Default is nil
+      # config.domain.cert_arn = "..."
+      config.domain.endpoint_type = "REGIONAL" # EDGE or REGIONAL. Default to EDGE because CloudFormation update is faster
+      config.domain.route53 = true # controls whether or not to create the managed route53 record.
+        # Useful to disable this when user wants to manage the route themself like pointing
+        # it to CloudFront for blue-green deployments instead.
+
+      # Custom user lambda layers
+      config.lambda = ActiveSupport::OrderedOptions.new
+      config.lambda.layers = []
+
+      # Only used for Jets Afterburner, Mega Mode currently. This is a fallback default
+      # encoding.  Usually, the Rails response will return a content-type header and
+      # the encoding in there is used when possible. Example Content-Type header:
+      #   Content-Type    text/html; charset=utf-8
+      config.encoding = ActiveSupport::OrderedOptions.new
+      config.encoding.default = "utf-8"
+
+      config.s3_event = ActiveSupport::OrderedOptions.new
+      # These notification_configuration properties correspond to the ruby aws-sdk
+      #   s3.put_bucket_notification_configuration
+      # in jets/s3_bucket_config.rb, not the CloudFormation Bucket properties. The CloudFormation
+      # bucket properties have a similiar structure but is slightly different so it can be confusing.
+      #
+      #   Ruby aws-sdk S3 Docs: https://amzn.to/2N7m5Lr
+      config.s3_event.configure_bucket = true
+      config.s3_event.notification_configuration = {
+        topic_configurations: [
+          {
+            events: ["s3:ObjectCreated:*"],
+            topic_arn: "!Ref SnsTopic", # must use this logical id
+          },
+        ],
+      }
+
+      # So tried to defined this in the jets/mailer.rb Turbine only but jets new requires it
+      # config.action_mailer = ActiveSupport::OrderedOptions.new
+
+      config
+    end
+  end
+end