jetski 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746e669c9cd0109b9c5d11bc04b8eeda814b529f211ea5cf8aafd1531aa651e3
-  data.tar.gz: d178172efe91cc4f611d0cf1c5225871d70ea8718af834d21648f7eb51de2324
+  metadata.gz: d1746870a727a12ac5a50fcda0a087b09c38c001792c231228171b51daa2157e
+  data.tar.gz: 39d1679fde3e431e227e83fd18599c36e81bf6bc4f4bfd8a8c271c54a5f2dc99
 SHA512:
-  metadata.gz: 7c8b29c0de093d02b4a3c72401210e54c97bd09615ef3894d216f7b2ede33878ee3b30ecd329cfbde8427951709ca983f04a8e152b0c2fe4d91370edae65a8d9
-  data.tar.gz: fd259f11692b58f01c5cdf82e462ea573ded074fa71924764d7932bbe42494c1e76861ca87030531f9279f1394daf321abfbe882656b92379b617e2f274810a3
+  metadata.gz: f5af7934d40d93fcf134268a9ae8a1f8cb868e36f198785c535e133561896684eafb4c8164899fb6fae6a50ddeb4eab60d1623f50da4a82a767b094bb274f020
+  data.tar.gz: 6795ff302861de5b124a085060dab9aef87c8fc68debba5d7cf27ae20558d033a9a6a6296d9e39263e48c796e347483e9a254834be86ac9e694ca6705fee3c45

data/bin/jetski

@@ -3,6 +3,8 @@
 require 'optparse'
 require 'jetski'
 require 'thor'
+require_relative './jetski_cli_helpers/generate.rb'
+require_relative './jetski_cli_helpers/destroy.rb'
 
 class JetskiCLI < Thor
   include Thor::Actions
@@ -12,10 +14,10 @@ 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"
-    say "cd #{name} && ruby ./start.rb"
+    say "🌊 Your app #{name} has been generated!"
   end
 
   desc "-v, --version", "show Jetski version"
@@ -31,9 +33,15 @@ class JetskiCLI < Thor
       say "#{route_obj[:method]} #{route_obj[:url]} #{route_obj[:controller_name]}##{route_obj[:action_name]}"
     end
   end
+
+  desc "generate", "generates resources in your jetski app"
+  subcommand "generate", JetskiCLIHelpers::Generate
+
+  desc "destroy", "destroys a resource in your jetski app"
+  subcommand "destroy", JetskiCLIHelpers::Destroy
   
   def self.source_root
-    File.join(File.dirname(__FILE__), '..', 'templates')
+    File.join(File.dirname(__FILE__), 'templates')
   end
 end
 

data/bin/jetski_cli_helpers/destroy.rb

@@ -0,0 +1,15 @@
+require 'thor'
+module JetskiCLIHelpers
+  class Destroy < Thor
+    include Thor::Actions
+    desc "controller NAME ACTION_NAMES", "Destroys a controller with matching actions"
+    def controller(name, *actions)
+      controller_file_path = "app/controllers/#{name}_controller.rb"
+      remove_file(controller_file_path)
+      actions.each do |action_name|
+        view_folder = "app/views/#{name}"
+        remove_dir(view_folder)
+      end
+    end
+  end
+end

data/bin/jetski_cli_helpers/generate.rb

@@ -0,0 +1,31 @@
+require 'thor'
+module JetskiCLIHelpers
+  class Generate < Thor
+    include Thor::Actions
+    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"
+        end
+        gsub_file(controller_file_path, /ACTION_NAME/, action_content.strip)
+        path_to_view = "app/views/#{name}/#{action_name}.html"
+
+        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)
+        say "🌊 View your new page at http://localhost:8000/#{name}/#{action_name}"
+      end
+    end
+        
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', 'templates')
+    end
+  end
+end

data/bin/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 → bin/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/bin/templates/base/app/views/pages/home.html

@@ -0,0 +1,3 @@
+<div class="home-page"> 
+  <h1 class="header"> APP_NAME </h1>
+</div>

data/bin/templates/controllers/example_controller

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

data/bin/templates/views/example.html

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

data/lib/jetski/base_controller.rb

@@ -45,6 +45,11 @@ module Jetski
       render_template_file
     end
 
+    def redirect_to(url)
+      @performed_render = true
+      res.set_redirect(WEBrick::HTTPStatus::Found, url)
+    end
+
   private
     def render_template_file
       views_folder = File.join(Jetski.app_root, 'app/views')

data/lib/jetski/router.rb

@@ -63,9 +63,9 @@ module Jetski
     end
 
     def host_css
-      css_files = Dir[File.join(Jetski.app_root,'app/assets/stylesheets/*.css')]
+      css_files = Dir[File.join(Jetski.app_root,'app/assets/stylesheets/**/*.css')]
       css_files.each do |file_path|
-        filename = file_path.split("/").last
+        filename  = file_path.split("app/assets/stylesheets/").last
         asset_url = "/#{filename}"
         server.mount_proc asset_url do |req, res|
           res.body = File.read(File.join(Jetski.app_root,"app/assets/stylesheets/#{filename}"))
@@ -75,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.2"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -46,19 +46,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/jetski
+- bin/jetski_cli_helpers/destroy.rb
+- bin/jetski_cli_helpers/generate.rb
+- bin/templates/base/Gemfile
+- bin/templates/base/app/assets/images/jetski-logo.png
+- 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/base/start.rb
+- bin/templates/controllers/example_controller
+- bin/templates/views/example.html
 - 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
-- 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/start.rb
 homepage: https://rubygems.org/gems/jetski
 licenses:
 - MIT

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

@@ -1 +0,0 @@
-<h1> Welcome to your first jetski app! </h1>