jetski 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147bd3b0e3d8cbbf54b2a4163fe00af53e3941e99942c6d91324e034aaee7f88
-  data.tar.gz: 21042af9af87651f01bc4b3b01ed6bb95d45990abcc9ff6fa1bea68b8b38bd68
+  metadata.gz: 0fba85e1a50746a7e376738a0ec5648ce22edcc7874ea0d9ee9b3be681d7364d
+  data.tar.gz: b3ac634c65fd946fb1dc43c62702b620b46dd17e1369ef0716eedfa6885e373d
 SHA512:
-  metadata.gz: 7b045263bc0e38b3e733d0552d7884a5648351a38ba422e8aee9f2604f56d94ef8a9409113aaa377d4828888787587e6b98bc90e6693e7cfcaf63bd5e11a99e6
-  data.tar.gz: 6c82897a30e17b21c3b7cb0a626b2cf5240124da8ea197e91c18ff3527e2da93965f456feffcd26c760d40e56534e13c770206de1b712998d2e8c0e4f3496237
+  metadata.gz: 9740af48073b1a0c8c069d834e2da63c7b351b5a84c5c77502348854c1164105a1002282c8036fa2eaa040cbf085b9e8e8a1ffb98c4b16a87208ca33dccd544c
+  data.tar.gz: cc288a4e32d8dff6c78c14baad4fb317049b2329d30a05bb3132ad1e054db0bf7a0924fec502720b7ae80a7e99d047ee2c364f1e1c5327d81244ddbb2734c6e1

data/bin/jetski

@@ -10,6 +10,7 @@ require_relative './jetski_cli_helpers/generators/model.rb'
 require_relative './jetski_cli_helpers/destroyers/controller.rb'
 require_relative './jetski_cli_helpers/destroyers/model.rb'
 require_relative './jetski_cli_helpers/shared_methods.rb'
+require_relative './jetski_cli_helpers/base.rb'
 require_relative './jetski_cli_helpers/generate.rb'
 require_relative './jetski_cli_helpers/destroy.rb'
 require_relative './jetski_cli_helpers/database.rb'

data/bin/jetski_cli_helpers/base.rb

@@ -0,0 +1,11 @@
+# Reason for this is to dry up code and includes between classes
+module JetskiCLIHelpers
+  class Base < Thor
+    include Jetski::Helpers::Generic, Thor::Actions, JetskiCLIHelpers::SharedMethods,
+      Jetski::Database::Base, Jetski::Database::Interface
+    
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', '..', 'templates')
+    end
+  end
+end

data/bin/jetski_cli_helpers/database.rb

@@ -1,15 +1,20 @@
 module JetskiCLIHelpers
-  class Database < Thor
-    include Thor::Actions, JetskiCLIHelpers::SharedMethods,
-      Jetski::Database::Base
-    desc "create", "Creates a database for your app"
-    def create
-      say "🌊 Database was created successfully!"
-    end
-
-    desc "create_table NAME COLUMN_NAMES", "Creates a new table in your database"
-    def create_table(name, *fields)
-      db.execute create_table_sql(table_name: name, field_names: fields)
+  class Database < Base
+    desc "migrate", "Create, load, and patch DB from models"
+    def migrate
+      Jetski::Autoloader.call
+      # Get all models defined in users app
+      Jetski::Model.subclasses.each do |model|
+        table_name = model.pluralized_table_name
+        # Create table if it doesnt exist
+        create_table(table_name) if !table_exists?(table_name)
+        # Get model attributes
+        model.db_attribute_values.each do |obj|
+          name = obj[:name]
+          type = obj[:type]
+          add_column_unless_exists(table_name, name, type)
+        end
+      end
     end
 
     desc "seed", "Seeds the database with records created from seed file"

data/bin/jetski_cli_helpers/destroy.rb

@@ -1,6 +1,6 @@
 module JetskiCLIHelpers
-  class Destroy < Thor
-    include Thor::Actions, JetskiCLIHelpers::Destroyers::Controller,
+  class Destroy < Base
+    include JetskiCLIHelpers::Destroyers::Controller,
     JetskiCLIHelpers::Destroyers::Model
     desc "controller NAME ACTION_NAMES", "Destroys a controller"
     def controller(name, *actions)
@@ -11,5 +11,11 @@ module JetskiCLIHelpers
     def model(name, *actions)
       destroy_model(name)
     end
+
+    desc "resource NAME ACTION_NAMES", "Destroys a resource"
+    def resource(name, *actions)
+      destroy_controller(name)
+      destroy_model(name)
+    end
   end
 end

data/bin/jetski_cli_helpers/destroyers/controller.rb

@@ -2,15 +2,10 @@ module JetskiCLIHelpers
   module Destroyers
     module Controller
       def destroy_controller(name)
-        pluralized_name = if name[-1] == 's'
-          name
-        else
-          name + 's'
-        end
-
-        controller_file_path = "app/controllers/#{pluralized_name}_controller.rb"
+        controller_name = pluralize_string(name)
+        controller_file_path = "app/controllers/#{controller_name}_controller.rb"
         remove_file(controller_file_path)
-        view_folder = "app/views/#{pluralized_name}"
+        view_folder = "app/views/#{controller_name}"
         remove_dir(view_folder)
       end
     end

data/bin/jetski_cli_helpers/destroyers/model.rb

@@ -3,8 +3,10 @@ module JetskiCLIHelpers
     module Model
       def destroy_model(name)
         model_file_path = "app/models/#{name}.rb"
-        remove_file(controller_file_path)
-        # TODO: Remove from db.
+        remove_file(model_file_path)
+        table_name = pluralize_string(name)
+        remove_table_sql = "DROP TABLE #{table_name}"
+        db.execute(remove_table_sql)
       end
     end
   end

data/bin/jetski_cli_helpers/generate.rb

@@ -1,7 +1,6 @@
 module JetskiCLIHelpers
-  class Generate < Thor
-    include Thor::Actions, JetskiCLIHelpers::SharedMethods, 
-      Jetski::Database::Base, JetskiCLIHelpers::Generators::Controller,
+  class Generate < Base
+    include JetskiCLIHelpers::Generators::Controller,
       JetskiCLIHelpers::Generators::Model
     desc "controller NAME ACTION_NAMES", "Create a controller with matching actions"
     def controller(name, *actions)
@@ -17,7 +16,7 @@ module JetskiCLIHelpers
     def resource(name, *field_names)
       crud_actions = %w(new create show index edit update destroy)
       generate_model(name, *field_names)
-      generate_controller(name, *crud_actions)
+      generate_controller(name, *crud_actions, field_names: field_names)
     end
   end
 end

data/bin/jetski_cli_helpers/generators/controller.rb

@@ -1,42 +1,37 @@
 module JetskiCLIHelpers
   module Generators
     module Controller
-      def generate_controller(name, *actions)
-        pluralized_name = if name[-1] == 's'
-          name
-        else
-          name + 's'
-        end
-
-        formatted_controller_name = pluralized_name.split("_").map(&:capitalize).join
-        controller_file_path = "app/controllers/#{pluralized_name}_controller.rb"
-        create_file controller_file_path
-        append_to_file controller_file_path, <<~CONTROLLER
-          class #{formatted_controller_name}Controller < Jetski::BaseController
+      def generate_controller(name, *actions, **extra_options)
+        field_names = extra_options[:field_names]
+        @name = name
+        @controller_name = pluralize_string(name)
 
-          end
-        CONTROLLER
+        controller_file_path = "app/controllers/#{@controller_name}_controller.rb"
+        
+        @controller_class_name = @controller_name.split("_").map(&:capitalize).join
+        @model_class_name = @name.capitalize # post -> Post
+        @field_names = field_names
+        @actions = actions
 
-        actions.each.with_index do |action_name, idx|
-          action_content = <<~ACTION_CONTENT
-            def #{action_name}
-
-            end
-          ACTION_CONTENT
-          action_nl_seperator = ((idx + 1) != actions.size) ? "\n\n" : ""
-          insert_into_file(controller_file_path, "#{indent_code(action_content, 1)}#{action_nl_seperator}", before: "\nend")
-          
+        # Create controller from template
+        template "controllers/controller.rb.erb", controller_file_path
+        
+        actions.each do |action_name|
+          # create views
           if !["create", "create", "update", "destroy"].include?(action_name)
