jetski 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357bfb82fcc61cf00861ecc1eae23837e62650788714473c98efa2423a982eae
-  data.tar.gz: 5548ed79761c0e03d05d2b34173d8c47377a44f6062429e281182a62db885b00
+  metadata.gz: 9d5b1bdf7d22ad076b4b10dd7c653521a2aa436779be86ccd3865121bed95d83
+  data.tar.gz: a7b4b87e4663ae80a462bd4b60ccad492a8e0276731e93352b9da2760c364042
 SHA512:
-  metadata.gz: 8fd0699bbbf6e90b28644e3c2511f279644ad928a30e023a12b87eb1360d795f7af9b5bc9d8876614b8f02eab1eacfeaca2da54542e83df84ee093b03ed7818d
-  data.tar.gz: 3c455bda8f1ac6074b10a4e6f7801be94dc7065f492bd52e4cde3ac2331d5dfc4abb1828688e2f8fa91f3ad3c429d3f7abd92ddc81b9c4ddcac6db1c824527bd
+  metadata.gz: d670a9bef0b7ae5b81ab9e6bea1ed54a72a7c3bbec3fe4e30a575e9aaaabb056088e9c323bc48f2e57497f4420b8c8c6155db044c1e18f99325bbe68297df0fe
+  data.tar.gz: 517e89e18274819e70a5649a5da786aca96ef5f73c4fa87da400f4aade36f38e9cd3bf2e683a209efcfaf0d8850e0a79a7cb5b9dbdc2fe27f287d67472e6dd2c

data/bin/jetski

@@ -18,9 +18,19 @@ class JetskiCLI < Thor
     say "cd #{name} && ruby ./start.rb"
   end
 
+  desc "-v, --version", "show Jetski version"
+  def version
+    say "Jetski v#{Jetski::VERSION}"
+  end
+
   def self.source_root
     File.join(File.dirname(__FILE__), '..', 'templates')
   end
 end
 
-JetskiCLI.start(ARGV)
+# Version command seperate from thor for simplicity
+if ["-v", "--version"].include?(ARGV[0])
+  puts "Jetski v#{Jetski::VERSION}"
+else
+  JetskiCLI.start(ARGV)
+end

data/lib/jetski/base_controller.rb

@@ -3,13 +3,33 @@ module Jetski
   class BaseController
     attr_accessor :action_name, :controller_name
     attr_reader :res
+    attr_reader :performed_render
+
+    class << self
+      def request_method(method)
+        # Really just a shell method since Im using File.readlines to use the logic in routes.
+      end
+
+      def root
+        # another shell method
+      end
+
+      def path(location)
+        # Another shell method
+      end
+    end
+
     def initialize(res)
       @res = res
+      @performed_render = false
     end
 
     # Method to render matching view with controller_name/action_name
     
     def render(**args)
+      @performed_render = true
+      request_status = args[:status] || 200
+      res.status = request_status
       if args[:text]
         res.content_type = "text/plain"
         res.body = "#{args[:text]}\n"
@@ -21,6 +41,7 @@ module Jetski
         res.body = args[:json].to_json
         return
       end
+      
       render_template_file
     end
 

data/lib/jetski/router.rb

@@ -10,38 +10,120 @@ module Jetski
     end
 
     def parse_routes
