jetski 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf7b96b5cefdcbd3ebcad38e3abb18500e9ff367e888a4432604e0ff7aaad8d
-  data.tar.gz: 6f482121c9a697c923c5a3a4d1a5b5fed822584190408db002d9e6668343372b
+  metadata.gz: 59cc948a27a477850ced800437233d2106f046a70eef581011efc407b29469ce
+  data.tar.gz: 52dee7630e6efac75428fc46a5e18b3c2374323d0d77dd793cb77f3554f994fd
 SHA512:
-  metadata.gz: 89b0d3060b6161e742960048b92a9ed41b16787914c2bc34cb1e046bf44537f997381168df708e0188b590ca23352ba622c6ffca1443c27921b273df41e34c06
-  data.tar.gz: 538160835a9a3e3a8768b1a2aa8c8e9664520ec8f3c403d0b98681535db57dc403ae0d1a6db57443d5c0054674e2bf25be42923bcfdd77de8cc990957579e2bd
+  metadata.gz: 9f5780959202dac7113a038c9793863851147156fcda7d9ca0efa8b837afc8aaeb37f9f65a7ef266e4b3693dd2acfef48e1987f376e869d88640ec2fcad6c19e
+  data.tar.gz: 76ca2114bc78e15d8fdac21a9f39b137cbf66fa0f3faf45948a245ffdf92722712a9099d55a285cbf0b83f886540b8c02fcc35730a08b91d9e418b2afefd2812

data/lib/jetski/autoloader.rb

@@ -6,6 +6,11 @@ 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", "").capitalize
+        model_class = Object.const_get(model_name)
+        model_class.define_attribute_methods
       end
     end
 

data/lib/jetski/base_controller.rb

@@ -1,6 +1,12 @@
 # This is the base controller of the library
 module Jetski
   class BaseController
+    RESERVED_INSTANCE_VARIABLES = [
+        :@res, :@performed_render, :@action_name, 
+        :@controller_name, :@controller_path, :@cookies, :@root,
+        :@request_method, :@path
+    ]
+
     include ReactiveForm
     attr_accessor :action_name, :controller_name, :controller_path, 
       :params, :cookies

data/lib/jetski/helpers/view_helpers.rb

@@ -1,8 +1,10 @@
 module Jetski
   module Helpers
     module ViewHelpers
-      def render(path_to_file)
-        File.join(Jetski.app_root, path_to_file)
+      # 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)
       end
     end
   end

data/lib/jetski/model.rb

@@ -3,33 +3,30 @@ 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"] ||= ""
+      # TODO: Need to fix code
+      # Cannot redefine methods every time we initialize a new object.
+      # need to define available methods on post when loading model
+      @virtual_attributes = args
+    end
 
-      @virtual_attributes.each do |k, v|
-        self.class.class_eval do 
-          define_method(k) { v }
-        end
+    def inspect
+      post_obj_id = object_id
+      inspect_str = "#<Post:#{post_obj_id}"
+      self.class.model_attributes.each do |attribute_name|
+        attribute_value = @virtual_attributes[attribute_name]
+        inspect_str += " #{attribute_name}=\"#{attribute_value}\""
       end
+      inspect_str += ">"
+      inspect_str
+    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
+    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
@@ -43,8 +40,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(", ")}) 
@@ -61,6 +60,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
+        model_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 = []
@@ -90,7 +102,7 @@ module Jetski
       def first
         format_model_obj(pluck_rows.first)
       end
-    private
+      
       def table_name
         self.to_s.downcase
       end
@@ -102,7 +114,12 @@ module Jetski
           table_name + "s"
         end
       end
+      
+      def model_attributes
+        attributes.concat(["id", "created_at", "updated_at"])
+      end
 
+    private
       def format_model_obj(row, columns = nil)
         return unless row
         columns ||= attributes

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/lib/jetski/view_renderer.rb

@@ -1,7 +1,7 @@
 module Jetski
   class ViewRenderer
-    extend Jetski::Helpers::Delegatable
     include Jetski::Helpers::ViewHelpers
+    extend Jetski::Helpers::Delegatable
     
     attr_reader :errors, :controller
     delegate :res, :action_name, :controller_path, to: :controller
@@ -33,14 +33,22 @@ module Jetski
       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
+
+      grab_instance_variables
+      template.result(binding)
     rescue => e
       @errors << e
       nil
     end
 
+    def grab_instance_variables
+      variables_from_controller = controller.instance_variables.filter { |var| !Jetski::BaseController::RESERVED_INSTANCE_VARIABLES.include?(var) }
+      variables_from_controller.each do |inst_var|
+        value = controller.instance_variable_get(inst_var)
+        instance_variable_set(inst_var, value)
+      end
+    end
+
     def content_for_head
       _content_for_head = ''
 

data/lib/jetski.rb

@@ -7,6 +7,7 @@ require "sqlite3"
 
 require_relative './jetski/version'
 require_relative './jetski/frontend/reactive_form'
+require_relative './jetski/helpers/view_helpers'
 require_relative './jetski/base_controller'
 require_relative './jetski/router/shared_methods'
 require_relative './jetski/router/parser'
@@ -16,7 +17,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetski
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Indigo Tech Tutorials