-            path_to_view = "app/views/#{pluralized_name}/#{action_name}.html.erb"
-
-            empty_directory("app/views/#{pluralized_name}")
-            create_file(path_to_view)
-            append_to_file path_to_view, <<~EXAMPLEFILE
-              <h1> #{pluralized_name}##{action_name} </h1>
-              <p> edit the content of this page at app/views/#{path_to_view}/#{action_name}.html.erb </p>
-            EXAMPLEFILE
-              
-            say "🌊 View your new page at http://localhost:8000/#{pluralized_name}/#{action_name}"
+            empty_directory("app/views/#{@controller_name}")
+            
+            # For new, show, edit, index actions
+            @path_to_view = "app/views/#{@controller_name}/#{action_name}.html.erb"
+            
+            template_name = if ["new", "show", "edit", "index"].include?(action_name)
+              action_name
+            else
+              "default"
+            end  
+            @action_name = action_name
+            template "controllers/views/#{template_name}.html.erb", @path_to_view
+            say "🌊 View your new page at http://localhost:8000/#{@controller_name}/#{action_name}"
           end
         end
       end

data/bin/jetski_cli_helpers/generators/model.rb

@@ -2,14 +2,28 @@ module JetskiCLIHelpers
   module Generators
     module Model
       def generate_model(name, *field_names)
-        db.execute create_table_sql(table_name: name, field_names: field_names)
-        model_file_path = "app/models/#{name}.rb"
-        create_file model_file_path
-        append_to_file model_file_path, <<~MODEL
-          class #{name.capitalize} < Jetski::Model
-            
+        # TODO: Instead of creating table here we should have a db:migrate method
+        # this will automatically build and patch db tables. Add/remove columns 
+        #db.execute create_table_sql(table_name: name, field_names: field_names)
+        @model_name = name
+
+        
+        if field_names
+          @model_attributes = []
+          custom_fields = field_names.filter { |f| f.include?(":") }
+          string_fields = field_names - custom_fields
+          string_fields.each do |field|
+            @model_attributes << ":#{field}"
           end
-        MODEL
+
+          custom_fields.each do |custom_field|
+            field, type = custom_field.split(":")
+            @model_attributes << "#{field}: :#{type}"
+          end
+        end
+          
+        model_file_path = "app/models/#{name}.rb"
+        template "model/template.rb.erb", model_file_path
       end
     end
   end

data/lib/jetski/autoloader.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   module Autoloader
     include Jetski::Router::FilePathHelper
     extend self
@@ -12,10 +12,6 @@ module Jetski
           .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

@@ -1,12 +1,12 @@
 # This is the base controller of the library
-module Jetski
+class Jetski
   class BaseController
     RESERVED_INSTANCE_VARIABLES = [
         :@res, :@performed_render, :@action_name, 
         :@controller_name, :@controller_path, :@cookies
     ]
 
-    include ReactiveForm
+    include Jetski::Frontend::JavascriptHelpers
     extend Jetski::Helpers::RouteHelpers
     attr_accessor :action_name, :controller_name, :controller_path, 
       :params, :cookies

data/lib/jetski/database/base.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   module Database
     module Base
       extend self
@@ -7,35 +7,13 @@ module Jetski
         @_db ||= SQLite3::Database.new "test.db"
       end
 
-      def create_table_sql(table_name:, field_names:)
-        pluralized_table_name = if table_name.chars.last == "s"
-          table_name
-        else
-          table_name + "s"
-        end
-
-        _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"
-
-        field_names.each.with_index do |field_name, idx|
-          field, field_data_type = if field_name.include?(":")
-            field_name.split(":")
-          else
-            [field_name, ""]
-          end
-          data_type = sql_data_type(field_data_type)
-          _gen_sql += "  #{field} #{data_type}"
-          if (idx + 1) < field_names.size
-            _gen_sql += ",\n"
-          else
-            _gen_sql += "\n"
-          end
-        end
+      def create_table_sql(table_name:, field_names: [])
+        table_name = pluralize_string(table_name)
+        default_fields = [["created_at", "datetime"], ["updated_at", "datetime"], ["id", "integer"]]
+        fields = field_names.map { |f| f.split(":") }
+        all_fields = fields + default_fields
+        _gen_sql = "create table #{table_name} (\n"
+        _gen_sql += all_fields.map { |field, data_type| " #{field} #{data_type}" }.join(",\n")
         _gen_sql += ");\n"
         _gen_sql
       end

