leanweb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da54199f1863128e9bb23baf728dff6be60123b9cf44947370293222816da122
-  data.tar.gz: 60e11d76704347858cdffbde24d17b5d0edf1061ea91ef158dd5a6928e48bc4c
+  metadata.gz: d4e80c5813858b838b39fea56bb96b2fb28f7749d22f02ab04694662a8595d96
+  data.tar.gz: c2fdc8ebf92d647516db11352e5a6cb7bc36f1489dfabe69c095e7090f1b7970
 SHA512:
-  metadata.gz: a3b3abccd00de5d76a06513c021b409d19073c911f3d236b7c7412c42e723bad9e616514a02e278e55271d5faf5709f94fb283af6fa93aa873e2144ff0d3211b
-  data.tar.gz: a366dce05e7a8108e7b3ca4096112a3567e8082a0934e64d323401a938dceb24bfdc6c03dd53193827800b04a05c1c4c9ab53189cc45453e7925422dfb58535b
+  metadata.gz: 1bed8458a93a2f0139609f17fe3402f69065182607b6b6664cc0c6d90ab3815f4dca7cd08c165dab17e5448d9c3f7d3c44ef8e1f28468cd3e4c42a66b096c8b8
+  data.tar.gz: 320c619aedd70c9bd0ed5e698ef456e293d3cf754bbe3ca939a7669b45ad117a371089db15737edf0c5c271ad638b84784e6ee3a730093a82a16843828a1074c

data/bin/leanweb

@@ -3,10 +3,10 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
 require 'fileutils'
 require 'leanweb'
