jets 2.1.1 → 2.1.2

data/lib/jets/resource/api_gateway/rest_api/routes/change/to.rb

@@ -1,10 +1,6 @@
 # Detects route to changes
 class Jets::Resource::ApiGateway::RestApi::Routes::Change
   class To < Base
-    def self.changed?
-      new.changed?
-    end
-
     def changed?
       deployed_routes.each do |deployed_route|
         new_route = find_comparable_route(deployed_route)

data/lib/jets/resource/api_gateway/rest_api/routes/change/variable.rb

@@ -1,10 +1,6 @@
 # Detects route variable changes
 class Jets::Resource::ApiGateway::RestApi::Routes::Change
   class Variable < Base
-    def self.changed?
-      new.changed?
-    end
-
     def changed?
       changed = false
       deployed_routes.each do |deployed_route|

data/lib/jets/resource/child_stack/api_resource.rb

@@ -0,0 +1,60 @@
+# Implements:
+#
+#   definition
+#   template_filename
+#
+module Jets::Resource::ChildStack
+  class ApiResource < Base
+    def initialize(*)
+      super
+      @page = @options[:page]
+    end
+
+    def definition
+      {
+        "api_resources_#{@page}" =>  {
+          type: "AWS::CloudFormation::Stack",
+          # depends_on: "ApiGateway", # CloudFormation seems to be smart enough
+          properties: {
+            template_url: template_url,
+            parameters: parameters,
+          }
+        }
+      }
+    end
+
+    def parameters
+      params = {}
+      # Since dont have all the info required.
+      # Read the template back to find the parameters required.
+      # Actually might be easier to rationalize this approach.
+      template_path = Jets::Naming.api_resources_template_path(@page)
+      template = Jets::Cfn::BuiltTemplate.get(template_path)
+      template['Parameters'].keys.each do |p|
+        case p
+        when "RestApi"
+          params[p] = "!GetAtt ApiGateway.Outputs.RestApi"
+        when "RootResourceId"
+          params[p] = "!GetAtt ApiGateway.Outputs.RootResourceId"
+        else
+          params[p] = "!GetAtt #{api_resource_page(p)}.Outputs.#{p}"
+        end
+      end
+      params
+    end
+
+    def api_resource_page(parameter)
+      Page.logical_id(parameter)
+    end
+
+    def outputs
+      {
+        logical_id => "!Ref #{logical_id}",
+      }
+    end
+
+    def template_filename
+      "#{Jets.config.project_namespace}-api-resources-#{@page}.yml"
+    end
+  end
+end

data/lib/jets/resource/child_stack/api_resource/page.rb

@@ -0,0 +1,20 @@
+class Jets::Resource::ChildStack::ApiResource
+  # Find the ApiResource Page that contains the AWS::ApiGateway::Resource
+  # Returns: logical id of ApiResource Page
+  class Page
+    def self.logical_id(parameter)
+      expression = "#{Jets::Naming.template_path_prefix}-api-resources-*"
+      # IE: path: #{Jets.build_root}/templates/demo-dev-2-api-resources-1.yml"
+      template_paths = Dir.glob(expression).sort.to_a
+      found_template = template_paths.detect do |path|
+        next unless File.file?(path)
+
+        template = Jets::Cfn::BuiltTemplate.get(path)
+        template['Outputs'].keys.include?(parameter)
+      end
+      md = found_template.match(/-(api-resources-\d+)/)
+
+      md[1].underscore.camelize # IE: ApiResources1
+    end
+  end
+end

data/lib/jets/resource/child_stack/app_class.rb

@@ -62,13 +62,24 @@ module Jets::Resource::ChildStack
       params = {
         RestApi: "!GetAtt ApiGateway.Outputs.RestApi",
       }
