jetski 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd192f0597ad9af2b70dcad5b6b8b7247e3bd7959c349519f2ac4cfd0e1b422
-  data.tar.gz: 8f5aeec13eeaf1468b6c7548d0f44de21ddf3cd30e58621d55655009e1872a39
+  metadata.gz: 357bfb82fcc61cf00861ecc1eae23837e62650788714473c98efa2423a982eae
+  data.tar.gz: 5548ed79761c0e03d05d2b34173d8c47377a44f6062429e281182a62db885b00
 SHA512:
-  metadata.gz: b8e32a10022af778ae0af47b043a1b5efba2129df3cb37ee473e45de900721f1116fb4549e47c54458d38046a1e32997ebb9fb30d33dc5b5d55e715abddd2ea9
-  data.tar.gz: 4c56bbc8de77e7bf2db76a602dfca4aaf71cf60850b8e5510a3f89fb4488eda2dcc72fd62c318232da92ec640d70f19f78401ffeda1363a36fe48dc3b6f081c3
+  metadata.gz: 8fd0699bbbf6e90b28644e3c2511f279644ad928a30e023a12b87eb1360d795f7af9b5bc9d8876614b8f02eab1eacfeaca2da54542e83df84ee093b03ed7818d
+  data.tar.gz: 3c455bda8f1ac6074b10a4e6f7801be94dc7065f492bd52e4cde3ac2331d5dfc4abb1828688e2f8fa91f3ad3c429d3f7abd92ddc81b9c4ddcac6db1c824527bd

data/lib/jetski/base_controller.rb

@@ -9,7 +9,23 @@ module Jetski
 
     # Method to render matching view with controller_name/action_name
     
-    def render
+    def render(**args)
+      if args[:text]
+        res.content_type = "text/plain"
+        res.body = "#{args[:text]}\n"
+        return
+      end
+
+      if args[:json]
+        res.content_type = "application/json"
+        res.body = args[:json].to_json
+        return
+      end
+      render_template_file
+    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"))
@@ -22,6 +38,7 @@ module Jetski
         ''
       end
       page_with_css = page_with_layout.gsub("DYNAMIC_CSS", css_content)
+      res.content_type = "text/html"
       res.body = page_with_css
     end
   end

data/lib/jetski/router.rb

@@ -16,24 +16,40 @@ 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?
+            controller_name_formatted = controller_name.split("/").map(&:capitalize).join("::")
+            constantized_controller = "#{controller_name_formatted}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"
+            # TODO: Need to setup redirects for other request types. POST/PUT/DELETE
           end
+
+          if errors.any?
+            res.body = errors.join(", ")
+          end
+
+          # TODO: Set response content/type and status when rendering/redirecting or head
         end
       end
     end
@@ -55,6 +71,8 @@ module Jetski
     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')
       ]

data/lib/jetski.rb

@@ -2,6 +2,7 @@ require_relative './jetski/server'
 require_relative './jetski/router'
 require_relative './jetski/base_controller'
 require "webrick"
+require "json"
 
 module Jetski
   # Debug stage add constants here for debugging.

metadata

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