jetski 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe71a8de5f4201c446a70331fae92f982af3887b388426e5b64f1b6c3d897c8
-  data.tar.gz: 73a1faada7420962abfdbab298f7f81157431b995452ca5fc2adefd903d074ec
+  metadata.gz: a7f1033d352171f7ccf893f673b76ed6f847c404b0aa460812fe60dc4ce0883a
+  data.tar.gz: 88b3a07a229f606c2599c6f728423a584b1c242441217f6c04d14c9b1dd8e873
 SHA512:
-  metadata.gz: 35e4cfce787089dfe046575b38969927013e09a91b855dee64af15394872eed1660a087ecdd801fb4c0ede590b491da3759b5d68f1ff2c92a49363426f5a8f38
-  data.tar.gz: '049857042cd6299e591dab667ef9f3943637649905fe77e09174eabdc3a1131abb9849e93e35f07adb32d9c09dda067ffc19c8d671ddade29715d74ff0c9acfa'
+  metadata.gz: dcce62044cc495b3e39645033c102a5146d39d7a00ecd3dc151d75aed67eda8f0c757323bb426c743cd8873cfa9e33945fbf8881b579853e872a61af524a4473
+  data.tar.gz: 2edf2994dd5a44423f48d4a9d2059e6508d2a1f766d0310597ffb7e7e6d975df0fcf0ef66ae6c7168c68e78baa41fc9bd6cfa9d293ce662b4c699909b5039d2a

data/bin/jetski

@@ -3,8 +3,14 @@
 require 'jetski'
 require 'optparse'
 require 'thor'
+require "sqlite3"
+require "pry"
+
+require_relative './jetski_cli_helpers/shared_methods.rb'
 require_relative './jetski_cli_helpers/generate.rb'
 require_relative './jetski_cli_helpers/destroy.rb'
+require_relative './jetski_cli_helpers/database.rb'
+
 require 'bundler/setup'
 
 class JetskiCLI < Thor
@@ -40,11 +46,22 @@ class JetskiCLI < Thor
     Jetski::Server.new.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
+  end
+
   desc "generate", "generates resources in your jetski app"
   subcommand "generate", JetskiCLIHelpers::Generate
 
   desc "destroy", "destroys a resource in your jetski app"
   subcommand "destroy", JetskiCLIHelpers::Destroy
+
+  desc "db", "commands related to database"
+  subcommand "db", JetskiCLIHelpers::Database
   
   def self.source_root
     File.join(File.dirname(__FILE__), 'templates')

data/bin/jetski_cli_helpers/database.rb

@@ -0,0 +1,27 @@
+require 'thor'
+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)
+    end
+
+    desc "seed", "Seeds the database with records created from seed file"
+    def seed
+      seed_file_path = './seed.rb'
+      if File.exist?(seed_file_path)
+        Jetski::Autoloader.call
+        load(seed_file_path)
+      else
+        say "No seed file is specified create one in your app ./seed.rb"
+      end
+    end
+  end
+end

data/bin/jetski_cli_helpers/destroy.rb

@@ -9,5 +9,12 @@ module JetskiCLIHelpers
       view_folder = "app/views/#{name}"
       remove_dir(view_folder)
     end
+
+    desc "model NAME ACTION_NAMES", "Destroys a model"
+    def model(name, *actions)
+      model_file_path = "app/models/#{name}.rb"
+      remove_file(controller_file_path)
+      # TODO: Remove from db.
+    end
   end
 end

data/bin/jetski_cli_helpers/generate.rb

@@ -1,7 +1,8 @@
 require 'thor'
 module JetskiCLIHelpers
   class Generate < Thor
-    include Thor::Actions
+    include Thor::Actions, JetskiCLIHelpers::SharedMethods, 
+      Jetski::Database::Base
     desc "controller NAME ACTION_NAMES", "Create a controller with matching actions"
     def controller(name, *actions)
       controller_file_path = "app/controllers/#{name}_controller.rb"
@@ -18,23 +19,34 @@ module JetskiCLIHelpers
 
           end
         ACTION_CONTENT
-        insert_into_file(controller_file_path, indent_code(action_content, 1), before: "\nend")
-        path_to_view = "app/views/#{name}/#{action_name}.html.erb"
+        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")
+        
+        if !["create", "create", "update", "destroy"].include?(action_name)
+          path_to_view = "app/views/#{name}/#{action_name}.html.erb"
 
