radical 1.0.0 → 1.2.0

data/lib/radical/router.rb

@@ -1,4 +1,6 @@
 # typed: true
+# frozen_string_literal: true
+
 require 'rack'
 require 'sorbet-runtime'
 
@@ -45,6 +47,8 @@ module Radical
     ].freeze
 
     RESOURCE_ACTIONS = [
+      [:new, 'GET', '/new'],
+      [:create, 'POST', ''],
       [:show, 'GET', ''],
       [:edit, 'GET', '/edit'],
       [:update, 'PUT', ''],
@@ -66,54 +70,31 @@ module Radical
 
     sig { params(klass: Class).void }
     def add_root(klass)
-      add_actions(klass, name: '')
+      add_routes(klass, name: '', actions: ACTIONS)
+      add_root_paths(klass)
     end
 
-    sig { params(klass: Class, name: T.nilable(String), prefix: T.nilable(String), actions: Array).void }
-    def add_actions(klass, name: nil, prefix: nil, actions: ACTIONS)
-      name ||= klass.route_name
-
-      actions.each do |method, http_method, suffix|
-        next unless klass.method_defined?(method)
-
-        path = "/#{prefix}#{name}#{suffix}"
-        path = Regexp.new("^#{path.gsub(/:(\w+)/, '(?<\1>[a-zA-Z0-9_]+)')}$")
-
-        if %i[index create show update destroy].include?(method) && !klass.method_defined?(:"#{klass.route_name}_path")
-          klass.define_method :"#{klass.route_name}_path" do |obj = nil|
-            if obj.is_a?(Model)
-              "/#{klass.route_name}/#{obj.id}"
-            else
-              "/#{klass.route_name}"
-            end
-          end
-        end
-
-        if method == :new
-          klass.define_method :"new_#{klass.route_name}_path" do
-            "/#{klass.route_name}/new"
-          end
-        end
-
-        if method == :edit
-          klass.define_method :"edit_#{klass.route_name}_path" do |obj|
-            "/#{klass.route_name}/#{obj.id}/edit"
-          end
-        end
-
-        @routes[http_method] << [path, [klass, method]]
-      end
+    sig { params(klass: Class).void }
+    def add_resource(klass)
+      add_routes(klass, actions: RESOURCE_ACTIONS)
+      add_resource_paths(klass)
     end
 
-    sig { params(classes: T::Array[Class], prefix: T.nilable(String), actions: Array).void }
-    def add_routes(classes, prefix: nil, actions: ACTIONS)
-      classes.each do |klass|
-        add_actions(klass, prefix: prefix, actions: actions)
+    sig { params(klass: Class, parents: T.nilable(T::Array[Class])).void }
+    def add_resources(klass, parents: nil)
+      if parents
+        parents.each do |scope|
+          add_routes(klass, actions: ACTIONS, scope: scope)
+          add_resources_paths(klass, scope: scope)
+        end
+      else
+        add_routes(klass, actions: ACTIONS)
+        add_resources_paths(klass)
       end
     end
 
-    sig { params(request: Rack::Request).returns(Rack::Response) }
-    def route(request)
+    sig { params(request: Rack::Request, options: T.nilable(Hash)).returns(Rack::Response) }
+    def route(request, options: {})
       params = T.let({}, T.nilable(Hash))
 
       route = @routes[request.request_method].find do |r|
@@ -128,7 +109,7 @@ module Radical
         request.update_param(k, v)
       end
 
-      instance = klass.new(request)
+      instance = klass.new(request, options: options)
 
       response = instance.public_send(method)
 
@@ -140,5 +121,125 @@ module Radical
 
       Rack::Response.new(body, 200, { 'Content-Type' => 'text/html' })
     end
+
+    private
+
+    sig { params(klass: Class, actions: Array, name: T.nilable(String), scope: T.nilable(Class)).void }
+    def add_routes(klass, actions:, name: nil, scope: nil)
+      name ||= klass.route_name
+
+      actions.each do |method, http_method, suffix|
+        next unless klass.method_defined?(method)
+
+        path = if scope
+                 if %i[index new create].include?(method)
+                   "/#{scope.route_name}/:#{scope.route_name}_id/#{name}#{suffix}"
+                 else
+                   "/#{name}#{suffix}"
+                 end
+               else
+                 "/#{name}#{suffix}"
+               end
+
+        path = Regexp.new("^#{path.gsub(/:(\w+)/, '(?<\1>[a-zA-Z0-9_]+)')}$").freeze
+
+        @routes[http_method] << [path, [klass, method]]
+      end
+    end
+
+    sig { params(klass: Class).void }
+    def add_root_paths(klass)
+      route_name = klass.route_name
+
+      if %i[index create show update destroy].any? { |method| klass.method_defined?(method) }
+        Controller.define_method :"#{route_name}_path" do |obj = nil|
+          if obj
+            "/#{obj.id}"
+          else
+            '/'
+          end
+        end
+      end
+
+      if klass.method_defined?(:new)
+        Controller.define_method :"new_#{route_name}_path" do
+          '/new'
+        end
+      end
+
+      return unless klass.method_defined?(:edit)
+
+      Controller.define_method :"edit_#{route_name}_path" do |obj|
+        "/#{obj.id}/edit"
+      end
+    end
+
+    sig { params(klass: Class).void }
+    def add_resource_paths(klass)
+      name = klass.route_name
+
+      if %i[create show update destroy].any? { |method| klass.method_defined?(method) }
+        Controller.define_method :"#{name}_path" do
+          "/#{name}"
+        end
+      end
+
+      if klass.method_defined?(:new)
+        Controller.define_method :"new_#{name}_path" do
+          "/#{name}/new"
+        end
+      end
+
+      return unless klass.method_defined?(:edit)
+
+      Controller.define_method :"edit_#{name}_path" do
+        "/#{name}/edit"
+      end
+    end
+
+    sig { params(klass: Class, scope: T.nilable(Class)).void }
+    def add_resources_paths(klass, scope: nil)
+      path_name = klass.route_name
+      scope_path_name = [scope&.route_name, klass.route_name].compact.join('_')
+      name = klass.route_name
+
+      if %i[index create show update destroy].any? { |method| klass.method_defined?(method) }
+        if scope
+          Controller.define_method :"#{scope_path_name}_path" do |parent|
+            "/#{scope.route_name}/#{parent.id}/#{name}"
+          end
+
+          Controller.define_method :"#{path_name}_path" do |obj|
+            "/#{name}/#{obj.id}"
+          end
+        else
+          Controller.define_method :"#{path_name}_path" do |obj = nil|
+            if obj
+              "/#{name}/#{obj.id}"
+            else
+              "/#{name}"
+            end
+          end
+        end
+      end
+
+      if klass.method_defined?(:new)
+        if scope
+          Controller.define_method :"new_#{scope_path_name}_path" do |parent|
+            "/#{scope.route_name}/#{parent.id}/#{name}/new"
+          end
+        else
+          Controller.define_method :"new_#{path_name}_path" do
+            "/#{name}/new"
+          end
+        end
+      end
+
+      return unless klass.method_defined?(:edit)
+
+      Controller.define_method :"edit_#{path_name}_path" do |obj|
+        "/#{name}/#{obj.id}/edit"
+      end
+    end
   end
 end

data/lib/radical/routes.rb

@@ -0,0 +1,59 @@
+# typed: true
+# frozen_string_literal: true
+
+require_relative 'router'
+
+module Radical
+  class Routes
+    class << self
+      extend T::Sig
+
+      sig { returns(Router) }
+      def router
+        @router ||= Router.new
+      end
+
+      def parents
+        @parents ||= []
+      end
+
+      sig { params(name: T.any(String, Symbol)).void }
+      def root(name)
+        klass = Object.const_get(name)
+
+        router.add_root(klass)
+      end
+
+      sig { params(names: T.any(String, Symbol)).void }
+      def resource(*names)
+        classes = names.map { |c| Object.const_get(c) }
+
+        classes.each do |klass|
+          router.add_resource(klass)
+        end
+      end
+
+      sig { params(names: T.any(String, Symbol), block: T.nilable(T.proc.void)).void }
+      def resources(*names, &block)
+        classes = names.map { |c| Object.const_get(c) }
+
+        classes.each do |klass|
+          if parents.any?
+            router.add_resources(klass, parents: @parents)
+
+            # only one level of nesting
+            @parents = []
+          else
+            router.add_resources(klass)
+          end
+        end
+
+        return unless block
+
+        @parents = classes
+
+        block.call
+      end
+    end
+  end
+end

data/lib/radical/security_headers.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Radical
+  class SecurityHeaders
+    DEFAULT_HEADERS = {
+      'X-Content-Type-Options' => 'nosniff',
+      'X-Frame-Options' => 'deny',
+      'X-XSS-Protection' => '1; mode=block',
+      'X-Permitted-Cross-Domain-Policies' => 'none',
+      'Strict-Transport-Security' => 'max-age=31536000;, max-age=31536000; includeSubdomains',
+      'Content-Security-Policy' => "default-src 'none'; style-src 'self'; script-src 'self'; connect-src 'self'; img-src 'self'; font-src 'self'; form-action 'self'; base-uri 'none'; frame-ancestors 'none'; block-all-mixed-content;"
+    }.freeze
+
+    def initialize(app, headers)
+      @app = app
+      @headers = DEFAULT_HEADERS.merge(headers)
+    end
+
+    def call(env)
+      @app.call(env).tap do |_, headers|
+        @headers.each do |k, v|
+          headers[k] ||= v
+        end
+      end
+    end
+  end
+end

data/lib/radical/strings.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Radical
+  class Strings
+    SNAKE_CASE_REGEX = /\B([A-Z])/.freeze
+
+    class << self
+      def snake_case(str)
+        str.gsub(SNAKE_CASE_REGEX, '_\1').downcase
+      end
+
+      def camel_case(str)
+        str.split('_').map(&:capitalize).join
+      end
+    end
+  end
+end

data/lib/radical/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Radical
   class Table
     attr_accessor :columns

data/lib/radical/view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erubi'
 require 'tilt'
 
@@ -20,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)
@@ -41,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

@@ -1,4 +1,15 @@
+# frozen_string_literal: true
+
 require_relative 'radical/app'
 require_relative 'radical/controller'
 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.0.0'
+  spec.version       = '1.2.0'
   spec.author        = 'Sean Walker'
   spec.email         = 'sean@swlkr.com'
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   if spec.respond_to?(:metadata)
     spec.metadata['homepage_uri'] = spec.homepage
     spec.metadata['source_code_uri'] = 'https://github.com/swlkr/radical'
-    spec.metadata['changelog_uri'] = 'https://github.com/swlkr/radical/CHANGELOG.md'
+    spec.metadata['changelog_uri'] = 'https://github.com/swlkr/radical/blob/main/CHANGELOG.md'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
       'public gem pushes.'
@@ -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.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean Walker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-03 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,14 +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
@@ -212,7 +239,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/swlkr/radical
   source_code_uri: https://github.com/swlkr/radical
-  changelog_uri: https://github.com/swlkr/radical/CHANGELOG.md
+  changelog_uri: https://github.com/swlkr/radical/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -221,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:
   - - ">="