jetski 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca235e070d85558c0d606ca2883f75c1bec7d9bb9e73ed1cde448c678478244
-  data.tar.gz: e55510b4db502090268d2aae1dc604c5202ca8598effb5435e8bac60a7ade7bc
+  metadata.gz: ffe71a8de5f4201c446a70331fae92f982af3887b388426e5b64f1b6c3d897c8
+  data.tar.gz: 73a1faada7420962abfdbab298f7f81157431b995452ca5fc2adefd903d074ec
 SHA512:
-  metadata.gz: 6fbd7c1108433ea9415787e6810b9bd86242b697ceabd4ed4acbce9e88dc72686a43ada361cca52ae8385dff3a153eb48faf47a41b5e3bd6486bbc015445debd
-  data.tar.gz: 1a2d75bcb797b8e355fcaa5a9990014b522755ac7dc62f706e63b0983bf9dc2da17840fb3893e46e3ff0d0a36e878592e3317b8f93033147c9c3fb456927ca3e
+  metadata.gz: 35e4cfce787089dfe046575b38969927013e09a91b855dee64af15394872eed1660a087ecdd801fb4c0ede590b491da3759b5d68f1ff2c92a49363426f5a8f38
+  data.tar.gz: '049857042cd6299e591dab667ef9f3943637649905fe77e09174eabdc3a1131abb9849e93e35f07adb32d9c09dda067ffc19c8d671ddade29715d74ff0c9acfa'

data/bin/jetski

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
 require 'jetski'
+require 'optparse'
 require 'thor'
 require_relative './jetski_cli_helpers/generate.rb'
 require_relative './jetski_cli_helpers/destroy.rb'
@@ -15,8 +15,8 @@ class JetskiCLI < Thor
     FileUtils.mkdir_p(name)
     say "Creating #{name} app with Jetski!"
     directory "base", "#{name}"
-    gsub_file "#{name}/app/views/layouts/application.html", /APP_NAME/, name.capitalize
-    gsub_file "#{name}/app/views/pages/home.html", /APP_NAME/, name.capitalize
+    gsub_file "#{name}/app/views/layouts/application.html.erb", /APP_NAME/, name.capitalize
+    gsub_file "#{name}/app/views/pages/home.html.erb", /APP_NAME/, name.capitalize
     run "cd #{name} && bundle install"
     say "🌊 Your app #{name} has been generated!"
   end
@@ -37,7 +37,6 @@ class JetskiCLI < Thor
 
   desc "server", "starts the jetski app"
   def server
-    ENV['JETSKI_PROJECT_PATH'] = __dir__
     Jetski::Server.new.call
   end
 

data/bin/jetski_cli_helpers/generate.rb

@@ -5,27 +5,36 @@ module JetskiCLIHelpers
     desc "controller NAME ACTION_NAMES", "Create a controller with matching actions"
     def controller(name, *actions)
       controller_file_path = "app/controllers/#{name}_controller.rb"
-      copy_file("controllers/example_controller", controller_file_path)
-      gsub_file(controller_file_path, /CONTROLLER_NAME/, name.capitalize)
-      actions.each.with_index do |action_name, idx|
-        action_content = "def #{action_name}\n  end"
-        if actions.size < (idx + 1)
-          action_content += "\nACTION_NAME"
+      create_file controller_file_path
+      append_to_file controller_file_path, <<~CONTROLLER
+        class #{name.capitalize}Controller < Jetski::BaseController
+
         end
-        gsub_file(controller_file_path, /ACTION_NAME/, action_content.strip)
-        path_to_view = "app/views/#{name}/#{action_name}.html"
+      CONTROLLER
+
+      actions.each.with_index do |action_name, idx|
+        action_content = <<~ACTION_CONTENT
+          def #{action_name}
+
+          end
+        ACTION_CONTENT
+        insert_into_file(controller_file_path, indent_code(action_content, 1), before: "\nend")
+        path_to_view = "app/views/#{name}/#{action_name}.html.erb"
 
         empty_directory("app/views/#{name}")
