rackr 0.0.54 → 0.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc3b5a671b8b0eef9b86ca1819ecdd86a9a9ef9d9baa03c93f16e63b6a3bae20
-  data.tar.gz: 94be73bde785a3031cc3c76278e61f77c61637bdb0e279f659aa2a4e5707f44d
+  metadata.gz: 817c73cfeca9d09f9bba0002c6bc19b34d5b6bcc0299a24a3e9bb87b075c12b5
+  data.tar.gz: e1c4710e34bf53a780a7d6b132469151fc2e4fafaf8a27205266414a02ac7299
 SHA512:
-  metadata.gz: 2c51c2245fa6a6f3c7c488a8c10974b7ed6f742c9e32d31011926efa34630fe9647c6fa0ec6b823fc8e4d9f2086fd1c2fb2c3030e8bb668494e5bdf782b50c0b
-  data.tar.gz: cb61baccbcf55cd758b8f255b386c999b119d8d5df6683efc84de927aaab4139d9990644060099595f85012d420e9ff72c12e144f453cfc9d4e877e9a583327a
+  metadata.gz: 63ff89e8f20793339587a042e626ab483ff524a21b90195e0b28e00c02a9e741b665b306fe30f07e05e0d7922b4ec6f6064bda8a019b0b6e0daf32cdd7a17be6
+  data.tar.gz: a308d0fe7e5df0c9d69ed789338bb7ded223b48c05bfac49230d588ee5b926dbb73473c4aadd1690594025779d82ba46b06a71b6b0577acf3b3bd712d1446ecf

data/lib/rackr/action.rb

@@ -1,11 +1,25 @@
 # frozen_string_literal: true
 
+require 'byebug'
 require 'erubi'
 require 'oj'
 require 'rack'
 
 class Rackr
   module Action
+    METHODS = {
+      html: lambda do |val, **opts|
+        [opts[:status] || 200, { 'content-type' => 'text/html' }.merge(opts[:headers] || {}), [val]]
+      end,
+      text: lambda do |val, **opts|
+        [opts[:status] || 200, { 'content-type' => 'text/plain' }.merge(opts[:headers] || {}), [val]]
+      end,
+      json: lambda do |val, **opts|
+        val = Oj.dump(val, mode: :compat) unless val.is_a?(String)
+        [opts[:status] || 200, { 'content-type' => 'application/json' }.merge(opts[:headers] || {}), [val]]
+      end
+    }
+
     def self.included(base)
       base.class_eval do
         attr_reader :routes, :config, :db if self != Rackr
@@ -16,13 +30,19 @@ class Rackr
           @db = config[:db]
         end
 
+        def render(**opts)
+          type, content = opts.first
+
+          METHODS[type]&.(content, **opts) || _render_view(content, **opts)
+        end
+
         def view_response(
           paths,
           status: 200,
           headers: {},
           layout_path: 'layout'
         )
