jets 1.9.32 → 2.0.0

data/lib/jets/router/scope.rb

@@ -1,6 +1,8 @@
 module Jets
   class Router
     class Scope
+      include Util
+
       attr_reader :options, :parent, :level
       def initialize(options = {}, parent = nil, level = 1)
         @options = options
@@ -16,14 +18,73 @@ module Jets
         self.class.new(options, self, level + 1)
       end
 
-      def full_namespace
-        ns = []
+      def full_module
+        items = walk_parents do |current, i, result|
+          mod = current.options[:module]
+          next unless mod
+          result.unshift(mod)
+        end
+
+        items.empty? ? nil : items.join('/')
+      end
+
+      def full_prefix
+        items = walk_parents do |current, i, result|
+          prefix = current.options[:prefix]
+          next unless prefix
+
+          case current.from
+          when :resources
+            variable = prefix.to_s.split('/').last
+            variable = ":#{variable.singularize}_id"
+            result.unshift(variable)
+            result.unshift(prefix)
+          else # resource, namespace or general scope
+            result.unshift(prefix)
+          end
+        end
+
+        items.empty? ? nil : items.join('/')
+      end
+
+      def full_as
+        items = []
         current = self
         while current
-          ns.unshift(current.options[:namespace])
+          items.unshift(current.options[:as]) # <= option_name
+          current = current.parent
+        end
+
+        items.compact!
+        return if items.empty?
+
+        items = singularize_leading(items)
+        items.join('_')
+      end
+
+      def walk_parents
+        current, i, result = self, 0, []
+        while current
+          yield(current, i, result)
           current = current.parent
+          i += 1
         end
-        ns.empty? ? nil : ns.join('/')
+        result
+      end
+
+      # singularize all except last item
+      def singularize_leading(items)
+        result = []
+        items.each_with_index do |item, index|
+          item = item.to_s
+          r = index == items.size - 1 ? item : item.singularize
+          result << r
+        end
+        result
+      end
+
+      def from
+        @options[:from]
       end
     end
   end

data/lib/jets/router/util.rb

@@ -0,0 +1,38 @@
+class Jets::Router
+  module Util
+    # used in MethodCreator logic
+    def join(*items)
+      list = items.compact.join('_')
+      underscore(list)
+    end
+
+    def underscore(str)
+      return unless str
+      str.to_s.gsub(/[^a-zA-Z0-9]/,'_')
+    end
+
+    def get_controller_action(options)
+      if options.key?(:controller) && options.key?(:action)
+        [options[:controller], options[:action]]
+      elsif options.key?(:controller) && options.key?(:to)
+        action = options[:to].split('#').last
+        [options[:controller], action]
+      elsif options.key?(:on)
+        handle_on!(options)
+      else
+        options[:to].split('#') # controller, action
+      end
+    end
+
+    def handle_on!(options)
+      controller = @scope.options[:prefix].to_s
+      to = "#{controller}##{options[:path]}"
+      options[:to] = to
+
+      as = @options[:on] == :member ? controller.singularize : controller
+      as = "#{@options[:path]}_#{as}"
+      options[:as] = as
+      to.split('#')
+    end
+  end
+end

data/lib/jets/turbo/project/config/application.rb

@@ -1,4 +1,5 @@
 Jets.application.configure do
   config.project_name = "project"
   config.mode = "api"
+  config.controllers.default_protect_from_forgery = false
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.9.32"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.9.32
+  version: 2.0.0
 platform: ruby
 authors:
 - Tung Nguyen
@@ -727,6 +727,7 @@ files:
 - lib/jets/commands/upgrade.rb
 - lib/jets/commands/upgrade/templates/bin/webpack
 - lib/jets/commands/upgrade/templates/bin/webpack-dev-server
+- lib/jets/commands/upgrade/version1.rb
 - lib/jets/commands/url.rb
 - lib/jets/commands/webpacker_template.rb
 - lib/jets/controller.rb
@@ -734,6 +735,9 @@ files:
 - lib/jets/controller/callbacks.rb
 - lib/jets/controller/cookies.rb
 - lib/jets/controller/cookies/jar.rb
+- lib/jets/controller/error.rb
+- lib/jets/controller/error/invalid_authenticity_token.rb
+- lib/jets/controller/forgery_protection.rb
 - lib/jets/controller/layout.rb
 - lib/jets/controller/middleware/cors.rb
 - lib/jets/controller/middleware/local.rb
@@ -759,6 +763,8 @@ files:
 - lib/jets/dotenv/ssm.rb
 - lib/jets/erb.rb
 - lib/jets/generator.rb
+- lib/jets/generator/templates/active_job/job/templates/application_job.rb.tt
+- lib/jets/generator/templates/active_job/job/templates/job.rb.tt
 - lib/jets/generator/templates/erb/controller/view.html.erb
 - lib/jets/generator/templates/erb/scaffold/_form.html.erb
 - lib/jets/generator/templates/erb/scaffold/edit.html.erb
@@ -817,6 +823,7 @@ files:
 - lib/jets/overrides/lambda.rb
 - lib/jets/overrides/lambda/marshaller.rb
 - lib/jets/overrides/rails.rb
+- lib/jets/overrides/rails/action_controller.rb
 - lib/jets/overrides/rails/asset_tag_helper.rb
 - lib/jets/overrides/rails/common_methods.rb
 - lib/jets/overrides/rails/rendering_helper.rb
@@ -884,9 +891,26 @@ files:
 - lib/jets/resource/sns/topic_policy.rb
 - lib/jets/resource/sqs/queue.rb
 - lib/jets/resource/standardizer.rb
-- lib/jets/route.rb
 - lib/jets/router.rb
+- lib/jets/router/dsl.rb
+- lib/jets/router/error.rb
+- lib/jets/router/helpers.rb
+- lib/jets/router/helpers/core_helper.rb
+- lib/jets/router/helpers/named_routes_helper.rb
+- lib/jets/router/method_creator.rb
+- lib/jets/router/method_creator/code.rb
+- lib/jets/router/method_creator/edit.rb
+- lib/jets/router/method_creator/generic.rb
+- lib/jets/router/method_creator/index.rb
+- lib/jets/router/method_creator/new.rb
+- lib/jets/router/method_creator/root.rb
+- lib/jets/router/method_creator/show.rb
+- lib/jets/router/resources/base.rb
+- lib/jets/router/resources/filter.rb
+- lib/jets/router/resources/options.rb
+- lib/jets/router/route.rb
 - lib/jets/router/scope.rb
+- lib/jets/router/util.rb
 - lib/jets/rule/base.rb
 - lib/jets/rule/dsl.rb
 - lib/jets/spec_helpers.rb

data/lib/jets/route.rb

@@ -1,166 +0,0 @@
-# route = Jets::Route.new(
-#   path: "posts",
-#   method: :get,
-#   to: "posts#index",
-# )
-class Jets::Route
-  CAPTURE_REGEX = "([^/]*)" # as string
-
-  def initialize(options)
-    @options = options
-  end
-
-  # IE: standard: posts/:id/edit
-  #     api_gateway: posts/{id}/edit
-  def path(format=:jets)
-    case format
-    when :api_gateway
-      api_gateway_format(@options[:path])
-    when :raw
-      @options[:path]
-    else # jets format
-      ensure_jets_format(@options[:path])
-    end
-  end
-
-  def method
-    @options[:method].to_s.upcase
-  end
-
-  # IE: posts#index
-  def to
-    @options[:to]
-  end
-
-  def internal?
-    !!@options[:internal]
-  end
-
-  def homepage?
-    path == ''
-  end
-
-  # IE: PostsController
-  def controller_name
-    to.sub(/#.*/,'').camelize + "Controller"
-  end
-
-  # IE: index
-  def action_name
-    to.sub(/.*#/,'')
-  end
-
-  # Checks to see if the corresponding controller exists. Useful to validate routes
-  # before deploying to CloudFormation and then rolling back.
-  def valid?
-    controller_class = begin
-      controller_name.constantize
-    rescue NameError
-      return false
-    end
-    controller_class.lambda_functions.include?(action_name.to_sym)
-  end
-
-  # Extracts the path parameters from the actual path
-  # Only supports extracting 1 parameter. So:
-  #
-  #   actual_path: posts/tung/edit
-  #   route.path: posts/:id/edit
-  #
-  # Returns:
-  #    { id: "tung" }
-  def extract_parameters(actual_path)
-    if path.include?(':')
-      extract_parameters_capture(actual_path)
-    elsif path.include?('*')
-      extract_parameters_proxy(actual_path)
-    else
-      # Lambda AWS_PROXY sets null to the input request when there are no path parmeters
-      nil
-    end
-  end
-
-  def extract_parameters_proxy(actual_path)
-    # changes path to a string used for a regexp
-    # others/*proxy => others\/(.*)
-    # nested/others/*proxy => nested/others\/(.*)
-    if path.include?('/')
-      leading_path = path.split('/')[0..-2].join('/') # drop last segment
-      # leading_path: nested/others
-      # capture everything after the leading_path as the value
-      regexp = Regexp.new("#{leading_path}/(.*)")
-      value = actual_path.match(regexp)[1]
-    else
-      value = actual_path
-    end
-
-    # the last segment without the '*' is the key
-    proxy_segment = path.split('/').last # last segment is the proxy segment
-    # proxy_segment: *proxy
-    key = proxy_segment.sub('*','')
-
-    { key => value }
-  end
-
-  def extract_parameters_capture(actual_path)
-    # changes path to a string used for a regexp
-    # posts/:id/edit => posts\/(.*)\/edit
-    labels = []
-    regexp_string = path.split('/').map do |s|
-                      if s.start_with?(':')
-                        labels << s.delete_prefix(':')
-                        CAPTURE_REGEX
-                      else
-                        s
-                      end
-                    end.join('\/')
-    # make sure beginning and end of the string matches
-    regexp_string = "^#{regexp_string}$"
-    regexp = Regexp.new(regexp_string)
-
-    values = regexp.match(actual_path).captures
-    labels.map do |next_label|
-      [next_label, values.delete_at(0)]
-    end.to_h
-  end
-
-  def authorization_type
-    @options[:authorization_type]
-  end
-
-private
-  def ensure_jets_format(path)
-    path.split('/').map do |s|
-      if s =~ /^\{/ and s =~ /\+\}$/
-        s.sub(/^\{/, '*').sub(/\+\}$/,'') # {proxy+} => *proxy
-      elsif s =~ /^\{/ and s =~ /\}$/
-        s.sub('{',':').sub(/\}$/,'') # {id} => :id
-      else
-        s
-      end
-    end.join('/')
-  end
-
-  def api_gateway_format(path)
-    path.split('/')
-      .map {|s| transform_capture(s) }
-      .map {|s| transform_proxy(s) }
-      .join('/')
-  end
-
-  def transform_capture(text)
-    if text.starts_with?(':')
-      text = text.sub(':','')
-      text = "{#{text}}"
-    end
-    text
-  end
-
-  def transform_proxy(text)
-    if text.starts_with?('*')
-      text = text.sub('*','')
-      text = "{#{text}+}"
-    end
-    text
-  end
-end