-      scoped_routes.each do |route|
-        resource = Jets::Resource::ApiGateway::Resource.new(route.path)
-        params[resource.logical_id] = "!GetAtt ApiGateway.Outputs.#{resource.logical_id}"
+
+      template_path = @path
+      template = Jets::Cfn::BuiltTemplate.get(template_path)
+      template['Parameters'].keys.each do |p|
+        case p
+        when /Resource$/ # AWS::ApiGateway::Resource in api-resources templates. IE: demo-dev-api-resources-2.yml
+          params[p] = "!GetAtt #{api_resource_page(p)}.Outputs.#{p}"
+        when 'RootResourceId'
+          params[p] = "!GetAtt ApiGateway.Outputs.RootResourceId"
+        end
       end
       params
     end
 
+    def api_resource_page(parameter)
+      ApiResource::Page.logical_id(parameter)
+    end
+
     def controller?
       @path.include?('_controller.yml')
     end

data/lib/jets/router.rb

@@ -107,57 +107,74 @@ module Jets
       simple_routes + capture_routes + wildcard_routes
     end
 
-    def self.has_controller?(name)
-      routes.detect { |r| r.controller_name == name }
-    end
+    class << self
+      def has_controller?(name)
+        routes.detect { |r| r.controller_name == name }
+      end
 
-    # Class methods
-    def self.draw
-      drawn_router
-    end
+      # Class methods
+      def draw
+        drawn_router
+      end
 
-    @@drawn_router = nil
-    def self.drawn_router
-      return @@drawn_router if @@drawn_router
+      @@drawn_router = nil
+      def drawn_router
+        return @@drawn_router if @@drawn_router
 
-      router = Jets.application.routes
-      @@drawn_router = router
-    end
+        router = Jets.application.routes
+        @@drawn_router = router
+      end
 
-    def self.clear!
-      @@drawn_router = nil
-      Jets::Router::Helpers::NamedRoutesHelper.clear!
-    end
+      def clear!
+        @@drawn_router = nil
+        Jets::Router::Helpers::NamedRoutesHelper.clear!
+      end
 
-    def self.routes
-      drawn_router.routes
-    end
+      def routes
+        drawn_router.routes
+      end
 
-    # Returns all paths including subpaths.
-    # Example:
-    # Input: ["posts/:id/edit"]
-    # Output: ["posts", "posts/:id", "posts/:id/edit"]
-    def self.all_paths
-      drawn_router.all_paths
-    end
+      # Returns all paths including subpaths.
+      # Example:
+      # Input: ["posts/:id/edit"]
+      # Output: ["posts", "posts/:id", "posts/:id/edit"]
+      def all_paths
+        drawn_router.all_paths
+      end
 
-    def self.help(routes)
-      return "Your routes table is empty." if routes.empty?
+      def help(routes)
+        return "Your routes table is empty." if routes.empty?
 
