jetski 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59cc948a27a477850ced800437233d2106f046a70eef581011efc407b29469ce
-  data.tar.gz: 52dee7630e6efac75428fc46a5e18b3c2374323d0d77dd793cb77f3554f994fd
+  metadata.gz: 147bd3b0e3d8cbbf54b2a4163fe00af53e3941e99942c6d91324e034aaee7f88
+  data.tar.gz: 21042af9af87651f01bc4b3b01ed6bb95d45990abcc9ff6fa1bea68b8b38bd68
 SHA512:
-  metadata.gz: 9f5780959202dac7113a038c9793863851147156fcda7d9ca0efa8b837afc8aaeb37f9f65a7ef266e4b3693dd2acfef48e1987f376e869d88640ec2fcad6c19e
-  data.tar.gz: 76ca2114bc78e15d8fdac21a9f39b137cbf66fa0f3faf45948a245ffdf92722712a9099d55a285cbf0b83f886540b8c02fcc35730a08b91d9e418b2afefd2812
+  metadata.gz: 7b045263bc0e38b3e733d0552d7884a5648351a38ba422e8aee9f2604f56d94ef8a9409113aaa377d4828888787587e6b98bc90e6693e7cfcaf63bd5e11a99e6
+  data.tar.gz: 6c82897a30e17b21c3b7cb0a626b2cf5240124da8ea197e91c18ff3527e2da93965f456feffcd26c760d40e56534e13c770206de1b712998d2e8c0e4f3496237

data/bin/jetski

@@ -5,6 +5,10 @@ require 'optparse'
 require 'thor'
 require "pry"
 
+require_relative './jetski_cli_helpers/generators/controller.rb'
+require_relative './jetski_cli_helpers/generators/model.rb'
+require_relative './jetski_cli_helpers/destroyers/controller.rb'
+require_relative './jetski_cli_helpers/destroyers/model.rb'
 require_relative './jetski_cli_helpers/shared_methods.rb'
 require_relative './jetski_cli_helpers/generate.rb'
 require_relative './jetski_cli_helpers/destroy.rb'

data/bin/jetski_cli_helpers/database.rb

@@ -1,4 +1,3 @@
-require 'thor'
 module JetskiCLIHelpers
   class Database < Thor
     include Thor::Actions, JetskiCLIHelpers::SharedMethods,

data/bin/jetski_cli_helpers/destroy.rb

@@ -1,20 +1,15 @@
-require 'thor'
 module JetskiCLIHelpers
   class Destroy < Thor
-    include Thor::Actions
+    include Thor::Actions, JetskiCLIHelpers::Destroyers::Controller,
+    JetskiCLIHelpers::Destroyers::Model
     desc "controller NAME ACTION_NAMES", "Destroys a controller"
     def controller(name, *actions)
-      controller_file_path = "app/controllers/#{name}_controller.rb"
-      remove_file(controller_file_path)
-      view_folder = "app/views/#{name}"
-      remove_dir(view_folder)
+      destroy_controller(name)
     end
 
     desc "model NAME ACTION_NAMES", "Destroys a model"
     def model(name, *actions)
-      model_file_path = "app/models/#{name}.rb"
-      remove_file(controller_file_path)
-      # TODO: Remove from db.
+      destroy_model(name)
     end
   end
 end

data/bin/jetski_cli_helpers/destroyers/controller.rb

@@ -0,0 +1,18 @@
+module JetskiCLIHelpers
+  module Destroyers
+    module Controller
+      def destroy_controller(name)
+        pluralized_name = if name[-1] == 's'
+          name
+        else
+          name + 's'
+        end
+
+        controller_file_path = "app/controllers/#{pluralized_name}_controller.rb"
+        remove_file(controller_file_path)
+        view_folder = "app/views/#{pluralized_name}"
+        remove_dir(view_folder)
+      end
+    end
+  end
+end

data/bin/jetski_cli_helpers/destroyers/model.rb

@@ -0,0 +1,11 @@
+module JetskiCLIHelpers
+  module Destroyers
+    module Model
+      def destroy_model(name)
+        model_file_path = "app/models/#{name}.rb"
+        remove_file(controller_file_path)
+        # TODO: Remove from db.
+      end
+    end
+  end
+end