-      # Convert routes file into render of correct controller and action
-      routes_file = File.join(Jetski.app_root, "config/routes")
+      auto_found_routes = []
+      controller_file_paths = Dir.glob([File.join(Jetski.app_root, 'app', 'controllers', '**', '*_controller.rb')])
+      controller_file_paths.each do |file_path| 
+        controller_file_name = file_path.split('app/controllers')[1]
+        controller_as_url = controller_file_name.gsub(/_controller.rb/, '')
+        controller_name = controller_as_url.split("/").last
+        controller_classname = controller_as_url.split("/").reject(&:empty?).map(&:capitalize).join("::") + "Controller"
+        controller_file_readlines = File.readlines(file_path)
+        controller_file_readlines.each.with_index do |line, idx| 
+          strp_line = line.strip 
+          if strp_line.start_with?('def')
+            action_name = strp_line.split("def").last.strip
+            base_opts = { 
+              controller_classname: controller_classname, 
+              controller_file_name: controller_file_name,
+              controller_name: controller_name 
+            }
+            case action_name
+            when "new"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url + "/new",
+                method: "GET",
+                action_name: action_name,
+              })
+            when "create"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url,
+                method: "POST",
+                action_name: action_name,
+              })
+            when "show"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url + "/:id",
+                method: "GET",
+                action_name: action_name,
+              })
+            when "edit"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url + "/:id/edit",
+                method: "GET",
+                action_name: action_name,
+              })
+            when "update"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url + "/:id",
+                method: "PUT",
+                action_name: action_name,
+              })
+            when "destroy"
+              auto_found_routes << base_opts.merge({
+                url: controller_as_url + "/:id",
+                method: "DELETE",
+                action_name: action_name,
+              })
+            else
+              method_route_options = controller_file_readlines[(idx - 2)..(idx - 1)].map(&:strip)
+              custom_request_method = method_route_options.find { |line| line.start_with? "request_method" }
+              custom_request_method = if custom_request_method
+                custom_request_method.split(" ")[1].gsub('"', '').upcase
+              else
+                "GET"
+              end
+              custom_path_option = method_route_options.find { |line| line.start_with? "path" }
+              check_root = controller_file_readlines[idx - 1].strip
+              url_to_use = if check_root.include?("root")
+                "/"
+              else
+                if custom_path_option
+                  custom_path_option.split(" ")[1].gsub('"', '')
+                else
+                  controller_as_url + "/#{action_name}"
+                end
+              end
+              auto_found_routes << base_opts.merge({
+                url: url_to_use,
+                method: custom_request_method,
+                action_name: action_name,
+              })
+            end
+          end
+        end
+      end
+
+      auto_found_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]
 
-      File.readlines(routes_file, chomp: true).each do |line|
-        route_action, served_url, controller_name, action_name = line.split(" ")
         server.mount_proc served_url do |req, res|
           errors = []
-          if (route_action.upcase != req.request_method)
+          if (request_method!= req.request_method)
             errors << "Wrong request was performed"
           end
-          # TODO: Fix the fact that we are always setting res.body to something here. 
-          # Theres no way to return. We need to organize into case statement or if/else type
-          
           if errors.empty?
-            controller_name_formatted = controller_name.split("/").map(&:capitalize).join("::")
-            constantized_controller = "#{controller_name_formatted}Controller"
-            path_to_defined_controller = File.join(Jetski.app_root, "app/controllers/#{controller_name}_controller.rb")
+            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(constantized_controller)
+              controller_class = Object.const_get(controller_classname)
             rescue NameError
-              errors << "#{constantized_controller} is not defined. Please create a file app/controllers/#{controller_name}.rb"
+              errors << "#{controller_classname} is not defined. Please create a file app/controllers/#{controller_file_name}"
             end
           end
 
-          if errors.empty? # Continue unless error found
+          if errors.empty?
             controller = controller_class.new(res)
             controller.action_name = action_name
             controller.controller_name = controller_name
             controller.send(action_name)
-            # Render matching HTML template for GET requests only
-            controller.render if route_action.upcase == "GET"
+            if !controller.performed_render && (request_method.upcase == "GET")
+              controller.render
+            end
             # TODO: Need to setup redirects for other request types. POST/PUT/DELETE
           end
 

data/lib/jetski/version.rb

@@ -0,0 +1,3 @@
+module Jetski
+  VERSION = "0.3.0"
+end

data/lib/jetski.rb

@@ -1,6 +1,7 @@
+require_relative './jetski/version'
+require_relative './jetski/base_controller'
 require_relative './jetski/server'
 require_relative './jetski/router'
-require_relative './jetski/base_controller'
 require "webrick"
 require "json"
 

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

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

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

@@ -5,6 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title> Jetski app </title>
   <link rel="stylesheet" href="/application.css">
+  <link rel="icon" type="image/x-icon" href="/jetski-logo.png">
   DYNAMIC_CSS
 </head>
 <body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -50,12 +50,13 @@ files:
 - lib/jetski/base_controller.rb
 - lib/jetski/router.rb
 - lib/jetski/server.rb
+- lib/jetski/version.rb
 - templates/base/Gemfile
+- templates/base/app/assets/images/jetski-logo.png
 - templates/base/app/assets/stylesheets/application.css
 - templates/base/app/controllers/pages_controller.rb
 - templates/base/app/views/layouts/application.html
 - templates/base/app/views/pages/home.html
-- templates/base/config/routes
 - templates/base/start.rb
 homepage: https://rubygems.org/gems/jetski
 licenses:

data/templates/base/config/routes

@@ -1 +0,0 @@
-get / pages home