jets 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b8d7335c644339643a2c97c53d4e320967f43761949eeda46909b33f140776
-  data.tar.gz: 49d1cd847f9423e21d899107534a81c5d51c368999d60cefe70a89b39b434b9c
+  metadata.gz: 75898252d0d7ef29286086cca3e59433da914f67bd9b42e66927beb9bd4b72e0
+  data.tar.gz: 6d535ce82983daee425f36a670fcca6d7d2650fce3714fa196dbdd4be685a8c5
 SHA512:
-  metadata.gz: fa356ebc6da237b6046e44bf6307af25bfce9fec40746346b52d7a4bc774cdd25ef6a449573c14b3fed5b514ffddc8327c0c7d4fbdc65040abdd7a5749642271
-  data.tar.gz: 99b185e759621461ce327b014c51345fe11843732395b79d3604216c60ef668a56ba0004e14ef68faf7151dee2379ae81939084e03e4f6b6bb58cc28e716fcad
+  metadata.gz: e2b412fdc2e7271eb998359bc501d76539d683d332ef8545c6ed5d1572bcd833ec2c963d115ba0bbbaa2662e922c4b88760884cae1a3424446097b6a812d932c
+  data.tar.gz: f57fa1a144e8b4328abfebc181d3bf7fd8df4dbed084ae7882eeee734ab1fa4557cd9d1d0733f115b675e7a9ad723b8b3199b1fe290d65177eabd115569b4261

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.
 
+## [1.6.2]
+- #165 remove always trailing slash from Jets.root
+- #166 fix cors headers
+- #167 controller authorization_type declaration
+
 ## [1.6.1]
 - #162 from patchkit-net/feature/spec_helpers
 - #163 from tongueroo/spec-helpers

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.6.1)
+    jets (1.6.2)
       activerecord (~> 5.2.1)
       activesupport (~> 5.2.1)
       aws-sdk-apigateway
@@ -66,7 +66,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.135.0)
+    aws-partitions (1.136.0)
     aws-sdk-apigateway (1.23.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
@@ -107,7 +107,7 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     dotenv (2.6.0)
-    dynomite (1.2.1)
+    dynomite (1.2.2)
       activesupport
       aws-sdk-dynamodb
     erubi (1.8.0)

data/lib/jets/application.rb

@@ -110,7 +110,7 @@ class Jets::Application
   def parse_project_name
     return ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME'] # override
 
-    lines = IO.readlines("#{Jets.root}config/application.rb")
+    lines = IO.readlines("#{Jets.root}/config/application.rb")
     project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ }
     project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') # project_name
   end
@@ -126,7 +126,7 @@ class Jets::Application
   end
 
   def eval_app_config
-    app_config = "#{Jets.root}config/application.rb"
+    app_config = "#{Jets.root}/config/application.rb"
     load app_config # use load instead of require so reload_configs! works
   end
 
@@ -138,7 +138,7 @@ class Jets::Application
   end
 
   def load_environments_config
-    env_file = "#{Jets.root}config/environments/#{Jets.env}.rb"
+    env_file = "#{Jets.root}/config/environments/#{Jets.env}.rb"
     if File.exist?(env_file)
       code = IO.read(env_file)
       instance_eval(code)
@@ -179,7 +179,7 @@ class Jets::Application
   #   app/shared/resources
   def default_autoload_paths
     paths = []
-    Dir.glob("#{Jets.root}app/*").each do |p|
+    Dir.glob("#{Jets.root}/app/*").each do |p|
       p.sub!('./','')
       paths << p unless exclude_autoload_path?(p)
     end
@@ -277,7 +277,7 @@ class Jets::Application
     config.database = {}
 
     Jets::Dotenv.load!
-    database_yml = "#{Jets.root}config/database.yml"
+    database_yml = "#{Jets.root}/config/database.yml"
     if File.exist?(database_yml)
       text = Jets::Erb.result(database_yml)
       db_config = YAML.load(text)
@@ -295,7 +295,7 @@ class Jets::Application
   end
 
   def load_routes
-    routes_file = "#{Jets.root}config/routes.rb"
+    routes_file = "#{Jets.root}/config/routes.rb"
     require routes_file if File.exist?(routes_file)
   end
 

data/lib/jets/booter.rb

@@ -45,7 +45,7 @@ class Jets::Booter
     end
 
     def app_initializers
-      Dir.glob("#{Jets.root}config/initializers/**/*").each do |path|
+      Dir.glob("#{Jets.root}/config/initializers/**/*").each do |path|
         load path
       end
     end
@@ -83,7 +83,7 @@ class Jets::Booter
     # config/database.yml exists.
     # Dynomite handles connecting to the clients lazily.
     def setup_db
-      return unless File.exist?("#{Jets.root}config/database.yml")
+      return unless File.exist?("#{Jets.root}/config/database.yml")
 
       db_configs = Jets.application.config.database
       # DatabaseTasks.database_configuration for db:create db:migrate tasks
@@ -106,7 +106,7 @@ class Jets::Booter
 
     # Cannot call this for the jets new
     def confirm_jets_project!
-      unless File.exist?("#{Jets.root}config/application.rb")
+      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.".color(:red)
         exit 1
       end
@@ -117,7 +117,7 @@ class Jets::Booter
     end
 
     def check_config_ru!
-      config_ru = File.read("#{Jets.root}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"'.color(:red)
         puts "This was changed as made in Jets v1.1.0."

data/lib/jets/builders/code_builder.rb

@@ -181,7 +181,7 @@ class Jets::Builders
       return unless webpacker_included?
 
       sh("yarn install")
-      webpack_command = File.exist?("#{Jets.root}bin/webpack") ?
+      webpack_command = File.exist?("#{Jets.root}/bin/webpack") ?
           "bin/webpack" :
           `which webpack`.strip
       sh "JETS_ENV=#{Jets.env} #{webpack_command}"
@@ -195,7 +195,7 @@ class Jets::Builders
 
       # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
       # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
-      lines = IO.readlines("#{Jets.root}Gemfile")
+      lines = IO.readlines("#{Jets.root}/Gemfile")
       lines.detect { |l| l =~ /webpacker/ }
     end
 
@@ -227,13 +227,13 @@ class Jets::Builders
       # rake is available in both rails 4 and 5. rails command only in 5
       command = "bundle exec rake assets:#{cmd} --trace"
       command = "RAILS_ENV=#{Jets.env} #{command}" unless Jets.env.development?
-      sh("cd #{jets_root}rack && #{command}")
+      sh("cd #{jets_root}/rack && #{command}")
     end
 
     # Rudimentary rails detection
     # Duplicated in builders/reconfigure_rails.rb
     def rails?
-      config_ru = "#{Jets.root}rack/config.ru"
+      config_ru = "#{Jets.root}/rack/config.ru"
       return false unless File.exist?(config_ru)
       !IO.readlines(config_ru).grep(/Rails.application/).empty?
     end
@@ -243,7 +243,7 @@ class Jets::Builders
     # Another way of checking is loading a rails console and checking Rails.application.config.api_only
     # Using this way for simplicity.
     def rails_api?
-      config_app = "#{Jets.root}rack/config/application.rb"
+      config_app = "#{Jets.root}/rack/config/application.rb"
       return false unless File.exist?(config_app)
       !IO.readlines(config_app).grep(/config.api_only.*=.*true/).empty?
     end

data/lib/jets/builders/shim_vars/app.rb

@@ -24,13 +24,13 @@ module Jets::Builders::ShimVars
     end
 
     def full(path)
-      path = "#{Jets.root}#{path}" unless path.starts_with?("/")
+      path = "#{Jets.root}/#{path}" unless path.starts_with?("/")
       path
     end
 
     def relative(path)
       full_path = full(path)
-      full_path.sub(Jets.root.to_s, "")
+      full_path.sub("#{Jets.root}/", "")
                .sub(/.*internal\/app/, "app")
 
     end

data/lib/jets/cfn/upload.rb

@@ -70,7 +70,7 @@ class Jets::Cfn
     end
 
     def upload_asset_folder(folder)
-      expression = "#{Jets.root}#{folder}/**/*"
+      expression = "#{Jets.root}/#{folder}/**/*"
       group_size = 10
       Dir.glob(expression).each_slice(group_size) do |paths|
         threads = []
@@ -95,7 +95,7 @@ class Jets::Cfn
     end
 
     def s3_key(full_path)
-      relative_path = full_path.sub(Jets.root.to_s, '')
+      relative_path = full_path.sub("#{Jets.root}/", '')
       "jets/#{relative_path}"
     end
 

data/lib/jets/commands/build.rb

@@ -109,12 +109,12 @@ module Jets::Commands
     # TODO: rework code so that Dir.pwd does not have to be in tmp_code for build to work.
     def self.app_files
       paths = []
-      expression = "#{Jets.root}app/**/**/*.rb"
+      expression = "#{Jets.root}/app/**/**/*.rb"
       Dir.glob(expression).each do |path|
         return false unless File.file?(path)
         next unless app_file?(path)
 
-        relative_path = path.sub(Jets.root.to_s, '')
+        relative_path = path.sub("#{Jets.root}/", '')
         # Rids of the Jets.root at beginning
         paths << relative_path
       end
@@ -128,12 +128,12 @@ module Jets::Commands
 
     def self.shared_files
       paths = []
-      expression = "#{Jets.root}app/**/**/*.rb"
+      expression = "#{Jets.root}/app/**/**/*.rb"
       Dir.glob(expression).each do |path|
         return false unless File.file?(path)
         next unless path.include?("app/shared/resources")
 
-        relative_path = path.sub(Jets.root.to_s, '')
+        relative_path = path.sub("#{Jets.root}/", '')
         # Rids of the Jets.root at beginning
         paths << relative_path
       end

data/lib/jets/commands/call.rb

@@ -115,7 +115,7 @@ class Jets::Commands::Call
 
   def load_event_from_file(text)
     path = text.gsub('file://','')
-    path = "#{Jets.root}#{path}" unless path[0..0] == '/'
+    path = "#{Jets.root}/#{path}" unless path[0..0] == '/'
     unless File.exist?(path)
       puts "File #{path} does not exist.  Are you sure the file exists?".color(:red)
       exit

data/lib/jets/commands/call/anonymous_guesser.rb

@@ -2,7 +2,7 @@ class Jets::Commands::Call
   class AnonymousGuesser < BaseGuesser
     def detect_class_name
       found_path = function_paths.find do |path|
-        File.exist?("#{Jets.root}#{path}")
+        File.exist?("#{Jets.root}/#{path}")
       end
 
       klass = Jets::Klass.from_path(found_path) if found_path

data/lib/jets/commands/db/tasks.rb

@@ -11,7 +11,7 @@ class Jets::Commands::Db::Tasks
     db_configs = Jets.application.config.database
     ActiveRecord::Tasks::DatabaseTasks.database_configuration = db_configs
     ActiveRecord::Tasks::DatabaseTasks.migrations_paths = ["db/migrate"]
-    ActiveRecord::Tasks::DatabaseTasks.seed_loader = Seeder.new("#{Jets.root}db/seeds.rb")
+    ActiveRecord::Tasks::DatabaseTasks.seed_loader = Seeder.new("#{Jets.root}/db/seeds.rb")
 
     # Need to mock out the usage of Rails.application in:
     # activerecord-5.1.4/lib/active_record/tasks/database_tasks.rb

data/lib/jets/commands/deploy.rb

@@ -39,7 +39,7 @@ module Jets::Commands
     end
 
     def check_dev_mode
-      if File.exist?("#{Jets.root}dev.mode")
+      if File.exist?("#{Jets.root}/dev.mode")
         puts "The dev.mode file exists. Please removed it and run bundle update before you deploy.".color(:red)
         exit 1
       end

data/lib/jets/commands/dynamodb/migrator.rb

@@ -17,7 +17,7 @@ class Jets::Commands::Dynamodb::Migrator
   end
 
   def migrate
-    path = "#{Jets.root}#{@path}"
+    path = "#{Jets.root}/#{@path}"
     unless File.exist?(path)
       puts "Unable to find the migration file: #{path}"
       exit 1 unless ENV['TEST']

data/lib/jets/commands/import/cheatsheet.rb

@@ -11,7 +11,7 @@ class Jets::Commands::Import
     def create
       path = File.expand_path("./templates/", File.dirname(__FILE__)) + "/submodules-cheatsheet.md"
       basename = File.basename(path)
-      dest = "#{Jets.root}#{basename}"
+      dest = "#{Jets.root}/#{basename}"
       cheatsheet = Jets::Erb.result(path, cheatsheet_vars)
       FileUtils.mkdir_p(File.dirname(dest))
       IO.write(dest, cheatsheet)

data/lib/jets/commands/import/sequence.rb

@@ -84,7 +84,7 @@ class Jets::Commands::Import
     end
 
     def rack_folder
-      "#{Jets.root}rack"
+      "#{Jets.root}/rack"
     end
   end
 end

data/lib/jets/commands/runner.rb

@@ -4,7 +4,7 @@ class Jets::Commands::Runner
 
     if code =~ %r{^file://}
       path = code.sub('file://', '')
-      full_path = "#{Jets.root}#{path}"
+      full_path = "#{Jets.root}/#{path}"
       if File.exist?(full_path)
         code = IO.read(full_path)
       else

data/lib/jets/commands/upgrade.rb

@@ -24,7 +24,7 @@ module Jets::Commands
       puts "path #{path}"
       Dir.glob("#{path}/*").each do |src|
         config_file = "config/environments/#{File.basename(src)}"
-        dest = "#{Jets.root}#{config_file}"
+        dest = "#{Jets.root}/#{config_file}"
 
         puts "src #{src}"
         puts "dest #{dest}"
@@ -37,7 +37,7 @@ module Jets::Commands
     end
 
     def update_routes
-      routes_file = "#{Jets.root}config/routes.rb"
+      routes_file = "#{Jets.root}/config/routes.rb"
       return unless File.exist?(routes_file)
 
       lines = IO.readlines(routes_file)
@@ -58,7 +58,7 @@ module Jets::Commands
     end
 
     def update_mode_setting
-      application_file = "#{Jets.root}config/application.rb"
+      application_file = "#{Jets.root}/config/application.rb"
       lines = IO.readlines(application_file)
       deprecated_code = 'config.api_generator'
       return unless lines.detect { |l| l.include?(deprecated_code) }
@@ -78,19 +78,19 @@ module Jets::Commands
     end
 
     def update_config_ru
-      config_ru = File.read("#{Jets.root}config.ru")
+      config_ru = File.read("#{Jets.root}/config.ru")
       return if config_ru.include?("Jets.boot")
 
       src = File.expand_path("templates/skeleton/config.ru", File.dirname(__FILE__))
-      dest = "#{Jets.root}config.ru"
+      dest = "#{Jets.root}/config.ru"
       puts "Update: config.ru"
       FileUtils.cp(src, dest)
     end
 
     def remove_ruby_lazy_load
-      app_config = "#{Jets.root}config/application.rb"
+      app_config = "#{Jets.root}/config/application.rb"
       remove_ruby_lazy_load_for(app_config)
-      Dir.glob("#{Jets.root}config/environments/*.rb").each do |env_config|
+      Dir.glob("#{Jets.root}/config/environments/*.rb").each do |env_config|
         remove_ruby_lazy_load_for(env_config)
       end
     end

data/lib/jets/controller/base.rb

@@ -90,5 +90,14 @@ class Jets::Controller
         self.internal_controller
       end
     end
+
+    class_attribute :auth_type
+    def self.authorization_type(value=nil)
+      if !value.nil?
+        self.auth_type = value
+      else
+        self.auth_type
+      end
+    end
   end
 end

data/lib/jets/controller/rendering.rb

@@ -47,7 +47,7 @@ class Jets::Controller
     end
 
     def default_layout
-      application_layout_exist = !Dir.glob("#{Jets.root}app/views/layouts/application*").empty?
+      application_layout_exist = !Dir.glob("#{Jets.root}/app/views/layouts/application*").empty?
       "application" if application_layout_exist
     end
 

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

@@ -215,7 +215,7 @@ module Jets::Controller::Rendering
           end
         end
 
-        ActionController::Base.append_view_path("#{Jets.root}app/views")
+        ActionController::Base.append_view_path("#{Jets.root}/app/views")
 
         setup_webpacker if Jets.webpacker?
       end
@@ -223,10 +223,10 @@ module Jets::Controller::Rendering
       # Does not include ApplicationHelper, will include ApplicationHelper explicitly first.
       def find_app_helper_classes
         klasses = []
-        expression = "#{Jets.root}app/helpers/**/*"
+        expression = "#{Jets.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("#{Jets.root}/app/helpers/","").sub(/\.rb/,'')
           unless class_name == "application_helper"
             klasses << class_name.classify.constantize # autoload
           end

data/lib/jets/core.rb

@@ -18,14 +18,10 @@ module Jets::Core
     Jets::Booter.boot!(options)
   end
 
-  # Ensures trailing slash
-  # Useful for appending a './' in front of a path or leaving it alone.
-  # Returns: '/path/with/trailing/slash/' or './'
   def root
     # Do not memoize this method. Turbo mode can change it
     root = ENV['JETS_ROOT'].to_s
-    root = '.' if root == ''
-    root = "#{root}/" unless root.ends_with?('/')
+    root = Dir.pwd if root == ''
     Pathname.new(root)
   end
 
@@ -110,14 +106,14 @@ module Jets::Core
 
   # Eager load user's application
   def eager_load_app
-    Dir.glob("#{Jets.root}app/**/*.rb").select do |path|
+    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.to_s,'')
+                    .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
@@ -150,7 +146,7 @@ module Jets::Core
   end
 
   def rack?
-    path = "#{Jets.root}rack"
+    path = "#{Jets.root}/rack"
     File.exist?(path) || File.symlink?(path)
   end
 

data/lib/jets/db.rb

@@ -1,14 +1,14 @@
 module Jets::Db ; end
 
 # Thanks: https://makandracards.com/makandra/42521-detecting-if-a-ruby-gem-is-loaded
-if File.exist?("#{Jets.root}config/database.yml")
+if File.exist?("#{Jets.root}/config/database.yml")
   require "active_record"
   specs = Gem.loaded_specs
   require "mysql2" if specs.key?('mysql2')
   require "pg" if specs.key?('pg')
 end
 
-if File.exist?("#{Jets.root}config/dynamodb.yml")
+if File.exist?("#{Jets.root}/config/dynamodb.yml")
   specs = Gem.loaded_specs
   specs.key?('dynomite')
   require "dynomite" if specs.key?('dynomite')

data/lib/jets/inflections.rb

@@ -24,7 +24,7 @@ module Jets
 
       # User defined custom inflections
       def custom
-        path = "#{Jets.root}config/inflections.yml"
+        path = "#{Jets.root}/config/inflections.yml"
         File.exist?(path) ? YAML.load_file(path) : {}
       end
     end

data/lib/jets/lambda/function_constructor.rb

@@ -29,12 +29,7 @@
 module Jets::Lambda
   class FunctionConstructor
     def initialize(code_path)
-      @code_path = full(code_path)
-    end
-
-    def full(path)
-      path = "#{Jets.root}#{path}" unless path.include?(Jets.root.to_s)
-      path
+      @code_path = "#{Jets.root}/#{code_path}"
     end
 
     def build
@@ -48,7 +43,7 @@ module Jets::Lambda
     # For anonymous classes method_added during task registration contains ""
     # for the class name.  We adjust it here.
     def adjust_tasks(klass)
-      class_name = @code_path.sub(/.*\/functions\//,'').sub(/\.rb$/, '')
+      class_name = @code_path.to_s.sub(/.*\/functions\//,'').sub(/\.rb$/, '')
       class_name = class_name.classify
       klass.tasks.each do |task|
         task.class_name = class_name

data/lib/jets/middleware/default_stack.rb

@@ -27,7 +27,7 @@ module Jets::Middleware
       # Different check for middleware because we need webpacker helpers for url helpers.
       # But we dont want to actually serve via webpacker middleware when running on AWS.
       # By this time the url helpers are serving assets out of s3.
-      return if File.exist?("#{Jets.root}config/disable-webpacker-middleware.txt") # created as part of `jets deploy`
+      return if File.exist?("#{Jets.root}/config/disable-webpacker-middleware.txt") # created as part of `jets deploy`
       require "jets/controller/middleware/webpacker_setup"
       middleware.use Webpacker::DevServerProxy
     end

data/lib/jets/overrides/rails/asset_tag_helper.rb

@@ -106,7 +106,7 @@ private
 
   def s3_public
     # s3_base_url.txt is created as part of the build process
-    s3_base_url = IO.read("#{Jets.root}config/s3_base_url.txt").strip
+    s3_base_url = IO.read("#{Jets.root}/config/s3_base_url.txt").strip
     "#{s3_base_url}/public"
   end
   memoize :s3_public

data/lib/jets/poly_fun/base_executor.rb

@@ -41,7 +41,7 @@ class Jets::PolyFun
       internal = app_class.respond_to?(:internal) && app_class.internal
       src = internal ?
         "#{File.expand_path("../internal", File.dirname(__FILE__))}/#{@task.poly_src_path}" :
-        "#{Jets.root}#{@task.poly_src_path}"
+        "#{Jets.root}/#{@task.poly_src_path}"
       dest = "#{@temp_dir}/#{@task.poly_src_path}"
 
       FileUtils.mkdir_p(File.dirname(dest))

data/lib/jets/poly_fun/node_executor.rb

@@ -18,7 +18,7 @@ class Jets::PolyFun
 
     # https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
     def async_syntax?
-      app_path = Jets.root + @task.handler_path.sub('handlers/', 'app/')
+      app_path = "#{Jets.root}/" + @task.handler_path.sub('handlers/', 'app/')
       source_code = IO.read(app_path)
       source_code.match(/=\s*async.*\(/)
     end

data/lib/jets/processors/deducer.rb

@@ -21,7 +21,7 @@ class Jets::Processors::Deducer
   # Input: @handler_path: handlers/jobs/hard_job.rb
   # Output: #{Jets.root/app/jobs/hard_job.rb
   def path
-    Jets.root.to_s + @handler_path.sub("handlers", "app") + ".rb"
+    @handler_path.sub("handlers", "app") + ".rb"
   end
 
   # process_type is key. It can be either "controller" or "job". It is used to

data/lib/jets/rack_server.rb

@@ -74,7 +74,7 @@ module Jets
     end
 
     def rack_project
-      "#{Jets.root}rack"
+      "#{Jets.root}/rack"
     end
   end
 end

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

@@ -15,10 +15,10 @@ module Jets::Resource::ApiGateway
             method_responses: [{
               status_code: '200',
               response_parameters: {
-                "method.response.header.Access-Control-AllowOrigin": true,
-                "method.response.header.Access-Control-AllowHeaders": true,
-                "method.response.header.Access-Control-AllowMethods": true,
-                "method.response.header.Access-Control-AllowCredentials": true,
+                "method.response.header.Access-Control-Allow-Origin": true,
+                "method.response.header.Access-Control-Allow-Headers": true,
+                "method.response.header.Access-Control-Allow-Methods": true,
+                "method.response.header.Access-Control-Allow-Credentials": true,
               },
               response_models: {},
             }],
@@ -31,10 +31,10 @@ module Jets::Resource::ApiGateway
               integration_responses: [{
                 status_code: '200',
                 response_parameters: {
-                  "method.response.header.Access-Control-AllowOrigin": "'#{allow_origin}'",
-                  "method.response.header.Access-Control-AllowHeaders": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'",
-                  "method.response.header.Access-Control-AllowMethods": "'OPTIONS,GET'",
-                  "method.response.header.Access-Control-AllowCredentials": "'false'",
+                  "method.response.header.Access-Control-Allow-Origin": "'#{allow_origin}'",
+                  "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'",
+                  "method.response.header.Access-Control-Allow-Methods": "'OPTIONS,GET'",
+                  "method.response.header.Access-Control-Allow-Credentials": "'false'",
                 },
                 response_templates: {
                   "application/json": '',

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

@@ -65,8 +65,17 @@ module Jets::Resource::ApiGateway
   private
 
     def authorization_type
-      type = @route.authorization_type || Jets.config.api.authorization_type
-      type.upcase
+      type = @route.authorization_type ||
+             controller_auth_type ||
+             Jets.config.api.authorization_type
+      type.to_s.upcase
+    end
+
+    def controller_auth_type
+      controller_name = @route.to.split('#').first
+      controller = "#{controller_name}_controller".classify.constantize
+      # Already handles inheritance via class_attribute
+      controller.authorization_type
     end
 
     def resource_id

data/lib/jets/router.rb

@@ -84,8 +84,10 @@ module Jets
     end
 
     # root "posts#index"
-    def root(to)
-      @routes << Route.new(path: '', to: to, method: :get, root: true)
+    def root(to, options={})
+      default = {path: '', to: to, method: :get, root: true}
+      options = default.merge(options)
+      @routes << Route.new(options)
     end
 
     # Useful for creating API Gateway Resources

data/lib/jets/stack.rb

@@ -72,13 +72,13 @@ module Jets
       end
 
       def eager_load_shared_resources!
-        ActiveSupport::Dependencies.autoload_paths += ["#{Jets.root}app/shared/resources"]
-        Dir.glob("#{Jets.root}app/shared/resources/**/*.rb").select do |path|
+        ActiveSupport::Dependencies.autoload_paths += ["#{Jets.root}/app/shared/resources"]
+        Dir.glob("#{Jets.root}/app/shared/resources/**/*.rb").select do |path|
           next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
 
           class_name = path
                         .sub(/\.rb$/,'') # remove .rb
-                        .sub(Jets.root.to_s,'') # remove ./
+                        .sub("#{Jets.root}/",'') # remove ./
                         .sub(%r{app/shared/resources/},'') # remove app/shared/resources/
                         .classify
           class_name.constantize # use constantize instead of require so dont have to worry about order.

data/lib/jets/stack/function.rb

@@ -40,7 +40,7 @@ class Jets::Stack
       attributes = @template.values.first
       handler = attributes['Properties']['Handler']
       search_expression = handler.split('.')[0..-2].join('.') + '.*'
-      search_expression.sub('handlers/shared/', "#{Jets.root}app/shared/")
+      search_expression.sub('handlers/shared/', "#{Jets.root}/app/shared/")
     end
 
     # Relative path

data/lib/jets/stack/main/dsl.rb

@@ -17,7 +17,7 @@ class Jets::Stack
       end
 
       def self.included(base)
-        base_path = "#{Jets.root}app/shared/extensions"
+        base_path = "#{Jets.root}/app/shared/extensions"
         ActiveSupport::Dependencies.autoload_paths += [base_path]
 
         Dir.glob("#{base_path}/**/*.rb").each do |path|

data/lib/jets/tmp_loader.rb

@@ -7,7 +7,7 @@ module Jets
     end
 
     def initialize(yaml_path=nil)
-      yaml_path ||= "#{Jets.root}handlers/data.yml"
+      yaml_path ||= "#{Jets.root}/handlers/data.yml"
       @data = YAML.load_file(yaml_path)
       @s3_bucket = @data['s3_bucket']
       @rack_zip = @data['rack_zip']

data/lib/jets/turbo/database_yaml.rb

@@ -1,7 +1,7 @@
 class Jets::Turbo
   class DatabaseYaml
     def reconfigure
-      current_yaml = "#{Jets.root}rack/config/database.yml"
+      current_yaml = "#{Jets.root}/rack/config/database.yml"
       return unless File.exist?(current_yaml)
 
       vars = {}
@@ -27,7 +27,7 @@ class Jets::Turbo
         if !current_database[env]['database'].include?('<%') # already has ERB
           vars["database_#{env}"] = current_database[env]['database']
         else
-          lines = IO.readlines("#{Jets.root}rack/config/application.rb")
+          lines = IO.readlines("#{Jets.root}/rack/config/application.rb")
           module_line = lines.find { |l| l =~ /^module / }
           app_module = module_line.gsub(/^module /,'').strip
           app_name = app_module.underscore

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord