rackr 0.0.47 → 0.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b5f08cc4a80ac9d5a0ea2a511256242aaf4ed4a243315e6674252f1912888d
-  data.tar.gz: e1e232c9b61919c3d1f34fda5fcb446c2a000c0d2b7330c8b247fe1cf40886d4
+  metadata.gz: f92461b0ae4b6cab185bc30a250bc4155995b75509c66303abdf4cc1448770aa
+  data.tar.gz: d5e3ac4c8555803763a3dcb9b1db3f0d6659e5b5be63dc23624cab75b15d8bb5
 SHA512:
-  metadata.gz: 9356de83cf84a8eda2afdecc1a4d7832b6eb2aa25dc3adfb21a6d979db2eba41e0f92470d1cf26c2f5e4dc8f31deb064c6c4546f8e5df104ba26cec25647f9ef
-  data.tar.gz: 5d474d1584a27200f16876c5da455c5249d66fad31a3c27a4339554285e55270b5e141ddd7d5cec932d479b7952885d71276434e8c160d5fe2b8d7c0fa1d43e7
+  metadata.gz: 37a468ee044c2628c810e783735d19bef979ed8ddbe1b62c52e856f992a9cf731b4e25f0785eb2570f47438ab43f4ed1842011aa570b85a5d786f65f1b0cfe7e
+  data.tar.gz: 253aff88e9aa466796f7657477c1fef6fe43c2b743a8400e9fca31a66667144c52eca7a981b65fb07f58f4ff89e67ee79f569a6ac8f7ea535c774806d187152b

data/lib/rackr/action.rb

@@ -16,11 +16,12 @@ class Rackr
           @db = config[:db]
         end
 
-        def view_response(a_path, a_view_params = {}, status: 200)
+        def view_response(a_path, a_view_params = {}, status: 200, headers: {})
           Rackr::Action.view_response(
             a_path,
             a_view_params,
             status: status,
+            headers: headers,
             config: config,
             routes: routes,
             db: db
@@ -28,12 +29,13 @@ class Rackr
         end
 
         def view(
-          a_path, a_view_params = {}, status: 200, response_instance: false
+          a_path, a_view_params = {}, status: 200, response_instance: false, headers: {}
         )
           Rackr::Action.view(
             a_path,
             a_view_params,
             status: status,
+            headers: headers,
             config: config,
             routes: routes,
             db: db,
@@ -47,40 +49,40 @@ class Rackr
       Rackr::Action.layout(layout_path, file_path)
     end
 
-    def html(content, status: 200)
-      Rackr::Action.html(content, status: status)
+    def html(content, status: 200, headers: {})
+      Rackr::Action.html(content, status: status, headers: headers)
     end
 
     def html_response(content, status: 200)
-      Rackr::Action.html_response(content, status: status)
+      Rackr::Action.html_response(content, status: status, headers: headers)
     end
 
-    def json(content = {}, status: 200)
-      Rackr::Action.json(content, status: status)
+    def json(content = {}, status: 200, headers: {})
+      Rackr::Action.json(content, status: status, headers: headers)
     end
 
-    def json_response(content = {}, status: 200)
-      Rackr::Action.json_response(content, status: status)
+    def json_response(content = {}, status: 200, headers: {})
+      Rackr::Action.json_response(content, status: status, headers: headers)
     end
 
-    def text(content, status: 200)
-      Rackr::Action.text(content, status: status)
+    def text(content, status: 200, headers: {})
+      Rackr::Action.text(content, status: status, headers: headers)
     end
 
-    def text_response(content, status: 200)
-      Rackr::Action.text_response(content, status: status)
+    def text_response(content, status: 200, headers: {})
+      Rackr::Action.text_response(content, status: status, headers: headers)
     end
 
     def erb(content, view_params = {})
       Rackr::Action.erb(content, view_params)
     end
 
-    def redirect_response(url)
-      Rackr::Action.redirect_response(url)
+    def redirect_response(url, headers: {})
+      Rackr::Action.redirect_response(url, headers: headers, headers: headers)
     end
 
-    def redirect_to(url)
-      Rackr::Action.redirect_to(url)
+    def redirect_to(url, headers: {})
+      Rackr::Action.redirect_to(url, headers: headers, headers: headers)
     end
 
     def response(body = nil, status = 200, headers = {})
@@ -92,6 +94,7 @@ class Rackr
         paths,
         view_params = {},
         status: 200,
+        headers: {},
         config: {},
         routes: nil,
         db: nil
@@ -102,6 +105,7 @@ class Rackr
           status: status,
           config: config,
           routes: routes,
+          headers: headers,
           db: db,
           response_instance: true
         )
@@ -111,6 +115,7 @@ class Rackr
         paths,
         view_params = {},
         status: 200,
+        headers: {},
         config: {},
         routes: nil,
         db: nil,
@@ -146,11 +151,11 @@ class Rackr
           return Rack::Response.new(
             erb,
             status,
-            { 'Content-Type' => 'text/html' }
+            { 'Content-Type' => 'text/html' }.merge(headers)
           )
         end
 
-        [status, { 'Content-Type' => 'text/html' }, [erb]]
+        [status, { 'Content-Type' => 'text/html' }.merge(headers), [erb]]
       end
 
       def layout(layout_path, file_path)
@@ -161,35 +166,35 @@ class Rackr
         ]
       end
 
-      def html(content, status: 200)
-        [status, { 'Content-Type' => 'text/html' }, [content]]
+      def html(content, status: 200, headers: {})
+        [status, { 'Content-Type' => 'text/html' }.merge(headers), [content]]
       end
 