-          view(
+          _render_view(
             paths,
             status: status,
             headers: headers,
@@ -31,12 +51,13 @@ class Rackr
           )
         end
 
-        def view(
+        def _render_view(
           paths,
           status: 200,
           headers: {},
           layout_path: 'layout',
-          response_instance: false
+          response_instance: false,
+          view: nil
         )
           base_path = config.dig(:views, :path) || 'views'
 
@@ -52,15 +73,15 @@ class Rackr
                            ::File.read("#{base_path}/#{paths}.html.erb")
                          end
 
-          layout_content = file_or_nil.("#{base_path}/#{layout_path}.html.erb")
+          layout_content = file_or_nil.call("#{base_path}/#{layout_path}.html.erb")
 
           parsed_erb =
             if layout_content
-              erb(layout_content) do
-                erb(file_content, binding_context: binding)
+              load_erb(layout_content) do
+                load_erb(file_content, binding_context: binding)
               end
             else
-              erb(file_content, binding_context: binding)
+              load_erb(file_content, binding_context: binding)
             end
 
           if response_instance
@@ -73,87 +94,62 @@ class Rackr
 
           [status, { 'content-type' => 'text/html' }.merge(headers), [parsed_erb]]
         end
-      end
-    end
 
-    def html(content = '', status: 200, headers: {}, &block)
-      if content == '' && block_given? && respond_to?(:html_slice)
-        if respond_to?(:layout)
-          content = layout(&block)
-        else
-          html_layout(&block)
-          content = html_slice
-        end
-      end
+        def load_json(val)
+          return Oj.load(val.body.read) if val.is_a?(Rack::Request)
 
-      [status, { 'content-type' => 'text/html' }.merge(headers), [content]]
-    end
-
-    def html_response(content = '', status: 200, headers: {}, &block)
-      if content == '' && block_given? && respond_to?(:html_slice)
-        if respond_to?(:layout)
-          content = layout(&block)
-        else
-          html_layout(&block)
-          content = html_slice
+          Oj.load(val)
         end
-      end
 
-      Rack::Response.new(content, status, { 'content-type' => 'text/html' }.merge(headers))
-    end
-
-    def json(content = {}, status: 200, headers: {})
-      content = Oj.dump(content, mode: :compat) unless content.is_a?(String)
-      [status, { 'content-type' => 'application/json' }.merge(headers), [content]]
-    end
-
-    def json_response(content = {}, status: 200, headers: {})
-      content = Oj.dump(content, mode: :compat) unless content.is_a?(String)
-      Rack::Response.new(
-        content,
-        status,
-        { 'content-type' => 'application/json' }.merge(headers)
-      )
-    end
+        def html_response(content = '', status: 200, headers: {})
+          Rack::Response.new(content, status, { 'content-type' => 'text/html' }.merge(headers))
+        end
 
-    def text(content, status: 200, headers: {})
-      [status, { 'content-type' => 'text/plain' }.merge(headers), [content]]
-    end
+        def json_response(content = {}, status: 200, headers: {})
+          content = Oj.dump(content, mode: :compat) unless content.is_a?(String)
+          Rack::Response.new(
+            content,
+            status,
+            { 'content-type' => 'application/json' }.merge(headers)
+          )
+        end
 
-    def text_response(content, status: 200, headers: {})
-      Rack::Response.new(
-        content,
-        status,
-        { 'content-type' => 'text/plain' }.merge(headers)
-      )
-    end
+        def text_response(content, status: 200, headers: {})
+          Rack::Response.new(
+            content,
+            status,
+            { 'content-type' => 'text/plain' }.merge(headers)
+          )
+        end
 
-    def erb(content, binding_context: nil, &block)
-      eval(Erubi::Engine.new(content).src, binding_context)
-    end
+        def load_erb(content, binding_context: nil)
+          eval(Erubi::Engine.new(content).src, binding_context)
+        end
 
-    def head(status, headers: {})
-      [status, headers, []]
-    end
+        def head(status, headers: {})
+          [status, headers, []]
+        end
 
-    def head_response(status, headers: {})
-      Rack::Response.new(nil, status, headers)
-    end
+        def head_response(status, headers: {})
+          Rack::Response.new(nil, status, headers)
+        end
 
-    def redirect_response(url, headers: {})
-      Rack::Response.new(
-        nil,
-        302,
-        { 'location' => url }.merge(headers)
-      )
-    end
+        def redirect_response(url, headers: {})
+          Rack::Response.new(
+            nil,
+            302,
+            { 'location' => url }.merge(headers)
+          )
+        end
 
-    def redirect_to(url, headers: {})
-      [302, { 'location' => url }.merge(headers), []]
-    end
+        def redirect_to(url, headers: {})
+          [302, { 'location' => url }.merge(headers), []]
+        end
 
-    def response(body = nil, status = 200, headers = {})
-      Rack::Response.new(body, status, headers)
+        def response(body = nil, status = 200, headers = {})
+          Rack::Response.new(body, status, headers)
+        end
+      end
     end
   end
 end

data/lib/rackr/router/build_request.rb

@@ -11,24 +11,15 @@ class Rackr
       def call(route = nil)
         request = Rack::Request.new(@env)
 
-        return request if route.nil?
-        return request unless route.has_params
+        return request if route.nil? || !route.has_params
 
-        update_request_params(request, route)
-      end
-
-      private
-
-      def update_request_params(request, route)
         i = 0
-
         while i < route.splitted_path.size
           route_word = route.splitted_path[i]
           if route_word.start_with?(':')
             param = @spplited_request_path[i]
-            param = param.to_i if is_a_integer_string?(param)
 
-            update_request_param(request, route_word, param)
+            request.params[route_word[1..].to_sym] = param
           end
 
           i += 1
@@ -36,14 +27,6 @@ class Rackr
 
         request
       end
-
-      def is_a_integer_string?(string)
-        string =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-      end
-
-      def update_request_param(request, word, param)
-        request.update_param(word.sub(':', '').to_sym, param)
-      end
     end
   end
 end

data/lib/rackr/router/errors/dev_html.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
+require 'html_slice'
+
 class Rackr
   class Router
     module Errors
       class DevHtml
         include Rackr::Action
-        include Rackr::HTML
+        include ::HtmlSlice
 
         def call(env)
-          html do
+          html_layout do
             tag :head do
               title 'Application error'
-              _ %q(<style>
+              _ '<style>
                     html * { padding:0; margin:0; }
                     body * { padding:10px 20px; }
                     body * * { padding:0; }
@@ -25,7 +29,7 @@ class Rackr
                       padding: 1em;
                       margin-bottom: 1em;
                     }
-              </style>)
+              </style>'
             end
             tag :body do
               div id: 'summary' do
@@ -50,39 +54,36 @@ class Rackr
             span '(innermost first)'
           end
 
-          tag :p, first, class: "first-p"
+          tag :p, first, class: 'first-p'
           br
 
           line_number = extract_line_number(first)
-          match = first.match(%r{^(\/[\w\/.-]+)})
+          match = first.match(%r{^(/[\w/.-]+)})
           file_path = (match ? match[1] : nil)
-          if file_path != nil
+          unless file_path.nil?
             lines = []
             File.open(file_path) do |file|
               lines = file.readlines
             end
 
             lines.map!.with_index do |line, i|
-              "#{i+1}: #{line} \n"
+              "#{i + 1}: #{line} \n"
             end
 
-            tag :pre, slice_around_index(lines, line_number).join("").chomp
+            tag :pre, slice_around_index(lines, line_number).join('').chomp
           end
 
           tag :p, tail.join("\n")
         end
 
-
         def extract_line_number(input)
-          if match = input.match(/:(\d+):in/)
+          if (match = input.match(/:(\d+):in/))
             match[1].to_i
-          else
-            nil
           end
         end
 
         def slice_around_index(array, index)
-          return array if index == nil || index < 1
+          return array if index.nil? || index < 1
 
           index -= 1
           start_index = [index - 2, 0].max

data/lib/rackr/router/errors.rb

@@ -13,15 +13,15 @@ class Rackr
 
       class << self
         def check_scope_name(path)
-          return if path.is_a?(String) || path.is_a?(Symbol) || path == nil
+          return if path.is_a?(String) || path.is_a?(Symbol) || path.nil?
 
           raise(InvalidBranchNameError, "Route scope name must be a `string` or a `symbol`, got: '#{path}'")
         end
 
         def check_scope_slashes(path)
-          if path.is_a?(String) && path.include?('/')
-            raise(InvalidBranchNameError, "Avoid slashes in scope name, use nested scopes instead, got: '#{path}'")
-          end
+          return unless path.is_a?(String) && path.include?('/')
+
+          raise(InvalidBranchNameError, "Avoid slashes in scope name, use nested scopes instead, got: '#{path}'")
         end
 
         def check_path(path)

data/lib/rackr/router/route.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rackr
   class Router
     class Route

data/lib/rackr/router.rb

@@ -35,14 +35,16 @@ class Rackr
     end
 
     def call(env)
-      @splitted_request_path_info = env['PATH_INFO'].split('/')
+      path_info = env['PATH_INFO']
+
+      @splitted_request_path_info = path_info.split('/')
       @current_request_path_info =
-        (env['PATH_INFO'] == '/') ? env['PATH_INFO'] : env['PATH_INFO'].sub(/\/\z/, '') # remove trailing "/"
+        path_info == '/' ? path_info : path_info.chomp('/') # remove trailing "/"
 
       request_builder = BuildRequest.new(env, @splitted_request_path_info)
       env['REQUEST_METHOD'] = 'GET' if env['REQUEST_METHOD'] == 'HEAD'
 
-      route_instance = match_route(env)
+      route_instance = match_route(env['REQUEST_METHOD'])
       return call_endpoint(@not_found, request_builder.call) if route_instance.nil?
 
       rack_request = request_builder.call(route_instance)
@@ -74,7 +76,7 @@ class Rackr
     rescue Exception => e
       return @error.call(request_builder.call, e) if !@dev_mode || ENV['RACKR_ERROR_DEV']
 
-      call_endpoint(Errors::DevHtml, env.merge({'error' => e}))
+      call_endpoint(Errors::DevHtml, env.merge({ 'error' => e }))
     end
 
     def add(method, path, endpoint, as: nil, route_befores: [], route_afters: [])
@@ -86,8 +88,8 @@ class Rackr
 
       method = :get if method == :head
 
-      wildcard = (path == '*') ? true : false
-      path = path.sub(/\A\//, '')
+      wildcard = path == '*'
+      path = path.is_a?(Symbol) ? path.inspect : path.sub(%r{\A/}, '')
       path_with_scopes = "/#{not_empty_scopes.join('/')}#{put_path_slash(path)}"
       add_named_route(method, path_with_scopes, as)
 
@@ -147,7 +149,7 @@ class Rackr
     def call_endpoint(endpoint, content)
       return endpoint.call(content) if endpoint.respond_to?(:call)
 
-      if endpoint.include?(Rackr::Action) || endpoint.include?(Rackr::Callback)
+      if endpoint < Rackr::Action || endpoint < Rackr::Callback
         return endpoint.new(routes: @routes, config: @config).call(content)
       end
 
@@ -165,8 +167,8 @@ class Rackr
       return @routes.send(method.downcase)[:root] = path_with_scopes if path_with_scopes == '/'
       return @routes.send(method.downcase)[as] = path_with_scopes unless as.nil?
 
-      key = path_with_scopes.sub("/","").gsub(":","").gsub("/","_")
-      @routes.send(method.downcase)["#{key}".to_sym] = path_with_scopes
+      key = path_with_scopes.sub('/', '').gsub(':', '').gsub('/', '_')
+      @routes.send(method.downcase)[key.to_s.to_sym] = path_with_scopes
     end
 
     def push_to_scope(method, route_instance)
@@ -186,6 +188,7 @@ class Rackr
     def put_path_slash(path)
       if not_empty_scopes != []
         return '' if ['/', ''].include?(path)
+
         return "/#{path}"
       end
 
@@ -196,35 +199,40 @@ class Rackr
       @scopes.reject { |v| (v == '') }
     end
 
-    def match_route(env, last_tail = nil, found_scopes = [])
-      instance_routes =
-        if last_tail.nil?
-          last_tail = @splitted_request_path_info.drop(1)
+    def match_route(request_method)
+      last_tail = @splitted_request_path_info.drop(1)
+      found_scopes = []
 
-          @instance_routes[env['REQUEST_METHOD']]
-        else
-          @instance_routes[env['REQUEST_METHOD']].dig(*found_scopes)
-        end
+      instance_routes = @instance_routes[request_method]
 
-      segment, *tail = last_tail
+      while last_tail && !last_tail.empty?
+        segment = last_tail.shift
+        found_route = nil
 
-      instance_routes.each do |scope, _v|
-        next if scope == :__instances
+        instance_routes.each_key do |scope|
+          next if scope == :__instances
 
-        if segment == scope || scope.start_with?(':')
-          found_scopes.push(scope)
-          break
-        end
-      end
+          if segment == scope
+            found_scopes << scope
+            instance_routes = @instance_routes[request_method].dig(*found_scopes)
+            break
+          elsif scope.start_with?(':')
+            found_route = @instance_routes[request_method].dig(
+              *(found_scopes + [:__instances])
+            )&.detect { |route_instance| route_instance.match?(@current_request_path_info) }
 
-      if tail.empty? || found_scopes == []
-        return @instance_routes[env['REQUEST_METHOD']].dig(
-          *(found_scopes << :__instances)
-        )
-          &.detect { |route_instance| route_instance.match?(@current_request_path_info) }
+            return found_route if found_route
+
+            found_scopes << scope
+            instance_routes = @instance_routes[request_method].dig(*found_scopes)
+            break
+          end
+        end
       end
 
-      match_route(env, tail, found_scopes)
+      @instance_routes[request_method].dig(
+        *(found_scopes + [:__instances])
+      )&.detect { |route_instance| route_instance.match?(@current_request_path_info) }
     end
   end
 end

data/lib/rackr.rb

@@ -2,18 +2,15 @@
 
 require_relative 'rackr/action'
 require_relative 'rackr/callback'
-require 'html_slice'
-require_relative 'rackr/html'
 require_relative 'rackr/router/errors/dev_html'
 require_relative 'rackr/router'
 
 class Rackr
   class NotFound < StandardError; end
 
-  HTTP_METHODS = %w[GET POST DELETE PUT TRACE OPTIONS PATCH]
+  HTTP_METHODS = %w[GET POST DELETE PUT TRACE OPTIONS PATCH].freeze
 
   include Action
-  include HTML
 
   def initialize(config = {}, before: [], after: [])
     @router = Router.new(config, before: before, after: after)
@@ -41,7 +38,7 @@ class Rackr
     @router.append_scope(
       name,
       scope_befores: before,
-      scope_afters: after,
+      scope_afters: after
     )
     instance_eval(&block)
 
@@ -64,10 +61,47 @@ class Rackr
     end
   end
 
+  # Beta
+  def resources(name, id:)
+    const_name = name.to_s.capitalize
+    id ||= :id
+
+    scope name do
+      get Object.const_get("Actions::#{const_name}::Index") if Object.const_defined?("Actions::#{const_name}::Index")
+      get 'new', Object.const_get("Actions::#{const_name}::New") if Object.const_defined?("Actions::#{const_name}::New")
+      post Object.const_get("Actions::#{const_name}::Index") if Object.const_defined?("Actions::#{const_name}::Index")
+
+      resource_actions = proc do
+        get Object.const_get("Actions::#{const_name}::Show") if Object.const_defined?("Actions::#{const_name}::Show")
+        if Object.const_defined?("Actions::#{const_name}::Edit")
+          get 'edit', Object.const_get("Actions::#{const_name}::Edit")
+        end
+        if Object.const_defined?("Actions::#{const_name}::Update")
+          put Object.const_get("Actions::#{const_name}::Update")
+        end
+        if Object.const_defined?("Actions::#{const_name}::Delete")
+          delete Object.const_get("Actions::#{const_name}::Delete")
+        end
+      end
+
+      if Object.const_defined?("Callbacks::#{const_name}::Assign")
+        scope(id.to_sym, before: Object.const_get("Callbacks::#{const_name}::Assign"), &resource_actions)
+      else
+        scope(id.to_sym, &resource_actions)
+      end
+    end
+  end
+
   HTTP_METHODS.each do |http_method|
     define_method(http_method.downcase.to_sym) do |*params, before: [], after: [], as: nil, &block|
       path = params[0] || ''
       endpoint = params[1] || ''
+      scopes = []
+      if path.is_a?(String) && path.include?('/')
+        scopes = path.split('/')[0...-1]
+        path = path.split('/').pop
+      end
+      scopes.each { |scope_name| @router.append_scope(scope_name) }
 
       if block.respond_to?(:call)
         @router.add(
@@ -93,6 +127,8 @@ class Rackr
           route_afters: after
         )
       end
+
+      scopes.length.times { @router.clear_last_scope }
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.57
 platform: ruby
 authors:
 - Henrique F. Teixeira
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-12 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -87,7 +86,6 @@ files:
 - lib/rackr.rb
 - lib/rackr/action.rb
 - lib/rackr/callback.rb
-- lib/rackr/html.rb
 - lib/rackr/router.rb
 - lib/rackr/router/build_request.rb
 - lib/rackr/router/errors.rb
@@ -97,7 +95,6 @@ homepage: https://github.com/henrique-ft/rackr
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A complete, simple and easy web micro-framework.
 test_files: []

data/lib/rackr/html.rb

@@ -1,7 +0,0 @@
-class Rackr
-  module HTML
-    def self.included(base)
-      base.class_eval { include ::HtmlSlice }
-    end
-  end
-end