jets 1.0.18 → 1.1.0

data/lib/jets/middleware/layer.rb

@@ -0,0 +1,34 @@
+module Jets::Middleware
+  class Layer
+    attr_reader :args, :block, :klass
+
+    def initialize(klass, args, block)
+      @klass = klass
+      @args  = args
+      @block = block
+    end
+
+    def name; klass.name; end
+
+    def ==(middleware)
+      case middleware
+      when Layer
+        klass == middleware.klass
+      when Class
+        klass == middleware
+      end
+    end
+
+    def inspect
+      if klass.is_a?(Class)
+        klass.to_s
+      else
+        klass.class.to_s
+      end
+    end
+
+    def build(app)
+      klass.new(app, *args, &block)
+    end
+  end
+end

data/lib/jets/middleware/stack.rb

@@ -0,0 +1,77 @@
+module Jets::Middleware
+  class Stack
+    include Enumerable
+
+    attr_accessor :middlewares
+    def initialize(*args)
+      @middlewares = []
+      yield(self) if block_given?
+    end
+
+    def each
+      @middlewares.each { |x| yield x }
+    end
+
+    def size
+      middlewares.size
+    end
+
+    def last
+      middlewares.last
+    end
+
+    def [](i)
+      middlewares[i]
+    end
+
+    def unshift(klass, *args, &block)
+      middlewares.unshift(build_middleware(klass, args, block))
+    end
+
+    def initialize_copy(other)
+      self.middlewares = other.middlewares.dup
+    end
+
+    def insert(index, klass, *args, &block)
+      index = assert_index(index, :before)
+      middlewares.insert(index, build_middleware(klass, args, block))
+    end
+
+    alias_method :insert_before, :insert
+
+    def insert_after(index, *args, &block)
+      index = assert_index(index, :after)
+      insert(index + 1, *args, &block)
+    end
+
+    def swap(target, *args, &block)
+      index = assert_index(target, :before)
+      insert(index, *args, &block)
+      middlewares.delete_at(index + 1)
+    end
+
+    def delete(target)
+      middlewares.delete_if { |m| m.klass == target }
+    end
+
+    def use(klass, *args, &block)
+      middlewares.push(build_middleware(klass, args, block))
+    end
+
+    def build(app = Proc.new)
+      middlewares.freeze.reverse.inject(app) { |a, e| e.build(a) }
+    end
+
+  private
+
+    def assert_index(index, where)
+      i = index.is_a?(Integer) ? index : middlewares.index { |m| m.klass == index }
+      raise "No such middleware to insert #{where}: #{index.inspect}" unless i
+      i
+    end
+
+    def build_middleware(klass, args, block)
+      Layer.new(klass, args, block)
+    end
+  end
+end

data/lib/jets/resource/function.rb

@@ -203,7 +203,7 @@ class Jets::Resource
       #   method: admin/pages_controller
       #   method: admin-pages_controller-index
       method = @app_class.underscore
-      method = method.sub('/','-') + "-#{@task.meth}"
+      method = method.sub('/','-').gsub(/[^0-9a-z\-_]/i, '') + "-#{@task.meth}"
       "#{Jets.config.project_namespace}-#{method}"
     end
   end

data/lib/jets/ruby_server.rb

@@ -51,7 +51,7 @@ module Jets
 
       # Fire and forget for concurrent, will wait with wait_for_rack_socket
       Thread.new do
-        Jets::Rack::Server.start
+        Jets::Server.start
       end
 
       wait_for_rack_socket # blocks until rack server is up

data/lib/jets/server.rb

@@ -1,16 +1,51 @@
-require 'rack'
-require 'rack/server'
-require "jets/server/webpacker_setup" if Jets.webpacker?
+module Jets
+  class Server
+    def self.start(options={})
+      new(options).start
+    end
 
-class Jets::Server
-  autoload :RouteMatcher, "jets/server/route_matcher"
-  autoload :TimingMiddleware, "jets/server/timing_middleware"
-  autoload :ApiGateway, "jets/server/api_gateway"
-  autoload :LambdaAwsProxy, "jets/server/lambda_aws_proxy"
+    def initialize(options)
+      @options = options
+    end
 
