rack-http_router 0.0.35 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7eb090e26635738162faa639dae1abd812fe0b5491f4767ae3bdfd8f8db36e
-  data.tar.gz: cf2d047dd885c51b8e45506835d03890502ab98a801065953cf06a2e516969e6
+  metadata.gz: d8116a8bf789a572ba51ac9b1644a88bcf7cffdd5d47533afccea57040d48556
+  data.tar.gz: 2c8f9d461996645b791e8087921d03d577576f56778669e8851c2cf2c3de9a70
 SHA512:
-  metadata.gz: a79812b7fb6d9d93f78d3e4dae086ee14e39036a6f0a82b946d6c68b0b0b3de3f9e0945e6fedad92efb51ccb2d4665bdfdc565cd4e9718efe400fe449a17152a
-  data.tar.gz: f5619bcb193f626bbc0b191798391b63e02a5eb98e04da9f63775f2e69665d502b92536dd5c6dee56feefbeed894132334abc1fcddef9bf10b4accd2ecf0da89
+  metadata.gz: 932d5f2c0b87140b7b0f6f9fb8bdf897af1335fd950af076204449153312013cbd0d866331b3a36dd4dde5563c57ebcbd99c4d213e7fd2f7100ab8729eebc7db
+  data.tar.gz: 460cf2a15bfb6e3f2837f59470127a77c15cd83abb0df2c264bd9c1c70db13b733351e5534d689dbcbad3285053c1ab2bcd7e5d5159a98b14480ebd352b9a034

data/lib/rack-http_router/action.rb

@@ -44,8 +44,8 @@ module Rack
         end
       end
 
-      def assign(obj, hash)
-        Rack::HttpRouter::Action.assign(obj, hash)
+      def layout(layout_path, file_path)
+        Rack::HttpRouter::Action.layout(layout_path, file_path)
       end
 
       def html(content, status: 200)
@@ -89,22 +89,6 @@ module Rack
       end
 
       class << self
-        def assign(obj, hash)
-          hash.each do |k, v|
-            obj.define_singleton_method(k) { v }
-          end
-
-          obj
-        end
-
-        def html(content, status: 200)
-          [status, { 'Content-Type' => 'text/html' }, [content]]
-        end
-
-        def html_response(content, status: 200)
-          Rack::Response.new(content, status, { 'Content-Type' => 'text/html' })
-        end
-
         def view_response(
           paths,
           view_params = {},
@@ -133,11 +117,31 @@ module Rack
           db: nil,
           response_instance: false
         )
-          erb = if paths.is_a?(Array)
-                  paths.map { |path| erb("#{config.dig(:views, :path) || "views"}/#{path}", config, route, db, view_params) }.join
-                else
-                  erb("#{config.dig(:views, :path) || "views"}/#{paths}", config, route, db, view_params)
-                end
+          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,
+            config,
+            route,
+            db,
+            view_params
+          )
 
           if response_instance
             return Rack::Response.new(
@@ -150,6 +154,22 @@ module Rack
           [status, { 'Content-Type' => 'text/html' }, [erb]]
         end
 
+        def layout(layout_path, file_path)
+          [
+            "layout/#{layout_path}/_header",
+            file_path,
+            "layout/#{layout_path}/_footer"
+          ]
+        end
+
+        def html(content, status: 200)
+          [status, { 'Content-Type' => 'text/html' }, [content]]
+        end
+
+        def html_response(content, status: 200)
+          Rack::Response.new(content, status, { 'Content-Type' => 'text/html' })
+        end
+
         def json(content = {}, status: 200)
           [status, { 'Content-Type' => 'application/json' }, [Oj.dump(content, mode: :compat)]]
         end
@@ -175,10 +195,10 @@ module Rack
         end
 
         # rubocop:disable Lint/UnusedMethodArgument
-        def erb(path, config, route, db, view_params = {})
+        def erb(content, config, route, db, view_params = {})
           @view = OpenStruct.new(view_params)
 
-          eval(Erubi::Engine.new(::File.read("#{path}.html.erb")).src)
+          eval(Erubi::Engine.new(content).src)
         end
         # rubocop:enable Lint/UnusedMethodArgument
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-http_router
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.37
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -58,7 +58,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: A complete http router solution that fit well with pure rack apps
+description: A complete http router solution that fit well with pure rack apps.
 email: hriqueft@gmail.com
 executables: []
 extensions: []
@@ -91,6 +91,5 @@ requirements: []
 rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
-summary: '"rack-http_router" come with a router and helper functions to build pure
-  Rack projects.'
+summary: A complete http router solution that fit well with pure rack apps.
 test_files: []