data/lib/jetski/database/interface.rb

@@ -0,0 +1,31 @@
+# Responsibility is to wrap calls to db and make it more clean and readable.
+
+class Jetski
+  module Database
+    module Interface
+      extend self
+
+      # expects an array of fields with type seperated by colon :
+      def create_table(table_name, *fields)
+        db.execute create_table_sql(table_name: table_name, field_names: fields)
+      end
+
+      def add_column(table_name, field_name, data_type = "string")
+        db.execute("ALTER TABLE #{table_name} ADD #{field_name} #{sql_data_type(data_type)}")
+      end
+
+      def add_column_unless_exists(table_name, field_name, data_type = nil)
+        add_column(table_name, field_name, data_type) if !field_exists?(table_name, field_name)
+      end
+
+      def table_exists?(table_name)
+        db.get_first_value("SELECT name FROM sqlite_master WHERE type='table' AND name=?", table_name)
+      end
+
+      def field_exists?(table_name, field_name)
+        table_info = db.execute("PRAGMA table_info(#{table_name})")
+        table_info.find { |d| d[1] == field_name } != nil
+      end
+    end
+  end
+end

data/lib/jetski/database/sqlite3.rb

@@ -0,0 +1,6 @@
+class Jetski
+  module Database
+    module Sqlite3
+    end
+  end
+end

data/lib/jetski/frontend/javascript_helpers.rb

@@ -0,0 +1,12 @@
+class Jetski
+  module Frontend
+    module JavascriptHelpers
+      def reactive_text_area(path, **opts)
+        css_classes = opts[:class]
+        value = opts[:value]
+        # Text area that auto saves to url.
+        "<textarea reactive-form-path='#{path}' class='#{css_classes}'>#{value}</textarea>"
+      end
+    end
+  end
+end

data/lib/jetski/helpers/delegatable.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   module Helpers
     module Delegatable
       # delegate(:method, to: :class)

data/lib/jetski/helpers/generic.rb

@@ -0,0 +1,14 @@
+class Jetski
+  module Helpers
+    module Generic
+      # Helpers for use all over codebase for simple grammatics etc..
+      def pluralize_string(string)
+        if string[-1] == 's'
+          string
+        else
+          string + 's'
+        end
+      end
+    end
+  end
+end

data/lib/jetski/helpers/route_helpers.rb

@@ -1,6 +1,6 @@
 # This is responsible for methods for routing in base_controller like the route class method
 
-module Jetski
+class Jetski
   module Helpers
     module RouteHelpers
       def route(method_name, root: false, path: nil, request_method: nil)

data/lib/jetski/helpers/view_helpers.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   module Helpers
     module ViewHelpers
       # Expecting a relative path.
@@ -84,8 +84,8 @@ module Jetski
         end.join(" ")
       end
     private
+      # TODO: could move this to a sharable method.
       def process_url(url)
-        # Need to ensure urls start with / to avoid relative requests
         if url[0] == '/'
           url
         else

data/lib/jetski/model/attributes.rb

@@ -0,0 +1,46 @@
+class Jetski
+  class Model
+    module Attributes
+      # class method for user to configure add/remove attributes on model
+      def attributes(*string_attributes, **custom_attributes)
+        @_db_string_attributes = string_attributes
+        @_db_custom_attributes = custom_attributes
+        combined_attributes = string_attributes + custom_attributes.map { |k, _v| k }
+        @_attribute_names ||= []
+        @_attribute_names.concat(combined_attributes)
+        @_attribute_names.concat([:created_at, :updated_at, :id]) # defaults
+        @_attribute_names = @_attribute_names.uniq
+        @_attribute_names.each do |attribute|
+          define_method attribute do
+            @virtual_attributes[attribute]
+          end
+        end
+      end
+
+      def attribute_names
+        @_attribute_names || []
+      end
+
+      def db_attribute_values
+        # Returns the formatted objects with types for each attribute
+        _db_attributes = []
+        
+        @_db_string_attributes.each do |value|
+          _db_attributes << {
+            name: value,
+            type: :string
+          }
+        end
+
+        @_db_custom_attributes.each do |key, value|
+          _db_attributes << {
+            name: key,
+            type: value
+          }
+        end
+
+        _db_attributes
+      end
+    end
+  end
+end

