jets 1.7.2 → 1.8.0

data/lib/jets/cfn/builders/parent_builder.rb

@@ -23,7 +23,7 @@ class Jets::Cfn::Builders
 
     def build_minimal_resources
       # Initial s3 bucket, used to store code zipfile and templates Jets generates
-      resource = Jets::Resource::S3.new
+      resource = Jets::Resource::S3::Bucket.new(logical_id: "s3_bucket")
       add_resource(resource)
       add_outputs(resource.outputs)
 

data/lib/jets/commands/build.rb

@@ -170,6 +170,9 @@ module Jets::Commands
     end
 
     # Add internal Jets controllers if they are being used
+    # TODO: Interesting, this eventually just used to generate handlers and controllers only.
+    # Maybe rename to make that clear.
+    # The copying of other internal files like views is done in builders/code_builder.rb copy_internal_jets_code
     def self.internal_app_files
       paths = []
       controllers = File.expand_path("../../internal/app/controllers/jets", __FILE__)
@@ -180,6 +183,9 @@ module Jets::Commands
       rack_catchall = Jets::Router.has_controller?("Jets::RackController")
       paths << "#{controllers}/rack_controller.rb" if rack_catchall
 
+      mailer_controller = Jets::Router.has_controller?("Jets::MailersController")
+      paths << "#{controllers}/mailers_controller.rb" if mailer_controller
+
       if Jets.config.prewarm.enable
         jobs = File.expand_path("../../internal/app/jobs/jets", __FILE__)
         paths << "#{jobs}/preheat_job.rb"

data/lib/jets/commands/deploy.rb

@@ -26,11 +26,21 @@ module Jets::Commands
 
       # Build code after the minimal stack because need s3 bucket for assets
       # on_aws? and s3_base_url logic
+      # TODO: possible deploy hook point: before_build
       build_code
 
+      # TODO: possible deploy hook point: before_ship
+      create_s3_event_buckets
       ship(stack_type: :full, s3_bucket: s3_bucket)
     end
 
+    def create_s3_event_buckets
+      buckets = Jets::Job::Base.s3_events.keys
+      buckets.each do |bucket|
+        Jets::AwsServices::S3Bucket.ensure_exists(bucket)
+      end
+    end
+
     def delete_minimal_stack
       puts "Existing stack is in ROLLBACK_COMPLETE state from a previous failed minimal deploy. Deleting stack and continuing."
       cfn.delete_stack(stack_name: stack_name)

data/lib/jets/commands/templates/skeleton/config/environments/development.rb

@@ -1,4 +1,7 @@
 Jets.application.configure do
   # Example:
   # config.function.memory_size = 1536
-end
+
+  # config.action_mailer.raise_delivery_errors = false
+  # Docs: http://rubyonjets.com/docs/email-sending/
+end

data/lib/jets/commands/templates/skeleton/config/environments/production.rb

@@ -1,4 +1,9 @@
 Jets.application.configure do
   # Example:
   # config.function.memory_size = 2048
-end
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # Docs: http://rubyonjets.com/docs/email-sending/
+  # config.action_mailer.raise_delivery_errors = false
+end

data/lib/jets/commands/templates/skeleton/config/environments/test.rb

@@ -0,0 +1,7 @@
+Jets.application.configure do
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  # Docs: http://rubyonjets.com/docs/email-sending/
+  config.action_mailer.delivery_method = :test
+end

data/lib/jets/controller/base.rb

@@ -56,8 +56,7 @@ class Jets::Controller
     def log_info_start
       display_event = @event.dup
       display_event['body'] = '[BASE64_ENCODED]' if @event['isBase64Encoded']
-      # Interesting, JSON.dump makes logging look like JSON.pretty_generate in
-      # CloudWatch but not locally. This is what we want.
+      # JSON.dump makes logging look pretty in CloudWatch logs because it keeps it on 1 line
       ip = request.ip
       Jets.logger.info "Started #{@event['httpMethod']} \"#{@event['path']}\" for #{ip} at #{Time.now}"
       Jets.logger.info "Processing #{self.class.name}##{@meth}"

data/lib/jets/controller/rendering/rack_renderer.rb

@@ -30,6 +30,7 @@ module Jets::Controller::Rendering
       if drop_content_info?(status)
         body = StringIO.new
       else
+
         renderer = ActionController::Base.renderer.new(renderer_options)
         body = renderer.render(render_options)
         body = StringIO.new(body)
@@ -191,7 +192,7 @@ module Jets::Controller::Rendering
         require "jets/overrides/rails"
 
         # Load helpers
-        # Assign local variable because scoe in the `:action_view do` changes
+        # Assign local variable because scope in the `:action_view do` block changes
         app_helper_classes = find_app_helper_classes
         ActiveSupport.on_load :action_view do
           include ApplicationHelper # include first
