jetski 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419176ab6c0bac6515d1f7f6136cd0ff800bad44fa34e41d882ef2bb6c59f46c
-  data.tar.gz: a349cc717aab7101fea571ad0a12eeadc618a5136103ef388875b4ef2ca806f4
+  metadata.gz: 59cc948a27a477850ced800437233d2106f046a70eef581011efc407b29469ce
+  data.tar.gz: 52dee7630e6efac75428fc46a5e18b3c2374323d0d77dd793cb77f3554f994fd
 SHA512:
-  metadata.gz: eb5520b371047a616aecdd8b341ee17a4b1a7ac4349164639ce8024f7a485b79a51c75035a703ccba0e036c957ad16bdf2f8a12d13eea2e9366f9473c9674bfa
-  data.tar.gz: 39643ec6fe8aa41363df7d1c3e627cc7aeb3e62a3ed2cbf3ba8d3ff94f19ed149d9d7ba8e5dedea245a2ad91b25fdce4d0a0e5c25dac73d99c86c48d35372fd1
+  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/model.rb

@@ -3,33 +3,21 @@ 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
+      # 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
 
-      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 = "#<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
 
     def destroy!
@@ -52,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(", ")}) 
@@ -70,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 = []
@@ -111,6 +114,10 @@ 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)

data/lib/jetski/version.rb

@@ -1,3 +1,3 @@
 module Jetski
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 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

metadata

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