data/lib/jetski/model/crud_helpers.rb

@@ -0,0 +1,76 @@
+class Jetski
+  class Model
+    module CrudHelpers
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      
+      def destroy!
+        # Destroy record: remove from db
+        delete_sql = <<~SQL
+          DELETE from #{self.class.pluralized_table_name} WHERE id=?
+        SQL
+        self.class.db.execute(delete_sql, id)
+        nil
+      end
+
+      module ClassMethods
+        def create(hash_args = nil, **key_args)
+          args = if hash_args && hash_args.is_a?(Hash)
+            hash_args
+          else
+            key_args
+          end
+
+          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
+
+          current_record_count = (count || 0)
+          record_id = current_record_count + 1
+          key_names.append "id"
+          data_values.append(record_id)
+
+          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)
+
+          record_attributes = {}
+          key_names.each.with_index do |k, i|
+            record_attributes[k.to_sym] = data_values[i]
+          end
+
+          new(**record_attributes)
+        end
+
+        def all
+          columns, *rows = db.execute2( "select * from #{pluralized_table_name}" )
+          _all = []
+          rows.map do |row|
+            _all << format_model_obj(row, columns)
+          end
+          _all
+        end
+
+        def find(id)
+          id_as_integer = id.to_i
+          columns, *rows = db.execute2( "select * from #{pluralized_table_name} WHERE id=?", id_as_integer)
+          format_model_obj(rows.last, columns)
+        end
+      
+
+        def destroy_all! 
+          db.execute("DELETE from #{pluralized_table_name}")
+        end
+      end
+    end
+  end
+end

data/lib/jetski/model.rb

@@ -1,15 +1,16 @@
-module Jetski
+class Jetski
   class Model
-    extend Jetski::Database::Base
+    extend Jetski::Database::Base, Jetski::Helpers::Generic, 
+      Jetski::Model::Attributes
+    include CrudHelpers, Jetski::Helpers::Generic
 
     def initialize(**args)
       @virtual_attributes = args
     end
 
     def inspect
-      post_obj_id = object_id
-      inspect_str = "#<#{self.class.to_s}:#{post_obj_id}"
-      self.class.attributes.each do |attribute_name|
+      inspect_str = "#<#{self.class.to_s}:#{object_id}"
+      self.class.attribute_names.each do |attribute_name|
         attribute_value = @virtual_attributes[attribute_name]
         inspect_str += " #{attribute_name}=\"#{attribute_value}\""
       end
@@ -17,120 +18,25 @@ module Jetski
       inspect_str
     end
 
-    def destroy!
-      # Destroy record: remove from db
-      delete_sql = <<~SQL
-        DELETE from #{self.class.pluralized_table_name} WHERE id=?
-      SQL
-      self.class.db.execute(delete_sql, id)
-      nil
-    end
-
     class << self
-      def create(hash_args = nil, **key_args)
-        args = if hash_args && hash_args.is_a?(Hash)
-          hash_args
-        else
-          key_args
-        end
-
-        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
-
-        current_post_count = (count || 0)
-        post_id = current_post_count + 1
-        key_names.append "id"
-        data_values.append(post_id)
-
-        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
-
-      # 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
+      extend Jetski::Helpers::Delegatable
+      delegate :count, :last, :first, to: :all
 
-      def all
-        columns, *rows = db.execute2( "select * from #{pluralized_table_name}" )
-        _all = []
-        rows.map do |row|
-          _all << format_model_obj(row, columns)
-        end
-        _all
-      end
-
-      def pluck_rows
-        db.execute( "select * from #{pluralized_table_name}" )
-      end
-
-      def count
-        pluck_rows.size
-      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
-
-      def last
-        format_model_obj(pluck_rows.last)
-      end
-
-      def first
-        format_model_obj(pluck_rows.first)
-      end
-
-      def find(id)
-        id_as_integer = id.to_i
-        columns, *rows = db.execute2( "select * from #{pluralized_table_name} WHERE id=?", id_as_integer)
-        format_model_obj(rows.last, columns)
-      end
-      
       def table_name
         self.to_s.downcase
       end
 
       def pluralized_table_name