-        copy_file("views/example.html", path_to_view)
-        gsub_file(path_to_view, /CONTROLLER_NAME/, name)
-        gsub_file(path_to_view, /ACTION_NAME/, action_name)
-        gsub_file(path_to_view, /PATH_TO_VIEW/, path_to_view)
+        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
         
-    def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'templates')
+  private
+    def indent_code(code, level = 1)
+      code.strip.split("\n").map { |l| (1..level).map { |lvl| "  " }.join + l }.join("\n")
     end
   end
 end

data/bin/templates/base/app/assets/javascript/application.js

@@ -0,0 +1 @@
+console.log("🌊 Hello Jetski JS!")

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

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

data/bin/templates/base/app/views/layouts/{application.html → application.html.erb}

@@ -4,11 +4,9 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title> APP_NAME </title>
-  <link rel="stylesheet" href="/application.css">
   <link rel="icon" type="image/x-icon" href="/jetski-logo.png">
-  DYNAMIC_CSS
 </head>
 <body>
-  YIELD_CONTENT
+  <%= yield %>
 </body>
 </html>

data/lib/jetski/base_controller.rb

@@ -4,6 +4,7 @@ module Jetski
     attr_accessor :action_name, :controller_name, :controller_path, :params
     attr_reader :res
     attr_reader :performed_render
+    attr_writer :root, :path, :request_method
 
     class << self
       def request_method(method)
@@ -50,23 +51,72 @@ module Jetski
       res.set_redirect(WEBrick::HTTPStatus::Found, url)
     end
 
+    def is_root?
+      @root == true
+    end
+
+    def custom_path
+      @path
+    end
+    
+    def custom_request_method
+      @request_method
+    end
+
   private
     def render_template_file
-      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"))
-      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, "#{path_to_controller}.css")
-      css_content = if File.exist? action_css_file
-        "<link rel='stylesheet' href='/#{path_to_controller}.css'>"
-      else
-        ''
-      end
-      page_with_css = page_with_layout.gsub("DYNAMIC_CSS", css_content)
+      view_render = page_with_layout.gsub("\n</head>", "#{content_for_head}\n</head>")
       res.content_type = "text/html"
-      res.body = page_with_css
+      res.body = view_render
+    end
+
+    def page_with_layout
+      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
+    end
+
+    def content_for_head
+      _content_for_head = ''
+
+      application_css_file = File.join(assets_folder, "stylesheets", "application.css")
+      if File.exist? application_css_file
+        _content_for_head += "<link rel='stylesheet' href='/application.css'>\n"
+      end
+
+      controller_css_file = File.join(assets_folder, "stylesheets", "#{path_to_controller}.css")
+      if File.exist? controller_css_file
+        _content_for_head += "<link rel='stylesheet' href='/#{path_to_controller}.css'>\n"
+      end
+      
+      application_js_file = File.join(assets_folder, "javascript", "application.js")
+      if File.exist? application_js_file
+        _content_for_head += "<script src='application.js' defer></script>\n"
+      end
+
+      controller_js_file = File.join(assets_folder, "javascript", "#{path_to_controller}.js")
+      if File.exist? controller_js_file
+        _content_for_head += "<script src='/#{path_to_controller}.js' defer></script>\n"
+      end
+
+      _content_for_head
+    end
+    
+    def views_folder 
+      File.join(Jetski.app_root, 'app/views')
+    end
+
+    def assets_folder
+      File.join(Jetski.app_root, 'app/assets')
+    end
+
+    def path_to_controller 
+      controller_path[1..-1]
+    end
+
+    def process_erb(content)
+      template = ERB.new(content)
+      template.result(binding)
     end
   end
 end

data/lib/jetski/router/parser.rb