data/bin/jetski_cli_helpers/generate.rb

@@ -1,52 +1,23 @@
-require 'thor'
 module JetskiCLIHelpers
   class Generate < Thor
     include Thor::Actions, JetskiCLIHelpers::SharedMethods, 
-      Jetski::Database::Base
+      Jetski::Database::Base, JetskiCLIHelpers::Generators::Controller,
+      JetskiCLIHelpers::Generators::Model
     desc "controller NAME ACTION_NAMES", "Create a controller with matching actions"
     def controller(name, *actions)
-      controller_file_path = "app/controllers/#{name}_controller.rb"
-      create_file controller_file_path
-      append_to_file controller_file_path, <<~CONTROLLER
-        class #{name.capitalize}Controller < Jetski::BaseController
-
-        end
-      CONTROLLER
-
-      actions.each.with_index do |action_name, idx|
-        action_content = <<~ACTION_CONTENT
-          def #{action_name}
-
-          end
-        ACTION_CONTENT
-        action_nl_seperator = ((idx + 1) != actions.size) ? "\n\n" : ""
-        insert_into_file(controller_file_path, "#{indent_code(action_content, 1)}#{action_nl_seperator}", before: "\nend")
-        
-        if !["create", "create", "update", "destroy"].include?(action_name)
-          path_to_view = "app/views/#{name}/#{action_name}.html.erb"
-
-          empty_directory("app/views/#{name}")
-          create_file(path_to_view)
-          append_to_file path_to_view, <<~EXAMPLEFILE
-            <h1> #{name}##{action_name} </h1>
-            <p> edit the content of this page at app/views/#{path_to_view}/#{action_name}.html.erb </p>
-          EXAMPLEFILE
-            
-          say "🌊 View your new page at http://localhost:8000/#{name}/#{action_name}"
-        end
-      end
+      generate_controller(name, *actions)
     end
 
     desc "model NAME FIELD_NAMES", "Creates a model with matching fields"
     def model(name, *field_names)
-      db.execute create_table_sql(table_name: name, field_names: field_names)
-      model_file_path = "app/models/#{name}.rb"
-      create_file model_file_path
-      append_to_file model_file_path, <<~MODEL
-        class #{name.capitalize} < Jetski::Model
-          
-        end
-      MODEL
+      generate_model(name, *field_names)
+    end
+
+    desc "resource NAME FIELD_NAMES", "Creates a resource with model and controller and crud routes"
+    def resource(name, *field_names)
+      crud_actions = %w(new create show index edit update destroy)
+      generate_model(name, *field_names)
+      generate_controller(name, *crud_actions)
     end
   end
 end

data/bin/jetski_cli_helpers/generators/controller.rb

@@ -0,0 +1,45 @@
+module JetskiCLIHelpers
+  module Generators
+    module Controller
+      def generate_controller(name, *actions)
+        pluralized_name = if name[-1] == 's'
+          name
+        else
+          name + 's'
+        end
+
+        formatted_controller_name = pluralized_name.split("_").map(&:capitalize).join
+        controller_file_path = "app/controllers/#{pluralized_name}_controller.rb"
+        create_file controller_file_path
+        append_to_file controller_file_path, <<~CONTROLLER
+          class #{formatted_controller_name}Controller < Jetski::BaseController
+
+          end
+        CONTROLLER
+
+        actions.each.with_index do |action_name, idx|
+          action_content = <<~ACTION_CONTENT
+            def #{action_name}
+
+            end
+          ACTION_CONTENT
+          action_nl_seperator = ((idx + 1) != actions.size) ? "\n\n" : ""
+          insert_into_file(controller_file_path, "#{indent_code(action_content, 1)}#{action_nl_seperator}", before: "\nend")
+          
+          if !["create", "create", "update", "destroy"].include?(action_name)
+            path_to_view = "app/views/#{pluralized_name}/#{action_name}.html.erb"
+
+            empty_directory("app/views/#{pluralized_name}")
+            create_file(path_to_view)
+            append_to_file path_to_view, <<~EXAMPLEFILE
+              <h1> #{pluralized_name}##{action_name} </h1>
+              <p> edit the content of this page at app/views/#{path_to_view}/#{action_name}.html.erb </p>
+            EXAMPLEFILE
+              
+            say "🌊 View your new page at http://localhost:8000/#{pluralized_name}/#{action_name}"
+          end
+        end
+      end
+    end
+  end
+end