@@ -16,15 +16,15 @@ require 'leanweb'
 files = [
   {
     filename: 'Gemfile',
-    # TODO: Use {LeanWeb::VERSION} when v1 is reached.
     content: <<~RUBY
       # frozen_string_literal: true
 
       source 'https://rubygems.org'
 
-      gem 'leanweb', '~> 0.2'
-      gem 'haml'
+      gem 'leanweb', '~> #{LeanWeb::VERSION}'
+      gem 'haml', '~> 5.2.2'
       gem 'rake'
+      gem 'puma'
     RUBY
   }, {
     filename: 'config.ru',
@@ -55,7 +55,7 @@ files = [
 
       require 'leanweb'
 
-      task default: %w[build]
+      task default: %w[build_static]
 
       task :build_static do
         require_relative 'routes'
@@ -63,7 +63,7 @@ files = [
       end
     RUBY
   }, {
-    filename: 'src/controllers/main.rb',
+    filename: 'src/controllers/main_controller.rb',
     content: <<~RUBY
       # frozen_string_literal: true
 

data/contrib/lib/hawese.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# Copyright 2022 Felix Freeman <libsys@hacktivista.org>
+#
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
+
+require 'json'
+require 'net/http'
+require 'openssl'
+require 'tilt'
+require 'uri'
+
+# Hawese client.
+#
+# **Environment variables**
+#
+# - HAWESE_RETURN_URL defaults to `LEANWEB_ENDPOINT/checkout`.
+# - HAWESE_ENDPOINT
+# - HAWESE_ORIGIN
+class Hawese
+  class << self
+    ENDPOINT = ENV.fetch('HAWESE_ENDPOINT')
+    RETURN_URL = ENV.fetch('HAWESE_RETURN_URL') do
+      "#{ENV.fetch('LEANWEB_ENDPOINT')}/checkout"
+    end
+    ORIGIN = ENV.fetch('HAWESE_ORIGIN')
+
+    def payment_methods
+      uri = URI("#{ENDPOINT}/gateways/payment-methods/purchase")
+      JSON.parse(Net::HTTP.get(uri))
+    end
+
+    def gateway_schema(gateway, query_params, schema = 'purchase')
+      uri = URI("#{ENDPOINT}/gateways/#{gateway}/schemas/#{schema}")
+      uri.query = URI.encode_www_form(query_params)
+      JSON.parse(Net::HTTP.get(uri))
+    end
+
+    def purchase(gateway, fields)
+      fields[:origin] = ORIGIN
+      uri = URI("#{ENDPOINT}/gateways/#{gateway}/purchase")
+      uri.query = URI.encode_www_form(return_url: RETURN_URL)
+      response = Net::HTTP.post(
+        uri,
+        fields.to_json,
+        'Content-Type' => 'application/json'
+      )
+      JSON.parse(response.body)
+    end
+
+    def purchase_from_schema(gateway, schema)
+      fields = {}
+      schema['properties'].each do |property, contents|
+        fields[property] = contents['default'] if contents.include?('default')
+      end
+      purchase(gateway, fields)
+    end
+  end
+end

data/contrib/lib/lean_mail.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+# Copyright 2022 Felix Freeman <libsys@hacktivista.org>
+#
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
+
+require 'net/smtp'
+require 'securerandom'
+require 'socket'
+require 'time'
+
+# Send an email with SMTP easily.
+#
+# Environment variables:
+#
+# - SMTP_HOST: Where to connect to.
+# - SMTP_PORT: Port, optional (default: 25).
+# - SMTP_SECURITY: `tls` or `starttls`, optional (default: `nil`).
+# - SMTP_USER: User, optional.
+# - SMTP_PASSWORD: Password, optional.
+# - SMTP_FROM: In the format `Name <user@mail>` or `user@mail`.
+#
+# @example Single address
+#   LeanMail.deliver('to@mail', 'subject', 'body')
+#
+# @example Multiple addresses
+#   LeanMail.deliver(['to@mail', 'to2@mail'], 'subject', 'body')
+module LeanMail
+  # RFC 2821 message data representation.
+  class Data
+    attr_reader :from, :to, :subject, :message
+
+    def initialize(from, to, subject, message)
+      @from = from
+      @to = to
+      @subject = subject
+      @message = message
+    end
+
+    def to_s
+      <<~MAIL
+        From: #{@from}
+        To: #{to.instance_of?(Array) ? to.join(', ') : to}
+        Subject: #{subject}
+        Date: #{Time.new.rfc2822}
+        Message-Id: <#{SecureRandom.uuid}@#{Socket.gethostname}>
+
+        #{@message}
+      MAIL
+    end
+  end
+
+  # Email deliverer.
+  class Deliver
+    attr_reader :data
+
+    def initialize
+      @user = ENV.fetch('SMTP_USER', nil)
+      @password = ENV.fetch('SMTP_PASSWORD', nil)
+      @from = ENV.fetch('SMTP_FROM')
+
+      @host = ENV.fetch('SMTP_HOST')
+      @port = ENV.fetch('SMTP_PORT', 25)
+      @security = ENV.fetch('SMTP_SECURITY', nil)
+
+      initialize_smtp
+    end
+
+    # Send email.
+    #
+    # @param to [Array, String] In the format `Name <user@mail>` or `user@mail`.
+    # @param subject [String]
+    # @param body [String]
+    # @return [Deliver]
+    def call(to, subject, body)
+      @data = Data.new(@from, to, subject, body)
+
+      @smtp.start(Socket.gethostname, @user, @password, :plain) do |smtp|
+        smtp.send_message(@data.to_s, extract_addr(@from), extract_addrs(to))
+      end
+
+      self
+    end
+
+    protected
+
+    def initialize_smtp
+      @smtp = Net::SMTP.new(@host, @port)
+      maybe_enable_security(@security)
+    end
+
+    def maybe_enable_security(security)
+      case security
+      when 'tls' then @smtp.enable_tls
+      when 'starttls' then @smtp.enable_starttls
+      end
+    end
+
+    def extract_addr(str)
+      match = str.match(%r{<([^/]+)>})
+      return match[1] if match
+
+      str
+    end
+
+    def extract_addrs(to)
+      return to.map{ |addr| extract_addr(addr) } if to.instance_of?(Array)
+
+      extract_addr(to)
+    end
+  end
+
+  # Deliver email.
+  #
+  # @param to [Array, String] In the format `Name <user@mail>` or `user@mail`.
+  # @param subject [String]
+  # @param body [String]
+  # @return [Deliver]
+  def self.deliver(to, subject, body)
+    LeanMail::Deliver.new.call(to, subject, body)
+  end
+end

data/contrib/lib/leanweb/controller_mixins/render_with_layout.rb

@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+# Copyright 2022 Felix Freeman <libsys@hacktivista.org>
+#
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
+
+
+module LeanWeb
+  module ControllerMixins
+    # {render_with_layout} for {Controller} with ERB, HAML, Tilt::EmacsOrg and
+    # Redcarpet Markdown support.
+    module RenderWithLayout
+      # Render a response with a layout.
+      #
+      # Depending on the `path` file contents and options `@content_for` might
+      # be filled. These contents must be inserted on the `head` or `body` of
+      # your layout file.
+      #
+      # All paths used on parameters can be relative to {VIEW_PATH} or absolute.
+      #
+      # @param path [String] Path to file to rendered.
+      # @param title [String] `@content_for[:title]` content.
+      # @param head [Hash] Things to be inserted on `@content_for[:head]`.
+      # @option head [String|Array] :js Javascript file path(s).
+      # @option head [String|Array] :jsm Javascript module file path (s).
+      # @option head [String|Array] :css CSS file path(s).
+      # @option head [String|Array] :raw Raw headers in HTML format.
+      # @param layout [String] Layout file path.
+      # @param sub_layout [String] Layout file to be inserted within layout.
+      # @param options [Hash] Options hash, to be given to the template engine
+      #   based on file extension: `Tilt::EmacsOrg` for `.org` and `Redcarpet`
+      #   for `.md`.
+      # @option options [String] :setupfile For `.org`.
+      # @option options [true] :toc For `.md`. To fill `@content_for[:toc]`
+      #   render with option `:with_toc_data`.
+      # @yield On dynamic templates (such as Haml and ERB) you can yield.
+      def render_with_layout( # rubocop:disable Metrics/ParameterLists
+        path,
+        title: nil,
+        head: nil,
+        layout: 'layout.haml',
+        sub_layout: nil,
+        options: {},
+        &block
+      )
+        @content_for[:title] = title unless title.nil?
+        content = render_by_extension(path, sub_layout, options, &block)
+        prepare_head(head) unless head.nil?
+        render_response(layout, 'text/html'){ content }
+      end
+
+      protected
+
+      # @param path [String]
+      # @param layout [String]
+      # @param options [Hash] Check `Tilt::EmacsOrg` options.
+      # @option options [String] :setupfile can be absolute or relative to
+      #   {VIEW_PATH}.
+      def render_org(path, layout: nil, options: {})
+        options[:setupfile] = "#{VIEW_PATH}/#{options[:setupfile]}" \
+          if options.include?(:setupfile) && options[:setupfile][0] != '/'
+
+        org_template = create_template(path, options)
+
+        @content_for[:title] = org_template.title \
+          unless @content_for.include?(:title)
+
+        if layout
+          create_template(layout).render(self){ org_template.render(self) }
+        else
+          org_template.render(self)
+        end
+      end
+
+      # @param path [String]
+      # @param layout [String]
+      # @param options [Hash] Check `RedCarpet` `render_options`.
+      # @option options [true] :toc To place an HTML based table of contents on
+      #   `@content_for[:toc]` and render with option `:with_toc_data`.
+      def render_markdown(path, layout: nil, options: {})
+        maybe_render_markdown_toc!(path, options)
+        markdown_template = create_template(path, options)
+        if layout
+          create_template(layout).render(self){ markdown_template.render(self) }
+        else
+          markdown_template.render(self)
+        end
+      end
+
+      # If `options[:toc]` is set, deletes options `:toc` and adds
+      # `:with_toc_data`. Also adds `@content_for[:toc]`.
+      def maybe_render_markdown_toc!(path, options)
+        return unless options.include?(:toc)
+
+        require('redcarpet')
+        @content_for[:toc] = create_template(
+          path, { renderer: Redcarpet::Render::HTML_TOC }
+        ).render
+
+        options.delete(:toc)
+        options[:with_toc_data] = true
+      end
+
+      # @param path [String]
+      # @param layout [String]
+      # @param options [Hash] Check `Haml` options.
+      # @yield If block given.
+      def render_other(path, layout: nil, options: {})
+        template = create_template(path, options)
+        if layout
+          create_template(layout).render(self) do
+            template.render(self){ yield if block_given? }
+          end
+        else
+          template.render(self){ yield if block_given? }
+        end
+      end
+
+      def render_by_extension(path, layout, options, &block)
+        case File.extname(path)
+        when '.org'
+          render_org(path, layout: layout, options: options)
+        when '.md'
+          render_markdown(path, layout: layout, options: options)
+        else
+          render_other(path, layout: layout, options: options, &block)
+        end
+      end
+
+      def prepare_head(js: nil, jsm: nil, css: nil, raw: nil)
+        head = String.new
+        head << prepare_head_js(js) unless js.nil?
+        head << prepare_head_js(jsm, 'module') unless jsm.nil?
+        head << prepare_head_css(css) unless css.nil?
+        head << prepare_head_raw(raw) unless raw.nil?
+        @content_for[:head] = head
+      end
+
+      def prepare_head_js(js, type = 'application/javascript')
+        head = String.new
+        js = [js] if js.instance_of?(String)
+        js.each do |src|
+          head << "<script type='#{type}' src='#{src}'"
+          head << ' defer' if type != 'module'
+          head << "></script>\n"
+        end
+        head
+      end
+
+      def prepare_head_css(css)
+        head = String.new
+        css = [css] if css.instance_of?(String)
+        css.each do |src|
+          head << "<link rel='stylesheet' type='text/css' href='#{src}'>\n"
+        end
+        head
+      end
+
+      def prepare_head_raw(raw)
+        head = String.new
+        raw = [raw] if raw.instance_of?(String)
+        raw.each{ |src| head << "#{src}\n" }
+        head
+      end
+    end
+  end
+end

data/contrib/lib/rack/session/json_file.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+# Copyright 2022 Felix Freeman <libsys@hacktivista.org>
+#
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
+
+require 'date'
+require 'fileutils'
+require 'json'
+require 'rack/session/abstract/id'
+
+module Rack
+  module Session
+    # A JSON File based session storage.
+    class JsonFile < Abstract::PersistedSecure
+      # Cleans session files that have not been used.
+      # @param to [Time|Date] Time from which file has not been accessed.
+      #   Defaults to 00:00 hrs 1 month ago.
+      # @param dir [String] Directory from which to clean files. Defaults to
+      #   `/tmp/rack.session`.
+      def self.clean(
+        to = Date.today.prev_month,
+        dir = "#{Dir.tmpdir}/rack.session"
+      )
+        to = to.to_time if to.instance_of?(Date)
+        Dir["#{dir}/*"].each do |file|
+          FileUtils.rm(file, force: true) if ::File.atime(file) < to
+        end
+      end
+
+      # @param options [Hash] Accepts a :session_dir path which defaults to
+      #   `/tmp/rack.session`.
+      def initialize(app, options = {})
+        super(
+          app,
+          {
+            secure: ENV['RACK_ENV'] != 'development', # HTTPS unless in dev env
+            same_site: 'Strict' # don't allow cross-site sessions
+          }.merge!(options)
+        )
+        @session_dir = "#{Dir.tmpdir}/#{@key}" || @default_options[:session_dir]
+      end
+
+      # @return [Array] [self, Hash].
+      def find_session(_req, sid)
+        sid = generate_sid if sid.nil?
+
+        [sid, JSON.parse(::File.read("#{@session_dir}/#{sid}"))]
+      rescue Errno::ENOENT
+        [generate_sid, {}]
+      rescue JSON::ParserError
+        [sid, {}]
+      end
+
+      # @param sid [String] Only known ids are allowed, to avoid session
+      #   fixation attacks.
+      # @return [self|false] session_id or false.
+      def write_session(_req, sid, session, _options)
+        return false unless ::File.exist?("#{@session_dir}/#{sid}")
+
+        ::File.open("#{@session_dir}/#{sid}", 'w', 0o600) do |f|
+          f << JSON.generate(session)
+        end
+        sid
+      end
+
+      # @return [self|nil] new session id or nil if options[:drop].
+      def delete_session(_req, sid, options)
+        FileUtils.rm("#{@session_dir}/#{sid}", force: true)
+        options&.include?(:drop) ? nil : generate_sid
+      end
+
+      def generate_sid(*)
+        sid = super
+        FileUtils.mkdir_p(@session_dir, mode: 0o700)
+        ::File.new("#{@session_dir}/#{sid}", 'w', 0o600).close
+        sid
+      end
+    end
+  end
+end

data/lib/leanweb/app.rb

@@ -2,10 +2,10 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
 require 'rack'
 

data/lib/leanweb/controller.rb

@@ -2,10 +2,10 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
 require 'rack'
 require 'tilt'
@@ -24,6 +24,7 @@ module LeanWeb
       @route = route
       @request = request
       @response = Rack::Response.new(nil, 200)
+      @content_for = {}
     end
 
     # Render magic. Supports every file extension that Tilt supports. Defaults

data/lib/leanweb/helpers.rb

@@ -2,23 +2,33 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
-# String helpers.
-class String
-  # String to PascalCase.
-  def pascalize
-    camelize(pascal: true)
-  end
 
-  # String to camelCase.
-  # @param pascal [Boolean] If true first letter is uppercase.
-  def camelize(pascal: false)
-    str = gsub(/[-_\s]+(.?)/){ |match| match[1].upcase }
-    str[0] = pascal ? str[0].upcase : str[0].downcase
-    str
+module LeanWeb
+  # String refinements.
+  module StringRefinements
+    refine ::String do
+      # String to PascalCase.
+      def pascalize
+        camelize(pascal: true)
+      end
+
+      # String to camelCase.
+      # @param pascal [Boolean] If true first letter is uppercase.
+      def camelize(pascal: false)
+        str = gsub(/[-_\s]+(.?)/){ |match| match[1].upcase }
+        str[0] = pascal ? str[0].upcase : str[0].downcase
+        str
+      end
+
+      # String to snake_case
+      def snakeize
+        gsub(/[[:upper:]]/){ |match| "_#{match.downcase}" }.delete_prefix('_')
+      end
+    end
   end
 end

data/lib/leanweb/route.rb

@@ -2,20 +2,22 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
 require 'rack/mock'
 
 module LeanWeb
   # Action for {Route#action}.
-  Action = Struct.new(:file, :controller, :action, keyword_init: true)
+  Action = Struct.new(:controller, :action, keyword_init: true)
 
   # A single route which routes with the {#respond} method. It can also {#build}
   # an static file.
   class Route
+    using StringRefinements
+
     attr_reader :path, :method, :action, :static
 
     # A new instance of Route.
@@ -27,13 +29,13 @@ module LeanWeb
     # @param action [Proc, Hash, String, nil] References a Method/Proc to be
     #   triggered. It can be:
     #
-    #   - A full hash `{ file: 'val', controller: 'val', action: 'val' }`.
-    #   - A hash with `{ 'file' => 'action' }` only (which has a controller
-    #     class name `{File}Controller`).
-    #   - A simple string (which will consider file `main.rb` and controller
-    #     `MainController`). Defaults to "{#path_basename}_{#method}", (ex:
-    #     `index_get`).
-    #   - It can also be a `Proc`.
+    #   - Nothing, defaults to :"{#path_basename}_{#method}" (such as
+    #     `:index_get`) on `:MainController`.
+    #   - A full hash `{ controller: 'val', action: 'val' }`.
+    #   - A hash with `{ Controller: :action }` only.
+    #   - A simple string for an action on `:MainController`.
+    #   - It can also be a `Proc`. Will be executed in a `:MainController`
+    #     instance context.
     #
     # @param static [Boolean|Array] Defines a route as static. Defaults true for
     #   GET method, false otherwise. Set to `false` to say it can only work
@@ -108,42 +110,45 @@ module LeanWeb
 
     # Assign value to `@action`.
     def action=(value)
-      @action = if value.instance_of?(Proc)
-                  value
-                else
-                  Action.new(**prepare_action_hash(value))
-                end
+      @action =
+        if value.instance_of?(Proc)
+          value
+        else
+          Action.new(**prepare_action_hash(value))
+        end
     end
 
     # @param src_value [Hash, String, nil] Check {#initialize} action param for
     #   valid input.
     # @return [Hash] valid hash for {Action}.
-    def prepare_action_hash(src_value) # rubocop:disable Metrics/MethodLength
-      begin
-        if %i[file controller action].include?(src_value.keys.first)
-          value = src_value
-        else
-          value = {}
-          value[:file], value[:action] = src_value.first
-        end
-      rescue NoMethodError
-        value = { action: src_value }
-      end
-      value[:file] ||= 'main'
-      value[:controller] ||= "#{value[:file].pascalize}Controller"
-      value[:action] ||= default_action_name
+    def prepare_action_hash(src_value)
+      value = prepare_prepare_action_hash(src_value)
+      value[:controller] = value[:controller]&.to_sym || DEFAULT_CONTROLLER
+      value[:action] = value[:action]&.to_sym || default_action_action
       value
     end
 
-    def default_action_name
-      "#{path_basename.gsub('-', '_')}_#{@method.downcase}"
+    def prepare_prepare_action_hash(src_value)
+      if %i[controller action].include?(src_value.keys.first)
+        src_value
+      else
+        value = {}
+        value[:controller], value[:action] = src_value.first
+        value
+      end
+    rescue NoMethodError
+      { action: src_value }
+    end
+
+    def default_action_action
+      "#{path_basename.gsub('-', '_')}_#{@method.downcase}".to_sym
     end
 
     # @param request [Rack::Request]
     # @return [Array] a valid Rack response.
     def respond_method(request)
       params = action_params(request.path)
-      require_relative("#{LeanWeb::CONTROLLER_PATH}/#{@action.file}")
+      require_relative("#{CONTROLLER_PATH}/#{@action.controller.to_s.snakeize}")
       controller = Object.const_get(@action.controller).new(self, request)
       return controller.public_send(@action.action, **params) \
         if params.instance_of?(Hash)
@@ -155,9 +160,12 @@ module LeanWeb
     # @return [Array] a valid Rack response.
     def respond_proc(request)
       params = action_params(request.path)
-      return @action.call(**params) if params.instance_of?(Hash)
+      require_relative("#{CONTROLLER_PATH}/#{DEFAULT_CONTROLLER.to_s.snakeize}")
+      controller = Object.const_get(DEFAULT_CONTROLLER).new(self, request)
+      return controller.instance_exec(**params, &@action) \
+        if params.instance_of?(Hash)
 
-      @action.call(*params)
+      controller.instance_exec(*params, &@action)
     end
 
     # @param request_path [String]
@@ -178,8 +186,18 @@ module LeanWeb
     # @param content_type [String]
     # @return [String] absolute route to path + extension based on content_type.
     def output_path(path, content_type)
-      path += 'index' if path[-1] == '/'
-      "#{LeanWeb::PUBLIC_PATH}#{path}#{LeanWeb::MEDIA_EXTENSIONS[content_type]}"
+      out_path =
+        if path[-1] == '/'
+          String.new("#{PUBLIC_PATH}#{path}/index")
+        else
+          String.new("#{PUBLIC_PATH}#{path}")
+        end
+
+      unless path.end_with?(MEDIA_EXTENSIONS[content_type])
+        out_path << MEDIA_EXTENSIONS[content_type]
+      end
+
+      out_path
     end
   end
 end

data/lib/leanweb/version.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Copyright 2022 Felix Freeman <libsys@hacktivista.org>
+#
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
+
+
+module LeanWeb
+  VERSION = '0.3.0'
+end

data/lib/leanweb.rb

@@ -2,14 +2,14 @@
 
 # Copyright 2022 Felix Freeman <libsys@hacktivista.org>
 #
-# This file is part of "LeanWeb" and licensed under the terms of the Hacktivista
-# General Public License version 0.1 or (at your option) any later version. You
-# should have received a copy of this license along with the software. If not,
-# see <https://hacktivista.org/licenses/>.
+# This file is part of "LeanWeb" and licensed under the terms of the GNU Affero
+# General Public License version 3 with permissions for compatibility with the
+# Hacktivista General Public License. You should have received a copy of this
+# license along with the software. If not, see <https://gnu.org/licenses/>.
 
 # LeanWeb is a minimal hybrid static / dynamic web framework.
 module LeanWeb
-  VERSION = '0.2.0'
+  require_relative 'leanweb/version'
 
   ROOT_PATH = ENV.fetch('LEANWEB_ROOT_PATH', Dir.pwd)
   CONTROLLER_PATH = "#{ROOT_PATH}/src/controllers"
@@ -26,13 +26,11 @@ module LeanWeb
     'text/csv' => '.csv'
   }.freeze
 
+  DEFAULT_CONTROLLER = :MainController
+
   autoload :Route, 'leanweb/route.rb'
   autoload :Controller, 'leanweb/controller.rb'
   autoload :App, 'leanweb/app.rb'
 end
 
 require_relative 'leanweb/helpers'
-
-# TODO: Remove if/when tilt-emacs_org gets merged on a Tilt release.
-require 'tilt'
-Tilt.register_lazy(:EmacsOrgTemplate, 'tilt/emacs_org', 'org')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leanweb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Freeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.16.2
+- !ruby/object:Gem::Dependency
+  name: minitest-sprint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.1
+- !ruby/object:Gem::Dependency
+  name: tilt-emacs_org
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -145,14 +187,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/leanweb
+- contrib/lib/hawese.rb
+- contrib/lib/lean_mail.rb
+- contrib/lib/leanweb/controller_mixins/render_with_layout.rb
+- contrib/lib/rack/session/json_file.rb
 - lib/leanweb.rb
 - lib/leanweb/app.rb
 - lib/leanweb/controller.rb
 - lib/leanweb/helpers.rb
 - lib/leanweb/route.rb
+- lib/leanweb/version.rb
 homepage: https://leanweb.hacktivista.org
 licenses:
-- LicenseRef-LICENSE
+- AGPL-3.0-only
 metadata:
   homepage_uri: https://leanweb.hacktivista.org
   source_code_uri: https://git.hacktivista.org/leanweb
@@ -163,6 +210,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- contrib/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -174,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.21
 signing_key:
 specification_version: 4
 summary: LeanWeb is a minimal hybrid static / dynamic web framework