jetski 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e52910ed0f138a7ee15543b4cdf1c0ed026a48dc51dec7caa99516ea1956638
-  data.tar.gz: 7c5ac09f7f96e8da04186bc56d0cfc37d0572d91e75b9b8faa69e3fc063e2173
+  metadata.gz: 624099d3ddaa989e241925d3d2b60850133beab8abf9b7eb4cd902fcbaebc3b9
+  data.tar.gz: d2b4b3b24794259ae69ab2d75d34207e1bf7dbcc3749c3f15b7baf5a0ea9fe30
 SHA512:
-  metadata.gz: fb905bab091e628e326bf7e98df3e1f5f1f4196503726f11fd8ee6ea40b19d9f30848f6d1a72315f0ceaf2f8d503fa6cd6523081e0db77b32fbf029e8ffc46e6
-  data.tar.gz: 3e46ae533b25bd01cd8fc7f275d356014d2e0b286b601f87119b952d9d31ae7e894e60179060b464103e47114ee89538c5a890f91a4adfc8b15c6786cdf60173
+  metadata.gz: 44768e82235e7fb494f7e8bd48456caf2322e6bf37f2d43bdad60cb8f9c44f89b7ad0e6d0bcfb3f9a0d7e38d6be224638e1c2bf5a6d731039adfbef4d25e8861
+  data.tar.gz: 9863dd9760385ef6488e69db0b0ff86d9990c1599ce63cef81bc70236b5c7dd080e3af7a35c0edcb7abb49fd36f5f3826716208523928d7ad9797e273c860d2f

data/lib/jetski/splash_router.rb

@@ -24,12 +24,24 @@ module Jetski
         end
         
         server.mount_proc served_url do |req, res|
-          controller_class = Object.const_get("#{controller_name.capitalize}Controller")
-          controller = controller_class.new(res)
-          controller.action_name = action_name
-          controller.controller_name = controller_name
-          controller.send(action_name)
-          controller.render
+          constantized_controller = "#{controller_name.capitalize}Controller"
+          path_to_defined_controller = File.join(Dir.pwd, "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"
+          end
+          if found_error == false # 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
+          end
         end
       end
     end

data/lib/jetski/waterfall_controller.rb

@@ -6,10 +6,13 @@ module Jetski
     def initialize(res)
       @res = res
     end
+
+    # Method to render matching view with controller_name/action_name
+    
     def render
-      views_folder = File.join(__dir__, '../../','app', 'views')
-      assets_folder = File.join(__dir__, '../../','app', 'assets', 'stylesheets')
-      layout_content = File.read(File.join(views_folder, "layouts", "application.html"))
+      views_folder = File.join(Dir.pwd, 'app/views')
+      assets_folder = File.join(Dir.pwd, 'app/assets/stylesheets')
+      layout_content = File.read(File.join(views_folder, "layouts/application.html"))
       page_content = File.read(File.join(views_folder, controller_name, "#{action_name}.html"))
       page_with_layout = layout_content.gsub("YIELD_CONTENT", page_content)
       action_css_file = File.join(assets_folder, "#{controller_name}.css")

data/lib/jetski.rb

@@ -2,6 +2,7 @@ require_relative './jetski/server'
 require_relative './jetski/splash_router'
 require_relative './jetski/waterfall_controller'
 require "webrick"
+require "pry"
 
 module Jetski
 end

metadata

@@ -1,14 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Indigo Tech Tutorials
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.2
 description: 'Would you rather ride on a train or a jetski? that is the question you
   might use when comparing using our framework or the popular Ruby on Rails framework. '
 email: indigo@tech.tut