@@ -207,11 +208,18 @@ module Jets::Controller::Rendering
 
       # Does not include ApplicationHelper, will include ApplicationHelper explicitly first.
       def find_app_helper_classes
+        internal_path = File.expand_path("../../internal", File.dirname(__FILE__))
+        internal_classes = find_app_helper_classes_from(internal_path)
+        app_classes = find_app_helper_classes_from(Jets.root)
+        (internal_classes + app_classes).uniq
+      end
+
+      def find_app_helper_classes_from(project_root)
         klasses = []
-        expression = "#{Jets.root}/app/helpers/**/*"
+        expression = "#{project_root}/app/helpers/**/*"
         Dir.glob(expression).each do |path|
           next unless File.file?(path)
-          class_name = path.sub("#{Jets.root}/app/helpers/","").sub(/\.rb/,'')
+          class_name = path.sub("#{project_root}/app/helpers/","").sub(/\.rb/,'')
           unless class_name == "application_helper"
             klasses << class_name.classify.constantize # autoload
           end

data/lib/jets/core.rb

@@ -55,72 +55,6 @@ module Jets::Core
     Jets::VERSION
   end
 
-  def eager_load!
-    eager_load_jets
-    eager_load_app
-  end
-
-  # Eager load jet's lib and classes
-  def eager_load_jets
-    lib_jets = File.expand_path(".", File.dirname(__FILE__))
-    Dir.glob("#{lib_jets}/**/*.rb").select do |path|
-      next if !File.file?(path)
-      next if skip_eager_load_paths?(path)
-
-      path = path.sub("#{lib_jets}/","jets/")
-      class_name = path
-                    .sub(/\.rb$/,'') # remove .rb
-                    .sub(/^\.\//,'') # remove ./
-                    .sub(/app\/\w+\//,'') # remove app/controllers or app/jobs etc
-                    .camelize
-      # special class mappings
-      class_name = class_mappings(class_name)
-      class_name.constantize # use constantize instead of require so dont have to worry about order.
-    end
-  end
-
-  # Skip these paths because eager loading doesnt work for them.
-  def skip_eager_load_paths?(path)
-    path =~ %r{/cli} ||
-    path =~ %r{/core_ext} ||
-    path =~ %r{/default/application} ||
-    path =~ %r{/functions} ||
-    path =~ %r{/internal/app} ||
-    path =~ %r{/jets/stack} ||
-    path =~ %r{/overrides} ||
-    path =~ %r{/rackup_wrappers} ||
-    path =~ %r{/reconfigure_rails} ||
-    path =~ %r{/templates/} ||
-    path =~ %r{/turbo/project/} ||
-    path =~ %r{/version} ||
-    path =~ %r{/webpacker} ||
-    path =~ %r{/jets/spec}
-  end
-
-  def class_mappings(class_name)
-    map = {
-      "Jets::Io" => "Jets::IO",
-    }
-    map[class_name] || class_name
-  end
-
-  # Eager load user's application
-  def eager_load_app
-    Dir.glob("#{Jets.root}/app/**/*.rb").select do |path|
-      next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
-      next if path.include?('app/functions') || path.include?('app/shared/functions') || path.include?('app/internal/functions')
-
-      class_name = path
-                    .sub(/\.rb$/,'') # remove .rb
-                    .sub(%{^\./},'') # remove ./
-                    .sub("#{Jets.root}/",'')
-                    .sub(%r{app/shared/\w+/},'') # remove shared/resources or shared/extensions
-                    .sub(%r{app/\w+/},'') # remove app/controllers or app/jobs etc
-      class_name = class_name.classify
-      class_name.constantize # use constantize instead of require so dont have to worry about order.
-    end
-  end
-
   # NOTE: In development this will always be 1 because the app gets reloaded.
   # On AWS Lambda, this will be ever increasing until the container gets replaced.
   @@call_count = 0
@@ -161,18 +95,17 @@ module Jets::Core
   end
 
   def on_exception(exception)
-    Jets::Turbine.subclasses.each do |subclass|
-      reporters = subclass.on_exceptions || []
-      reporters.each do |label, block|
-        block.call(exception)
-      end
-    end
+    Jets::Booter.run_turbines(:on_exceptions)
   end
 
   def custom_domain?
     Jets.config.domain.hosted_zone_name
   end
 
+  def s3_event?
+    !Jets::Job::Base.s3_events.empty?
+  end
+
   def process(event, context, handler)
     if event['_prewarm']
       Jets.increase_prewarm_count

data/lib/jets/internal/app/controllers/jets/mailers_controller.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+class Jets::MailersController < Jets::Controller::Base # :nodoc:
+  before_action :find_preview, only: [:preview]
+  before_action :set_locale, only: [:preview]
+  # TODO: allow multiple actions
+  # before_action :find_preview, :set_locale, only: :preview
+
+  # TODO: add helper_method support
+  # helper_method :part_query, :locale_query
+
+  # TODO: content_security_policy
+  # content_security_policy(false)
+
+  def index
+    @previews = ActionMailer::Preview.all
+    @page_title = "Mailer Previews"
+  end
+
+  def preview
+    if params[:path] == @preview.preview_name
+      @page_title = "Mailer Previews for #{@preview.preview_name}"
+      render :mailer
+    else
+      @email_action = File.basename(params[:path])
+
+      if @preview.email_exists?(@email_action)
+        @email = @preview.call(@email_action, params)
+
+        if params[:part]
+          part_type = Mime::Type.lookup(params[:part])
+
+          if part = find_part(part_type)
+            response.headers["Content-Type"] = params[:part]
+            render plain: part.respond_to?(:decoded) ? part.decoded : part
+          else
+            raise AbstractController::ActionNotFound, "Email part '#{part_type}' not found in #{@preview.name}##{@email_action}"
+          end
+        else
+          @part = find_preferred_part(Mime[:html], Mime[:text])
+          render :email, layout: false, formats: %w[html]
+        end
+      else
+        raise AbstractController::ActionNotFound, "Email '#{@email_action}' not found in #{@preview.name}"
+      end
+    end
+  end
+
+  private
+    def show_previews? # :doc:
+      ActionMailer::Base.show_previews
+    end
+
+    def find_preview # :doc:
+      candidates = []
+      params[:path].to_s.scan(%r{/|$}) { candidates << $` } # ` # hack to fix syntax highlighting
+      preview = candidates.detect { |candidate| ActionMailer::Preview.exists?(candidate) }
+
+      if preview
+        @preview = ActionMailer::Preview.find(preview)
+      else
+        raise AbstractController::ActionNotFound, "Mailer preview '#{params[:path]}' not found"
+      end
+    end
+
+    def find_preferred_part(*formats) # :doc:
+      formats.each do |format|
+        if part = @email.find_first_mime_type(format)
+          return part
+        end
+      end
+
+      if formats.any? { |f| @email.mime_type == f }
+        @email
+      end
+    end
+
+    def find_part(format) # :doc:
+      if part = @email.find_first_mime_type(format)
+        part
+      elsif @email.mime_type == format
+        @email
+      end
+    end
+
+    def part_query(mime_type)
+      request.query_parameters.merge(part: mime_type).to_query
+    end
+
+    def locale_query(locale)
+      request.query_parameters.merge(locale: locale).to_query
+    end
+
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+    end
+end

data/lib/jets/internal/app/helpers/jets/mailers_helper.rb

@@ -0,0 +1,9 @@
+module Jets::MailersHelper
+  def part_query(mime_type)
+    mime_type
+  end
+
+  def locale_query(locale)
+    locale
+  end
+end

data/lib/jets/internal/app/shared/functions/jets/s3_bucket_config.rb

@@ -0,0 +1,43 @@
+require "active_support/all"
+require "aws-sdk-s3"
+require "cfnresponse"
+include Cfnresponse
+
+def lambda_handler(event:, context:)
+  # Print out debugging info immediately just in case
+  puts "event: #{json_pretty(event)}"
+  puts "context: #{json_pretty(context)}"
+
+  if %w[Create Update].include?(event['RequestType'])
+    properties = event["ResourceProperties"].dup
+    # After deleting ServiceToken, the rest of the values is the bucket configuration properties.
+    properties.delete("ServiceToken")
+    configurator = BucketConfigurator.new
+    configurator.put(properties)
+  end
+
+  send_response(event, context, "SUCCESS")
+
+# We rescue all exceptions and send an message to CloudFormation so we dont have to
+# wait for over an hour for the stack operation to timeout and rollback.
+rescue Exception => e
+  puts e.message
+  puts e.backtrace
+  sleep 10 # a little time for logs to be sent to CloudWatch
+  send_response(event, context, "FAILED")
+end
+
+########################################################
+
+class BucketConfigurator
+  def put(props={})
+    # all props including bucket gets passed from the Custom::S3BucketConfiguration resource
+    props = props.deep_transform_keys { |k| k.to_s.underscore.to_sym }
+    puts "props: #{JSON.dump(props)}"
+    s3.put_bucket_notification_configuration(props)
+  end
+
+  def s3
+    @s3 ||= Aws::S3::Client.new
+  end
+end

data/lib/jets/internal/app/views/jets/mailers/email.html.erb

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html><head>
+<meta name="viewport" content="width=device-width" />
+<style type="text/css">
+  html, body, iframe {
+    height: 100%;
+  }
+
+  body {
+    margin: 0;
+  }
+
+  header {
+    width: 100%;
+    padding: 10px 0 0 0;
+    margin: 0;
+    background: white;
+    font: 12px "Lucida Grande", sans-serif;
+    border-bottom: 1px solid #dedede;
+    overflow: hidden;
+  }
+
+  dl {
+    margin: 0 0 10px 0;
+    padding: 0;
+  }
+
+  dt {
+    width: 80px;
+    padding: 1px;
+    float: left;
+    clear: left;
+    text-align: right;
+    color: #7f7f7f;
+  }
+
+  dd {
+    margin-left: 90px; /* 80px + 10px */
+    padding: 1px;
+  }
+
+  dd:empty:before {
+    content: "\00a0"; // &nbsp;
+  }
+
+  iframe {
+    border: 0;
+    width: 100%;
+  }
+</style>
+</head>
+
+<body>
+<header>
+  <dl>
+    <% if @email.respond_to?(:smtp_envelope_from) && Array(@email.from) != Array(@email.smtp_envelope_from) %>
+      <dt>SMTP-From:</dt>
+      <dd><%= @email.smtp_envelope_from %></dd>
+    <% end %>
+
+    <% if @email.respond_to?(:smtp_envelope_to) && @email.to != @email.smtp_envelope_to %>
+      <dt>SMTP-To:</dt>
+      <dd><%= @email.smtp_envelope_to %></dd>
+    <% end %>
+
+    <dt>From:</dt>
+    <dd><%= @email.header['from'] %></dd>
+
+    <% if @email.reply_to %>
+      <dt>Reply-To:</dt>
+      <dd><%= @email.header['reply-to'] %></dd>
+    <% end %>
+
+    <dt>To:</dt>
+    <dd><%= @email.header['to'] %></dd>
+
+    <% if @email.cc %>
+      <dt>CC:</dt>
+      <dd><%= @email.header['cc'] %></dd>
+    <% end %>
+
+    <dt>Date:</dt>
+    <dd><%= Time.current.rfc2822 %></dd>
+
+    <dt>Subject:</dt>
+    <dd><strong><%= @email.subject %></strong></dd>
+
+    <% unless @email.attachments.nil? || @email.attachments.empty? %>
+      <dt>Attachments:</dt>
+      <dd>
+        <% @email.attachments.each do |a| %>
+          <% filename = a.respond_to?(:original_filename) ? a.original_filename : a.filename %>
+          <%= link_to filename, "data:application/octet-stream;charset=utf-8;base64,#{Base64.encode64(a.body.to_s)}", download: filename %>
+        <% end %>
+      </dd>
+    <% end %>
+
+    <dt>Format:</dt>
+    <% if @email.multipart? %>
+      <dd>
+        <select id="part" onchange="refreshBody(false);">
+          <option <%= request.format == Mime[:html] ? 'selected' : '' %> value="<%= part_query('text/html') %>">View as HTML email</option>
+          <option <%= request.format == Mime[:text] ? 'selected' : '' %> value="<%= part_query('text/plain') %>">View as plain-text email</option>
+        </select>
+      </dd>
+    <% else %>
+      <dd id="mime_type" data-mime-type="<%= part_query(@email.mime_type) %>"><%= @email.mime_type == 'text/html' ? 'HTML email' : 'plain-text email' %></dd>
+    <% end %>
+
+    <% if I18n.available_locales.count > 1 %>
+      <dt>Locale:</dt>
+      <dd>
+        <select id="locale" onchange="refreshBody(true);">
+          <% I18n.available_locales.each do |locale| %>
+            <option <%= I18n.locale == locale ? 'selected' : '' %> value="<%= locale_query(locale) %>"><%= locale %></option>
+          <% end %>
+        </select>
+      </dd>
+    <% end %>
+  </dl>
+</header>
+
+<iframe seamless name="messageBody" src="?part=<%= part_query(@part.mime_type) %>"></iframe>
+
+<script>
+  function refreshBody(reload) {
+    var part_select = document.querySelector('select#part');
+    var locale_select = document.querySelector('select#locale');
+    var iframe = document.getElementsByName('messageBody')[0];
+    var part_param = part_select ?
+      part_select.options[part_select.selectedIndex].value :
+      document.querySelector('#mime_type').dataset.mimeType;
+    var fresh_location = '?part=' + part_param;
+    var doc = iframe.contentWindow.document;
+
+    doc.open();
+    doc.write("Loading...");
+    doc.close();
+
+    iframe.contentWindow.location = fresh_location;
+  }
+</script>
+
+</body>
+</html>