-        if table_name[-1] == "s"
-          table_name
-        else
-          table_name + "s"
-        end
+        pluralize_string(table_name)
       end
+      
+      # Mark attributes method as private hide it from IRB
+      private :attributes
     private
-      def format_model_obj(row, columns = nil)
-        return unless row
-        columns ||= attributes
+      def format_model_obj(row, columns)
         row_obj = {}
         columns.each.with_index do |col, idx|
-          row_obj[col] = row[idx]
+          row_obj[col.to_sym] = row[idx]
         end
         new(**row_obj)
       end

data/lib/jetski/router/file_path_helper.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     module FilePathHelper
       def controller_file_paths

data/lib/jetski/router/host/base.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     module Host
       class Base

data/lib/jetski/router/host/controller.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     module Host
       class Controller < Base
@@ -33,6 +33,8 @@ module Jetski
             parsed_body = parse_body(req.body, req.content_type)
             params_hash = parsed_body.merge(params_hash)
           end
+
+          # TODO: Need to support deep object structuring.
           controller.params = OpenStruct.new(params_hash)
           controller.cookies = req.cookies
           controller.send(action_name)
@@ -40,7 +42,7 @@ module Jetski
             controller.render
           end
         end
-
+      private
         def parse_body(body, content_type = '')
           case content_type
           when "application/x-www-form-urlencoded"

data/lib/jetski/router/host/crud.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     module Host
       class Crud < Base
@@ -26,7 +26,6 @@ module Jetski
         end
       private
         def determine_action_from_url
-          # TODO: Handle checking for url params.
           req_path = req.request_uri.path
           custom_route_options.tap do |opts|
             case req_path
@@ -45,11 +44,11 @@ module Jetski
             else
               url_param = req_path.split("#{controller_path}/")[-1]
               case
-              when url_param.match(/\d(\/edit)/)
+              when url_param&.match(/\d(\/edit)/)
                 # Edit page
                 opts[:action_name] = "edit"
                 opts[:method] = "GET"
-              when url_param.match(/\d\z/)
+              when url_param&.match(/\d\z/)
                 # matches only id 5 with no additional characters
                 # Determine if show/update/destroy from request_method
                 opts[:method] = req.request_method
@@ -62,7 +61,7 @@ module Jetski
                   opts[:action_name] = "destroy"
                 end
               else
-                handle_controller_render = false
+                @handle_controller_render = false
               end
             end
           end

data/lib/jetski/router/parser.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     module Parser
       include Jetski::Router::FilePathHelper

data/lib/jetski/router.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Router
     include Parser
     attr_reader :server, :routes, :crud_routes
@@ -28,16 +28,14 @@ module Jetski
     end
 
     def host_crud_routes
-      # TODO: Build server block to handle custom crud routes
       crud_routes_for_controller = crud_routes.group_by { |route| route[:controller_path] }
       crud_routes_for_controller.each do |controller_path, controller_routes|
-        # TODO: Implement base level server block and checking.
         Host::Crud.new(server, controller_routes, **controller_routes.first).call
       end
     end
 
     def host_assets
-      host_css && host_images && host_javascript && host_reactive_form_js
+      host_css && host_images && host_javascript && host_javascript_helpers
     end
 
     def host_css
@@ -79,10 +77,10 @@ module Jetski
       end
     end
 
-    def host_reactive_form_js
+    def host_javascript_helpers
       server.mount_proc "/reactive-form.js" do |req, res|
         res.content_type = "text/javascript"
-        res.body = File.read(File.join(__dir__, 'frontend/reactive_form.js'))
+        res.body = File.read(File.join(__dir__, 'frontend/javascript_helpers.js'))
       end
     end
 

data/lib/jetski/server.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class Server
     attr_reader :port
     

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
-module Jetski
-  VERSION = "0.4.9"
+class Jetski
+  VERSION = "0.5.0"
 end

