jetski 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419176ab6c0bac6515d1f7f6136cd0ff800bad44fa34e41d882ef2bb6c59f46c
-  data.tar.gz: a349cc717aab7101fea571ad0a12eeadc618a5136103ef388875b4ef2ca806f4
+  metadata.gz: 718959913722c396f5ada24d19c6997aee009d7a0aca229156a877def8dba9e4
+  data.tar.gz: 8ad9d4179950762af88e4f4df0a02ff4d8510050a5f7417af440b04f758a78dd
 SHA512:
-  metadata.gz: eb5520b371047a616aecdd8b341ee17a4b1a7ac4349164639ce8024f7a485b79a51c75035a703ccba0e036c957ad16bdf2f8a12d13eea2e9366f9473c9674bfa
-  data.tar.gz: 39643ec6fe8aa41363df7d1c3e627cc7aeb3e62a3ed2cbf3ba8d3ff94f19ed149d9d7ba8e5dedea245a2ad91b25fdce4d0a0e5c25dac73d99c86c48d35372fd1
+  metadata.gz: c1c685e092ab8da1cf08805874d24f3e2319982f11c1a17ce14e92f0342b8ef5622a24cdd4db89e325c36e0a8c842e547057468b592d9028fdbff1fff84963bf
+  data.tar.gz: 847df89c32ce237683bd953da15d589236fe7884707e088e09d0512cc7554a3df09b05a493dd537586e11ac7e094ffc1142e443ea5649d5f1311aea329a669a4

data/lib/jetski/autoloader.rb

@@ -6,6 +6,16 @@ module Jetski
     def call
       model_file_paths.each do |path_to_model|
         require_relative path_to_model
+        # Call method to define model attributes after loading
+        model_name = path_to_model.split("app/models/")[-1]
+          .gsub(".rb", "")
+          .split("/")
+          .map(&:capitalize)
+          .join("::")
+        # posts/comment
+        # Post/comment
+        model_class = Object.const_get(model_name)
+        model_class.define_attribute_methods
       end
     end
 

data/lib/jetski/base_controller.rb

@@ -3,11 +3,11 @@ module Jetski
   class BaseController
     RESERVED_INSTANCE_VARIABLES = [
         :@res, :@performed_render, :@action_name, 
-        :@controller_name, :@controller_path, :@cookies, :@root,
-        :@request_method, :@path
+        :@controller_name, :@controller_path, :@cookies
     ]
 
     include ReactiveForm
+    extend Jetski::Helpers::RouteHelpers
     attr_accessor :action_name, :controller_name, :controller_path, 
       :params, :cookies
     attr_reader :res, :performed_render
@@ -52,17 +52,5 @@ module Jetski
     def get_cookie(name)
       cookies&.find { |c| c.name == name.to_s }&.value
     end
-
-    def is_root?
-      @root == true
-    end
-
-    def custom_path
-      @path
-    end
-    
-    def custom_request_method
-      @request_method
-    end
   end
 end

data/lib/jetski/database/base.rb

@@ -18,7 +18,6 @@ module Jetski
         _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/route_helpers.rb

@@ -0,0 +1,18 @@
+# This is responsible for methods for routing in base_controller like the route class method
+
+module Jetski
+  module Helpers
+    module RouteHelpers
+      def route(method_name, root: false, path: nil, request_method: nil)
+        # TODO: write code to set route
+        @custom_route_opts ||= {}
+        @custom_route_opts[method_name] = {
+          method_name: method_name,
+          root: root,
+          path: path,
+          request_method: request_method,
+        }
+      end
+    end
+  end
+end

data/lib/jetski/helpers/view_helpers.rb

@@ -2,9 +2,50 @@ module Jetski
   module Helpers
     module ViewHelpers
       # Expecting a relative path.