-  # Use by Jets::Application
-  # Where config.ru in the project leads to.
-  def self.call(env)
-    ApiGateway.call(env)
+    def start
+      return unless File.exist?("#{rack_project}/config.ru")
+      puts "Starting additional rack server for the project under the rack subfolder..." if ENV['JETS_DEBUG']
+
+      if ENV['FOREGROUND']
+        serve
+        return
+      end
+
+      # Reaching here means we'll run the server in the background.
+      # Handle daemonzing ourselves because it keeps the stdout of the 2nd
+      # rack server. The rackup --daemonize option ends up hiding the output.
+      pid = Process.fork
+      if pid.nil?
+        # we're in the child process
+        serve
+      else
+        # we're in the parent process
+        Process.detach(pid) # dettached but still in the "foreground" since bin/rackup runs in the foreground
+      end
+    end
+
+    # Runs in the child process
+    def serve
+      # Note, looks like stopping jets server with Ctrl-C sends the TERM signal
+      # down to the sub bin/rackup command cleans up the child process fine.
+      Bundler.with_clean_env do
+        args = ''
+        args << " --host #{@options[:host]}" if @options[:host] # only forward the host option
+                                                                # port is always 9292 for simplicity
+        command = "cd #{rack_project} && bin/rackup#{args}" # leads to the same wrapper rack scripts
+        puts "=> #{command}".colorize(:green)
+        system(command)
+      end
+    end
+
+    def rack_project
+      "#{Jets.root}rack"
+    end
   end
-end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.0.18"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -432,7 +432,6 @@ files:
 - jets.gemspec
 - lib/jets.rb
 - lib/jets/application.rb
-- lib/jets/application/middleware.rb
 - lib/jets/aws_info.rb
 - lib/jets/aws_services.rb
 - lib/jets/aws_services/stack_status.rb
@@ -539,9 +538,9 @@ files:
 - lib/jets/commands/runner.rb
 - lib/jets/commands/sequence.rb
 - lib/jets/commands/stack_info.rb
-- lib/jets/commands/templates/skeleton/.env
 - lib/jets/commands/templates/skeleton/.env.development.tt
 - lib/jets/commands/templates/skeleton/.env.test
+- lib/jets/commands/templates/skeleton/.env.tt
 - lib/jets/commands/templates/skeleton/.gitignore
 - lib/jets/commands/templates/skeleton/.jetskeep
 - lib/jets/commands/templates/skeleton/.rspec
@@ -584,12 +583,24 @@ files:
 - lib/jets/controller.rb
 - lib/jets/controller/base.rb
 - lib/jets/controller/callbacks.rb
+- lib/jets/controller/cookies.rb
+- lib/jets/controller/cookies/jar.rb
 - lib/jets/controller/layout.rb
+- lib/jets/controller/middleware.rb
+- lib/jets/controller/middleware/local.rb
+- lib/jets/controller/middleware/local/api_gateway.rb
+- lib/jets/controller/middleware/local/mimic_aws_call.rb
+- lib/jets/controller/middleware/local/route_matcher.rb
+- lib/jets/controller/middleware/main.rb
+- lib/jets/controller/middleware/webpacker_setup.rb
 - lib/jets/controller/params.rb
+- lib/jets/controller/rack.rb
+- lib/jets/controller/rack/adapter.rb
+- lib/jets/controller/rack/env.rb
 - lib/jets/controller/redirection.rb
 - lib/jets/controller/renderers.rb
-- lib/jets/controller/renderers/aws_proxy_renderer.rb
 - lib/jets/controller/renderers/base_renderer.rb
+- lib/jets/controller/renderers/rack_renderer.rb
 - lib/jets/controller/renderers/template_renderer.rb
 - lib/jets/controller/rendering.rb
 - lib/jets/controller/request.rb
@@ -597,7 +608,6 @@ files:
 - lib/jets/core.rb
 - lib/jets/core_ext/kernel.rb
 - lib/jets/db.rb
-- lib/jets/default/application.rb
 - lib/jets/dotenv.rb
 - lib/jets/erb.rb
 - lib/jets/generator.rb
@@ -630,6 +640,14 @@ files:
 - lib/jets/lambda/functions.rb
 - lib/jets/lambda/task.rb
 - lib/jets/logger.rb
+- lib/jets/mega.rb
+- lib/jets/mega/hash_converter.rb
+- lib/jets/mega/request.rb
+- lib/jets/middleware.rb
+- lib/jets/middleware/configurator.rb
+- lib/jets/middleware/default_stack.rb
+- lib/jets/middleware/layer.rb
+- lib/jets/middleware/stack.rb
 - lib/jets/naming.rb
 - lib/jets/poly_fun.rb
 - lib/jets/poly_fun/base_executor.rb
@@ -642,10 +660,6 @@ files:
 - lib/jets/processors.rb
 - lib/jets/processors/deducer.rb
 - lib/jets/processors/main_processor.rb
-- lib/jets/rack.rb
-- lib/jets/rack/hash_converter.rb
-- lib/jets/rack/request.rb
-- lib/jets/rack/server.rb
 - lib/jets/rails_overrides.rb
 - lib/jets/rails_overrides/asset_tag_helper.rb
 - lib/jets/rails_overrides/common_methods.rb
@@ -692,11 +706,6 @@ files:
 - lib/jets/rule/base.rb
 - lib/jets/rule/dsl.rb
 - lib/jets/server.rb
