jetski 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a5eb209993245418bdb609704ef729ad5172ed2ccf14f6709b95617133f0556
-  data.tar.gz: db7045ed55f40315c8101e13ecf1c4118fb615a494e186767182333d34f80b65
+  metadata.gz: 1fd192f0597ad9af2b70dcad5b6b8b7247e3bd7959c349519f2ac4cfd0e1b422
+  data.tar.gz: 8f5aeec13eeaf1468b6c7548d0f44de21ddf3cd30e58621d55655009e1872a39
 SHA512:
-  metadata.gz: 7734a200ff384cd6aa329704c7fab739a63aa1282f90d1fc27774c8a88dade6f3813cf0573f179d1d3dc2594ae654169ee095cb3e2f080e2a30943df36ea5b62
-  data.tar.gz: 7d7b428272c24007b3b9a36bff888f977559bd92dcd20d19eae37730193cfe72dce345d36c649e1d9f36fffbd623137685cbbcdad1f37a1fca3df6752304d665
+  metadata.gz: b8e32a10022af778ae0af47b043a1b5efba2129df3cb37ee473e45de900721f1116fb4549e47c54458d38046a1e32997ebb9fb30d33dc5b5d55e715abddd2ea9
+  data.tar.gz: 4c56bbc8de77e7bf2db76a602dfca4aaf71cf60850b8e5510a3f89fb4488eda2dcc72fd62c318232da92ec640d70f19f78401ffeda1363a36fe48dc3b6f081c3

data/lib/jetski/base_controller.rb

@@ -17,7 +17,7 @@ module Jetski
       page_with_layout = layout_content.gsub("YIELD_CONTENT", page_content)
       action_css_file = File.join(assets_folder, "#{controller_name}.css")
       css_content = if File.exist? action_css_file
-        "<link rel='stylesheet' href='/assets/#{controller_name}.css'>"
+        "<link rel='stylesheet' href='/#{controller_name}.css'>"
       else
         ''
       end

data/lib/jetski/router.rb

@@ -4,25 +4,17 @@ module Jetski
     def initialize(server)
       @server = server
     end
+
     def call
       parse_routes && host_assets
     end
 
     def parse_routes
       # Convert routes file into render of correct controller and action
-      routes_file = File.join(Jetski.app_root, "config/routes.rb")
+      routes_file = File.join(Jetski.app_root, "config/routes")
 
       File.readlines(routes_file, chomp: true).each do |line|
-        route_action = line.split(" ")[0]
-        controller_mapping = line.split(" ")[1].gsub(/\"/, "")
-        controller_name = controller_mapping.split("#")[0]
-        action_name = controller_mapping.split("#")[1]
-        
-        served_url = case route_action
-        when "root"
-          "/"
-        end
-        
+        route_action, served_url, controller_name, action_name = line.split(" ")
         server.mount_proc served_url do |req, res|
           constantized_controller = "#{controller_name.capitalize}Controller"
           path_to_defined_controller = File.join(Jetski.app_root, "app/controllers/#{controller_name}_controller.rb")
@@ -47,15 +39,32 @@ module Jetski
     end
 
     def host_assets
-      # Render css via url
+      # Render stylesheets css via url
+      host_css && host_images
+    end
+
+    def host_css
       css_files = Dir[File.join(Jetski.app_root,'app/assets/stylesheets/*.css')]
       css_files.each do |file_path|
         filename = file_path.split("/").last
-        asset_url = "/assets/#{filename}"
+        asset_url = "/#{filename}"
         server.mount_proc asset_url do |req, res|
           res.body = File.read(File.join(Jetski.app_root,"app/assets/stylesheets/#{filename}"))
         end
       end
     end
+
+    def host_images
+      image_files = Dir[
+        File.join(Jetski.app_root, 'app/assets/images/*.jpg')
+      ]
+      image_files.each do |file_path|
+        filename = file_path.split("/").last
+        asset_url = "/#{filename}"
+        server.mount_proc asset_url do |req, res|
+          res.body = File.read(File.join(Jetski.app_root,"app/assets/images/#{filename}"))
+        end
+      end
+    end
   end
 end

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

@@ -0,0 +1,5 @@
+* {
+  margin: 0px;
+  padding: 0px;
+  box-sizing: border-box;
+}

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

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title> Jetski app </title>
-  <link rel="stylesheet" href="/assets/application.css">
+  <link rel="stylesheet" href="/application.css">
   DYNAMIC_CSS
 </head>
 <body>

data/templates/base/config/routes

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -51,10 +51,11 @@ files:
 - lib/jetski/router.rb
 - lib/jetski/server.rb
 - templates/base/Gemfile
+- 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.rb
+- templates/base/config/routes
 - templates/base/start.rb
 homepage: https://rubygems.org/gems/jetski
 licenses:

data/templates/base/config/routes.rb

@@ -1 +0,0 @@
-root "pages#home"