-      def render(partial_path)
-        path_to_file = File.join(Jetski.app_root, 'app/views', path_to_controller, "_#{partial_path}.html.erb")
-        File.read(path_to_file)
+      def render(partial_path, **locals)
+        path_to_file = File.join(Jetski.app_root, 'app/views', 
+          path_to_controller, "_#{partial_path}.html.erb")
+        content = File.read(path_to_file)
+        bind = binding
+        locals.each do |k, v| 
+          bind.local_variable_set k, v
+        end
+        template = ERB.new(content)
+        template.result(bind)
+      end
+
+      # link_to "New post", "/posts/new"
+      def link_to(link_text, url, **html_opts)
+        # TODO: Allow passing block to link_to
+        "<a href='#{url}' #{format_html_options(**html_opts)}>#{link_text}</a>"
+      end
+
+      # button_to("Click me", class: "cool-btn")
+      def button_to(button_text, **html_opts)
+        "<button #{format_html_options(**html_opts)}>#{button_text}</button>"
+      end
+
+      def input_tag(**html_opts)
+        "<input #{format_html_options(**html_opts)}>"
+      end
+
+      def textarea_tag(**html_opts)
+        "<textarea #{format_html_options(**html_opts.except(:value))}>#{html_opts[:value]}</textarea>"
+      end
+
+      def image_tag(image_path, **html_opts)
+        "<img src='#{image_path}' #{format_html_options(**html_opts)}></img>"
+      end
+
+      def favicon_tag(url, **html_opts)
+        "<link rel='icon' type='image/x-icon' #{format_html_options(**html_opts)} href='#{url}'>"
+      end
+
+      def format_html_options(**html_opts)
+        html_opts.map do |k, v|
+          formatted_key = k.to_s.gsub("_", "-")
+          "#{formatted_key}='#{v}'"
+        end.join(" ")
       end
     end
   end

data/lib/jetski/model.rb

@@ -3,33 +3,18 @@ module Jetski
     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
+      @virtual_attributes = args
+    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
+    def inspect
+      post_obj_id = object_id
+      inspect_str = "#<#{self.class.to_s}:#{post_obj_id}"
+      self.class.attributes.each do |attribute_name|
+        attribute_value = @virtual_attributes[attribute_name]
+        inspect_str += " #{attribute_name}=\"#{attribute_value}\""
       end
+      inspect_str += ">"
+      inspect_str
     end
 
     def destroy!
@@ -52,8 +37,10 @@ module Jetski
         key_names.append "created_at"
         data_values.append Time.now.to_s
 
+        current_post_count = (count || 0)
+        post_id = current_post_count + 1
         key_names.append "id"
-        data_values.append(count + 1)
+        data_values.append(post_id)
 
         sql_command = <<~SQL
           INSERT INTO #{pluralized_table_name} (#{key_names.join(", ")}) 
@@ -70,6 +57,19 @@ module Jetski
         new(**post_attributes)
       end
 
+      # Careful methods / delete all records from table
+      def destroy_all! 
+        db.execute("DELETE from #{pluralized_table_name}")
+      end
+
+      def define_attribute_methods
+        attributes.each do |attribute|
+          define_method attribute do
+            @virtual_attributes[attribute]
+          end
+        end
+      end
+
       def all
         columns, *rows = db.execute2( "select * from #{pluralized_table_name}" )
         _all = []
@@ -88,6 +88,7 @@ module Jetski
       end
 
       def attributes
+        # TODO: Find a more performant way to get the column names from a table
         columns, *rows = db.execute2( "select * from #{pluralized_table_name}" )
         columns
       end
@@ -111,7 +112,6 @@ module Jetski
           table_name + "s"
         end
       end
-
     private
       def format_model_obj(row, columns = nil)
         return unless row

data/lib/jetski/router/parser.rb

@@ -24,18 +24,34 @@ module Jetski
             controller_name: controller_name,
             controller_path: controller_path,
           }
+          route_opts_hash = controller_class.instance_variable_get(:@custom_route_opts)
           action_names.each do |action_name|
             action_name = action_name.to_s
