jetski 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9695762a6c63b04e17d8477feff33bd1cf6e44a819a7112c17abed5c9411826b
-  data.tar.gz: 046a721b230e7fe80c5fe19a95a1a81d64d3e1956caff0163127a4752064a58a
+  metadata.gz: d01eb3967fa2528047cd44f6febbce3812545582bfd41578bc80c75dcd88d198
+  data.tar.gz: 787d378ad536c27338201f829f51e3727aa87f9f54e7090d18104087f2e63f91
 SHA512:
-  metadata.gz: 3186f1f38ab5fd20ddbd24f6c3e9958f34e44161269333c83b1ae42208e64d4016ed03354458c4a7540c4e38784120a9ff8e971279465b2d66156d9909c0a7c3
-  data.tar.gz: 1b6674aaffba2a6054bd0d07e9923d5c0bf43df333572e4b81f9474c2d671d01c3ad63b987d0625a794012c227003b831c97ce3b956e7e3b655985f35677400c
+  metadata.gz: c35e892800c34e6c3f4bcad62b96d98d547f9380564e363b954df9719c33af9f22626f22a008c6d47135b047d8c5a317605471672bff142f4fa0515c1aa167a3
+  data.tar.gz: a2b9a659f588215404a3435688dd250917c179b7aecade731bd56efc5863fe6ca694abd257dd569b2746cd374f05c2d8b18980cb7dac7667a4f2c080eb509b44

data/bin/jetski

@@ -12,6 +12,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
     run "cd #{name} && bundle install"
     say "Your app #{name} has been generated!"
     say "Start you're app fast with this command"

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

@@ -7,9 +7,9 @@ module Jetski
         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_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 
@@ -18,42 +18,43 @@ module Jetski
               base_opts = { 
                 controller_classname: controller_classname, 
                 controller_file_name: controller_file_name,
-                controller_name: controller_name 
+                controller_name: controller_name,
+                controller_path: controller_path,
               }
               case action_name
               when "new"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url + "/new",
+                  url: controller_path + "/new",
                   method: "GET",
                   action_name: action_name,
                 })
               when "create"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url,
+                  url: controller_path,
                   method: "POST",
                   action_name: action_name,
                 })
               when "show"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url + "/:id",
+                  url: controller_path + "/:id",
                   method: "GET",
                   action_name: action_name,
                 })
               when "edit"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url + "/:id/edit",
+                  url: controller_path + "/:id/edit",
                   method: "GET",
                   action_name: action_name,
                 })
               when "update"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url + "/:id",
+                  url: controller_path + "/:id",
                   method: "PUT",
                   action_name: action_name,
                 })
               when "destroy"
                 auto_found_routes << base_opts.merge({
-                  url: controller_as_url + "/:id",
+                  url: controller_path + "/:id",
                   method: "DELETE",
                   action_name: action_name,
                 })
@@ -74,7 +75,7 @@ module Jetski
                     custom_path_option.split(" ")[1].gsub('"', '')
                   else
                     url_friendly_action_name = action_name.split("_").join("-")
-                    controller_as_url + "/#{url_friendly_action_name}"
+                    controller_path + "/#{url_friendly_action_name}"
                   end
                 end
                 auto_found_routes << base_opts.merge({

data/lib/jetski/router.rb

@@ -19,6 +19,7 @@ module Jetski
         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 = []
@@ -39,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
@@ -73,10 +75,10 @@ module Jetski
 
     def host_images
       # TODO: Expand this to support more types of images.
-      
-      image_files = Dir[
-        File.join(Jetski.app_root, 'app/assets/images/*.jpg')
-      ]
+      file_ext_types = ["png", "jpg"]
+      image_files = Dir.glob(
+        file_ext_types.map { |ext| File.join(Jetski.app_root, "app/assets/images/*.#{ext}")  }
+      )
       image_files.each do |file_path|
         filename = file_path.split("/").last
         asset_url = "/#{filename}"

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/templates/base/app/assets/stylesheets/pages.css

@@ -0,0 +1,16 @@
+.home-page {
+  --primary-color: hsl(240, 63%, 45%);
+  --secondary-color: hsl(202, 66%, 40%);
+
+  min-height: 100vh;
+  width: 100%;
+  background: linear-gradient(to bottom, var(--primary-color), var(--secondary-color));
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  
+  .header {
+    font-size: 64px;
+    color: hsl(from var(--primary-color) h s calc(l + 50))
+  }
+}

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

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

data/templates/base/app/views/pages/home.html

@@ -1 +1,3 @@
-<h1> Welcome to your first jetski app! </h1>
+<div class="home-page"> 
+  <h1 class="header"> APP_NAME </h1>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -55,6 +55,7 @@ files:
 - templates/base/Gemfile
 - templates/base/app/assets/images/jetski-logo.png
 - templates/base/app/assets/stylesheets/application.css
+- templates/base/app/assets/stylesheets/pages.css
 - templates/base/app/controllers/pages_controller.rb
 - templates/base/app/views/layouts/application.html
 - templates/base/app/views/pages/home.html