-      table = Text::Table.new
-      table.head = %w[As Verb Path Controller#action]
-      routes.each do |route|
-        table.rows << [route.as, route.method, route.path, route.to]
+        table = Text::Table.new
+        table.head = %w[As Verb Path Controller#action]
+        routes.each do |route|
+          table.rows << [route.as, route.method, route.path, route.to]
+        end
+        table
       end
-      table
-    end
 
-    def self.all_routes_valid
-      invalid_routes.empty?
-    end
+      def all_routes_valid?
+        invalid_routes.empty?
+      end
+
+      def invalid_routes
+        routes.select { |r| !r.valid? }
+      end
+
+      def validate_routes!
+        check_route_connected_functions
+      end
 
-    def self.invalid_routes
-      routes.select { |r| !r.valid? }
+      # Checks that all routes are validate and have corresponding lambda functions
+      def check_route_connected_functions
+        return true if all_routes_valid?
+
+        puts "Please double check the routes below map to valid controllers:".color(:red)
+        invalid_routes.each do |route|
+          puts "  /#{route.path} => #{route.controller_name}##{route.action_name}"
+        end
+        false
+      end
     end
   end
 end

data/lib/jets/router/method_creator/code.rb

@@ -33,7 +33,7 @@ class Jets::Router::MethodCreator
     end
 
     def action
-      @action || self.class.name.split('::').last.downcase
+      @action || self.class.name.split('::').last.downcase # MethodCreator::Edit, MethodCreator::New, etc
     end
 
     def full_as
@@ -55,6 +55,7 @@ class Jets::Router::MethodCreator
     end
 
     def path_method
+      return if @as == :disabled
       <<~EOL
         def #{full_meth_name(:path)}#{meth_args}
           "#{meth_result}"
@@ -63,6 +64,7 @@ class Jets::Router::MethodCreator
     end
 
     def url_method
+      return if @as == :disabled
       path_method_call = "#{full_meth_name(:path)}#{meth_args}"
       # Note: It is important lazily get the value of ENV['JETS_HOST'] within the method.
       # Since it is not set until the requrest goes through the main middleware.

data/lib/jets/router/method_creator/edit.rb

@@ -1,7 +1,12 @@
 class Jets::Router::MethodCreator
   class Edit < Code
     def meth_name
-      join(action, singularize(full_as), singularize(method_name_leaf))
+      path_items = @path.to_s.split('/')
+      if method_name_leaf && path_items.size != 3
+        nil # fallback: do not define url method
+      else  # comes from resources
+        join(action, singularize(full_as), singularize(method_name_leaf))
+      end
     end
   end
 end

data/lib/jets/router/method_creator/index.rb

@@ -1,7 +1,7 @@
 class Jets::Router::MethodCreator
   class Index < Code
     def meth_name
-      # Well this is pretty confusing and tough to follow. TODO: figure out how to improve this.
+      # TODO: figure out how to improve this and make easier to follow.
       #
       # Example 1:
       #
@@ -32,9 +32,15 @@ class Jets::Router::MethodCreator
       # all the info we need. In this tricky case, the method_name_leaf is set.
       # We then have to reconstruct the meth_name.
       #
+
       if method_name_leaf
-        join(singularize(full_as), method_name_leaf) # reconstruct
-      else
+        path_items = @path.to_s.split('/')
+        if path_items.size == 1
+          join(singularize(full_as), method_name_leaf) # reconstruct
+        else
+          nil # fallback: do not define url method
+        end
+      else  # comes from resources
         join(full_as) # construct entirely from scope info
       end
     end

data/lib/jets/router/method_creator/new.rb

@@ -1,7 +1,12 @@
 class Jets::Router::MethodCreator
   class New < Code
     def meth_name
-      join(action, singularize(full_as), singularize(method_name_leaf))
+      path_items = @path.to_s.split('/')
+      if method_name_leaf && path_items.size != 2
+        nil # fallback: do not define url method
+      else  # comes from resources
+        join(action, singularize(full_as), singularize(method_name_leaf))
+      end
     end
   end
 end

data/lib/jets/router/method_creator/show.rb

@@ -1,7 +1,12 @@
 class Jets::Router::MethodCreator
   class Show < Code
     def meth_name
-      join(singularize(full_as), singularize(method_name_leaf))
+      path_items = @path.to_s.split('/')
+      if method_name_leaf && path_items.size != 2
+        nil # fallback: do not define url method
+      else  # comes from resources
+        join(singularize(full_as), singularize(method_name_leaf))
+      end
     end
   end
 end

data/lib/jets/router/route.rb

@@ -59,6 +59,7 @@ class Jets::Router
     end
 
     def compute_as
+      return nil if @options[:as] == :disabled
       return unless @options[:method] == :get || @options[:root]
 
       controller, action = get_controller_action(@options)

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -529,10 +529,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Jets is a framework that allows you to create serverless applications
-  with a beautiful language: Ruby. It includes everything required to build an application
-  and deploy it to AWS Lambda. Jets makes serverless accessible to everyone.'
-email:
-- tongueroo@gmail.com
+  with a beautiful language: Ruby. It includes everything required to build and deploy
+  an application.  Jets leverages the power of Ruby to make serverless joyful for
+  everyone.'
+email: tongueroo@gmail.com
 executables:
 - jets
 extensions: []
@@ -540,14 +540,13 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".codebuild/README.md"
-- ".codebuild/bin/jets"
-- ".codebuild/buildspec-base.yml"
-- ".codebuild/integration.sh"
-- ".codebuild/jets.postman_collection.json"
-- ".codebuild/scripts/install-docker.sh"
-- ".codebuild/scripts/install-dynamodb-local.sh"
-- ".codebuild/scripts/install-java.sh"
-- ".codebuild/scripts/install-node.sh"
+- ".codebuild/docs/bin/build.sh"
+- ".codebuild/docs/bin/cli_docs.sh"
+- ".codebuild/docs/bin/git_commit.sh"
+- ".codebuild/docs/bin/git_setup.sh"
+- ".codebuild/docs/bin/subnav.sh"
+- ".codebuild/docs/buildspec.yml"
+- ".codebuild/docs/project.rb"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation.md"
@@ -609,6 +608,7 @@ files:
 - lib/jets/camelizer.rb
 - lib/jets/cfn/builders/api_deployment_builder.rb
 - lib/jets/cfn/builders/api_gateway_builder.rb
+- lib/jets/cfn/builders/api_resources_builder.rb
 - lib/jets/cfn/builders/base_child_builder.rb
 - lib/jets/cfn/builders/controller_builder.rb
 - lib/jets/cfn/builders/function_builder.rb
@@ -617,6 +617,7 @@ files:
 - lib/jets/cfn/builders/parent_builder.rb
 - lib/jets/cfn/builders/rule_builder.rb
 - lib/jets/cfn/builders/shared_builder.rb
+- lib/jets/cfn/built_template.rb
 - lib/jets/cfn/ship.rb
 - lib/jets/cfn/status.rb
 - lib/jets/cfn/upload.rb
@@ -653,9 +654,9 @@ files:
 - lib/jets/commands/help/console.md
 - lib/jets/commands/help/db/generate.md
 - lib/jets/commands/help/dbconsole.md
+- lib/jets/commands/help/degenerate.md
 - lib/jets/commands/help/delete.md
 - lib/jets/commands/help/deploy.md
-- lib/jets/commands/help/destroy.md
 - lib/jets/commands/help/dynamodb/generate.md
 - lib/jets/commands/help/dynamodb/migrate.md
 - lib/jets/commands/help/gems/check.md
@@ -856,6 +857,8 @@ files:
 - lib/jets/resource/api_gateway/rest_api/routes.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change/base.rb
+- lib/jets/resource/api_gateway/rest_api/routes/change/media_types.rb
+- lib/jets/resource/api_gateway/rest_api/routes/change/page.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change/to.rb
 - lib/jets/resource/api_gateway/rest_api/routes/change/variable.rb
 - lib/jets/resource/api_gateway/rest_api/routes/collision.rb
@@ -864,6 +867,8 @@ files:
 - lib/jets/resource/base.rb
 - lib/jets/resource/child_stack/api_deployment.rb
 - lib/jets/resource/child_stack/api_gateway.rb
+- lib/jets/resource/child_stack/api_resource.rb
+- lib/jets/resource/child_stack/api_resource/page.rb
 - lib/jets/resource/child_stack/app_class.rb
 - lib/jets/resource/child_stack/base.rb
 - lib/jets/resource/child_stack/shared.rb
@@ -967,7 +972,7 @@ files:
 - readme/testing.md
 - vendor/aws_data/Gemfile.lock
 - vendor/aws_data/pkg/aws_data-0.1.0.gem
-homepage: http://rubyonjets.com
+homepage: https://rubyonjets.com
 licenses:
 - MIT
 metadata: {}
@@ -1029,5 +1034,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby Serverless Framework on AWS Lambda
+summary: Ruby Serverless Framework
 test_files: []