rackr 0.0.56 → 0.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0064b397729023c9354b47f6b98abb0526fd42d67905dbf12f34283368ff4d
-  data.tar.gz: e0fa0a69981b67e151af1763f46c802719f8ea68af1d426eb53972c68e70e577
+  metadata.gz: 817c73cfeca9d09f9bba0002c6bc19b34d5b6bcc0299a24a3e9bb87b075c12b5
+  data.tar.gz: e1c4710e34bf53a780a7d6b132469151fc2e4fafaf8a27205266414a02ac7299
 SHA512:
-  metadata.gz: 8f7cdc5a620b6eb51e30ea81276f4d3c2ca70d10e2bb4d12f4721319ca9a89bafd53885ff5fe51390f83980b281996ec6551217482407d740fb39a9b203f5b81
-  data.tar.gz: ca6b207e9089104fe1bde0cad0e162cb0c126ee6f11d8420615dae7e1e7c8eaf2c293fc2d40341ca9c2fc59ff3160ad375e1ece5a001aecd4a6a76e690320421
+  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'
 
@@ -56,11 +77,11 @@ class Rackr
 
           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,93 +94,62 @@ class Rackr
 
           [status, { 'content-type' => 'text/html' }.merge(headers), [parsed_erb]]
         end
-      end
-    end
 
-    def load_json(val)
-      return Oj.load(val.body.read) if val.is_a?(Rack::Request)
+        def load_json(val)
+          return Oj.load(val.body.read) if val.is_a?(Rack::Request)
 
-      Oj.load(val)
-    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
+          Oj.load(val)
         end
-      end
 
-      [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
+        def html_response(content = '', status: 200, headers: {})
+          Rack::Response.new(content, status, { 'content-type' => 'text/html' }.merge(headers))
         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 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)
-      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/errors/dev_html.rb

@@ -1,14 +1,16 @@
 # 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'
               _ '<style>

data/lib/rackr.rb

@@ -2,8 +2,6 @@
 
 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'
 
@@ -13,7 +11,6 @@ class Rackr
   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)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.57
 platform: ruby
 authors:
 - Henrique F. Teixeira
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-03-18 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.3
-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,9 +0,0 @@
-# frozen_string_literal: true
-
-class Rackr
-  module HTML
-    def self.included(base)
-      base.class_eval { include ::HtmlSlice }
-    end
-  end
-end