jets 1.0.18 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3641bfc605d605d224afb10bb88984598e186c9e804a93a4a0cae6c21196355
-  data.tar.gz: bfece6211fcbfc4e58b0032adc42edfa8c9ebb2342cd78cb1cd67efee0591f6d
+  metadata.gz: c16c6b3b6a3226c7512a79011f134db88f544e86944fd96041c43cfa155c949a
+  data.tar.gz: b598ecc601f5edafb12dc8589be0511e9302b0fb16c61a27a27805612554b1c7
 SHA512:
-  metadata.gz: de90662184c6b339aa2dd68d8fc11a77043a899d0df0e80e432bbbddb37fa96f207a52392b73810cb1147b60131ed2682f8d94a717f4516cbf35d079d9cd4f98
-  data.tar.gz: 2969e083ee32d7053e65689eb9888b45ae144d4b0e681dd17ca30f2c13cc1153c6db5d5da364dfe251fc971fd627762877b0e209840c06092d9ccb61bb5abd7b
+  metadata.gz: e590e98ec4f3b6f6b865d678af0bbb519f4c7b41f0ea99b6d607cd948f18dbfba230cadd30a78342b894dc090eb5ac32de191253538f60715e136b7833a675c7
+  data.tar.gz: 371c670262da7a386880b6a467251c39fa846bb016325eb75b0e0a8e630934c3284134d5e8db27c64a8d62af0e06f927ced345c10faa1fdd862f2c7c84a14cb8

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.1.0]
+- rack compatibility pull request #72 from tongueroo/rack
+- remove Jets::Timing pull request #73 from tongueroo/rm-timing
+
 ## [1.0.18]
 - re-raise exception properly after reporting locally
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.0.18)
+    jets (1.1.0)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
@@ -65,9 +65,9 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.113.0)
-    aws-sdk-cloudformation (1.11.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-partitions (1.114.0)
+    aws-sdk-cloudformation (1.12.0)
+      aws-sdk-core (~> 3, >= 3.37.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-cloudwatchlogs (1.10.0)
       aws-sdk-core (~> 3, >= 3.26.0)
@@ -83,15 +83,15 @@ GEM
     aws-sdk-kms (1.11.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-lambda (1.13.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-lambda (1.14.0)
+      aws-sdk-core (~> 3, >= 3.37.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.23.1)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-s3 (1.24.1)
+      aws-sdk-core (~> 3, >= 3.37.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sdk-sns (1.8.0)
-      aws-sdk-core (~> 3, >= 3.26.0)
+    aws-sdk-sns (1.8.1)
+      aws-sdk-core (~> 3, >= 3.37.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     builder (3.2.3)

data/README/testing.md

@@ -17,7 +17,7 @@ To run the integration tests locally, you need to create a new Jets CRUD project
     jets new demo
     cd demo
     jets generate scaffold Post title:string
-    jets server
+    jets server --no-reload
 
 Then you can run the postman tests:
 
@@ -45,4 +45,7 @@ Run the remote integration script:
 Example:
 
     BASE_URL=https://wb5dcjc09a.execute-api.us-west-2.amazonaws.com/dev spec/integration/remote.sh
-    
+
+## Manual Test
+
+Test books create, update and delete manually until it's scripted.

data/lib/jets.rb

@@ -32,11 +32,12 @@ module Jets
   autoload :Klass, 'jets/klass'
   autoload :Lambda, 'jets/lambda'
   autoload :Logger, "jets/logger"
+  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 :Rack, "jets/rack"
   autoload :Rdoc, "jets/rdoc"
   autoload :Resource, "jets/resource"
   autoload :Route, "jets/route"
@@ -45,7 +46,6 @@ module Jets
   autoload :Rule, 'jets/rule'
   autoload :Server, "jets/server"
   autoload :Stack, "jets/stack"
-  autoload :Timing, "jets/timing"
   autoload :Turbine, 'jets/turbine'
   autoload :Util, "jets/util"
 

data/lib/jets/application.rb

@@ -1,12 +1,12 @@
 require "active_support/ordered_options"
 require "singleton"
+require "rack"
 
 class Jets::Application
   include Singleton
   extend Memoist
-  # Middleware used for development only
-  autoload :Middleware, "jets/application/middleware"
-  include Middleware
+  autoload :Middleware, "jets/middleware"
+  include Jets::Middleware
 
   def configure(&block)
     instance_eval(&block) if block
@@ -23,9 +23,30 @@ class Jets::Application
     Jets::Inflections.load!
   end
 
-  # Default config
   def config
+    @config ||= ActiveSupport::OrderedOptions.new # dont use memoize since we reset @config later
+  end
+
+  def default_config(project_name=nil)
     config = ActiveSupport::OrderedOptions.new
+    config.project_name = project_name
+    config.cors = true
+    config.autoload_paths = %w[
+                              app/controllers
+                              app/models
+                              app/jobs
+                              app/rules
+                              app/helpers
+                              app/shared/resources
+                            ]
+    config.extra_autoload_paths = []
+
+    # 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
@@ -51,53 +72,37 @@ class Jets::Application
     config.ruby = ActiveSupport::OrderedOptions.new
     config.ruby.lazy_load = true # also set in config/environments files
 
-    config
-  end
-  memoize :config
+    config.middleware = Jets::Middleware::Configurator.new
 
-  def setup_auto_load_paths
-    autoload_paths = config.autoload_paths + config.extra_autoload_paths
-    autoload_paths = autoload_paths.uniq.map { |p| "#{Jets.root}#{p}" }
-    # internal_autoload_paths are last
-    autoload_paths += internal_autoload_paths
-    ActiveSupport::Dependencies.autoload_paths += autoload_paths
-  end
+    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 = {}
 
-  def internal_autoload_paths
-    internal = File.expand_path("../internal", __FILE__)
-    paths = %w[
-      app/controllers
-      app/models
-      app/jobs
-    ]
-    paths.map { |path| "#{internal}/#{path}" }
-  end
-
-  def load_configs
-    # The Jets default/application.rb is loaded.
-    load File.expand_path("../default/application.rb", __FILE__)
-    # Then project config/application.rb is loaded.
-    load_app_config
-    load_db_config
-    load_environments_config
+    config
   end
 
-  # First time loading this might not have all the values. Some values like
-  # project_namespace depend on project_name. Loading the config twice
-  # resolves the chicken and egg problem here.
   def load_app_config
-    eval_app_config
-    # Normalize config and setup some shortcuts
+    # First time loading will not have all correct values. Some values like
+    # project_namespace depend on project_name. Loading the config twice
+    # resolves the chicken-and-egg problem with config.project_name.
+    # TODO: Improve the way we this is solved.
+    eval_app_config(squash_exception: true) # first time load to capture the config.project_name
+    @config = default_config(config.project_name) # reset config with the captured project_name
+
     set_dependent_configs! # things like project_namespace that need project_name
-    eval_app_config # twice to fix values that rely on the dependent configs
 
-    set_iam_policy # relies on dependent values, must be called late
+    # Running eval_app_config the second time, hack to solve the chicken-and-egg problem
+    eval_app_config
+
+    set_iam_policy # relies on dependent values, must be called afterwards
     normalize_env_vars!
   end
 
-  def eval_app_config
+  def eval_app_config(squash_exception: false)
     app_config = "#{Jets.root}config/application.rb"
-    load app_config if File.exist?(app_config)
+    load app_config
+  rescue NoMethodError => e
+    raise(e) unless squash_exception
   end
 
   def load_environments_config
@@ -108,6 +113,30 @@ class Jets::Application
     end
   end
 
+  def load_configs
+    load_app_config
+    load_db_config
+    load_environments_config
+  end
+
+  def setup_auto_load_paths
+    autoload_paths = config.autoload_paths + config.extra_autoload_paths
+    autoload_paths = autoload_paths.uniq.map { |p| "#{Jets.root}#{p}" }
+    # internal_autoload_paths are last
+    autoload_paths += internal_autoload_paths
+    ActiveSupport::Dependencies.autoload_paths += autoload_paths
+  end
+
+  def internal_autoload_paths
+    internal = File.expand_path("../internal", __FILE__)
+    paths = %w[
+      app/controllers
+      app/models
+      app/jobs
+    ]
+    paths.map { |path| "#{internal}/#{path}" }
+  end
+
   # Use the shorter name in stack names, but use the full name when it
   # comes to checking for the env.
   #

data/lib/jets/booter.rb

@@ -4,18 +4,23 @@ class Jets::Booter
     def boot!(options={})
       return if @booted
 
-      redirect_output
       confirm_jets_project!
       require_bundle_gems
       Jets::Dotenv.load!
-      Jets.application # triggers application.setup! # autoload_paths, routes, etc
+      Jets.application # triggers Application.instance setup # autoload_paths, routes, etc
       setup_db
       app_initializers
       turbine_initializers
+      build_middleware_stack
 
       @booted = true
     end
 
+    # Builds and memoize stack so it only gets built on bootup
+    def build_middleware_stack
+      Jets.application.build_stack
+    end
+
     def turbine_initializers
       Jets::Turbine.subclasses.each do |subclass|
         subclass.initializers.each do |label, block|
@@ -30,23 +35,6 @@ class Jets::Booter
       end
     end
 
-    # AWS Lambda for natively supported languages prints to CloudWatch instead of
-    # mungling up the response. We'll redirect stdout to stderr to mimic AWS Lambda
-    # behavior.
-    #
-    # Also, for local use, printing to stdout can mangle up the response when piping
-    # the value to jq. For example:
-    #
-    #   `jets call --local .. | jq`
-    #
-    # By redirecting stderr we can use jq safely.
-    #
-    def redirect_output
-      $stdout.sync = true
-      $stderr.sync = true
-      $stdout = $stderr # jets call and local jets operation
-    end
-
     # require_bundle_gems called when environment boots up via Jets.boot.  It
     # also useful for when to loading Rake tasks in
     # Jets::Commands::RakeTasks.load!
@@ -105,12 +93,21 @@ class Jets::Booter
     def confirm_jets_project!
       unless File.exist?("#{Jets.root}config/application.rb")
         puts "It does not look like you are running this command within a jets project.  Please confirm that you are in a jets project and try again.".colorize(:red)
-        exit
+        exit 1
       end
     end
 
     def message
       "Jets booting up in #{Jets.env.colorize(:green)} mode!"
     end
+
+    def check_config_ru!
+      config_ru = File.read("#{Jets.root}config.ru")
+      unless config_ru.include?("Jets.boot")
+        puts 'The config.ru file is missing Jets.boot.  Please add Jets.boot after require "jets"'.colorize(:red)
+        puts "This was changed as made in Jets v1.1.0"
+        exit 1
+      end
+    end
   end
 end

data/lib/jets/builders/code_builder.rb

@@ -53,7 +53,6 @@ class Jets::Builders
     # https://docs.aws.amazon.com/lambda/latest/dg/limits.html
     AWS_CODE_SIZE_LIMIT = 250 * 1024 * 1024 # 250MB
 
-    include Jets::Timing
     include Jets::AwsServices
     include Util
     extend Memoist
@@ -80,7 +79,6 @@ class Jets::Builders
         code_finish
       end
     end
-    time :build
 
     # Resolves the chicken-and-egg problem with md5 checksums. The handlers need
     # to reference files with the md5 checksum.  The files are the:
@@ -113,7 +111,6 @@ class Jets::Builders
         end
       end
     end
-    time :create_zip_files
 
     def exist_on_s3?(filename)
       s3_key = "jets/code/#{filename}"
@@ -163,17 +160,16 @@ class Jets::Builders
     def code_setup
       reconfigure_development_webpacker
     end
-    time :code_setup
 
     def code_finish
       update_lazy_load_config # at the top, must be called before Jets.lazy_load? is used
       store_s3_base_url
+      disable_webpacker_middleware
       setup_tmp
       calculate_md5s # must be called before generate_node_shims and create_zip_files
       generate_node_shims
       create_zip_files
     end
-    time :code_finish
 
     def update_lazy_load_config
       size_limit = AWS_CODE_SIZE_LIMIT
@@ -231,6 +227,12 @@ class Jets::Builders
       Jets.aws.s3_bucket
     end
 
+    def disable_webpacker_middleware
+      full_path = "#{full(tmp_code)}/config/disable-webpacker-middleware.txt"
+      FileUtils.mkdir_p(File.dirname(full_path))
+      FileUtils.touch(full_path)
+    end
+
     # This happens in the current app directory not the tmp code for simplicity.
     # This is because the node and yarn has likely been set up correctly there.
     def compile_assets
@@ -250,7 +252,6 @@ class Jets::Builders
           `which webpack`.strip
       sh("JETS_ENV=#{Jets.env} #{webpack_command}")
     end
-    time :compile_assets
 
     # This happens in the current app directory not the tmp code for simplicity
     # This is because the node likely been set up correctly there.
@@ -311,7 +312,6 @@ class Jets::Builders
         move_node_modules(Jets.build_root, Jets.root) # move node_modules directory back
       end
     end
-    time :copy_project
 
     # Move the node modules to the tmp build folder to speed up project copying.
     # A little bit risky because a ctrl-c in the middle of the project copying
@@ -360,7 +360,6 @@ class Jets::Builders
       ruby_packager.finish
       rack_packager.finish
     end
-    time :package_ruby
 
     # TODO: Move logic into plugin instead
     def reconfigure_rails

data/lib/jets/cfn/ship.rb

@@ -1,6 +1,5 @@
 class Jets::Cfn
   class Ship
-    include Jets::Timing
     include Jets::AwsServices
 
     def initialize(options)
@@ -35,7 +34,6 @@ class Jets::Cfn
       prewarm
       show_api_endpoint
     end
-    time :run
 
     def save_stack
       if stack_exists?(@parent_stack_name)
@@ -49,7 +47,6 @@ class Jets::Cfn
       # parent stack template is on filesystem and child stacks templates is on s3
       cfn.create_stack(stack_options)
     end
-    time :create_stack
 
     def update_stack
       begin
@@ -59,7 +56,6 @@ class Jets::Cfn
         true # error
       end
     end
-    time :update_stack
 
     # options common to both create_stack and update_stack
     def stack_options
@@ -75,7 +71,6 @@ class Jets::Cfn
     def wait_for_stack
       Jets::Cfn::Status.new(@options).wait
     end
-    time :wait_for_stack
 
     def prewarm
       if ENV['SKIP_PREWARMING']
@@ -147,6 +142,5 @@ class Jets::Cfn
       uploader = Upload.new(@options[:s3_bucket])
       uploader.upload
     end
-    time :upload_to_s3
   end
 end