@@ -5,85 +5,84 @@ module Jetski
       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_paths.each do |file_path|
+          require_relative 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,
-                })
+          controller_classname = controller_path
+            .split("/")
+            .reject(&:empty?)
+            .map(&:capitalize)
+            .map { |c| c.split("_").map(&:capitalize).join }
+            .join("::") + "Controller"
+          controller_class = Module.const_get(controller_classname)
+          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,
+          }
+          action_names.each do |action_name|
+            action_name = action_name.to_s
+            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
+              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
+                custom_path
               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,
-                })
+                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,
+                method: custom_request_method || "GET",
+                action_name: action_name,
+              })
             end
           end
         end

data/lib/jetski/router.rb

@@ -57,7 +57,7 @@ module Jetski
 
     def host_assets
       # Render stylesheets css via url
-      host_css && host_images
+      host_css && host_images && host_javascript
     end
 
     def host_css
@@ -66,6 +66,7 @@ module Jetski
         filename  = file_path.split("app/assets/stylesheets/").last
         asset_url = "/#{filename}"
         server.mount_proc asset_url do |req, res|
+          res.content_type = "text/css"
           res.body = File.read(File.join(Jetski.app_root,"app/assets/stylesheets/#{filename}"))
         end
       end
@@ -81,9 +82,22 @@ module Jetski
         filename = file_path.split("/").last
         asset_url = "/#{filename}"
         server.mount_proc asset_url do |req, res|
+          res.content_type = "image/*"
           res.body = File.read(File.join(Jetski.app_root,"app/assets/images/#{filename}"))
         end
       end
     end
+
+    def host_javascript
+      js_files = Dir[File.join(Jetski.app_root,'app/assets/javascript/**/*.js')]
+      js_files.each do |file_path|
+        filename  = file_path.split("app/assets/javascript/").last
+        asset_url = "/#{filename}"
+        server.mount_proc asset_url do |req, res|
+          res.content_type = "text/javascript"
+          res.body = File.read(File.join(Jetski.app_root,"app/assets/javascript/#{filename}"))
+        end
+      end
+    end
   end
 end

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/lib/jetski.rb

@@ -1,15 +1,16 @@
+require "webrick"
+require "json"
+require "json"
+require "ostruct"
+require "erb"
+
 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"
-require "ostruct"
 
 module Jetski
-  # Debug stage add constants here for debugging.
   extend self
   def app_root
     Dir.pwd

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 description: 'Would you rather ride on a train or a jetski? that is the question you
   might use when comparing using our framework or the popular Ruby on Rails framework. '
 email: indigo@tech.tut
@@ -64,13 +78,12 @@ files:
 - bin/jetski_cli_helpers/generate.rb
 - bin/templates/base/Gemfile
 - bin/templates/base/app/assets/images/jetski-logo.png
+- bin/templates/base/app/assets/javascript/application.js
 - bin/templates/base/app/assets/stylesheets/application.css
 - bin/templates/base/app/assets/stylesheets/pages.css
 - bin/templates/base/app/controllers/pages_controller.rb
-- bin/templates/base/app/views/layouts/application.html
-- bin/templates/base/app/views/pages/home.html
-- bin/templates/controllers/example_controller
-- bin/templates/views/example.html
+- bin/templates/base/app/views/layouts/application.html.erb
+- bin/templates/base/app/views/pages/home.html.erb
 - lib/jetski.rb
 - lib/jetski/base_controller.rb
 - lib/jetski/router.rb

data/bin/templates/controllers/example_controller

@@ -1,3 +0,0 @@
-class CONTROLLER_NAMEController < Jetski::BaseController
-  ACTION_NAME
-end

data/bin/templates/views/example.html

@@ -1,2 +0,0 @@
-<h1> CONTROLLER_NAME#ACTION_NAME </h1>
-<p> edit the content of this page at app/views/PATH_TO_VIEW/ACTION_NAME.html </p>