jetski 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52524e0b705d5bb94407dda01e0af30c309213798ff46047ac5f2aa4224ebe44
-  data.tar.gz: 8ddf98dc0ec78eda05b6bdf17dbdd42f68fbd1045e5fb3dcb0a4c7c901f1eaac
+  metadata.gz: 831978e080c29ad5bfdf13d68c4eb578c008eb84e99316f3dd8209988399b582
+  data.tar.gz: 698027e9c51838c642f02871f77a09edcdabcb997e2e0688bc9a7abc9a8197aa
 SHA512:
-  metadata.gz: c4c1f737cc101e4b5aee3ffd4b9560fe9e1a80f4e5ac351cf167e6bae37ffe76283689df8086bfa88f929aeed8a671849546c41f174c4fc3f963e7dca28a4b29
-  data.tar.gz: 32665c9eef582c11d7d3c7958976b71009234780fdc37ee97502caf4d6d2e4f426103b1e24ff14212367621252e34bf655b2c7abe90146bc65954ba7f95bb1a4
+  metadata.gz: 83f11f888980010118f35a9717d666a3e85739ff425b0a3b76620d093a2a28a773b73edd04136de07462d678304362af5120365f751aa220b66e2d941a7ada89
+  data.tar.gz: 963765aee88f67fd4516853332cee01ef3e78558e99db439a31261078eb43f31b3ac8e5f61b6e65bfa50c393c296781fa6b2effdb035a9a6e019814af4755f78

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

@@ -16,38 +16,69 @@ module Jetski
       File.readlines(routes_file, chomp: true).each do |line|
         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")
-          require_relative path_to_defined_controller
-          found_error = false
-          begin
-            controller_class = Object.const_get(constantized_controller)
-          rescue NameError
-            found_error = true
-            # TODO: Move this into a method that can render a styled error to page.  
-            res.body = "#{constantized_controller} is not defined. Please create a file app/controllers/#{controller_name}.rb"
+          errors = []
+          if (route_action.upcase != req.request_method)
+            errors << "Wrong request was performed"
           end
-          if found_error == false # Continue unless error found
+          # TODO: Fix the fact that we are always setting res.body to something here. 
+          # Theres no way to return. We need to organize into case statement or if/else type
+          
+          if errors.empty?
+            constantized_controller = "#{controller_name.capitalize}Controller"
+            path_to_defined_controller = File.join(Jetski.app_root, "app/controllers/#{controller_name}_controller.rb")
+            require_relative path_to_defined_controller
+            begin
+              controller_class = Object.const_get(constantized_controller)
+            rescue NameError
+              errors << "#{constantized_controller} is not defined. Please create a file app/controllers/#{controller_name}.rb"
+            end
+          end
+
+          if errors.empty? # Continue unless error found
             controller = controller_class.new(res)
             controller.action_name = action_name
             controller.controller_name = controller_name
             controller.send(action_name)
-            controller.render
+            # Render matching HTML template for GET requests only
+            controller.render if route_action.upcase == "GET"
+          end
+
+          if errors.any?
+            res.body = errors.join(", ")
           end
         end
       end
     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
+      # TODO: Expand this to support more types of 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/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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Indigo Tech Tutorials