data/lib/jetski/view_renderer.rb

@@ -1,4 +1,4 @@
-module Jetski
+class Jetski
   class ViewRenderer
     include Jetski::Helpers::ViewHelpers
     extend Jetski::Helpers::Delegatable
@@ -33,8 +33,6 @@ module Jetski
 
     def process_erb(content)
       template = ERB.new(content)
-      # Perserve instance variables to view render
-      # @posts from controller to posts/index.html.erb
 
       grab_instance_variables
       template.result(binding)
@@ -69,7 +67,7 @@ module Jetski
       
       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"
+        _content_for_head += "<script src='/application.js' defer></script>\n"
       end
 
       controller_js_file = File.join(assets_folder, "javascript", "#{path_to_controller}.js")

data/lib/jetski.rb

@@ -6,10 +6,11 @@ require "rack"
 require "sqlite3"
 
 require_relative './jetski/version'
+require_relative './jetski/helpers/generic'
 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/frontend/javascript_helpers'
 require_relative './jetski/base_controller'
 require_relative './jetski/router/file_path_helper'
 require_relative './jetski/router/parser'
@@ -20,12 +21,16 @@ require_relative './jetski/router'
 require_relative './jetski/autoloader'
 require_relative './jetski/server'
 require_relative './jetski/database/base'
+require_relative './jetski/database/sqlite3'
+require_relative './jetski/database/interface'
+require_relative './jetski/model/crud_helpers'
+require_relative './jetski/model/attributes'
 require_relative './jetski/model'
 require_relative './jetski/view_renderer'
 
-module Jetski
-  extend self
-  def app_root
+class Jetski
+  include Jetski::Helpers::Generic
+  def self.app_root
     Dir.pwd
   end
 end

data/templates/controllers/controller.rb.erb

@@ -0,0 +1,56 @@
+class <%= @controller_class_name %>Controller < Jetski::BaseController
+<% @actions.each.with_index do |action_name, idx| -%>
+<% if action_name == "new" -%>
+  def new
+    @<%= @name %> = <%= @model_class_name %>.new
+  end
+<% end -%>
+<% if action_name == "create" -%>
+  def create
+    @<%= @name %> = <%= @model_class_name %>.create(<%= @name %>_params)
+    redirect_to "/<%= @controller_name %>/" + @<%= @name %>.id.to_s
+  end
+<% end -%>
+<% if action_name == "show" -%>
+  def show
+    @<%= @name %> = <%= @model_class_name %>.find(params[:id])
+  end
+<% end -%>
+<% if action_name == "edit" -%>
+  def edit
+    @<%= @name %> = <%= @model_class_name %>.find(params[:id])
+  end
+<% end -%>
+<% if action_name == "update" -%>
+  def update
+    @<%= @name %> = <%= @model_class_name %>.find(params[:id])
+    @<%= @name %>.update(<%= @name %>_params)
+    redirect_to "/<%= @controller_name %>/" + @<%= @name %>.id.to_s
+  end
+<% end -%>
+<% if action_name == "destroy" -%>
+  def destroy
+    @<%= @name %> = <%= @model_class_name %>.find(params[:id])
+    @<%= @name %>.destroy
+    redirect_to <%= @controller_name %>
+  end
+<% end -%>
+<% if action_name == "index" -%>
+  def index
+    @<%= @controller_name %> = <%= @model_class_name %>.all
+  end
+<% end -%>
+
+<% end -%>
+private
+
+<% if @field_names -%>
+  def <%= @name %>_params
+    {
+  <% @field_names.each do |field| -%>
+    <%= field.split(":")[0] %>: params["<%= @controller_name%>"]["<%= field.split(":")[0] %>"],
+  <% end -%>
+  }
+  end
+<% end -%>
+end

data/templates/controllers/views/default.html.erb

@@ -0,0 +1,2 @@
+<h1> <%= @controller_name %>#<%= @action_name %> </h1>
+<p> edit the content of this page at app/views/<%= @path_to_view %>/ <%= @action_name %>.html.erb </p>

data/templates/controllers/views/edit.html.erb