data/bin/jetski_cli_helpers/generators/model.rb

@@ -0,0 +1,17 @@
+module JetskiCLIHelpers
+  module Generators
+    module Model
+      def generate_model(name, *field_names)
+        db.execute create_table_sql(table_name: name, field_names: field_names)
+        model_file_path = "app/models/#{name}.rb"
+        create_file model_file_path
+        append_to_file model_file_path, <<~MODEL
+          class #{name.capitalize} < Jetski::Model
+            
+          end
+        MODEL
+      end
+    end
+  end
+end
+

data/lib/jetski/autoloader.rb

@@ -1,6 +1,6 @@
 module Jetski
   module Autoloader
-    include Jetski::Router::SharedMethods
+    include Jetski::Router::FilePathHelper
     extend self
     # Responsibility is to load all models in app.
     def call
@@ -8,7 +8,12 @@ module Jetski
         require_relative path_to_model
         # Call method to define model attributes after loading
         model_name = path_to_model.split("app/models/")[-1]
-          .gsub(".rb", "").capitalize
+          .gsub(".rb", "")
+          .split("/")
+          .map(&:capitalize)
+          .join("::")
+        # posts/comment
+        # Post/comment
         model_class = Object.const_get(model_name)
         model_class.define_attribute_methods
       end

data/lib/jetski/base_controller.rb

@@ -3,11 +3,11 @@ module Jetski
   class BaseController
     RESERVED_INSTANCE_VARIABLES = [
         :@res, :@performed_render, :@action_name, 
-        :@controller_name, :@controller_path, :@cookies, :@root,
-        :@request_method, :@path
+        :@controller_name, :@controller_path, :@cookies
     ]
 
     include ReactiveForm
+    extend Jetski::Helpers::RouteHelpers
     attr_accessor :action_name, :controller_name, :controller_path, 
       :params, :cookies
     attr_reader :res, :performed_render
@@ -19,8 +19,6 @@ module Jetski
     end
 
     # Method to render matching view with controller_name/action_name
-    # TODO: Make render available in view as seperate method.
-
     def render(**args)
       @performed_render = true
       request_status = args[:status] || 200
@@ -52,17 +50,5 @@ module Jetski
     def get_cookie(name)
       cookies&.find { |c| c.name == name.to_s }&.value
     end
-
-    def is_root?
-      @root == true
-    end
-
-    def custom_path
-      @path
-    end
-    
-    def custom_request_method
-      @request_method
-    end
   end
 end

data/lib/jetski/database/base.rb

@@ -18,7 +18,6 @@ module Jetski
         _gen_sql += "create table #{pluralized_table_name} (\n"
         
         # Default fields on all models
-        
         _gen_sql += "  created_at datetime,\n"
         _gen_sql += "  updated_at datetime,\n"
         _gen_sql += "  id integer,\n"

data/lib/jetski/helpers/route_helpers.rb

@@ -0,0 +1,17 @@
+# This is responsible for methods for routing in base_controller like the route class method
+
+module Jetski
+  module Helpers
+    module RouteHelpers
+      def route(method_name, root: false, path: nil, request_method: nil)
+        @custom_route_opts ||= {}
+        @custom_route_opts[method_name] = {
+          method_name: method_name,
+          root: root,
+          path: path,
+          request_method: request_method,
+        }
+      end
+    end
+  end
+end

data/lib/jetski/helpers/view_helpers.rb

@@ -2,9 +2,95 @@ module Jetski
   module Helpers
     module ViewHelpers
       # Expecting a relative path.