-        empty_directory("app/views/#{name}")
-        create_file(path_to_view)
-        append_to_file path_to_view, <<~EXAMPLEFILE
-          <h1> #{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/#{name}/#{action_name}"
+          empty_directory("app/views/#{name}")
+          create_file(path_to_view)
+          append_to_file path_to_view, <<~EXAMPLEFILE
+            <h1> #{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/#{name}/#{action_name}"
+        end
       end
     end
-        
-  private
-    def indent_code(code, level = 1)
-      code.strip.split("\n").map { |l| (1..level).map { |lvl| "  " }.join + l }.join("\n")
+
+    desc "model NAME FIELD_NAMES", "Creates a model with matching fields"
+    def 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
+          
+        end
+      MODEL
     end
   end
 end

data/bin/jetski_cli_helpers/shared_methods.rb

@@ -0,0 +1,8 @@
+module JetskiCLIHelpers
+  module SharedMethods
+    def indent_code(code, level = 1)
+      code.strip.split("\n").map { |l| 
+        (1..level).map { |lvl| "  " }.join + l }.join("\n")
+    end
+  end
+end

data/lib/jetski/autoloader.rb

@@ -0,0 +1,18 @@
+module Jetski
+  module Autoloader
+    include Jetski::Router::SharedMethods
+    extend self
+    # Responsibility is to load all models in app.
+    def call
+      model_file_paths.each do |path_to_model|
+        require_relative path_to_model
+      end
+    end
+
+    def load_controllers
+      controller_file_paths.each do |file_path|
+        require_relative file_path
+      end
+    end
+  end
+end

data/lib/jetski/base_controller.rb

@@ -1,25 +1,12 @@
 # This is the base controller of the library
 module Jetski
   class BaseController
-    attr_accessor :action_name, :controller_name, :controller_path, :params
-    attr_reader :res
-    attr_reader :performed_render
+    include ReactiveForm
+    attr_accessor :action_name, :controller_name, :controller_path, 
+      :params, :cookies
+    attr_reader :res, :performed_render
     attr_writer :root, :path, :request_method
 
-    class << self
-      def request_method(method)
-        # Really just a shell method since Im using File.readlines to use the logic in routes.
-      end
-
-      def root
-        # another shell method
-      end
-
-      def path(location)
-        # Another shell method
-      end
-    end
-
     def initialize(res)
       @res = res
       @performed_render = false
@@ -51,6 +38,14 @@ module Jetski
       res.set_redirect(WEBrick::HTTPStatus::Found, url)
     end
 
+    def set_cookie(name, value)
+      res.cookies.push WEBrick::Cookie.new(name.to_s, value || "")
+    end
+
+    def get_cookie(name)
+      cookies&.find { |c| c.name == name.to_s }&.value
+    end
+
     def is_root?
       @root == true
     end
@@ -99,6 +94,9 @@ module Jetski
         _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
     

data/lib/jetski/database/base.rb

@@ -0,0 +1,51 @@
+module Jetski
+  module Database
+    module Base
+      extend self
+
+      def db
+        @_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"
+        _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
+        _gen_sql += ");\n"
+        _gen_sql
+      end
+
+      def sql_data_type(str)
+        case str
+        when "", "string"
+          "varchar(255)"
+        else
+          str
+        end
+      end
+    end
+  end
+end

data/lib/jetski/frontend/reactive_form.js

@@ -0,0 +1,12 @@
+let reactiveFormELS = document.querySelectorAll("[reactive-form-path]")
+reactiveFormELS.forEach(reactiveFormElement => {
+  reactiveFormElement.addEventListener("input", () => {
+    let reactiveFormURL = reactiveFormElement.getAttribute("reactive-form-path")
+    fetch(reactiveFormURL, {
+      body: JSON.stringify({
+        content: reactiveFormElement.value,
+      }),
+      method: "POST",
+    })
+  })
+})

data/lib/jetski/frontend/reactive_form.rb

@@ -0,0 +1,8 @@
+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

data/lib/jetski/model.rb

