jets 1.9.32 → 2.0.0

data/lib/jets/generator/templates/erb/scaffold/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%%= render 'form', <%= singular_table_name %>: @<%= singular_table_name %> %>
 
-<%%= link_to 'Show', "/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}" %> |
-<%%= link_to 'Back', "/<%= plural_table_name %>" %>
+<%%= link_to 'Show', @<%= singular_table_name %> %> |
+<%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/jets/generator/templates/erb/scaffold/index.html.erb

@@ -14,11 +14,11 @@
     <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
       <tr class="jets-element-to-delete">
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
-        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+        <td><%%= <%= singular_table_name %>.<%= attribute.column_name %> %></td>
 <% end -%>
-        <td><%%= link_to 'Show', "/<%= plural_table_name %>/#{<%= singular_table_name %>.id}" %></td>
-        <td><%%= link_to 'Edit', "/<%= plural_table_name %>/#{<%= singular_table_name %>.id}/edit" %></td>
-        <td><%%= link_to 'Destroy', "/<%= plural_table_name %>/#{<%= singular_table_name %>.id}", method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%%= link_to 'Show', <%= model_resource_name %> %></td>
+        <td><%%= link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>) %></td>
+        <td><%%= link_to 'Destroy', <%= model_resource_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <%% end %>
   </tbody>
@@ -26,4 +26,4 @@
 
 <br>
 
-<%%= link_to 'New <%= singular_table_name.titleize %>', "/<%= plural_table_name %>/new" %>
+<%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path %>

data/lib/jets/generator/templates/erb/scaffold/new.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render 'form', <%= singular_table_name %>: @<%= singular_table_name %> %>
 
-<%%= link_to 'Back', "/<%= plural_table_name %>" %>
+<%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/jets/generator/templates/erb/scaffold/show.html.erb

@@ -1,9 +1,9 @@
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
 <p>
   <strong><%= attribute.human_name %>:</strong>
-  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
+  <%%= @<%= singular_table_name %>.<%= attribute.column_name %> %>
 </p>
 
 <% end -%>
-<%%= link_to 'Edit', "/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}/edit" %> |
-<%%= link_to 'Back', "/<%= plural_table_name %>" %>
+<%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
+<%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/jets/generator/templates/rails/scaffold_controller/controller.rb

@@ -30,9 +30,9 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     if @<%= orm_instance.save %>
       if request.xhr?
-        render json: {success: true, location: url_for("/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}")}
+        render json: {success: true, location: url_for(@<%= singular_table_name %>)}
       else
-        redirect_to "/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}"
+        redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
       end
     else
       render :new
@@ -43,9 +43,9 @@ class <%= controller_class_name %>Controller < ApplicationController
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       if request.xhr?
-        render json: {success: true, location: url_for("/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}")}
+        render json: {success: true, location: url_for(@<%= singular_table_name %>)}
       else
-        redirect_to "/<%= plural_table_name %>/#{@<%= singular_table_name %>.id}"
+        redirect_to <%= singular_table_name %>_path(@<%= singular_table_name %>)
       end
     else
       render :edit
@@ -58,7 +58,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if request.xhr?
       render json: {success: true}
     else
-      redirect_to "/<%= plural_table_name %>"
+      redirect_to <%= table_name %>_path
     end
   end
 

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

@@ -1,6 +1,7 @@
 class Jets::RackController < Jets::Controller::Base
   layout false
   internal true
+  skip_forgery_protection
 
   # Megamode
   def process

data/lib/jets/overrides/rails.rb

@@ -1,4 +1,5 @@
 require "jets/overrides/rails/common_methods"
 require "jets/overrides/rails/url_helper"
 require "jets/overrides/rails/rendering_helper"
-require "jets/overrides/rails/asset_tag_helper"
+require "jets/overrides/rails/asset_tag_helper"
+require "jets/overrides/rails/action_controller"

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

@@ -0,0 +1,12 @@
+ActiveSupport.on_load :action_controller do
+  class ActionController::Base
+    class << self
+      def _prefixes
+        @@_prefixes
+      end
+      def _prefixes=(v)
+        @@_prefixes = v
+      end
+    end
+  end
+end

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

@@ -11,15 +11,76 @@ module Jets::UrlHelper
             options
           when :back
             _back_url
-          # TODO: hook this up to Jets implmentation of config/routes.rb
-          # when ActiveRecord::Base
-          #   record = options
-          #   record.id
+          when ActiveRecord::Base
+            _handle_model(options)
+          when Array
+            _handle_array(options)
           else
-            raise ArgumentError, "Please provided a String to link_to as the the second argument. The Jets link_to helper takes as the second argument."
+            raise ArgumentError, "Please provided a String or ActiveRecord model to link_to as the the second argument. The Jets link_to helper takes as the second argument."
           end
 
     add_stage_name(url)
   end
+
+  def _handle_model(record)
+    model = record.to_model
+    if model.persisted?
+      meth = model.model_name.singular_route_key + "_path"
+      send(meth, record) # Example: post_path(record)
+    else
+      meth = model.model_name.route_key + "_path"
+      send(meth) # Example: posts_path
+    end
+  end
+
+  # Convention is that the model class name is the method name. Doesnt work if user is using as.
+  def _handle_array(array)
+    contains_nil = !array.select(&:nil?).empty?
+    if contains_nil
+      raise "ERROR: You passed a nil value in the Array. #{array.inspect}."
+    end
+
+    last_persisted = nil
+    items = array.map do |x|
+      if x.is_a?(ActiveRecord::Base)
+        last_persisted = x.persisted?
+        x.persisted? ? x.model_name.singular_route_key : x.model_name.route_key
+      else
+        x
+      end
+    end
+    meth = items.join('_') + "_path"
+
+    args = array.clone
+    args.shift if args.first.is_a?(Symbol) # drop the first element if its a symbol
+    args = last_persisted ? args : args[0..-2]
+
+    # post_comment_path(post_id) - keep all args - for update
+    # post_comments_path - drop last arg - for create
+    send(meth, *args)
+  end
+
+  # for forgery protection
+  def token_tag(token = nil, form_options: {})
+    return '' unless protect_against_forgery?
+
+    hidden_field_tag 'authenticity_token', masked_authenticity_token
+  end
+
+  def masked_authenticity_token
+    @masked_authenticity_token ||= SecureRandom.hex(32)
+    session[:authenticity_token] = @masked_authenticity_token
+  end
+
+  def protect_against_forgery?
+    @_jets[:controller].class.forgery_protection_enabled?
+  end
+
+  def csrf_meta_tags
+    if protect_against_forgery?
+      tag("meta", name: "csrf-token", content: masked_authenticity_token).html_safe
+    end
+  end
 end # UrlHelper
+
 ActionView::Helpers.send(:include, Jets::UrlHelper)

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

@@ -33,7 +33,7 @@ class Jets::Resource::ApiGateway::RestApi::Routes::Change
           path = recreate_path(resource.path)
           method = http_verb.downcase.to_sym
           to = to(resource.id, http_verb)
-          route = Jets::Route.new(path: path, method: method, to: to)
+          route = Jets::Router::Route.new(path: path, method: method, to: to)
           routes << route
         end
       end

data/lib/jets/resource/api_gateway/rest_api/routes/collision.rb

@@ -62,7 +62,7 @@ class Jets::Resource::ApiGateway::RestApi::Routes
       end
       paths.map do |path|
         path.sub("#{parent}/",'').gsub(%r{/.*},'')
-      end.uniq.sort
+      end.select { |x| x =~ /^:/ }.uniq.sort
     end
 
     def parent?(parent, path)

data/lib/jets/router.rb

@@ -2,9 +2,12 @@ require 'text-table'
 
 module Jets
   class Router
+    include Dsl
+
     attr_reader :routes
     def initialize
       @routes = []
+      @scope = Scope.new
     end
 
     def draw(&block)
@@ -20,51 +23,40 @@ module Jets
       raise collision.exception if collide
     end
 