-      def render(partial_path)
-        path_to_file = File.join(Jetski.app_root, 'app/views', path_to_controller, "_#{partial_path}.html.erb")
-        File.read(path_to_file)
+      def render(partial_path, **locals)
+        path_to_file = File.join(Jetski.app_root, 'app/views', 
+          path_to_controller, "_#{partial_path}.html.erb")
+        content = File.read(path_to_file)
+        bind = binding
+        locals.each do |k, v| 
+          bind.local_variable_set k, v
+        end
+        template = ERB.new(content)
+        template.result(bind)
+      end
+
+      # link_to "New post", "/posts/new"
+      def link_to(link_text, url, **html_opts)
+        # TODO: Allow passing block to link_to
+        "<a href='#{url}' #{format_html_options(**html_opts)}>#{link_text}</a>"
+      end
+
+      # button_to("Click me", class: "cool-btn")
+      def button_to(button_text, url = nil, **html_opts)
+        if url
+          _method = html_opts[:method] || 'POST'
+          # Create form with button inside lol
+          _form = "<form action='#{url}' method='#{_method}'>"
+          _form += "<button type='submit' #{format_html_options(**html_opts)}>#{button_text}</button>"
+          _form += "</form>"
+          _form
+        else
+          _button = "<button #{format_html_options(**html_opts)}>#{button_text}</button>"
+        end
+      end
+
+      def input_tag(input_name = nil, **html_opts)
+        html_opts[:name] ||= input_name
+        "<input #{format_html_options(**html_opts)}>"
+      end
+
+      def label_tag(text, **html_opts)
+        "<label #{format_html_options(**html_opts)}>#{text}</label>"
+      end
+
+      def textarea_tag(name = nil, value = nil, **html_opts)
+        html_opts[:name] ||= name
+        value ||= html_opts[:value]
+        "<textarea #{format_html_options(**html_opts.except(:value))}>#{value}</textarea>"
+      end
+
+      def image_tag(image_path, **html_opts)
+        abs_url = process_url(image_path)
+        "<img src='#{abs_url}' #{format_html_options(**html_opts)}></img>"
+      end
+
+      def favicon_tag(url, **html_opts)
+        abs_url = process_url(url)
+        "<link rel='icon' type='image/x-icon' #{format_html_options(**html_opts)} href='#{abs_url}'>"
+      end
+
+      def stylesheet_tag(url, **html_opts)
+        abs_url = process_url(url)
+        "<link rel='stylesheet' #{format_html_options(**html_opts)} href='#{abs_url}'>"
+      end
+
+      def javascript_include_tag(url, **html_opts)
+        abs_url = process_url(url)
+        "<script src='#{abs_url}' #{format_html_options(**html_opts)}></script>"
+      end
+
+      def javascript_tag(**html_opts)
+        "<script #{format_html_options(**html_opts)}>#{yield}</script>"
+      end
+
+      def truncate(text, limit)
+        text[0..limit]
+      end
+
+      def format_html_options(**html_opts)
+        html_opts.map do |k, v|
+          formatted_key = k.to_s.gsub("_", "-")
+          "#{formatted_key}='#{v}'"
+        end.join(" ")
+      end
+    private
+      def process_url(url)
+        # Need to ensure urls start with / to avoid relative requests
+        if url[0] == '/'
+          url
+        else
+          "/#{url}"
+        end
       end
     end
   end

data/lib/jetski/model.rb

@@ -3,16 +3,13 @@ module Jetski
     extend Jetski::Database::Base
 
     def initialize(**args)
-      # TODO: Need to fix code
-      # Cannot redefine methods every time we initialize a new object.
-      # need to define available methods on post when loading model
       @virtual_attributes = args
     end
 
     def inspect
       post_obj_id = object_id
-      inspect_str = "#<Post:#{post_obj_id}"
-      self.class.model_attributes.each do |attribute_name|
+      inspect_str = "#<#{self.class.to_s}:#{post_obj_id}"
+      self.class.attributes.each do |attribute_name|
         attribute_value = @virtual_attributes[attribute_name]
         inspect_str += " #{attribute_name}=\"#{attribute_value}\""
       end
@@ -30,7 +27,13 @@ module Jetski
     end
 
     class << self
-      def create(**args)
+      def create(hash_args = nil, **key_args)
+        args = if hash_args && hash_args.is_a?(Hash)
+          hash_args
+        else
+          key_args
+        end
+
         return puts "#{table_name.capitalize}.create was called with no args" if args.size == 0
         data_values = args.map { |k,v| v }
         key_names = args.map { |k, v| k }
@@ -66,7 +69,7 @@ module Jetski
       end
 
       def define_attribute_methods
-        model_attributes.each do |attribute|
+        attributes.each do |attribute|
           define_method attribute do
             @virtual_attributes[attribute]
           end
