railz_lite 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ebf1f78b9263164fa6d9c864a3344f834171df91856e8f5cfb18b318b7c215
-  data.tar.gz: 8844959b357a2ad711666cff1eadfdfd5a963621d09f1d035442162eb4ccd0f1
+  metadata.gz: c174580952b1c2956cf1d6bdbe7fbc0c7991a8b4401c98d63d3d3a9718ab4319
+  data.tar.gz: 3e32d2b2cc43e7ed406095e6934798e3c5fbafbe55f4965e3f08b732932d92ec
 SHA512:
-  metadata.gz: 3e2f0f87d0a1cbb225d5987518e3f025446b04c075e28c6faf749f616cc3ac0393f12c09b963e08aaa33ac93fd29b8c9c6cbae43aebd0baa766615b62b4b5c50
-  data.tar.gz: 144b760958c29eaf21ba4c4977af41e47fe068c20eb651798c4fa751e5a2c791e2afd81e24d430a05a506482078f480b0931a9efb53f23846f674ec32d7ea2cc
+  metadata.gz: dca26645dca90b0a88e43ff6790083c7df11d1cff5b1b880d832156d1675e71f50e5310d2e01815b83b6f93c75f38a9c36b0b3e4ea21225e855d40b677647bfb
+  data.tar.gz: 6b682f976740cc0b9127bd7673fd520c7cbff38392aa54c3c7079bc5f1dc14274f452cefa3f6fdaf4388e317f73b9b97cc8b8f773c9e92499ba8e03ff0f5b93c

data/lib/railz_lite/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'railz_lite'
 require 'railz_lite/generators/project'
+require 'railz_lite/models/db_connection'
 
 module RailzLite
   class CLI < Thor
@@ -9,7 +10,7 @@ module RailzLite
       RailzLite::Generators::Project.start([project_name])
     end
 
-    desc 'server', 'Starts up a puma server within RailzLite project'
+    desc 'server', 'Starts up a puma server within RailzLite project. Also initializes '
     def server
       file =  File.join(Dir.pwd, 'config', 'server.rb')
       if File.exist?(file)
@@ -18,5 +19,10 @@ module RailzLite
         raise "File not found at #{file}"
       end
     end
+
+    desc 'db_reset', 'Restarts the database and reads db/app.sql file'
+    def db_reset
+      DBConnection.reset
+    end
   end
 end

data/lib/railz_lite/controllers/controller_base.rb

@@ -5,6 +5,9 @@ require_relative './session'
 require_relative './flash'
 
 module RailzLite
+  class LayoutRenderer # dummy class used to pass yield blocks into ERB method results https://hostiledeveloper.com/2015/05/28/working-with-templates-in-ruby-erb.html
+  end
+
   class ControllerBase
     attr_reader :req, :res, :params
 
@@ -45,11 +48,24 @@ module RailzLite
     # use ERB and binding to evaluate templates
     # pass the rendered html to render_content
     def render(template_name)
-      dir_path = File.dirname(__FILE__)
-      file_path = File.join(dir_path, '..', 'views', "#{self.class.name.underscore}", "#{template_name.to_s}.html.erb")
-      file = File.read(file_path)
-      template = ERB.new(file).result(binding)
-      render_content(template, 'text/html')
+      dir_path = Dir.pwd
+
+      layout_path = File.join(dir_path, 'views', 'application', 'application.html.erb')
+      inner_file_path = File.join(dir_path, 'views', "#{self.class.name.underscore.split('_controller').first}", "#{template_name.to_s}.html.erb")
+
+      layout_template = File.read(layout_path)
+      inner_template = File.read(inner_file_path)
+
+      layout = ERB.new(layout_template)
+      inner = ERB.new(inner_template)
+
+      layout.def_method(LayoutRenderer, 'render') # dummy method used so that blocks can be passed to ERB result
+
+      result = LayoutRenderer.new.render do
+        inner.result(binding)
+      end
+
+      render_content(result, 'text/html')
     end
 
     # method exposing a `Session` object

data/lib/railz_lite/controllers/static.rb

@@ -61,7 +61,7 @@ class FileServer
   def requested_file_name(env)
     req = Rack::Request.new(env)
     path = req.path
-    dir = File.dirname(__FILE__)
-    File.join(dir, '..', path)
+    dir = Dir.pwd
+    File.join(dir, path)
   end
 end

data/lib/railz_lite/generators/project.rb

@@ -11,7 +11,6 @@ module RailzLite
       end
 
       def self.destination_root
-        puts "destination for folder #{Dir.pwd}"
         Dir.pwd
       end
       
@@ -27,12 +26,18 @@ module RailzLite
         template('server.rb', "#{project_name}/config/server.rb")
       end
 
-      def add_views
-        empty_directory("#{project_name}/views")
+      def setup_views
+        template('welcome_view.index.html.erb', "#{project_name}/views/welcome/index.html.erb")
+        template('application.html.erb', "#{project_name}/views/application/application.html.erb")
+        create_file("#{project_name}/views/application/application.css")
       end
 
       def add_public
-        empty_directory("#{project_name}/public")
+        copy_file('winter_fox_large.jpg', "#{project_name}/public/winter_fox_large.jpg")
+      end
+
+      def create_sql_file
+        create_file("#{project_name}/db/app.sql")
       end
     end
   end

data/lib/railz_lite/generators/templates/application.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>App Title</title>
+    <link rel="stylesheet" href="application.css">
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/lib/railz_lite/generators/templates/server.rb

@@ -2,10 +2,17 @@ require 'rack'
 require 'railz_lite/controllers/static'
 require 'railz_lite/controllers/show_exceptions'
 require 'railz_lite/controllers/router'
+require 'railz_lite'
+
+# example controller config
+ class WelcomeController < RailzLite::ControllerBase
+   def index; end
+ end
 
 router = Router.new
 router.draw do
   # add routes here
+  get Regexp.new('^/$'), WelcomeController, :index
 end
 
 app = Proc.new do |env|

data/lib/railz_lite/generators/templates/welcome_view.index.html.erb

@@ -0,0 +1,12 @@
+<div style="
+    width: 50%;
+    margin: 0 auto;
+    margin-top: 18px;
+    text-align: center;
+    ">
+  <h1>Welcome To Railz Lite!</h1>
+
+  <img src="../public/winter_fox_large.jpg" />
+
+  <h3>For guidelines on how to build an app with this framework see <a href="https://github.com/bryanqb07/railz_lite">here</a>.</h3>
+</div>

data/lib/railz_lite/models/associatable.rb

@@ -46,34 +46,32 @@ class HasManyOptions < AssocOptions
   end
 end
 
-module Associatable
-  def belongs_to(name, options = {})
-    options = BelongsToOptions.new(name, options)
-    assoc_options[name] = options
-    define_method(name) do
-     foreign_key = send(options.foreign_key)
-     primary_key = options.primary_key
-     params = [[primary_key, foreign_key]].to_h
-     options.model_class.where(params).first
+module RailzLite
+  module Associatable
+    def belongs_to(name, options = {})
+      options = BelongsToOptions.new(name, options)
+      assoc_options[name] = options
+      define_method(name) do
+        foreign_key = send(options.foreign_key)
+        primary_key = options.primary_key
+        params = [[primary_key, foreign_key]].to_h
+        options.model_class.where(params).first
+      end
     end
-  end
 
-  def has_many(name, options = {})
-    options = HasManyOptions.new(name, self.name, options)
-    define_method(name) do
-     foreign_key = options.foreign_key
-     primary_key = send(options.primary_key)
-     params = [[foreign_key, primary_key]].to_h
-     options.model_class.where(params)
+    def has_many(name, options = {})
+      options = HasManyOptions.new(name, self.name, options)
+      define_method(name) do
+        foreign_key = options.foreign_key
+        primary_key = send(options.primary_key)
+        params = [[foreign_key, primary_key]].to_h
+        options.model_class.where(params)
+      end
     end
