railz_lite 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9913416758845461437f605307b2a10be934ed1da34652947f9a2dcbfdb1caa
-  data.tar.gz: 33c8f9a302c65d3f4f55ebcd1682458de7a856d2c0c66c4fc6e1c614d64792e6
+  metadata.gz: f212021508124c75b30ec2d598c39939597f7263f8a08d8909efedc5d13220e7
+  data.tar.gz: 2b45fc4a2b46f7aa168a48d1fc0c222cbeca5007c1c1df7400bbd591363388a7
 SHA512:
-  metadata.gz: 900a8e1808fdfc07b4c5638c1a7fb0cc3357c15fe9eaf8a563c8b56596716fc12ba038a75df0fe462ddd7f2bffc42c6367c6743e9184fe4d63c3be5e8cd384ec
-  data.tar.gz: 56cdd5db6f1d0b008f1ad9b34e24047da258601bd57b8d76723bf1ccd8a76bbad486c1ec7df5503965d3d0f1b1d3e7fb8e7939974e71739bfbee4d94ca762144
+  metadata.gz: d9a20d00eeab48b8738ee9f136468f97081a2b14c1819c9473277374a169cc8dbe85a45ee4ed48bfcc4df24856791019cf994df791d062c4a339d5d0ea83bc03
+  data.tar.gz: 0646d6b6f01ac5c7998e9bf3c0431a34777cf22f7ac46e34756b2fc197832c9794949d2de2398c2ccbdaa5f2c8d59497a3dacaca62d9c2e5ace82fa1eae261bf

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/lib/railz_lite/cli.rb

@@ -14,7 +14,6 @@ module RailzLite
     def server
       file =  File.join(Dir.pwd, 'config', 'server.rb')
       if File.exist?(file)
-        DBConnection.start # load our db connection
         system('ruby', file)
       else
         raise "File not found at #{file}"

data/lib/railz_lite/controllers/controller_base.rb

@@ -1,10 +1,14 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'erb'
+require 'loofah'
 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
 
@@ -46,10 +50,24 @@ module RailzLite
     # pass the rendered html to render_content
     def render(template_name)
       dir_path = Dir.pwd
-      file_path = File.join(dir_path, 'views', "#{self.class.name.underscore.split('_controller').first}", "#{template_name.to_s}.html.erb")
-      file = File.read(file_path)
-      template = ERB.new(file).result(binding)
-      render_content(template, 'text/html')
+
+      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_html = inner.result(binding)
+        Loofah.fragment(inner_html).scrub!(:prune).to_s # prevent non-safe html from being executed
+      end
+
+      render_content(result, 'text/html')
     end
 
     # method exposing a `Session` object

data/lib/railz_lite/controllers/static.rb

@@ -1,11 +1,11 @@
 require 'rack'
 
 class Static
-  attr_reader :app, :file_server, :root
+  attr_reader :app, :file_server, :root_paths
 
   def initialize(app)
     @app = app
-    @root = 'public'
+    @root_paths = ['public', 'assets']
     @file_server = FileServer.new
   end
 
@@ -23,7 +23,7 @@ class Static
   private
 
   def can_match?(path)
-    path.index("/#{root}")
+    root_paths.any? { |root| path.index("/#{root}") }
   end
 end
 
@@ -32,7 +32,9 @@ class FileServer
   MIME_TYPES = {
     '.txt' => 'text/plain',
     '.jpg' => 'image/jpeg',
-    '.zip' => 'application/zip'
+    '.zip' => 'application/zip',
+    '.css' => 'text/css',
+    '.js' => 'text/javascript'
   }
 
   def call(env)

data/lib/railz_lite/generators/project.rb

@@ -26,8 +26,13 @@ module RailzLite
         template('server.rb', "#{project_name}/config/server.rb")
       end
 
-      def add_welcome_view
+      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")
+      end
+
+      def add_assets
+        create_file("#{project_name}/assets/application.css")
       end
 
       def add_public

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="assets/application.css">
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

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

@@ -6,7 +6,7 @@
     ">
   <h1>Welcome To Railz Lite!</h1>
 
-  <img src="../public/winter_fox_large.jpg" />
+  <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/db_connection.rb

@@ -29,7 +29,7 @@ class DBConnection
   end
 
   def self.instance
-    reset if @db.nil?
+    start if @db.nil?
 
     @db
   end

data/lib/railz_lite/version.rb

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

data/railz_lite.gemspec

@@ -29,11 +29,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "rack"
-  spec.add_dependency "activesupport"
-  spec.add_dependency "puma"
-  spec.add_dependency "sqlite3"
-  spec.add_dependency "thor"
+  spec.add_dependency "rack", '~> 2.2.3'
+  spec.add_dependency "activesupport", '~> 6.1.4'
+  spec.add_dependency "puma", '~> 5.3.2'
+  spec.add_dependency "sqlite3", '~> 1.4.2'
+  spec.add_dependency "thor", '~> 1.1.0'
+  spec.add_dependency "loofah", '~> 2.10.0'
 
 
   spec.add_development_dependency "byebug"

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: railz_lite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.3.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,7 @@ 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