jets 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d62ec1deed884ea8ccccd1b6f6cafdbccf8f9778b9ddfb9bc80d827c3b8f2d
-  data.tar.gz: 4edc9600af70c32b175ba077a5d75b55575c030807aa1c1ad26b96914b0c372b
+  metadata.gz: e4eba3758c709669dde525de421e7ed5241c0b2e1b4c0488fe928744501f94ca
+  data.tar.gz: 37565466a6f5f8382424a110893bf7237012dba8e25eed7cd16ca133fdfd648d
 SHA512:
-  metadata.gz: 1ec1dcbb1c0a6a977dcdabbc2138178d43687d1257f40239e2e379400a435f84301f5b5105fb59d36860c9e4a8051c64547770963be63b6ea5a33c0ce4ffc142
-  data.tar.gz: 1e15d436ecf7fa3dea5852023afb2db0544ca56fc21c76c80d8554b8acffd1d98a20acceb1416038257a233bddeac95a3896ceddd4aceee62c505a55370742de
+  metadata.gz: 5cf83a19ca5a635226316bee54bec5c0ab3b74b9dcf25850f0b55ce32798943dc7b280ee25e1b1ef7cf3f9862f1e287b63e38de13f5771378293f2f3be20cea1
+  data.tar.gz: aeb7657e68051f368fc97c7aa888e03aae1c001ed17e11b34d9cfa0f18c40a9a3987775d7a5b5eea378ab23af0beb03c55b17c3a8877756876d4864ee8cf1c78

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/), even before v1.0.
 
+## [0.10.0]
+- Merge pull request #45 from tongueroo/remove-internal-welcome
+- Fix routing: Allow multiple paths to point to same controller action
+- Refer to upgrading notes: http://rubyonjets.com/docs/upgrading/
+
 ## [0.9.2]
 - s3 assets support: Merge pull request #44 from tongueroo/s3-assets
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.9.2)
+    jets (0.10.0)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/commands/build.rb

@@ -149,6 +149,7 @@ module Jets::Commands
         # 1. remove app/controllers or app/jobs, etc
         # 2. remove .rb extension
         app_file = path.sub(%r{app/\w+/},'').sub(/\.rb$/,'')
+
         # Internal jets controllers like Welcome and Public need a different regexp
         app_file = app_file.sub(%r{.*lib/jets/internal/},'')
         app_class = app_file.classify.constantize # IE: PostsController, Jets::PublicController
@@ -163,9 +164,6 @@ module Jets::Commands
       paths = []
       controllers = File.expand_path("../../internal/app/controllers/jets", __FILE__)
 
-      welcome = Jets::Router.has_controller?("Jets::WelcomeController")
-      paths << "#{controllers}/welcome_controller.rb" if welcome
-
       public_catchall = Jets::Router.has_controller?("Jets::PublicController")
       paths << "#{controllers}/public_controller.rb" if public_catchall
 

data/lib/jets/commands/help/routes.md

@@ -11,7 +11,6 @@
     | GET    | posts/:id/edit | posts#edit         |
     | PUT    | posts/:id      | posts#update       |
     | DELETE | posts/:id      | posts#delete       |
-    | GET    |                | jets/welcome#index |
     | ANY    | *catchall      | jets/public#show   |
     +--------+----------------+--------------------+
     $

data/lib/jets/commands/new.rb

@@ -112,11 +112,11 @@ JS
 
           To deploy to AWS Lambda, edit your .env.development.remote and add a DATABASE_URL endpoint.
           Then run:
-        
+
             jets deploy
         EOL
       end
-      
+
       puts <<~EOL
         #{"="*64}
         Congrats 🎉 You have successfully created a Jets project.

data/lib/jets/commands/templates/skeleton/config/routes.rb

@@ -4,9 +4,17 @@ Jets.application.routes.draw do
   # More info:
   #   http://rubyonjets.com/docs/routes-workaround/
   #   http://rubyonjets.com/docs/env-extra/
-  root "jets/welcome#index"
+  root "jets/public#show"
 