-    # Methods supported by API Gateway
-    %w[any delete get head options patch post put].each do |method_name|
-      define_method method_name do |path, options|
-        create_route(options.merge(path: path, method: __method__))
-      end
-    end
-
     def create_route(options)
-      # Currently only using scope to add namespace
       # TODO: Can use it to add additional things like authorization_type
       # Would be good to add authorization_type at the controller level also
-      options[:path] = add_namespace(options[:path])
-      @routes << Route.new(options)
+      infer_to_option!(options)
+      handle_on!(options)
+      MethodCreator.new(options, @scope).define_url_helper!
+      @routes << Route.new(options, @scope)
     end
 
-    def add_namespace(path)
-      return path unless @scope
-      ns = @scope.full_namespace
-      return path unless ns
-      "#{ns}/#{path}"
-    end
+    # Can possibly infer to option from the path. Example:
+    #
+    #     get 'posts/index'
+    #     get 'posts', to: 'posts#index'
+    #
+    #     get 'posts/show'
+    #     get 'posts', to: 'posts#show'
+    #
+    def infer_to_option!(options)
+      return if options[:to]
 
-    def namespace(ns, &block)
-      scope(namespace: ns, &block)
-    end
+      path = options[:path].to_s
+      return unless path.include?('/')
 
-    def scope(options={})
-      root_level = @scope.nil?
-      @scope = root_level ? Scope.new(options) : @scope.new(options)
-      yield
-    ensure
-      @scope = @scope.parent if @scope
+      items = path.split('/')
+      if items.size == 2
+        options[:to] = items.join('#')
+      end
     end
 
-    # resources macro expands to all the routes
-    def resources(name)
-      get "#{name}", to: "#{name}#index"
-      get "#{name}/new", to: "#{name}#new" unless api_mode?
-      get "#{name}/:id", to: "#{name}#show"
-      post "#{name}", to: "#{name}#create"
-      get "#{name}/:id/edit", to: "#{name}#edit" unless api_mode?
-      put "#{name}/:id", to: "#{name}#update"
-      post "#{name}/:id", to: "#{name}#update" # for binary uploads
-      patch "#{name}/:id", to: "#{name}#update"
-      delete "#{name}/:id", to: "#{name}#delete"
+    def handle_on!(options)
+      if options[:on] && !%w[resources resource].include?(@scope.from.to_s)
+        raise Error.new("ERROR: The `on:` option can only be used within a resource or resources block")
+      end
+      options[:on] ||= @on_option if @on_option
     end
 
     def api_mode?
@@ -81,13 +73,6 @@ module Jets
       api_mode
     end
 
-    # root "posts#index"
-    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
     def all_paths
       results = []
@@ -141,6 +126,7 @@ module Jets
 
     def self.clear!
       @@drawn_router = nil
+      Jets::Router::Helpers::NamedRoutesHelper.clear!
     end
 
     def self.routes
@@ -155,13 +141,13 @@ module Jets
       drawn_router.all_paths
     end
 
-    def self.routes_help
+    def self.help(routes)
       return "Your routes table is empty." if routes.empty?
 
       table = Text::Table.new
