radical 1.1.0 → 1.2.0

data/lib/radical/view.rb

@@ -22,20 +22,28 @@ module Radical
     class << self
       attr_accessor :_views_path, :_layout
 
-      def view_path(dir, name)
-        filename = File.join(@_views_path || '.', 'views', dir, "#{name}.erb")
+      def view_path!(dir, name)
+        filename = view_path(dir, name)
 
         raise "Could not find view file: #{filename}. You need to create it." unless File.exist?(filename)
 
         filename
       end
 
+      def view_path(dir, name)
+        File.join(@_views_path || '.', 'views', dir, "#{name}.erb")
+      end
+
       def template(dir, name)
         Tilt.new(view_path(dir, name), engine_class: CaptureEngine, escape_html: true)
       end
 
-      def path(path = nil, test = Env.test?)
-        @_views_path = path || ((test ? 'test' : '') + __dir__)
+      def template!(dir, name)
+        Tilt.new(view_path!(dir, name), engine_class: CaptureEngine, escape_html: true)
+      end
+
+      def path(path = nil)
+        @_views_path = path
       end
 
       def layout(name)
@@ -43,13 +51,13 @@ module Radical
       end
 
       def render(dir, name, scope, options = {})
-        t = template(dir, name)
+        t = template!(dir, name)
 
-        if @_layout && options[:layout] != false
-          layout = template('', @_layout)
+        layout = template('', @_layout || 'layout') unless options[:layout] != false
 
-          layout.render(scope, {}) do
-            t.render scope
+        if layout
+          layout.render scope, {} do
+            t.render scope, options[:locals] || {}
           end
         else
           t.render scope

data/lib/radical.rb

@@ -6,3 +6,10 @@ require_relative 'radical/view'
 require_relative 'radical/model'
 require_relative 'radical/migration'
 require_relative 'radical/routes'
+require_relative 'radical/env'
+
+module Radical
+  def self.env
+    Radical::Env
+  end
+end

data/radical.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = 'radical'
-  spec.version       = '1.1.0'
+  spec.version       = '1.2.0'
   spec.author        = 'Sean Walker'
   spec.email         = 'sean@swlkr.com'
 
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'puma', '~> 5.5'
@@ -36,10 +37,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'sorbet', '~> 0.5'
 
+  spec.add_dependency 'brotli', '~> 0.4'
   spec.add_dependency 'erubi', '~> 1.10'
   spec.add_dependency 'rack', '~> 2.2'
   spec.add_dependency 'rack_csrf', '~> 2.6'
-  spec.add_dependency 'rack-flash3', '~> 1.0'
   spec.add_dependency 'sorbet-runtime', '~> 0.5'
   spec.add_dependency 'sqlite3', '~> 1.4'
   spec.add_dependency 'tilt', '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radical
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Walker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -81,61 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: erubi
+  name: brotli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rack_csrf
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rack-flash3
+  name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,8 @@ dependencies:
         version: '2.0'
 description: This gem helps you write rails-like web applications
 email: sean@swlkr.com
-executables: []
+executables:
+- rad
 extensions: []
 extra_rdoc_files: []
 files:
@@ -192,16 +193,40 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- exe/rad
 - lib/radical.rb
 - lib/radical/app.rb
+- lib/radical/asset.rb
+- lib/radical/asset_compiler.rb
+- lib/radical/assets.rb
 - lib/radical/controller.rb
 - lib/radical/database.rb
 - lib/radical/env.rb
+- lib/radical/flash.rb
 - lib/radical/form.rb
+- lib/radical/generator.rb
+- lib/radical/generator/app/.env
+- lib/radical/generator/app/Gemfile
+- lib/radical/generator/app/app.rb
+- lib/radical/generator/app/config.ru
+- lib/radical/generator/app/controllers/controller.rb
+- lib/radical/generator/app/models/model.rb
+- lib/radical/generator/app/routes.rb
+- lib/radical/generator/blank_migration.rb
+- lib/radical/generator/controller.rb
+- lib/radical/generator/migration.rb
+- lib/radical/generator/model.rb
+- lib/radical/generator/views/_form.rb
+- lib/radical/generator/views/edit.rb
+- lib/radical/generator/views/index.rb
+- lib/radical/generator/views/new.rb
+- lib/radical/generator/views/show.rb
 - lib/radical/migration.rb
 - lib/radical/model.rb
 - lib/radical/router.rb
 - lib/radical/routes.rb
+- lib/radical/security_headers.rb
+- lib/radical/strings.rb
 - lib/radical/table.rb
 - lib/radical/view.rb
 - radical.gemspec
@@ -223,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="