-  # Required for API Gateway to serve static utf8 content out of public folder.
-  # Replace with your own controller to customize.
+  # The jets/public#show controller serves static utf8 content out of the public folder.
+  # Replace it with your own controller to customize.
+  # Note, binary files do not get served on AWS Lambda unless you specify the Accept header.
+  # This is problematic for images requested by the Browser. IE: We don't control
+  # that accept header that the browser sends.
+  # Caveat, setting the Accept header to '*' for the entire API Gateway settings will force
+  # the public controller to serve binary data when requested by the browser, but it
+  # also results in form data always being treated as binary data also.
+  # Instead, it is recommended to serve binary data using s3.
+  # More info here: http://rubyonjets.com/docs/assets-serving/
   any "*catchall", to: "jets/public#show"
 end

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

@@ -10,14 +10,18 @@ class Jets::PublicController < Jets::Controller::Base
     python :show
   else
     def show
+      catchall = params[:catchall].blank? ? 'index.html' : params[:catchall]
       public_path = Jets.root + "public"
-      catchall_path = "#{public_path}/#{params[:catchall]}"
+      catchall_path = "#{public_path}/#{catchall}"
+
       if File.exist?(catchall_path)
         content_type = Rack::Mime.mime_type(File.extname(catchall_path))
         binary = !MimeMagic.by_path(catchall_path).text?
-        puts "content_type #{content_type.inspect}"
-        puts "binary #{binary}"
 
+        # TODO: binary support doesn't quite work yet.
+        # We have to add '*/*' as a binary media type to the API Gateway RestApi
+        # to enable binary support without having to send a Accept header.
+        # But doing so breaks regular form submission. Figure out how to workaround this.
         if binary
           encoded_content = Base64.encode64(IO.read(catchall_path))
           render plain: encoded_content, content_type: content_type, base64: true

data/lib/jets/resource/api_gateway/method.rb

@@ -34,7 +34,20 @@ module Jets::Resource::ApiGateway
     end
 
     def method_logical_id
-      "{namespace}_api_method"
+      # https://stackoverflow.com/questions/6104240/how-do-i-strip-non-alphanumeric-characters-from-a-string-and-keep-spaces
+      # Add path to the logical id to allow 2 different paths to be connected to the same controller action.
+      # Example:
+      #
+      #   root "jets/public#show"
+      #   any "*catchall", to: "jets/public#show"
+      #
+      # Without the path in the logical id, the logical id would be ShowApiMethod for both routes and only the
+      # last one would be created in the CloudFormation template.
+      path = @route.path.gsub('*','')
+              .gsub(/[^0-9a-z]/i, ' ')
+              .gsub(/\s+/, '_')
+      path = nil if path == ''
+      [path, "{namespace}_api_method"].compact.join('_')
     end
 
     def replacements

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -588,8 +588,6 @@ files:
 - lib/jets/internal/app/controllers/jets/public_controller.rb
 - lib/jets/internal/app/controllers/jets/public_controller/python/show.py
 - lib/jets/internal/app/controllers/jets/public_controller/python/show.pyc
-- lib/jets/internal/app/controllers/jets/welcome_controller.rb
-- lib/jets/internal/app/controllers/jets/welcome_controller/python/index.py
 - lib/jets/internal/app/jobs/jets/preheat_job.rb
 - lib/jets/io.rb
 - lib/jets/job.rb

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

@@ -1,22 +0,0 @@
-class Jets::WelcomeController < Jets::Controller::Base
-  layout false
-  internal true
-
-  # # Use python until ruby support is added.
-  # python :index
-
-  if Jets::Commands::Build.poly_only?
-    # Use python if poly only so we don't have to upload rubuy
-    python :index
-  else
-    # TODO: When ruby support is relesed, switch to it only.
-    def index
-      homepage = "#{Jets.root}public/index.html"
-      if File.exist?(homepage)
-        render file: homepage
-      else
-        render plain: "The public/index.html file does not exist but the root route in config/routes.rb routes to this file.  You probably want to update the root route."
-      end
-    end
-  end
-end

data/lib/jets/internal/app/controllers/jets/welcome_controller/python/index.py

@@ -1,24 +0,0 @@
-from pprint import pprint
-import json
-import os.path
-
-def lambda_handler(event, context):
-    homepage = "public/index.html"
-    html = None
-    if os.path.exists(homepage):
-        with open(homepage,'r') as f:
-            html = f.read()
-    return response(html, 200)
-
-def response(body, status_code):
-    return {
-        'statusCode': str(status_code),
-        'body': body,
-        'headers': {
-            'Content-Type': 'text/html',
-            'Access-Control-Allow-Origin': '*'
-            },
-        }
-
-if __name__ == '__main__':
-    print(lambda_handler({}, {}))