@@ -0,0 +1,7 @@
+<h1> Edit <%= @name %> </h1>
+<form action='/<%= @controller_name %>/<%%= @<%= @name %>.id %>' method='PUT'>
+<% @field_names.each do |field| -%>
+  <input name='<%= @controller_name %>[<%= field.split(":")[0] %>]'/>
+<% end -%>
+  <button type='submit'>Update <%= @name %></button>
+</form>

data/templates/controllers/views/index.html.erb

@@ -0,0 +1,12 @@
+<h1> Viewing all <%= @controller_name %></h1>
+
+<a href="/<%= @controller_name %>/new"> New <%= @name %> </a>
+
+<%% @<%= @controller_name %>.each do |<%= @name %>| %>
+<% @field_names.each do |field| -%>
+  <p> 
+    <%= field.split(":")[0] %>: <%%= <%= @name %>.<%= field.split(":")[0] %> %>
+  </p>
+  <a href='/<%= @controller_name %>/<%%= <%= @name %>.id %>'> View <%= @name %></a>
+<% end %>
+<%% end %>

data/templates/controllers/views/new.html.erb

@@ -0,0 +1,7 @@
+<h1> New <%= @name %> </h1>
+<form action='/<%= @controller_name %>' method='POST'>
+<% @field_names.each do |field| -%>
+  <input name='<%= @controller_name %>[<%= field.split(":")[0] %>]'/>
+<% end -%>
+  <button type='submit'>Create <%= @name %></button>
+</form>

data/templates/controllers/views/show.html.erb

@@ -0,0 +1,8 @@
+<h1> Viewing your <%= @name %> </h1>
+<a href="/<%= @controller_name %>"> Back to <%= @controller_name %></a>
+<a href="/<%= @controller_name %>/<%%= @<%= @name %>.id %>/edit"> Edit <%= @name %></a>
+<% @field_names.each do |field| -%>
+  <p> 
+    <%= field.split(":")[0] %>: <%%= @<%= @name %>.<%= field.split(":")[0] %> %>
+  </p>
+<% end -%>

data/templates/model/template.rb.erb

@@ -0,0 +1,5 @@
+class <%= @model_name.capitalize %> < Jetski::Model
+<% if @model_attributes -%>
+  attributes <%= @model_attributes.join(", ") %>
+<% end -%>
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -38,33 +38,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: erb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
-  name: erb
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/jetski
+- bin/jetski_cli_helpers/base.rb
 - bin/jetski_cli_helpers/database.rb
 - bin/jetski_cli_helpers/destroy.rb
 - bin/jetski_cli_helpers/destroyers/controller.rb
@@ -128,12 +129,17 @@ files:
 - 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/database/interface.rb
+- lib/jetski/database/sqlite3.rb
+- lib/jetski/frontend/javascript_helpers.js
+- lib/jetski/frontend/javascript_helpers.rb
 - lib/jetski/helpers/delegatable.rb
+- lib/jetski/helpers/generic.rb
 - lib/jetski/helpers/route_helpers.rb
 - lib/jetski/helpers/view_helpers.rb
 - lib/jetski/model.rb
+- lib/jetski/model/attributes.rb
+- lib/jetski/model/crud_helpers.rb
 - lib/jetski/router.rb
 - lib/jetski/router/file_path_helper.rb
 - lib/jetski/router/host/base.rb
@@ -151,6 +157,13 @@ files:
 - templates/base/app/controllers/pages_controller.rb
 - templates/base/app/views/layouts/application.html.erb
 - templates/base/app/views/pages/home.html.erb
+- templates/controllers/controller.rb.erb
+- templates/controllers/views/default.html.erb
+- templates/controllers/views/edit.html.erb
+- templates/controllers/views/index.html.erb
+- templates/controllers/views/new.html.erb
+- templates/controllers/views/show.html.erb
+- templates/model/template.rb.erb
 homepage: https://rubygems.org/gems/jetski
 licenses:
 - MIT

data/lib/jetski/frontend/reactive_form.rb

@@ -1,8 +0,0 @@
-module ReactiveForm
-  def reactive_text_area(path, **opts)
-    css_classes = opts[:class]
-    value = opts[:value]
-    # Text area that auto saves to url.
-    "<textarea reactive-form-path='#{path}' class='#{css_classes}'>#{value}</textarea>"
-  end
-end