@@ -91,6 +94,7 @@ module Jetski
       end
 
       def attributes
+        # TODO: Find a more performant way to get the column names from a table
         columns, *rows = db.execute2( "select * from #{pluralized_table_name}" )
         columns
       end
@@ -102,6 +106,12 @@ module Jetski
       def first
         format_model_obj(pluck_rows.first)
       end
+
+      def find(id)
+        id_as_integer = id.to_i
+        columns, *rows = db.execute2( "select * from #{pluralized_table_name} WHERE id=?", id_as_integer)
+        format_model_obj(rows.last, columns)
+      end
       
       def table_name
         self.to_s.downcase
@@ -114,11 +124,6 @@ module Jetski
           table_name + "s"
         end
       end
-      
-      def model_attributes
-        attributes.concat(["id", "created_at", "updated_at"])
-      end
-
     private
       def format_model_obj(row, columns = nil)
         return unless row

data/lib/jetski/router/{shared_methods.rb → file_path_helper.rb}

@@ -1,6 +1,6 @@
 module Jetski
   class Router
-    module SharedMethods
+    module FilePathHelper
       def controller_file_paths
         Dir.glob([File.join(Jetski.app_root, 'app', 'controllers', '**', '*_controller.rb')])
       end

data/lib/jetski/router/host/base.rb

@@ -0,0 +1,58 @@
+module Jetski
+  class Router
+    module Host
+      class Base
+        attr_reader :server, :errors, :served_url, :request_method, :req, :res,
+          :controller_classname, :controller_file_name, :controller_path, 
+          :controller_name, :action_name, :controller_class, :all_server_options
+        
+        attr_writer :res, :req
+        
+        def initialize(server, **server_options)
+          @server = server
+          @errors = []
+          @all_server_options = server_options
+          @served_url = server_options[:url]
+          @request_method = server_options[:method]
+          @controller_file_name = server_options[:controller_file_name]
+          @controller_path = server_options[:controller_path]
+          @controller_classname = server_options[:controller_classname]
+          @controller_name = server_options[:controller_name]
+          @action_name = server_options[:action_name]
+        end
+
+        def call
+          server.mount_proc served_url do |req, res|
+            @req = req
+            @res = res
+            check_request_url
+            yield
+            if errors.any?
+              res.body = errors.join(", ")
+            end
+          end
+        end
+      protected
+        def fetch_controller_class
+          path_to_defined_controller = File.join(Jetski.app_root, "app/controllers/#{controller_file_name}")
+          require_relative path_to_defined_controller
+          begin
+            @controller_class = Object.const_get(controller_classname)
+          rescue NameError
+            @errors << "#{controller_classname} is not defined. Please create a file app/controllers/#{controller_file_name}"
+          end
+        end
+      private
+
+        def check_request_url
+          if req.request_uri.path != served_url
+            # Silently fail to avoid printing error to page
+            res.status = 404
+            res.body = "Not Found"
+            #@errors << "Wrong url was used for request. Bad url: #{req.request_uri}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jetski/router/host/controller.rb

@@ -0,0 +1,57 @@
+module Jetski
+  class Router
+    module Host
+      class Controller < Base
+        # Responsibility is to host the route with methods to route url to controller action
+        # URL -> Controller#Action
+        # Uses controller class name and action name to serve request
+        
+        def initialize(server, **server_options)
+          super(server, **server_options)
+        end
+
+        def call
+          super do
+            fetch_controller_class if errors.empty?
+            call_controller if errors.empty?
+          end
+        end
+
+        def call_controller
+          controller = controller_class.new(res)
+          controller.action_name = action_name
+          controller.controller_name = controller_name
+          controller.controller_path = controller_path
+          params_hash = {}
+          id_crud_actions = ["show", "edit", "destroy"]
+          if id_crud_actions.include?(action_name)
+            # Need to set id value from url. if available.
+            auto_id_param = req.path.split("#{controller_path}/")[-1].split("/")[0]
+            params_hash[:id] ||= auto_id_param
+          end
+          if req.body
+            parsed_body = parse_body(req.body, req.content_type)
+            params_hash = parsed_body.merge(params_hash)
+          end
+          controller.params = OpenStruct.new(params_hash)
+          controller.cookies = req.cookies
+          controller.send(action_name)
+          if !controller.performed_render && (request_method.upcase == "GET")
+            controller.render
+          end
+        end
+
+        def parse_body(body, content_type = '')
+          case content_type
+          when "application/x-www-form-urlencoded"
+            Rack::Utils.parse_nested_query body
+          when "application/json"
+            JSON.parse(body)
+          else
+            body
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jetski/router/host/crud.rb

