jetski 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5b1bdf7d22ad076b4b10dd7c653521a2aa436779be86ccd3865121bed95d83
-  data.tar.gz: a7b4b87e4663ae80a462bd4b60ccad492a8e0276731e93352b9da2760c364042
+  metadata.gz: 746e669c9cd0109b9c5d11bc04b8eeda814b529f211ea5cf8aafd1531aa651e3
+  data.tar.gz: d178172efe91cc4f611d0cf1c5225871d70ea8718af834d21648f7eb51de2324
 SHA512:
-  metadata.gz: d670a9bef0b7ae5b81ab9e6bea1ed54a72a7c3bbec3fe4e30a575e9aaaabb056088e9c323bc48f2e57497f4420b8c8c6155db044c1e18f99325bbe68297df0fe
-  data.tar.gz: 517e89e18274819e70a5649a5da786aca96ef5f73c4fa87da400f4aade36f38e9cd3bf2e683a209efcfaf0d8850e0a79a7cb5b9dbdc2fe27f287d67472e6dd2c
+  metadata.gz: 7c8b29c0de093d02b4a3c72401210e54c97bd09615ef3894d216f7b2ede33878ee3b30ecd329cfbde8427951709ca983f04a8e152b0c2fe4d91370edae65a8d9
+  data.tar.gz: fd259f11692b58f01c5cdf82e462ea573ded074fa71924764d7932bbe42494c1e76861ca87030531f9279f1394daf321abfbe882656b92379b617e2f274810a3

data/bin/jetski

@@ -23,6 +23,15 @@ class JetskiCLI < Thor
     say "Jetski v#{Jetski::VERSION}"
   end
 
+  desc "routes", "shows the routes in your app."
+  def routes
+    compiled_routes = Jetski::Router::Parser.compile_routes
+    say "🌊 Jetski Routes 🏄‍♂️"
+    compiled_routes.each do |route_obj|
+      say "#{route_obj[:method]} #{route_obj[:url]} #{route_obj[:controller_name]}##{route_obj[:action_name]}"
+    end
+  end
+  
   def self.source_root
     File.join(File.dirname(__FILE__), '..', 'templates')
   end

data/lib/jetski/base_controller.rb

@@ -1,7 +1,7 @@
 # This is the base controller of the library
 module Jetski
   class BaseController
-    attr_accessor :action_name, :controller_name
+    attr_accessor :action_name, :controller_name, :controller_path
     attr_reader :res
     attr_reader :performed_render
 
@@ -50,11 +50,12 @@ module Jetski
       views_folder = File.join(Jetski.app_root, 'app/views')
       assets_folder = File.join(Jetski.app_root, 'app/assets/stylesheets')
       layout_content = File.read(File.join(views_folder, "layouts/application.html"))
-      page_content = File.read(File.join(views_folder, controller_name, "#{action_name}.html"))
+      path_to_controller = controller_path[1..-1]
+      page_content = File.read(File.join(views_folder, path_to_controller, "#{action_name}.html"))
       page_with_layout = layout_content.gsub("YIELD_CONTENT", page_content)
-      action_css_file = File.join(assets_folder, "#{controller_name}.css")
+      action_css_file = File.join(assets_folder, "#{path_to_controller}.css")
       css_content = if File.exist? action_css_file
-        "<link rel='stylesheet' href='/#{controller_name}.css'>"
+        "<link rel='stylesheet' href='/#{path_to_controller}.css'>"
       else
         ''
       end

data/lib/jetski/router/parser.rb

@@ -0,0 +1,94 @@
+module Jetski
+  class Router
+    module Parser
+      extend self
+      def compile_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_path = controller_file_name.gsub(/_controller.rb/, '')
+          controller_name = controller_path.split("/").last
+          controller_classname = controller_path.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,
+                controller_path: controller_path,
+              }
+              case action_name
+              when "new"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path + "/new",
+                  method: "GET",
+                  action_name: action_name,
+                })
+              when "create"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path,
+                  method: "POST",
+                  action_name: action_name,
+                })
+              when "show"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path + "/:id",
+                  method: "GET",
+                  action_name: action_name,
+                })
+              when "edit"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path + "/:id/edit",
+                  method: "GET",
+                  action_name: action_name,
+                })
+              when "update"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path + "/:id",
+                  method: "PUT",
+                  action_name: action_name,
+                })
+              when "destroy"
+                auto_found_routes << base_opts.merge({
+                  url: controller_path + "/: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
+                    url_friendly_action_name = action_name.split("_").join("-")
+                    controller_path + "/#{url_friendly_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
+      end
+    end
+  end
+end

data/lib/jetski/router.rb

@@ -1,105 +1,25 @@
 module Jetski
   class Router
+    include Parser
     attr_reader :server
     def initialize(server)
       @server = server
     end
 
     def call
-      parse_routes && host_assets
+      host_routes && host_assets
     end
 
-    def parse_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|
+    def host_routes
+      routes = compile_routes
+      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 = []
@@ -120,6 +40,7 @@ module Jetski
             controller = controller_class.new(res)
             controller.action_name = action_name
             controller.controller_name = controller_name
+            controller.controller_path = controller_path
             controller.send(action_name)
             if !controller.performed_render && (request_method.upcase == "GET")
               controller.render

data/lib/jetski/version.rb

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

data/lib/jetski.rb

@@ -1,9 +1,11 @@
 require_relative './jetski/version'
 require_relative './jetski/base_controller'
 require_relative './jetski/server'
+require_relative './jetski/router/parser'
 require_relative './jetski/router'
 require "webrick"
 require "json"
+require "json"
 
 module Jetski
   # Debug stage add constants here for debugging.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -49,6 +49,7 @@ files:
 - lib/jetski.rb
 - lib/jetski/base_controller.rb
 - lib/jetski/router.rb
+- lib/jetski/router/parser.rb
 - lib/jetski/server.rb
 - lib/jetski/version.rb
 - templates/base/Gemfile