rackr 0.0.50 → 0.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889c67a66431461f8ef941117b0195498135b5ee0c4b3b75c17f8c784f65678c
-  data.tar.gz: 5482a863b01cf4637824ed7a054da8ac7a339154c8dc2b19faf11576e7585b77
+  metadata.gz: 279a41741ba1b761a98b837d7d27b92c8cce088c87f99bedb644e3bbae653b7a
+  data.tar.gz: a8d1193621683b375605ebc4807440560b4a45fff0d8240c1493dd2b060d4077
 SHA512:
-  metadata.gz: 1f0fb3862cb8f3e50b3aef24c99e0ee9ee2252542d026c4d7d078063d30ccbbd8bed3b0964814d82f95d929cdcb33c29bd639209842666c2af173f17f9d70160
-  data.tar.gz: f5a6835a8b80acd26e8e3ddf8cd38c84b23066319e65727688285c8b51ddcaccab401908e4dff64bcbabe3614ca45ab20a3cd3cc638b434c70cd94f76b33e321
+  metadata.gz: 0ae5954c85b11789fe66e14e1b9851036d2a9ca6a9b1ce61faf05515b3336204ae77521339b16d32b51ef0ee84914763918769dfe8c14ec078c32f41ee0a9e6d
+  data.tar.gz: 5d00b7e15751b6c2c7699bd169ade250a173082b98e2ee9621019678fa2498ab71426400b26094c4f044e550766e375e002b6d9f7ee6d550bd4b388f53056815

data/lib/rackr/action.rb

@@ -16,251 +16,142 @@ class Rackr
           @db = config[:db]
         end
 
