jetski 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f1033d352171f7ccf893f673b76ed6f847c404b0aa460812fe60dc4ce0883a
-  data.tar.gz: 88b3a07a229f606c2599c6f728423a584b1c242441217f6c04d14c9b1dd8e873
+  metadata.gz: 95f5aadf74c7ce5bcf18c35cf8c2cf3767fa5751a4c3ff400be66f9e6ecaec65
+  data.tar.gz: b7f6820ba40818e1cfa11a8e3ff8df6c57a442663ba52450ed322af8474f845f
 SHA512:
-  metadata.gz: dcce62044cc495b3e39645033c102a5146d39d7a00ecd3dc151d75aed67eda8f0c757323bb426c743cd8873cfa9e33945fbf8881b579853e872a61af524a4473
-  data.tar.gz: 2edf2994dd5a44423f48d4a9d2059e6508d2a1f766d0310597ffb7e7e6d975df0fcf0ef66ae6c7168c68e78baa41fc9bd6cfa9d293ce662b4c699909b5039d2a
+  metadata.gz: 82d48043e89dcbb5c5eb1e9a07cb1a076362b7041b21323c31760b3e0fe47d8a350d2a190e9911ed07c5c3cb97402c24b7b68427a93e15649ee31fb240964e1e
+  data.tar.gz: 67b50c582a2e69fd043422d3ba1d9ad5b944f0f8461375a647e7be2e97f56b2ef892a347047019cd422aa21a67a20679364f28a982a2006ab57b728d7f08f006

data/bin/jetski

@@ -42,13 +42,13 @@ class JetskiCLI < Thor
   end
 
   desc "server", "starts the jetski app"
+  method_option :port, :aliases => "-p", :desc => "Configure which port number to run server on"
   def server
-    Jetski::Server.new.call
+    Jetski::Server.new(port: options[:port]).call
   end
 
   desc "console", "opens jetski console"
   def console
-    # TODO: Open console and include all controllers/models/etc
     Jetski::Autoloader.call
     Jetski::Autoloader.load_controllers
     Pry.start
@@ -64,7 +64,7 @@ class JetskiCLI < Thor
   subcommand "db", JetskiCLIHelpers::Database
   
   def self.source_root
-    File.join(File.dirname(__FILE__), 'templates')
+    File.join(File.dirname(__FILE__), '..', 'templates')
   end
 end
 

data/lib/jetski/base_controller.rb

@@ -13,7 +13,8 @@ module Jetski
     end
 
     # Method to render matching view with controller_name/action_name
-    
+    # TODO: Make render available in view as seperate method.
+
     def render(**args)
       @performed_render = true
       request_status = args[:status] || 200
@@ -29,8 +30,8 @@ module Jetski
         res.body = args[:json].to_json
         return
       end
-      
-      render_template_file
+
+      ViewRenderer.new(self).call
     end
 
     def redirect_to(url)
@@ -57,64 +58,5 @@ module Jetski
     def custom_request_method
       @request_method
     end
-
-  private
-    def render_template_file
-      view_render = page_with_layout.gsub("\n</head>", "#{content_for_head}\n</head>")
-      res.content_type = "text/html"
-      res.body = view_render
-    end
-
-    def 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
-    end
-
-    def content_for_head
-      _content_for_head = ''
-
-      application_css_file = File.join(assets_folder, "stylesheets", "application.css")
-      if File.exist? application_css_file
-        _content_for_head += "<link rel='stylesheet' href='/application.css'>\n"
-      end
-
-      controller_css_file = File.join(assets_folder, "stylesheets", "#{path_to_controller}.css")
-      if File.exist? controller_css_file
-        _content_for_head += "<link rel='stylesheet' href='/#{path_to_controller}.css'>\n"
-      end
-      
-      application_js_file = File.join(assets_folder, "javascript", "application.js")
-      if File.exist? application_js_file
-        _content_for_head += "<script src='application.js' defer></script>\n"
-      end
-
-      controller_js_file = File.join(assets_folder, "javascript", "#{path_to_controller}.js")
-      if File.exist? controller_js_file
-        _content_for_head += "<script src='/#{path_to_controller}.js' defer></script>\n"
-      end
-
-      # Add reactive form JS code
-      _content_for_head += "<script src='/reactive-form.js' defer></script>\n"
-
-      _content_for_head
-    end
-    
-    def views_folder 
-      File.join(Jetski.app_root, 'app/views')
-    end
-
-    def assets_folder
-      File.join(Jetski.app_root, 'app/assets')
-    end
-
-    def path_to_controller 
-      controller_path[1..-1]
-    end
-
-    def process_erb(content)
-      template = ERB.new(content)
-      template.result(binding)
-    end
   end
 end