-      table.head = %w[Verb Path Controller#action]
+      table.head = %w[As Verb Path Controller#action]
       routes.each do |route|
-        table.rows << [route.method, route.path, route.to]
+        table.rows << [route.as, route.method, route.path, route.to]
       end
       table
     end

data/lib/jets/router/dsl.rb

@@ -0,0 +1,136 @@
+class Jets::Router
+  module Dsl
+    # Methods supported by API Gateway
+    %w[any delete get head options patch post put].each do |method_name|
+      define_method method_name do |path, options={}|
+        create_route(options.merge(path: path, method: __method__))
+      end
+    end
+
+    def namespace(ns, &block)
+      scope(module: ns, prefix: ns, as: ns, from: :namespace, &block)
+    end
+
+    def prefix(prefix, &block)
+      scope(prefix: prefix, &block)
+    end
+
+    # scope supports three options: module, prefix and as.
+    # Jets vs Rails:
+    #   module - module
+    #   prefix - path
+    #   as - as
+    def scope(args)
+      # normalizes `scope(:admin)` as `scope(prefix: :admin)`
+      options = case args
+      when Hash
+        args
+      when String, Symbol
+        { prefix: args }
+      end
+
+      root_level = @scope.nil?
+      @scope = root_level ? Scope.new(options) : @scope.new(options)
+      yield
+    ensure
+      @scope = @scope.parent if @scope
+    end
+
+    # resources macro expands to all the routes
+    def resources(*items, **options)
+      items.each do |item|
+        scope_options = scope_options!(item, options)
+        scope_options[:from] = :resources # flag for MethodCreator logic: to handle method_name_leaf and more
+        scope(scope_options) do
+          each_resources(item, options, block_given?)
+          yield if block_given?
+        end
+      end
+    end
+
+    def scope_options!(item, options)
+      prefix = if options[:prefix]
+        # prefix given from the resources macro get automatically prepended to the item name
+        p = options.delete(:prefix)
+        "#{p}/#{item}"
+      else
+        item
+      end
+
+      {
+        as: options.delete(:as) || item, # delete as or it messes with create_route
+        prefix: prefix,
+        # module: options.delete(:module) || item, # NOTE: resources does not automatically set module, but namespace does
+      }
+    end
+
+    def each_resources(name, options={}, has_block=nil)
+      o = Resources::Options.new(name, options)
+      f = Resources::Filter.new(name, options)
+      param = default_param(has_block, name, options)
+
+      get name, o.build(:index) if f.yes?(:index)
+      get "#{name}/new", o.build(:new) if f.yes?(:new) && !api_mode?
+      get "#{name}/:#{param}", o.build(:show) if f.yes?(:show)
+      post name, o.build(:create) if f.yes?(:create)
+      get "#{name}/:#{param}/edit", o.build(:edit) if f.yes?(:edit) && !api_mode?
+      put "#{name}/:#{param}", o.build(:update) if f.yes?(:update)
+      post "#{name}/:#{param}", o.build(:update) if f.yes?(:update) # for binary uploads
+      patch "#{name}/:#{param}", o.build(:update) if f.yes?(:update)
+      delete "#{name}/:#{param}", o.build(:delete) if f.yes?(:delete)
+    end
+
+    def resource(*items, **options)
+      items.each do |item|
+        scope_options = scope_options!(item, options)
+        scope_options[:from] = :resource # flag for MethodCreator logic: to handle method_name_leaf and more
+        scope(scope_options) do
+          each_resource(item, options, block_given?)
+          yield if block_given?
+        end
+      end
+    end
+
+    def each_resource(name, options={}, has_block=nil)
+      o = Resources::Options.new(name, options.merge(singular_resource: true))
+      f = Resources::Filter.new(name, options)
+
+      get "#{name}/new", o.build(:new) if f.yes?(:new) && !api_mode?
+      get name, o.build(:show) if f.yes?(:show)
+      post name, o.build(:create) if f.yes?(:create)
+      get "#{name}/edit", o.build(:edit) if f.yes?(:edit) && !api_mode?
+      put name, o.build(:update) if f.yes?(:update)
+      post name, o.build(:update) if f.yes?(:update) # for binary uploads
+      patch name, o.build(:update) if f.yes?(:update)
+      delete name, o.build(:delete) if f.yes?(:delete)
+    end
+
+    def member
+      @on_option = :member
+      yield
+      @on_option = nil
+    end
+
+    def collection
+      @on_option = :collection
+      yield
+      @on_option = nil
+    end
+
+    # If a block has pass then we assume the resources will be nested and then prefix
+    # the param name with the resource. IE: post_id instead of id
+    # This avoids an API Gateway parent sibling variable collision.
+    def default_param(has_block, name, options)
+      default_param = has_block ? "#{name.to_s.singularize}_id".to_sym : :id
+      options[:param] || default_param
+    end
+
+    # root "posts#index"
+    def root(to, options={})
+      default = {path: '', to: to, method: :get, root: true}
+      options = default.merge(options)
+      MethodCreator.new(options, @scope).create_root_helper
+      @routes << Route.new(options, @scope)
+    end
+  end
+end