+            route_opts = route_opts_hash.fetch(action_name.to_sym, {})
+            custom_request_method = route_opts.fetch(:request_method, nil)
+            is_root = route_opts.fetch(:root, nil)
+            custom_path = route_opts.fetch(:path, nil)
+            
+            url_to_use = proc do |url|
+              if is_root
+                "/"
+              elsif custom_path
+                custom_path
+              else
+                url
+              end
+            end
+
             case action_name
             when "new"
               auto_found_routes << base_opts.merge({
-                url: controller_path + "/new",
+                url: url_to_use.call(controller_path + "/new"),
                 method: "GET",
                 action_name: action_name,
               })
             when "create"
               auto_found_routes << base_opts.merge({
-                url: controller_path,
+                url: url_to_use.call(controller_path),
                 method: "POST",
                 action_name: action_name,
               })
@@ -53,21 +69,23 @@ module Jetski
               })
             when "update"
               auto_found_routes << base_opts.merge({
-                url: controller_path + "/:id",
+                url: url_to_use.call(controller_path + "/:id"),
                 method: "PUT",
                 action_name: action_name,
               })
             when "destroy"
               auto_found_routes << base_opts.merge({
-                url: controller_path + "/:id",
+                url: url_to_use.call(controller_path + "/:id"),
                 method: "DELETE",
                 action_name: action_name,
               })
+            when "index"
+              auto_found_routes << base_opts.merge({
+                url: url_to_use.call(controller_path),
+                method: "GET",
+                action_name: action_name,
+              })
             else
-              tmp_controller_instance = controller_class.new("")
-              tmp_controller_instance.send(action_name)
-              is_root = tmp_controller_instance.is_root?
-              custom_path = tmp_controller_instance.custom_path 
               url_to_use = if is_root
                 "/"
               elsif custom_path
@@ -76,7 +94,6 @@ module Jetski
                 url_friendly_action_name = action_name.split("_").join("-")
                 controller_path + "/#{url_friendly_action_name}"
               end
-              custom_request_method = tmp_controller_instance.custom_request_method
 
               auto_found_routes << base_opts.merge({
                 url: url_to_use,

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.4.6"
+  VERSION = "0.4.8"
 end

data/lib/jetski/view_renderer.rb

@@ -33,7 +33,7 @@ module Jetski
       template = ERB.new(content)
       # Perserve instance variables to view render
       # @posts from controller to posts/index.html.erb
-      # controller.class.class_eval problem is you still have render defined there
+
       grab_instance_variables
       template.result(binding)
     rescue => e

data/lib/jetski.rb

@@ -6,8 +6,10 @@ require "rack"
 require "sqlite3"
 
 require_relative './jetski/version'
-require_relative './jetski/frontend/reactive_form'
 require_relative './jetski/helpers/view_helpers'
+require_relative './jetski/helpers/route_helpers'
+require_relative './jetski/helpers/delegatable'
+require_relative './jetski/frontend/reactive_form'
 require_relative './jetski/base_controller'
 require_relative './jetski/router/shared_methods'
 require_relative './jetski/router/parser'
@@ -16,7 +18,6 @@ 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/view_renderer'
 
 module Jetski

data/templates/base/app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < Jetski::BaseController
+  route :home, root: true
   def home
-    @root = true
   end
 end

data/templates/base/app/views/layouts/application.html.erb

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title> APP_NAME </title>
-  <link rel="icon" type="image/x-icon" href="/jetski-logo.png">
+  <%= favicon_tag "jetski-logo.png" %>
 </head>
 <body>
   <%= yield %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -127,6 +127,7 @@ files:
 - lib/jetski/frontend/reactive_form.js
 - lib/jetski/frontend/reactive_form.rb
 - lib/jetski/helpers/delegatable.rb
+- lib/jetski/helpers/route_helpers.rb
 - lib/jetski/helpers/view_helpers.rb
 - lib/jetski/model.rb
 - lib/jetski/router.rb