@@ -0,0 +1,74 @@
+module Jetski
+  class Model
+    extend Jetski::Database::Base
+    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 }
+        
+        key_names.append "created_at"
+        data_values.append Time.now.to_s
+
+        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)
+      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 pluck_rows
+        db.execute( "select * from #{pluralized_table_name}" )
+      end
+
+      def count
+        pluck_rows.size
+      end
+
+      def attributes
+        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
+    private
+      def table_name
+        self.to_s.downcase
+      end
+
+      def pluralized_table_name
+        if table_name[-1] == "s"
+          table_name
+        else
+          table_name + "s"
+        end
+      end
+
+      def format_model_obj(row, columns = nil)
+        return unless row
+        columns ||= attributes
+        row_obj = {}
+        columns.each.with_index do |col, idx|
+          row_obj[col] = row[idx]
+        end
+        OpenStruct.new(row_obj)
+      end
+    end
+  end
+end

data/lib/jetski/router/parser.rb

@@ -1,10 +1,10 @@
 module Jetski
   class Router
     module Parser
+      include Jetski::Router::SharedMethods
       extend self
       def compile_routes
         auto_found_routes = []
-        controller_file_paths = Dir.glob([File.join(Jetski.app_root, 'app', 'controllers', '**', '*_controller.rb')])
         controller_file_paths.each do |file_path|
           require_relative file_path
           controller_file_name = file_path.split('app/controllers')[1]

data/lib/jetski/router/shared_methods.rb

@@ -0,0 +1,13 @@
+module Jetski
+  class Router
+    module SharedMethods
+      def controller_file_paths
+        Dir.glob([File.join(Jetski.app_root, 'app', 'controllers', '**', '*_controller.rb')])
+      end
+
+      def model_file_paths
+        Dir.glob(File.join(Jetski.app_root, 'app', 'models', '**/*.rb'))
+      end
+    end
+  end
+end

data/lib/jetski/router.rb

@@ -41,7 +41,12 @@ 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
+            # 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
+            controller.cookies = req.cookies
             controller.send(action_name)
             if !controller.performed_render && (request_method.upcase == "GET")
               controller.render
@@ -56,8 +61,7 @@ module Jetski
     end
 
     def host_assets
-      # Render stylesheets css via url
-      host_css && host_images && host_javascript
+      host_css && host_images && host_javascript && host_reactive_form_js
     end
 
     def host_css
@@ -73,8 +77,7 @@ module Jetski
     end
 
     def host_images
-      # TODO: Expand this to support more types of images.
-      file_ext_types = ["png", "jpg"]
+      file_ext_types = ["png", "jpg"] # TODO: Expand this to support more types of images.
       image_files = Dir.glob(
         file_ext_types.map { |ext| File.join(Jetski.app_root, "app/assets/images/*.#{ext}")  }
       )
@@ -99,5 +102,23 @@ module Jetski
         end
       end
     end
+
+    def host_reactive_form_js
+      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'))
+      end
+    end
+  private
+    def parse_body(body, content_type = '')
+      case content_type
+      when "application/x-www-form-urlencoded"
+        Rack::Utils.parse_nested_query body
+      when "application/json"
+        OpenStruct.new(JSON.parse(body))
+      else
+        body
+      end
+    end
   end
 end

data/lib/jetski/server.rb

@@ -6,6 +6,8 @@ module Jetski
     def call
       server = WEBrick::HTTPServer.new Port: 8000
 
+      Jetski::Autoloader.call
+      
       Jetski::Router.new(server).call
 
       trap 'INT' do server.shutdown end

data/lib/jetski/version.rb

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

data/lib/jetski.rb

@@ -3,12 +3,18 @@ require "json"
 require "json"
 require "ostruct"
 require "erb"
+require "rack"
 
 require_relative './jetski/version'
+require_relative './jetski/frontend/reactive_form'
 require_relative './jetski/base_controller'
-require_relative './jetski/server'
+require_relative './jetski/router/shared_methods'
 require_relative './jetski/router/parser'
 require_relative './jetski/router'
+require_relative './jetski/autoloader'
+require_relative './jetski/server'
+require_relative './jetski/database/base'
+require_relative './jetski/model'
 
 module Jetski
   extend self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Indigo Tech Tutorials
@@ -65,6 +65,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.2
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.4
 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
@@ -74,8 +116,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/jetski
+- bin/jetski_cli_helpers/database.rb
 - 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
@@ -85,9 +129,15 @@ files:
 - 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/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
 homepage: https://rubygems.org/gems/jetski