@@ -0,0 +1,73 @@
+module Jetski
+  class Router
+    module Host
+      class Crud < Base
+        # Responsible for hosting auto crud routes
+        attr_reader :custom_route_options
+        attr_accessor :handle_controller_render
+        def initialize(server, controller_routes, **server_options)
+          server_options[:url] = server_options[:controller_path]
+          super(server, **server_options)
+          @handle_controller_render = true
+        end
+
+        def call
+          super do
+            @custom_route_options = all_server_options.dup.except(:action_name, :method)
+            determine_action_from_url
+            if handle_controller_render
+              @controller_host = Jetski::Router::Host::Controller.new(server, **custom_route_options)
+              @controller_host.res = res
+              @controller_host.req = req
+              @controller_host.fetch_controller_class
+              @controller_host.call_controller
+            end
+          end
+        end
+      private
+        def determine_action_from_url
+          # TODO: Handle checking for url params.
+          req_path = req.request_uri.path
+          custom_route_options.tap do |opts|
+            case req_path
+            when controller_path # /posts
+              # check request method for create action
+              if req.request_method == "POST"
+                opts[:action_name] = "create"
+                opts[:method] = "POST"
+              else
+                opts[:action_name] = "index"
+                opts[:method] = "GET"
+              end
+            when "#{controller_path}/new"
+              opts[:action_name] = "new"
+              opts[:method] = "GET"
+            else
+              url_param = req_path.split("#{controller_path}/")[-1]
+              case
+              when url_param.match(/\d(\/edit)/)
+                # Edit page
+                opts[:action_name] = "edit"
+                opts[:method] = "GET"
+              when url_param.match(/\d\z/)
+                # matches only id 5 with no additional characters
+                # Determine if show/update/destroy from request_method
+                opts[:method] = req.request_method
+                case req.request_method
+                when "GET"
+                  opts[:action_name] = "show"
+                when "PUT"
+                  opts[:action_name] = "update"
+                when "DELETE"
+                  opts[:action_name] = "destroy"
+                end
+              else
+                handle_controller_render = false
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jetski/router/parser.rb

@@ -1,7 +1,7 @@
 module Jetski
   class Router
     module Parser
-      include Jetski::Router::SharedMethods
+      include Jetski::Router::FilePathHelper
       extend self
       def compile_routes
         auto_found_routes = []
@@ -20,16 +20,32 @@ module Jetski
           action_names = controller_class.instance_methods(false)
           base_opts = { 
             controller_classname: controller_classname, 
-            controller_file_name: controller_file_name,
             controller_name: controller_name,
             controller_path: controller_path,
+            controller_file_name: controller_file_name,
           }
+          route_opts_hash = controller_class.instance_variable_get(:@custom_route_opts) || {}
           action_names.each do |action_name|
             action_name = action_name.to_s
+            route_opts = route_opts_hash.fetch(action_name.to_sym, {})
+            custom_request_method = route_opts.fetch(:request_method, nil)
+            is_root = route_opts.fetch(:root, nil)
+            custom_path = route_opts.fetch(:path, nil)
+            
+            url_to_use = proc do |url|
+              if is_root
+                "/"
+              elsif custom_path
+                custom_path
+              else
+                url
+              end
+            end
+            
             case action_name
             when "new"
               auto_found_routes << base_opts.merge({
-                url: controller_path + "/new",
+                url: url_to_use.call(controller_path + "/new"),
                 method: "GET",
                 action_name: action_name,
               })
@@ -63,11 +79,13 @@ module Jetski
                 method: "DELETE",
                 action_name: action_name,
               })
+            when "index"
+              auto_found_routes << base_opts.merge({
+                url: url_to_use.call(controller_path),
+                method: "GET",
+                action_name: action_name,
+              })
             else