-- lib/jets/server/api_gateway.rb
-- lib/jets/server/lambda_aws_proxy.rb
-- lib/jets/server/route_matcher.rb
-- lib/jets/server/timing_middleware.rb
-- lib/jets/server/webpacker_setup.rb
 - lib/jets/stack.rb
 - lib/jets/stack/builder.rb
 - lib/jets/stack/definition.rb
@@ -715,8 +724,6 @@ files:
 - lib/jets/stack/parameter/dsl.rb
 - lib/jets/stack/resource.rb
 - lib/jets/stack/resource/dsl.rb
-- lib/jets/timing.rb
-- lib/jets/timing/report.rb
 - lib/jets/turbine.rb
 - lib/jets/util.rb
 - lib/jets/version.rb

data/lib/jets/application/middleware.rb

@@ -1,23 +0,0 @@
-module Jets::Application::Middleware
-  def call(env)
-    # Only require when necessary because middleware is only used for development
-    # Requring here instead of top of file because Jets::Application::Middleware
-    # gets autoloaded when Jets::Application gets autoloaded.
-    # Trying to keep the config.ru interface clean:
-    #
-    #   require "jets"
-    #   run Jets.application
-    require "jets/server/webpacker_setup" if Jets.webpacker? # makes "use Webpacker::DevServerProxy" works
-    triplet = assemble_app.call(env)
-  end
-
-  def assemble_app
-    Rack::Builder.new do
-      map("/") do
-        use Jets::Server::TimingMiddleware
-        use Webpacker::DevServerProxy if Jets.webpacker?
-        run Jets::Server
-      end
-    end
-  end
-end

data/lib/jets/default/application.rb

@@ -1,23 +0,0 @@
-Jets.application.configure do
-  config.project_name = "project"
-  # config.env_extra = 2 # Optional. Any value works: 1,2,abc,xyz
-    # Allows creation of multiple instances of env.
-  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
-end
-

data/lib/jets/rack.rb

@@ -1,7 +0,0 @@
-module Jets
-  module Rack
-    autoload :Request, 'jets/rack/request'
-    autoload :Server, 'jets/rack/server'
-    autoload :HashConverter, 'jets/rack/hash_converter'
-  end
-end

data/lib/jets/rack/server.rb

@@ -1,47 +0,0 @@
-require 'fileutils'
-
-module Jets::Rack
-  class Server
-    def self.start
-      new.start
-    end
-
-    def start
-      puts "Jets::Rack#start"
-      return unless File.exist?("#{rack_project}/config.ru")
-      puts "Starting additional rack server for the project under the rack subfolder..." if ENV['JETS_DEBUG']
-
-      if ENV['FOREGROUND']
-        serve
-        return
-      end
-
-      # Reaching here means we'll run the server in the background.
-      # Handle daemonzing ourselves because it keeps the stdout of the 2nd
-      # rack server. The rackup --daemonize option ends up hiding the output.
-      pid = Process.fork
-      if pid.nil?
-        # we're in the child process
-        serve
-      else
-        # we're in the parent process
-        Process.detach(pid) # dettached but still in the "foreground" since bin/rackup runs in the foreground
-      end
-    end
-
-    # Runs in the child process
-    def serve
-      # Note, looks like stopping jets server with Ctrl-C sends the TERM signal
-      # down to the sub bin/rackup command cleans up the child process fine.
-      Bundler.with_clean_env do
-        command = "cd #{rack_project} && bin/rackup" # leads to the same wrapper rack scripts
-        puts "=> #{command}".colorize(:green)
-        system(command)
-      end
-    end
-
-    def rack_project
-      "#{Jets.root}rack"
-    end
-  end
-end

data/lib/jets/server/api_gateway.rb

@@ -1,39 +0,0 @@
-require 'kramdown'
-
-class Jets::Server
-  class ApiGateway
-    def self.call(env)
-      Jets.boot
-      route = RouteMatcher.new(env).find_route
-      if route
-        proxy = LambdaAwsProxy.new(route, env)
-        proxy.response # triplet
-      else
-        [404, {'Content-Type' => 'text/html'}, [routes_error_message(env)]]
-      end
-    end
-
-    def self.routes_error_message(env)
-      message = "<h2>404 Error: Route #{env['PATH_INFO'].sub('/','')} not found</h2>"
-      if Jets.env != "production"
-        message << "<p>Here are the routes defined in your application:</p>"
-        message << "#{routes_table}"
-      end
-      message
-    end
-
-    # Show pretty route table for user to help with debugging in non-production mode
-    def self.routes_table
-      routes = Jets::Router.routes
-
-      return "Your routes table is empty." if routes.empty?
-
-      text = "Verb | Path | Controller#action\n"
-      text << "--- | --- | ---\n"
-      routes.each do |route|
-        text << "#{route.method} | #{route.path} | #{route.to}\n"
-      end
-      Kramdown::Document.new(text).to_html
-    end
-  end
-end