RubyGems - jetski - Versions diffs - 0.3.6 → 0.3.8 - Mend

jetski 0.3.6 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +4 -4
data/bin/jetski +9 -2
data/bin/jetski_cli_helpers/generate.rb +2 -2
data/bin/templates/base/app/views/layouts/{application.html → application.html.erb} +1 -1
data/bin/templates/views/{example.html → example.html.erb} +1 -1
data/lib/jetski/base_controller.rb +11 -4
data/lib/jetski/router.rb +1 -3
data/lib/jetski/version.rb +1 -1
data/lib/jetski.rb +3 -7
metadata +33 -6
data/bin/templates/base/start.rb +0 -6
/data/bin/templates/base/app/views/pages/{home.html → home.html.erb} +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce5f1070f7bbe93cbf9f3ef5a097c0f1c303b4351afec67599af2af02cfd5ab3
-  data.tar.gz: c9c224fdd2c4a26d63a7d9acb8fa4b748289dafef9807a3599fb2acf24267488
+  metadata.gz: 4b9af95cf6ae12478fd887ccfa44148279a237b622b893013d0b93e221f3be73
+  data.tar.gz: 7f615515947fe954ca0069361cf5eaee12920552028d9e24a3275de2e18713f1
 SHA512:
-  metadata.gz: c0f3d084fd9585089155e4f6226bad830a3b3addb9a1cbb0e1a7ea33e85411c72f789431ca8739cb0f65e3d5031546f74680337020f2380e0d5b7c8cb8d10699
-  data.tar.gz: 47a9a950d449f8ab4255444dc67c7fe7d93c7d87a91445526832f0a956fa5604e9f921d9de599e0545f3e8cfea94d8ed03894fda0cc1ac64f8cfa73dc575a4ee
+  metadata.gz: 96d3e3bd8b93a7fa3f52195d0ea5bf6c34435f815e56f0da5e285285cba321de6b8645b3d923740aacd5e42e957158d37ba409bc6b3d9fc770da495d65e6e652
+  data.tar.gz: de08a81e274f83226cdfb0979656739f6886f04878d87ec5d24e7837d3ef78b6b534569b2dcbee0f826b10de9d994c031c91eb87f86d239128707fbf4d61602e

data/bin/jetski CHANGED Viewed

@@ -5,6 +5,7 @@ require 'jetski'
 require 'thor'
 require_relative './jetski_cli_helpers/generate.rb'
 require_relative './jetski_cli_helpers/destroy.rb'
+require 'bundler/setup'
 class JetskiCLI < Thor
   include Thor::Actions
@@ -14,8 +15,8 @@ class JetskiCLI < Thor
     FileUtils.mkdir_p(name)
     say "Creating #{name} app with Jetski!"
     directory "base", "#{name}"
-    gsub_file "#{name}/app/views/layouts/application.html", /APP_NAME/, name.capitalize
-    gsub_file "#{name}/app/views/pages/home.html", /APP_NAME/, name.capitalize
+    gsub_file "#{name}/app/views/layouts/application.html.erb", /APP_NAME/, name.capitalize
+    gsub_file "#{name}/app/views/pages/home.html.erb", /APP_NAME/, name.capitalize
     run "cd #{name} && bundle install"
     say "🌊 Your app #{name} has been generated!"
   end
@@ -34,6 +35,12 @@ class JetskiCLI < Thor
     end
   end
+  desc "server", "starts the jetski app"
+  def server
+    ENV['JETSKI_PROJECT_PATH'] = __dir__
+    Jetski::Server.new.call
+  end
   desc "generate", "generates resources in your jetski app"
   subcommand "generate", JetskiCLIHelpers::Generate

data/bin/jetski_cli_helpers/generate.rb CHANGED Viewed

@@ -13,10 +13,10 @@ module JetskiCLIHelpers
           action_content += "\nACTION_NAME"
         end
         gsub_file(controller_file_path, /ACTION_NAME/, action_content.strip)
-        path_to_view = "app/views/#{name}/#{action_name}.html"
+        path_to_view = "app/views/#{name}/#{action_name}.html.erb"
         empty_directory("app/views/#{name}")
-        copy_file("views/example.html", path_to_view)
+        copy_file("views/example.html.erb", path_to_view)
         gsub_file(path_to_view, /CONTROLLER_NAME/, name)
         gsub_file(path_to_view, /ACTION_NAME/, action_name)
         gsub_file(path_to_view, /PATH_TO_VIEW/, path_to_view)

data/bin/templates/base/app/views/layouts/{application.html → application.html.erb} RENAMED Viewed

@@ -9,6 +9,6 @@
   DYNAMIC_CSS
 </head>
 <body>
-  YIELD_CONTENT
+  <%= yield %>
 </body>
 </html>

data/bin/templates/views/{example.html → example.html.erb} RENAMED Viewed

@@ -1,2 +1,2 @@
 <h1> CONTROLLER_NAME#ACTION_NAME </h1>
-<p> edit the content of this page at app/views/PATH_TO_VIEW/ACTION_NAME.html </p>
+<p> edit the content of this page at app/views/PATH_TO_VIEW/ACTION_NAME.html.erb </p>

data/lib/jetski/base_controller.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # This is the base controller of the library
 module Jetski
   class BaseController
-    attr_accessor :action_name, :controller_name, :controller_path
+    attr_accessor :action_name, :controller_name, :controller_path, :params
     attr_reader :res
     attr_reader :performed_render
@@ -52,12 +52,14 @@ module Jetski
   private
     def render_template_file
+      require 'erb'
       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"))
       path_to_controller = controller_path[1..-1]
-      page_content = File.read(File.join(views_folder, path_to_controller, "#{action_name}.html"))
-      page_with_layout = layout_content.gsub("YIELD_CONTENT", page_content)
+      page_with_layout = process_erb(File.read(File.join(views_folder, "layouts/application.html.erb"))) do
+        process_erb(File.read(File.join(views_folder, path_to_controller, "#{action_name}.html.erb")))
+      end
       action_css_file = File.join(assets_folder, "#{path_to_controller}.css")
       css_content = if File.exist? action_css_file
         "<link rel='stylesheet' href='/#{path_to_controller}.css'>"
@@ -68,5 +70,10 @@ module Jetski
       res.content_type = "text/html"
       res.body = page_with_css
     end
+    def process_erb(content)
+      template = ERB.new(content)
+      template.result(binding)
+    end
   end
 end

data/lib/jetski/router.rb CHANGED Viewed

@@ -41,18 +41,16 @@ module Jetski
             controller.action_name = action_name
             controller.controller_name = controller_name
             controller.controller_path = controller_path
+            controller.params = OpenStruct.new(JSON.parse(req.body)) if req.body
             controller.send(action_name)
             if !controller.performed_render && (request_method.upcase == "GET")
               controller.render
             end
-            # 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

data/lib/jetski/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.3.6"
+  VERSION = "0.3.8"
 end

data/lib/jetski.rb CHANGED Viewed

@@ -6,17 +6,13 @@ require_relative './jetski/router'
 require "webrick"
 require "json"
 require "json"
+require "ostruct"
+require "erb"
 module Jetski
   # Debug stage add constants here for debugging.
   extend self
   def app_root
-    if ENV['JETSKI_PROJECT_PATH']
-      ENV['JETSKI_PROJECT_PATH']
-    elsif ENV['USE_DIR']
-      __dir__
-    else
-      Dir.pwd
-    end
+    Dir.pwd
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -30,13 +30,41 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.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
@@ -53,11 +81,10 @@ files:
 - bin/templates/base/app/assets/stylesheets/application.css
 - bin/templates/base/app/assets/stylesheets/pages.css
 - bin/templates/base/app/controllers/pages_controller.rb
-- bin/templates/base/app/views/layouts/application.html
-- bin/templates/base/app/views/pages/home.html
-- bin/templates/base/start.rb
+- bin/templates/base/app/views/layouts/application.html.erb
+- bin/templates/base/app/views/pages/home.html.erb
 - bin/templates/controllers/example_controller
-- bin/templates/views/example.html
+- bin/templates/views/example.html.erb
 - lib/jetski.rb
 - lib/jetski/base_controller.rb
 - lib/jetski/router.rb

data/bin/templates/base/start.rb DELETED Viewed

@@ -1,6 +0,0 @@
-require 'bundler/setup'
-require "jetski"
-ENV['JETSKI_PROJECT_PATH'] = __dir__
-Jetski::Server.new.call

/data/bin/templates/base/app/views/pages/{home.html → home.html.erb} RENAMED Viewed

File without changes