-              tmp_controller_instance = controller_class.new("")
-              tmp_controller_instance.send(action_name)
-              is_root = tmp_controller_instance.is_root?
-              custom_path = tmp_controller_instance.custom_path 
               url_to_use = if is_root
                 "/"
               elsif custom_path
@@ -76,7 +94,6 @@ module Jetski
                 url_friendly_action_name = action_name.split("_").join("-")
                 controller_path + "/#{url_friendly_action_name}"
               end
-              custom_request_method = tmp_controller_instance.custom_request_method
 
               auto_found_routes << base_opts.merge({
                 url: url_to_use,

data/lib/jetski/router.rb

@@ -1,60 +1,38 @@
 module Jetski
   class Router
     include Parser
-    attr_reader :server
+    attr_reader :server, :routes, :crud_routes
     def initialize(server)
       @server = server
+      @crud_routes = []
     end
 
     def call
-      host_routes && host_assets
+      browser_support
+      fetch_routes
+      host_routes
+      host_crud_routes
+      host_assets
     end
 
     def host_routes
-      routes = compile_routes
+      crud_actions = %w(new create show index edit update destroy)
       routes.each do |af_route|
-        served_url = af_route[:url]
-        request_method = af_route[:method]
-        controller_classname = af_route[:controller_classname]
-        controller_name = af_route[:controller_name]
-        action_name = af_route[:action_name]
-        controller_file_name = af_route[:controller_file_name]
-        controller_path = af_route[:controller_path]
-
-        server.mount_proc served_url do |req, res|
-          errors = []
-          if (request_method!= req.request_method)
-            errors << "Wrong request was performed"
-          end
-          if errors.empty?
-            path_to_defined_controller = File.join(Jetski.app_root, "app/controllers/#{controller_file_name}")
-            require_relative path_to_defined_controller
-            begin
-              controller_class = Object.const_get(controller_classname)
-            rescue NameError
-              errors << "#{controller_classname} is not defined. Please create a file app/controllers/#{controller_file_name}"
-            end
-          end
-
-          if errors.empty?
-            controller = controller_class.new(res)
-            controller.action_name = action_name
-            controller.controller_name = controller_name
-            controller.controller_path = controller_path
-            if req.body
-              controller.params = parse_body(req.body, req.content_type)
-            end
-            controller.cookies = req.cookies
-            controller.send(action_name)
-            if !controller.performed_render && (request_method.upcase == "GET")
-              controller.render
-            end
-          end
-
-          if errors.any?
-            res.body = errors.join(", ")
-          end
+        if crud_actions.include?(af_route[:action_name]) && (af_route[:url] != '/')
+          @crud_routes << af_route
+          next 
+          # We need to have only one server block for routes with handle crud enabled
         end
+        Host::Controller.new(server, **af_route).call
+      end
+    end
+
+    def host_crud_routes
+      # TODO: Build server block to handle custom crud routes
+      crud_routes_for_controller = crud_routes.group_by { |route| route[:controller_path] }
+      crud_routes_for_controller.each do |controller_path, controller_routes|
+        # TODO: Implement base level server block and checking.
+        Host::Crud.new(server, controller_routes, **controller_routes.first).call
       end
     end
 
@@ -107,16 +85,16 @@ module Jetski
         res.body = File.read(File.join(__dir__, 'frontend/reactive_form.js'))
       end
     end
-  private
-    def parse_body(body, content_type = '')
-      case content_type
-      when "application/x-www-form-urlencoded"
-        Rack::Utils.parse_nested_query body
-      when "application/json"
-        OpenStruct.new(JSON.parse(body))
-      else
-        body
+
+    # routes to help browser default requests etc. prevent breakage
+    def browser_support
+      server.mount_proc "/favicon.ico" do |req, res|
+        res.status = 204  # No Content
       end
     end
+  private
+    def fetch_routes
+      @routes ||= compile_routes
+    end
   end
 end

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.4.7"
+  VERSION = "0.4.9"
 end

data/lib/jetski/view_renderer.rb

@@ -13,7 +13,9 @@ module Jetski
 
     def call
       res.content_type = "text/html"
-      view_render = perform_view_render&.gsub("\n</head>", "#{content_for_head}\n</head>")
+      _rendered_view = perform_view_render
+      sanitized_view_render = _rendered_view.split("\n").map(&:strip).join("\n")
+      view_render = sanitized_view_render.gsub("\n</head>", "#{content_for_head}\n</head>")
       return error_screen if errors.any?
       res.body = view_render
     end
@@ -24,9 +26,9 @@ module Jetski
     end
 
     def perform_view_render
-      process_erb(File.read(File.join(views_folder, "layouts/application.html.erb"))) do
-        process_erb(File.read(File.join(views_folder, path_to_controller, "#{action_name}.html.erb")))
-      end
+      template_content = File.read(template_path)
+      layout_content = File.read(layout_path)
+      process_erb(layout_content) { process_erb(template_content) }
     end
 
     def process_erb(content)
@@ -37,6 +39,9 @@ module Jetski
       grab_instance_variables
       template.result(binding)
     rescue => e
+      # TODO: Add a better error screen like rails show a snapshot of the template and get the line number of error
+      # Also using template error doesnt account for errors inside of partials so need a new way of getting this
+      @errors << "Error in #{local_template_path}"
       @errors << e
       nil
     end
@@ -86,6 +91,18 @@ module Jetski
       File.join(Jetski.app_root, 'app/assets')
     end
 
+    def layout_path
+      File.join(views_folder, "layouts/application.html.erb")
+    end
+
+    def template_path
+      File.join(views_folder, local_template_path)
+    end
+
+    def local_template_path
+      File.join(path_to_controller, "#{action_name}.html.erb")
+    end
+
     def path_to_controller 
       controller_path[1..-1]
     end

data/lib/jetski.rb

@@ -6,17 +6,21 @@ require "rack"
 require "sqlite3"
 
 require_relative './jetski/version'
-require_relative './jetski/frontend/reactive_form'
 require_relative './jetski/helpers/view_helpers'
+require_relative './jetski/helpers/route_helpers'
+require_relative './jetski/helpers/delegatable'
+require_relative './jetski/frontend/reactive_form'
 require_relative './jetski/base_controller'
-require_relative './jetski/router/shared_methods'
+require_relative './jetski/router/file_path_helper'
 require_relative './jetski/router/parser'
+require_relative './jetski/router/host/base'
+require_relative './jetski/router/host/controller'
+require_relative './jetski/router/host/crud'
 require_relative './jetski/router'
 require_relative './jetski/autoloader'
 require_relative './jetski/server'
 require_relative './jetski/database/base'
 require_relative './jetski/model'
-require_relative './jetski/helpers/delegatable'
 require_relative './jetski/view_renderer'
 
 module Jetski

data/templates/base/app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < Jetski::BaseController
+  route :home, root: true
   def home
-    @root = true
   end
 end

data/templates/base/app/views/layouts/application.html.erb

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title> APP_NAME </title>
-  <link rel="icon" type="image/x-icon" href="/jetski-logo.png">
+  <%= favicon_tag "jetski-logo.png" %>
 </head>
 <body>
   <%= yield %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -118,7 +118,11 @@ files:
 - bin/jetski
 - bin/jetski_cli_helpers/database.rb
 - bin/jetski_cli_helpers/destroy.rb
+- bin/jetski_cli_helpers/destroyers/controller.rb
+- bin/jetski_cli_helpers/destroyers/model.rb
 - bin/jetski_cli_helpers/generate.rb
+- bin/jetski_cli_helpers/generators/controller.rb
+- bin/jetski_cli_helpers/generators/model.rb
 - bin/jetski_cli_helpers/shared_methods.rb
 - lib/jetski.rb
 - lib/jetski/autoloader.rb
@@ -127,11 +131,15 @@ files:
 - lib/jetski/frontend/reactive_form.js
 - lib/jetski/frontend/reactive_form.rb
 - lib/jetski/helpers/delegatable.rb
+- lib/jetski/helpers/route_helpers.rb
 - lib/jetski/helpers/view_helpers.rb
 - lib/jetski/model.rb
 - lib/jetski/router.rb
+- lib/jetski/router/file_path_helper.rb
+- lib/jetski/router/host/base.rb
+- lib/jetski/router/host/controller.rb
+- lib/jetski/router/host/crud.rb
 - lib/jetski/router/parser.rb
-- lib/jetski/router/shared_methods.rb
 - lib/jetski/server.rb
 - lib/jetski/version.rb
 - lib/jetski/view_renderer.rb