jetski 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd192f0597ad9af2b70dcad5b6b8b7247e3bd7959c349519f2ac4cfd0e1b422
-  data.tar.gz: 8f5aeec13eeaf1468b6c7548d0f44de21ddf3cd30e58621d55655009e1872a39
+  metadata.gz: 831978e080c29ad5bfdf13d68c4eb578c008eb84e99316f3dd8209988399b582
+  data.tar.gz: 698027e9c51838c642f02871f77a09edcdabcb997e2e0688bc9a7abc9a8197aa
 SHA512:
-  metadata.gz: b8e32a10022af778ae0af47b043a1b5efba2129df3cb37ee473e45de900721f1116fb4549e47c54458d38046a1e32997ebb9fb30d33dc5b5d55e715abddd2ea9
-  data.tar.gz: 4c56bbc8de77e7bf2db76a602dfca4aaf71cf60850b8e5510a3f89fb4488eda2dcc72fd62c318232da92ec640d70f19f78401ffeda1363a36fe48dc3b6f081c3
+  metadata.gz: 83f11f888980010118f35a9717d666a3e85739ff425b0a3b76620d093a2a28a773b73edd04136de07462d678304362af5120365f751aa220b66e2d941a7ada89
+  data.tar.gz: 963765aee88f67fd4516853332cee01ef3e78558e99db439a31261078eb43f31b3ac8e5f61b6e65bfa50c393c296781fa6b2effdb035a9a6e019814af4755f78

data/lib/jetski/router.rb

@@ -16,23 +16,35 @@ 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
@@ -55,6 +67,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')
       ]

metadata

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