data/lib/jetski/database/base.rb

@@ -16,6 +16,9 @@ module Jetski
 
         _gen_sql = ""
         _gen_sql += "create table #{pluralized_table_name} (\n"
+        
+        # Default fields on all models
+        
         _gen_sql += "  created_at datetime,\n"
         _gen_sql += "  updated_at datetime,\n"
         _gen_sql += "  id integer,\n"

data/lib/jetski/helpers/delegatable.rb

@@ -0,0 +1,15 @@
+module Jetski
+  module Helpers
+    module Delegatable
+      # delegate(:method, to: :class)
+      # Allows you to delegate a method to another class
+      def delegate(*delegatables, to:)
+        delegatables.each do |method_name|
+          define_method method_name do
+            public_send(to).public_send(method_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jetski/helpers/view_helpers.rb

@@ -0,0 +1,9 @@
+module Jetski
+  module Helpers
+    module ViewHelpers
+      def render(path_to_file)
+        File.join(Jetski.app_root, path_to_file)
+      end
+    end
+  end
+end

data/lib/jetski/model.rb

@@ -1,21 +1,64 @@
 module Jetski
   class Model
     extend Jetski::Database::Base
+
+    def initialize(**args)
+      @virtual_attributes = {}
+      
+      args.each do |k, v|
+        @virtual_attributes[k] = v
+      end
+      
+      @virtual_attributes["id"]         ||= ""
+      @virtual_attributes["created_at"] ||= ""
+      @virtual_attributes["updated_at"] ||= ""
+
+      @virtual_attributes.each do |k, v|
+        self.class.class_eval do 
+          define_method(k) { v }
+        end
+      end
+
+      self.class.class_eval do 
+        define_method(:inspect) do
+          post_obj_id = object_id
+          inspect_str = "#<Post:#{post_obj_id}"
+          @virtual_attributes.each do |k, v|
+            inspect_str += " #{k}=\"#{v}\""
+          end
+          inspect_str += ">"
+          inspect_str
+        end
+      end
+    end
+
     class << self
       def create(**args)
         return puts "#{table_name.capitalize}.create was called with no args" if args.size == 0
         data_values = args.map { |k,v| v }
         key_names = args.map { |k, v| k }
         
+        # Set default values on create
+
         key_names.append "created_at"
         data_values.append Time.now.to_s
 
+        key_names.append "id"
+        data_values.append(count + 1)
+
         sql_command = <<~SQL
           INSERT INTO #{pluralized_table_name} (#{key_names.join(", ")}) 
           VALUES (#{(1..key_names.size).map { |n| "?" }.join(", ")})
         SQL
 
         db.execute(sql_command, data_values)
+
+        post_attributes = {}
+        key_names.each.with_index do |k, i|
+          post_attributes[k] = data_values[i]
+        end
+
+        new(**post_attributes)
       end
 
       def all
@@ -67,7 +110,7 @@ module Jetski
         columns.each.with_index do |col, idx|
           row_obj[col] = row[idx]
         end
-        OpenStruct.new(row_obj)
+        new(**row_obj)
       end
     end
   end

data/lib/jetski/router.rb

@@ -41,8 +41,6 @@ module Jetski
             controller.action_name = action_name
             controller.controller_name = controller_name
             controller.controller_path = controller_path
-            # TODO: Check how body is being passed in and parse it correctly.
-            # Currently is breaking with regular html form submissions
             if req.body
               controller.params = parse_body(req.body, req.content_type)
             end

data/lib/jetski/server.rb

@@ -1,10 +1,13 @@
 module Jetski
   class Server
-    def initialize
+    attr_reader :port
+    
+    def initialize(**args)
+      @port = args[:port] || 8000
     end
 
     def call
-      server = WEBrick::HTTPServer.new Port: 8000
+      server = WEBrick::HTTPServer.new Port: port
 
       Jetski::Autoloader.call
       

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.4.1"
+  VERSION = "0.4.4"
 end

data/lib/jetski/view_renderer.rb

@@ -0,0 +1,85 @@
+module Jetski
+  class ViewRenderer
+    extend Jetski::Helpers::Delegatable
+    include Jetski::Helpers::ViewHelpers
+    
+    attr_reader :errors, :controller
+    delegate :res, :action_name, :controller_path, to: :controller
+    
+    def initialize(controller)
+      @controller = controller
+      @errors = []
+    end
+
+    def call
+      res.content_type = "text/html"
+      view_render = perform_view_render&.gsub("\n</head>", "#{content_for_head}\n</head>")
+      return error_screen if errors.any?
+      res.body = view_render
+    end
+  private
+    def error_screen
+      # TODO: Make better error screen
+      res.body = "<h1> Errors: #{errors.map {|e| e }.join(", ")} </h1>"
+    end
+
+    def perform_view_render
+      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
+    end
+
+    def process_erb(content)
+      template = ERB.new(content)
+      # Perserve instance variables to view render
+      # @posts from controller to posts/index.html.erb
+      controller.instance_eval do
+        template.result(binding)
+      end
+    rescue => e
+      @errors << e
+      nil
+    end
+
+    def content_for_head
+      _content_for_head = ''
+
+      application_css_file = File.join(assets_folder, "stylesheets", "application.css")
+      if File.exist? application_css_file
+        _content_for_head += "<link rel='stylesheet' href='/application.css'>\n"
+      end
+
+      controller_css_file = File.join(assets_folder, "stylesheets", "#{path_to_controller}.css")
+      if File.exist? controller_css_file
+        _content_for_head += "<link rel='stylesheet' href='/#{path_to_controller}.css'>\n"
+      end
+      
+      application_js_file = File.join(assets_folder, "javascript", "application.js")
+      if File.exist? application_js_file
+        _content_for_head += "<script src='application.js' defer></script>\n"
+      end
+
+      controller_js_file = File.join(assets_folder, "javascript", "#{path_to_controller}.js")
+      if File.exist? controller_js_file
+        _content_for_head += "<script src='/#{path_to_controller}.js' defer></script>\n"
+      end
+
+      # Add reactive form JS code
+      _content_for_head += "<script src='/reactive-form.js' defer></script>\n"
+
+      _content_for_head
+    end
+    
+    def views_folder 
+      File.join(Jetski.app_root, 'app/views')
+    end
+
+    def assets_folder
+      File.join(Jetski.app_root, 'app/assets')
+    end
+
+    def path_to_controller 
+      controller_path[1..-1]
+    end
+  end
+end

data/lib/jetski.rb

@@ -1,6 +1,5 @@
 require "webrick"
 require "json"
-require "json"
 require "ostruct"
 require "erb"
 require "rack"
@@ -15,6 +14,9 @@ require_relative './jetski/autoloader'
 require_relative './jetski/server'
 require_relative './jetski/database/base'
 require_relative './jetski/model'
+require_relative './jetski/helpers/delegatable'
+require_relative './jetski/helpers/view_helpers'
+require_relative './jetski/view_renderer'
 
 module Jetski
   extend self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -120,26 +120,29 @@ files:
 - bin/jetski_cli_helpers/destroy.rb
 - bin/jetski_cli_helpers/generate.rb
 - bin/jetski_cli_helpers/shared_methods.rb
-- bin/templates/base/Gemfile
-- bin/templates/base/app/assets/images/jetski-logo.png
-- bin/templates/base/app/assets/javascript/application.js
-- 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.erb
-- bin/templates/base/app/views/pages/home.html.erb
 - lib/jetski.rb
 - lib/jetski/autoloader.rb
 - lib/jetski/base_controller.rb
 - lib/jetski/database/base.rb
 - lib/jetski/frontend/reactive_form.js
 - lib/jetski/frontend/reactive_form.rb
+- lib/jetski/helpers/delegatable.rb
+- lib/jetski/helpers/view_helpers.rb
 - lib/jetski/model.rb
 - lib/jetski/router.rb
 - lib/jetski/router/parser.rb
 - lib/jetski/router/shared_methods.rb
 - lib/jetski/server.rb
 - lib/jetski/version.rb
+- lib/jetski/view_renderer.rb
+- templates/base/Gemfile
+- templates/base/app/assets/images/jetski-logo.png
+- templates/base/app/assets/javascript/application.js
+- templates/base/app/assets/stylesheets/application.css
+- templates/base/app/assets/stylesheets/pages.css
+- templates/base/app/controllers/pages_controller.rb
+- templates/base/app/views/layouts/application.html.erb
+- templates/base/app/views/pages/home.html.erb
 homepage: https://rubygems.org/gems/jetski
 licenses:
 - MIT