-      def html_response(content, status: 200)
-        Rack::Response.new(content, status, { 'Content-Type' => 'text/html' })
+      def html_response(content, status: 200, headers: {})
+        Rack::Response.new(content, status, { 'Content-Type' => 'text/html' }.merge(headers))
       end
 
-      def json(content = {}, status: 200)
-        [status, { 'Content-Type' => 'application/json' }, [Oj.dump(content, mode: :compat)]]
+      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)
+      def json_response(content = {}, status: 200, headers: {})
         Rack::Response.new(
           Oj.dump(content, mode: :compat),
           status,
-          { 'Content-Type' => 'application/json' }
+          { 'Content-Type' => 'application/json' }.merge(headers)
         )
       end
 
-      def text(content, status: 200)
-        [status, { 'Content-Type' => 'text/plain' }, [content]]
+      def text(content, status: 200, headers: {})
+        [status, { 'Content-Type' => 'text/plain' }.merge(headers), [content]]
       end
 
-      def text_response(content, status: 200)
+      def text_response(content, status: 200, headers: {})
         Rack::Response.new(
           content,
           status,
-          { 'Content-Type' => 'text/plain' }
+          { 'Content-Type' => 'text/plain' }.merge(headers)
         )
       end
 
@@ -201,16 +206,16 @@ class Rackr
       end
       # rubocop:enable Lint/UnusedMethodArgument
 
-      def redirect_response(url)
+      def redirect_response(url, headers: {})
         Rack::Response.new(
           nil,
           302,
-          { 'Location' => url }
+          { 'Location' => url }.merge(headers)
         )
       end
 
-      def redirect_to(url)
-        [302, { 'Location' => url }, []]
+      def redirect_to(url, headers: {})
+        [302, { 'Location' => url }.merge(headers), []]
       end
 
       def response(body = nil, status = 200, headers = {})

data/lib/rackr/router.rb

@@ -14,18 +14,20 @@ class Rackr
       %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |method|
         @instance_routes[method] = { __instances: [] }
       end
-      @routes =
-        Hash.new do |_hash, key|
+      http_methods = HTTP_METHODS.map { |m| m.downcase.to_sym }
+      @routes = Struct.new(*http_methods).new
+      http_methods.each do |method|
+        @routes.send("#{method}=", Hash.new do |_hash, key|
           raise(Errors::UndefinedNamedRouteError, "Undefined named route: '#{key}'")
-        end
+        end)
+      end
+
       @config = config
       @branches = []
       @befores = ensure_array(before)
       @branches_befores = {}
       @afters = ensure_array(after)
       @branches_afters = {}
-      @nameds_as = []
-      @branches_named_as = {}
       @error = proc { |_req, e| raise e }
       @not_found = proc { [404, {}, ['Not found']] }
       @splitted_request_path = []
@@ -81,7 +83,7 @@ class Rackr
       method = :get if method == :head
 
       path_with_branches = "/#{@branches.join('/')}#{put_path_slash(path)}"
-      add_named_route(path_with_branches, as)
+      add_named_route(method, path_with_branches, as)
 
       route_instance =
         Route.new(
@@ -108,9 +110,8 @@ class Rackr
       @error = endpoint
     end
 
-    def append_branch(name, branch_befores: [], branch_afters: [], as: nil)
+    def append_branch(name, branch_befores: [], branch_afters: [])
       Errors.check_branch_name(name)
-      Errors.check_as(as, @branches.join('/'))
       Errors.check_callbacks(branch_befores, name)
       Errors.check_callbacks(branch_afters, name)
 
@@ -125,15 +126,11 @@ class Rackr
       branch_afters = ensure_array(branch_afters)
       @afters.concat(branch_afters)
       @branches_afters[name] = branch_afters
-
-      @nameds_as.push(as)
-      @branches_named_as[name] = as
     end
 
     def clear_last_branch
       @befores -= @branches_befores[@branches.last]
       @afters -= @branches_afters[@branches.last]
-      @nameds_as -= [@branches_named_as[@branches.last]]
       @branches = @branches.first(@branches.size - 1)
     end
 
@@ -156,11 +153,12 @@ class Rackr
       [list]
     end
 
-    def add_named_route(path_with_branches, as)
-      nameds_as = [@nameds_as.last].push(as).compact
-      return if nameds_as.empty?
+    def add_named_route(method, path_with_branches, as)
+      return @routes.send(method.downcase)[:root] = path_with_branches if path_with_branches == '/'
+      return @routes.send(method.downcase)[as] = path_with_branches unless as.nil?
 
-      @routes[nameds_as.join('_').to_sym] = path_with_branches
+      key = path_with_branches.sub("/","").gsub(":","").gsub("/","_")
+      @routes.send(method.downcase)["#{key}".to_sym] = path_with_branches
     end
 
     def push_to_branch(method, route_instance)

data/lib/rackr.rb

@@ -7,6 +7,8 @@ require_relative 'rackr/callback'
 class Rackr
   class NotFound < StandardError; end
 
+  HTTP_METHODS = %w[GET POST DELETE PUT TRACE OPTIONS PATCH]
+
   include Action
 
   def initialize(config = {}, before: [], after: [])
@@ -31,12 +33,11 @@ class Rackr
     @router.config[:db]
   end
 
-  def r(name, before: [], after: [], as: nil, &block)
+  def r(name, before: [], after: [], &block)
     @router.append_branch(
       name,
       branch_befores: before,
       branch_afters: after,
-      as: as
     )
     instance_eval(&block)
 
@@ -59,8 +60,8 @@ class Rackr
     end
   end
 
-  %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |http_method|
-    define_method(http_method.downcase.to_sym) do |*params, as: nil, before: nil, after: nil, &block|
+  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] || ''
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.49
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-23 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi