jetski 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ba77a68ef3741faae8836d61c81ae6cf99744d009808b19f7725ca004dc5b8
-  data.tar.gz: 5d5c5eb62baea896554cf8417fcee072733e6320c43ecdd28ff329ba3a5e5355
+  metadata.gz: 4cb2dca5f55f7aeb66ed8c29bd5935c78caf8f9c37526f1bc4b98c5ddafec213
+  data.tar.gz: 36ec4d3decdd69d50f81de281209a46c9e340dd29d61fe812f62011d04ab4fc2
 SHA512:
-  metadata.gz: efa13a9f4e1a18de7d3e9464c38530c32a0510c6e4a673c59b7ab823ddc772b11fdd731cafadfd2cf36611db9fb2b1466f4212e787014e978acd37c8503d6050
-  data.tar.gz: 36011c0020d8d0a405fc2a3c895ed0d2271dc9fd65f1e54d42466b8930c2d828d6ff02ce4e8b1d218babaa5eace786c2abf2f4cb148ed674da3911aba39f3ea3
+  metadata.gz: 4541ab2646b4e5757568a8e025b4253d27ab392f4c0e3163cfe6010bece59b6ce2f7a595caae7d3e5d882a25a7a3cb0f045c7ffa87414bfd0197e90041977d67
+  data.tar.gz: ccb780abc4c5b1b58d4627321dd465e227fa4b9c6402de8ec509bafed6f1ee2b0c5f265f4d319e34f2562557cd37fd070d85813f49e832f53a43dd93d84d4efc

data/lib/jetski/splash_router.rb

@@ -10,7 +10,7 @@ module Jetski
 
     def parse_routes
       # Convert routes file into render of correct controller and action
-      routes_file = "config/routes.rb"
+      routes_file = File.join(Dir.pwd, "config/routes.rb")
 
       File.readlines(routes_file, chomp: true).each do |line|
         route_action = line.split(" ")[0]
@@ -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,7 +2,7 @@ require_relative './jetski/server'
 require_relative './jetski/splash_router'
 require_relative './jetski/waterfall_controller'
 require "webrick"
-Dir[File.join('./app', 'controllers', '*.rb')].each { |file| require file }
+require "pry"
 
 module Jetski
 end

metadata

@@ -1,14 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 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