jetski 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bf7b96b5cefdcbd3ebcad38e3abb18500e9ff367e888a4432604e0ff7aaad8d
-  data.tar.gz: 6f482121c9a697c923c5a3a4d1a5b5fed822584190408db002d9e6668343372b
+  metadata.gz: 419176ab6c0bac6515d1f7f6136cd0ff800bad44fa34e41d882ef2bb6c59f46c
+  data.tar.gz: a349cc717aab7101fea571ad0a12eeadc618a5136103ef388875b4ef2ca806f4
 SHA512:
-  metadata.gz: 89b0d3060b6161e742960048b92a9ed41b16787914c2bc34cb1e046bf44537f997381168df708e0188b590ca23352ba622c6ffca1443c27921b273df41e34c06
-  data.tar.gz: 538160835a9a3e3a8768b1a2aa8c8e9664520ec8f3c403d0b98681535db57dc403ae0d1a6db57443d5c0054674e2bf25be42923bcfdd77de8cc990957579e2bd
+  metadata.gz: eb5520b371047a616aecdd8b341ee17a4b1a7ac4349164639ce8024f7a485b79a51c75035a703ccba0e036c957ad16bdf2f8a12d13eea2e9366f9473c9674bfa
+  data.tar.gz: 39643ec6fe8aa41363df7d1c3e627cc7aeb3e62a3ed2cbf3ba8d3ff94f19ed149d9d7ba8e5dedea245a2ad91b25fdce4d0a0e5c25dac73d99c86c48d35372fd1

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

@@ -32,6 +32,15 @@ module Jetski
       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
       def create(**args)
         return puts "#{table_name.capitalize}.create was called with no args" if args.size == 0
@@ -90,7 +99,7 @@ module Jetski
       def first
         format_model_obj(pluck_rows.first)
       end
-    private
+      
       def table_name
         self.to_s.downcase
       end
@@ -103,6 +112,7 @@ module Jetski
         end
       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.6"
 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
+      # controller.class.class_eval problem is you still have render defined there
+      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.6
 platform: ruby
 authors:
 - Indigo Tech Tutorials