-  end
 
-  def assoc_options
-    @assoc_options ||= {}
-    @assoc_options
+    def assoc_options
+      @assoc_options ||= {}
+      @assoc_options
+    end
   end
 end
-
-class SQLObject
-  extend Associatable
-end

data/lib/railz_lite/models/db_connection.rb

@@ -1,12 +1,16 @@
 require 'sqlite3'
 
-PRINT_QUERIES = ENV['PRINT_QUERIES'] == 'true'
-# https://tomafro.net/2010/01/tip-relative-paths-with-file-expand-path
-ROOT_FOLDER = File.join(File.dirname(__FILE__), '..')
-SQL_FILE = File.join(ROOT_FOLDER, 'app.sql')
-DB_FILE = File.join(ROOT_FOLDER, 'app.db')
-
 class DBConnection
+  PRINT_QUERIES = ENV['PRINT_QUERIES'] == 'true'
+  ROOT_FOLDER = Dir.pwd
+  SQL_FILE = File.join(ROOT_FOLDER, 'db', 'app.sql')
+  DB_FILE = File.join(ROOT_FOLDER, 'db', 'app.db')
+
+  def self.start
+    `sqlite3 #{DB_FILE}`
+    DBConnection.open(DB_FILE)
+  end
+
   def self.open(db_file_name)
     @db = SQLite3::Database.new(db_file_name)
     @db.results_as_hash = true
@@ -26,7 +30,7 @@ class DBConnection
   end
 
   def self.instance
-    reset if @db.nil?
+    start if @db.nil?
 
     @db
   end

data/lib/railz_lite/models/searchable.rb

@@ -1,10 +1,10 @@
 require_relative 'db_connection'
-require_relative 'sql_object'
 
-module Searchable
-  def where(params)
-    where_line = params.keys.map { |attr_name| "#{attr_name} = ?" }.join(" AND ")
-    results = DBConnection.execute(<<-SQL, *params.values)
+module RailzLite
+  module Searchable
+    def where(params)
+      where_line = params.keys.map { |attr_name| "#{attr_name} = ?" }.join(" AND ")
+      results = DBConnection.execute(<<-SQL, *params.values)
       SELECT
         *
       FROM
@@ -12,10 +12,7 @@ module Searchable
       WHERE
         #{where_line}
     SQL
-    results.map { |attrs| self.new(attrs) }
+      results.map { |attrs| self.new(attrs) }
+    end
   end
 end
-
-class SQLObject
-  extend Searchable
-end

data/lib/railz_lite/models/sql_object.rb

@@ -1,8 +1,13 @@
 require_relative 'db_connection'
+require_relative 'associatable'
+require_relative 'searchable'
 require 'active_support/inflector'
 
 module RailzLite
   class SQLObject
+    extend RailzLite::Associatable
+    extend RailzLite::Searchable
+
     def self.columns
       @columns ||= DBConnection.execute2(<<-SQL)
       SELECT

data/lib/railz_lite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailzLite
-  VERSION = "0.1.7"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railz_lite
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - bryan lynch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -166,8 +166,11 @@ files:
 - lib/railz_lite/controllers/templates/rescue.html.erb
 - lib/railz_lite/generators/project.rb
 - lib/railz_lite/generators/project.rb~
+- lib/railz_lite/generators/templates/application.html.erb
 - lib/railz_lite/generators/templates/application_controller.rb~
 - lib/railz_lite/generators/templates/server.rb
+- lib/railz_lite/generators/templates/welcome_view.index.html.erb
+- lib/railz_lite/generators/templates/winter_fox_large.jpg
 - lib/railz_lite/models/associatable.rb
 - lib/railz_lite/models/associatable2.rb
 - lib/railz_lite/models/attr_accessor_object.rb