-        def view_response(a_path, a_view_params = {}, status: 200, headers: {})
-          Rackr::Action.view_response(
-            a_path,
-            a_view_params,
+        def view_response(
+          paths,
+          status: 200,
+          headers: {},
+          layout_path: 'layout'
+        )
+          view(
+            paths,
             status: status,
             headers: headers,
-            config: config,
-            routes: routes,
-            db: db
+            layout_path: layout_path,
+            response_instance: true
           )
         end
 
         def view(
-          a_path, a_view_params = {}, status: 200, response_instance: false, headers: {}
+          paths,
+          status: 200,
+          headers: {},
+          layout_path: 'layout',
+          response_instance: false
         )
-          Rackr::Action.view(
-            a_path,
-            a_view_params,
-            status: status,
-            headers: headers,
-            config: config,
-            routes: routes,
-            db: db,
-            response_instance: response_instance
-          )
+          base_path = config.dig(:views, :path) || 'views'
+
+          file_or_nil = lambda do |path|
+            ::File.read(path)
+          rescue Errno::ENOENT
+            nil
+          end
+
+          file_content = if paths.is_a?(Array)
+                           paths.map { |path| ::File.read("#{base_path}/#{path}.html.erb") }.join
+                         else
+                           ::File.read("#{base_path}/#{paths}.html.erb")
+                         end
+
+          layout_content = file_or_nil.("#{base_path}/#{layout_path}.html.erb")
+
+          parsed_erb =
+            if layout_content
+              erb(layout_content) do
+                erb(file_content, binding_context: binding)
+              end
+            else
+              erb(file_content, binding_context: binding)
+            end
+
+          if response_instance
+            return Rack::Response.new(
+              parsed_erb,
+              status,
+              { 'content-type' => 'text/html' }.merge(headers)
+            )
+          end
+
+          [status, { 'content-type' => 'text/html' }.merge(headers), [parsed_erb]]
         end
       end
     end
 
     def html(content = '', status: 200, headers: {}, &block)
-      if block_given? && respond_to?(:html_slice)
+      if content == '' && block_given? && respond_to?(:html_slice)
         if respond_to?(:layout)
           content = layout(&block)
         else
-          html_slice(:root, &block)
+          html_layout(&block)
           content = html_slice
         end
       end
 
-      Rackr::Action.html(content, status: status, headers: headers, &block)
+      [status, { 'content-type' => 'text/html' }.merge(headers), [content]]
     end
 
-    def html_response(content = '', status: 200, headers: {} &block)
-      if block_given? && respond_to?(:html_slice)
+    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_slice(:root, &block)
+          html_layout(&block)
           content = html_slice
         end
       end
 
-      Rackr::Action.html_response(content, status: status, headers: headers, &block)
+      Rack::Response.new(content, status, { 'content-type' => 'text/html' }.merge(headers))
     end
 
     def json(content = {}, status: 200, headers: {})
-      Rackr::Action.json(content, status: status, headers: headers)
+      [status, { 'content-type' => 'application/json' }.merge(headers), [Oj.dump(content, mode: :compat)]]
     end
 
     def json_response(content = {}, status: 200, headers: {})
-      Rackr::Action.json_response(content, status: status, headers: headers)
+      Rack::Response.new(
+        Oj.dump(content, mode: :compat),
+        status,
+        { 'content-type' => 'application/json' }.merge(headers)
+      )
     end
 
     def text(content, status: 200, headers: {})
-      Rackr::Action.text(content, status: status, headers: headers)
+      [status, { 'content-type' => 'text/plain' }.merge(headers), [content]]
     end
 
     def text_response(content, status: 200, headers: {})
-      Rackr::Action.text_response(content, status: status, headers: headers)
+      Rack::Response.new(
+        content,
+        status,
+        { 'content-type' => 'text/plain' }.merge(headers)
+      )
     end
 
-    def erb(content, view_params = {})
-      Rackr::Action.erb(content, view_params)
+    def erb(content, binding_context: nil, &block)
+      eval(Erubi::Engine.new(content).src, binding_context)
     end
 
     def head(status, headers: {})
-      Rackr::Action.head(status, headers: headers)
+      [status, headers, []]
     end
 
     def head_response(status, headers: {})
-      Rackr::Action.head_response(status, headers: headers)
+      Rack::Response.new(nil, status, headers)
     end
 
     def redirect_response(url, headers: {})
-      Rackr::Action.redirect_response(url, headers: headers)
+      Rack::Response.new(
+        nil,
+        302,
+        { 'location' => url }.merge(headers)
+      )
     end
 
     def redirect_to(url, headers: {})
-      Rackr::Action.redirect_to(url, headers: headers)
+      [302, { 'location' => url }.merge(headers), []]
     end
 
     def response(body = nil, status = 200, headers = {})
       Rack::Response.new(body, status, headers)
     end
-
-    class << self
-      def view_response(
-        paths,
-        view_params = {},
-        status: 200,
-        headers: {},
-        config: {},
-        routes: nil,
-        db: nil
-      )
-        view(
-          paths,
-          view_params,
-          status: status,
-          config: config,
-          routes: routes,
-          headers: headers,
-          db: db,
-          response_instance: true
-        )
-      end
-
-      def view(
-        paths,
-        view_params = {},
-        status: 200,
-        headers: {},
-        config: {},
-        routes: nil,
-        db: nil,
-        response_instance: false
-      )
-        base_path = config.dig(:views, :path) || 'views'
-
-        file_or_nil = lambda do |path|
-          ::File.read(path)
-        rescue Errno::ENOENT
-          nil
-        end
-
-        file_content = if paths.is_a?(Array)
-                         paths.map { |path| ::File.read("#{base_path}/#{path}.html.erb") }.join
-                       else
-                         ::File.read("#{base_path}/#{paths}.html.erb")
-                       end
-
-        erb = erb(
-          [
-            file_or_nil.call("#{base_path}/layout/_header.html.erb"),
-            file_content,
-            file_or_nil.call("#{base_path}/layout/_footer.html.erb")
-          ].join,
-          view_params,
-          config: config,
-          routes: routes,
-          db: db
-        )
-
-        if response_instance
-          return Rack::Response.new(
-            erb,
-            status,
-            { 'Content-Type' => 'text/html' }.merge(headers)
-          )
-        end
-
-        [status, { 'Content-Type' => 'text/html' }.merge(headers), [erb]]
-      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_slice(:root, &block)
-            content = html_slice
-          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_slice(:root, &block)
-            content = html_slice
-          end
-        end
-
-        Rack::Response.new(content, status, { 'Content-Type' => 'text/html' }.merge(headers))
-      end
-
-      def json(content = {}, status: 200, headers: {})
-        [status, { 'Content-Type' => 'application/json' }.merge(headers), [Oj.dump(content, mode: :compat)]]
-      end
-
-      def json_response(content = {}, status: 200, headers: {})
-        Rack::Response.new(
-          Oj.dump(content, mode: :compat),
-          status,
-          { 'Content-Type' => 'application/json' }.merge(headers)
-        )
-      end
-
-      def text(content, status: 200, headers: {})
-        [status, { 'Content-Type' => 'text/plain' }.merge(headers), [content]]
-      end
-
-      def text_response(content, status: 200, headers: {})
-        Rack::Response.new(
-          content,
-          status,
-          { 'Content-Type' => 'text/plain' }.merge(headers)
-        )
-      end
-
-      # rubocop:disable Lint/UnusedMethodArgument
-      def erb(content, view_params = {}, config: nil, routes: nil, db: nil)
-        @view = OpenStruct.new(view_params)
-
-        eval(Erubi::Engine.new(content).src)
-      end
-      # rubocop:enable Lint/UnusedMethodArgument
-
-      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 head(status, headers: {})
-        [status, headers, []]
-      end
-
-      def head_response(status, headers: {})
-        Rack::Response.new(nil, status, headers)
-      end
-
-      def response(body = nil, status = 200, headers = {})
-        Rack::Response.new(body, status, headers)
-      end
-    end
   end
 end

data/lib/rackr/html.rb

@@ -1,139 +1,7 @@
 class Rackr
   module HTML
-    # HTML as a first-class citizen in ruby code
-    # Faster than ERB.
-
-    TAGS = %i[
-      div
-      title
-      embed
-      meta
-      br
-      a
-      em
-      b
-      i
-      ul
-      ol
-      li
-      img
-      table
-      tbody
-      thead
-      tr
-      th
-      td
-      form
-      input
-      button
-      link
-      h1
-      h2
-      h3
-      h4
-      h5
-      h6
-      hr
-      span
-      label
-      iframe
-      template
-      main
-      footer
-      aside
-      source
-      section
-      small
-      script
-      nav
-      area
-    ]
-
-    EMPTY_TAGS = %i[
-      area
-      br
-      embed
-      hr
-      img
-      input
-      link
-      meta
-      source
-    ].freeze
-
-    def html_layout(&block)
-      html_slice(:root, &block)
-    end
-
-    def html_slice(type = nil, &block)
-      if block_given?
-        if type == :root
-          wrap = ['<!DOCTYPE html><html>', '</html>']
-        else
-          wrap = ['','']
-        end
-        @html_slice = wrap[0]
-        instance_eval(&block)
-        @html_slice << wrap[1]
-      else
-        @html_slice
-      end
-    end
-
-    TAGS.each do |name|
-      define_method name do |*args, &block|
-        tag(name, *args, &block)
-      end
-    end
-
-    def _(content)
-      @html_slice << content.to_s
-    end
-
-    def tag(tag_name, *args, &block)
-      content, attributes = parse_html_tag_arguments(args)
-      generate_and_append_html_tag(tag_name, content, attributes, &block)
-    end
-
-    private
-
-    def parse_html_tag_arguments(args)
-      content = ''
-      attributes = {}
-
-      first_argument = args.shift
-      if first_argument.is_a?(String)
-        content = CGI.escapeHTML(first_argument)
-        attributes = args.pop || {}
-      elsif first_argument.is_a?(Hash)
-        attributes = first_argument
-      end
-
-      [content, attributes]
-    end
-
-    def generate_and_append_html_tag(tag_name, content, attributes, &block)
-      open_tag = build_html_open_tag(tag_name, attributes)
-
-      if block_given?
-        @html_slice << open_tag << ">"
-        instance_eval(&block)
-        @html_slice << "</#{tag_name}>"
-      else
-        if content.empty? && EMPTY_TAGS.include?(tag_name)
-          @html_slice << open_tag << "/>"
-        else
-          @html_slice << open_tag << ">" << content << "</#{tag_name}>"
-        end
-      end
-    end
-
-    def build_html_open_tag(tag_name, attributes)
-      open_tag = "<#{tag_name}"
-      attributes.each do |key, value|
-        open_tag << " #{key.to_s.gsub('_', '-')}='#{value}'"
-      end
-      open_tag
+    def self.included(base)
+      base.class_eval { include ::HtmlSlice }
     end
   end
 end

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

@@ -27,13 +27,11 @@ class Rackr
                 background-color: #191919;
                     color: white;
                         padding: 0em 2em;
-                            border: 5px solid #ffffff;
-                                border-radius: 1em;
+                            border: 5px solid #191919;
                 }
                 h1 {
                     background-color: #464646;
                         padding: 1em;
-                            border-radius: 0.2em;
                 }
               )
             end

data/lib/rackr/router.rb

@@ -72,7 +72,7 @@ class Rackr
     rescue Rackr::NotFound
       call_endpoint(@not_found, request_builder.call)
     rescue Exception => e
-      return @error.call(request_builder.call, e) unless @dev_mode
+      return @error.call(request_builder.call, e) if !@dev_mode || ENV['RACKR_ERROR_DEV']
 
       call_endpoint(Errors::DevHtml, env.merge({'error' => e}))
     end

data/lib/rackr.rb

@@ -2,6 +2,7 @@
 
 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.52
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -58,6 +58,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: html_slice
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A complete http router solution that fit well with pure rack apps.
 email: hriqueft@gmail.com
 executables: []