rackr 0.0.41 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c92b9939e63fb6f89dde70e441527279567e58ee6a9a2a490d195b093e083e0
-  data.tar.gz: c9f0f1ab708b742d319de83e314b2f37dbe6ab0eafa85496cb3ff2ac8f333466
+  metadata.gz: 3e5867f9d9dab3c8331510c345df1c57e8fb00628493796b7f6b031646b0d7e3
+  data.tar.gz: 2a390c59f7d5a0405522f4448d94db6f9d0e8c0bee775543d017aec010844af8
 SHA512:
-  metadata.gz: b637fb24fc243de2461370122a0228e6228537f62ce658fbaddeb12a9d30974795d33adf48029a380e4ed26fadcc8c05f4b60a6f59e855c32452af2bcf23ac3a
-  data.tar.gz: c3e7397002bf65a165459ebcae8cc5d5976843b009f88d20e6596fa0787408ff18391de071e2d538323f92cd505478fdba37e4536e0cecb4abf48550859b70a9
+  metadata.gz: 8739b713136d2c97394ce64a3e45b385c5df7c4481796575d38f43411974f5e9168e2730e1f955b0608a0c3c045f95154137386a6c66107bcfaf447f335de656
+  data.tar.gz: c13efed3e12031b84129ce74351e710be2a6b36a49a31db2392060a88ef58631821fa4b1be9af7bf27a4e49a8e90edbb38bb5d0265a4a6fc72e3904b11f8c6ce

data/lib/rackr/action.rb

@@ -116,7 +116,7 @@ class Rackr
         db: nil,
         response_instance: false
       )
-        base_path = config.dig(:views, :path) || "views"
+        base_path = config.dig(:views, :path) || 'views'
 
         file_or_nil = lambda do |path|
           ::File.read(path)

data/lib/rackr/callback.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rackr
   module Callback
     def self.included(base)

data/lib/rackr/router/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Rackr
   class Router
     module Errors
@@ -25,13 +27,15 @@ class Rackr
         def check_as(as, path)
           return if as.is_a?(String) || as.is_a?(Symbol) || as.nil?
 
-          raise(InvalidNamedRouteError, "as: argument in routes and branches must be a `string` or a `symbol`, got: '#{as}' for '#{path}'")
+          raise(InvalidNamedRouteError,
+                "as: argument in routes and branches must be a `string` or a `symbol`, got: '#{as}' for '#{path}'")
         end
 
         def check_callbacks(callbacks, path)
           check = lambda { |callback|
             unless callback.nil? || callback.respond_to?(:call) || (callback.respond_to?(:new) && callback.instance_methods.include?(:call))
-              raise(InvalidCallbackError, "Callbacks must respond to a `call` method or be a class with a `call` instance method, got: '#{callback.inspect}' for '#{path}'")
+              raise(InvalidCallbackError,
+                    "Callbacks must respond to a `call` method or be a class with a `call` instance method, got: '#{callback.inspect}' for '#{path}'")
             end
           }
 
@@ -43,7 +47,8 @@ class Rackr
             return
           end
 
-          raise(InvalidEndpointError, "Endpoints must respond to a `call` method or be a class with a `call` instance method, got: '#{endpoint.inspect}' for '#{path}'")
+          raise(InvalidEndpointError,
+                "Endpoints must respond to a `call` method or be a class with a `call` instance method, got: '#{endpoint.inspect}' for '#{path}'")
         end
       end
     end

data/lib/rackr/router/route.rb

@@ -3,9 +3,15 @@
 class Rackr
   class Router
     class Route
-      attr_reader :endpoint, :splitted_path, :has_params, :has_befores, :befores
-
-      def initialize(path, endpoint, befores = [])
+      attr_reader :endpoint,
+                  :splitted_path,
+                  :has_params,
+                  :has_befores,
+                  :befores,
+                  :has_afters,
+                  :afters
+
+      def initialize(path, endpoint, befores: [], afters: [])
         @path = path
         @splitted_path = @path.split('/')
         @endpoint = endpoint
@@ -13,6 +19,8 @@ class Rackr
         @has_params = @params != []
         @befores = befores
         @has_befores = befores != []
+        @afters = afters
+        @has_afters = afters != []
       end
 
       def match?(env)

data/lib/rackr/router.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'router/errors'
 require_relative 'router/route'
 require_relative 'router/build_request'
@@ -7,7 +9,7 @@ class Rackr
     attr_writer :not_found
     attr_reader :route, :config
 
-    def initialize(config = {})
+    def initialize(config = {}, before: [], after: [])
       @routes = {}
       %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |method|
         @routes[method] = { __instances: [] }
@@ -18,8 +20,10 @@ class Rackr
         end
       @config = config
       @branches = []
-      @befores = []
+      @befores = ensure_array(before)
       @branches_befores = {}
+      @afters = ensure_array(after)
+      @branches_afters = {}
       @nameds_as = []
       @branches_named_as = {}
       @error = proc { |_req, e| raise e }
@@ -43,19 +47,33 @@ class Rackr
         before_result = call_endpoint(befores[i], rack_request)
         return before_result unless before_result.is_a?(Rack::Request)
 
+        rack_request = before_result
+
+        i += 1
+      end
+
+      endpoint_result = call_endpoint(route_instance.endpoint, before_result || rack_request)
+
+      afters = route_instance.afters
+      i = 0
+      while i < afters.size
+        call_endpoint(afters[i], endpoint_result)
         i += 1
       end
 
-      call_endpoint(route_instance.endpoint, before_result || rack_request)
+      endpoint_result
+    rescue Rackr::NotFound
+      render_not_found(request_builder.call)
     rescue Exception => e
       @error.call(request_builder.call, e)
     end
 
-    def add(method, path, endpoint, as = nil, route_befores = [])
+    def add(method, path, endpoint, as: nil, route_befores: [], route_afters: [])
       Errors.check_path(path)
       Errors.check_endpoint(endpoint, path)
       Errors.check_as(as, path)
       Errors.check_callbacks(route_befores, path)
+      Errors.check_callbacks(route_afters, path)
 
       method = :get if method == :head
 
@@ -63,11 +81,14 @@ class Rackr
       add_named_route(path_with_branches, as)
 
       route_instance =
-        Route.new(path_with_branches, endpoint, @befores + ensure_array(route_befores))
+        Route.new(
+          path_with_branches,
+          endpoint,
+          befores: @befores + ensure_array(route_befores),
+          afters: @afters + ensure_array(route_afters)
+        )
 
-      if @branches.size >= 1
-        return push_to_branch(method.to_s.upcase, route_instance)
-      end
+      return push_to_branch(method.to_s.upcase, route_instance) if @branches.size >= 1
 
       @routes[method.to_s.upcase][:__instances].push(route_instance)
     end
@@ -84,10 +105,11 @@ class Rackr
       @error = endpoint
     end
 
-    def append_branch(name, branch_befores = [], as = nil)
+    def append_branch(name, branch_befores: [], branch_afters: [], as: nil)
       Errors.check_branch_name(name)
       Errors.check_as(as, @branches.join('/'))
       Errors.check_callbacks(branch_befores, name)
+      Errors.check_callbacks(branch_afters, name)
 
       @branches.push(name)
 
@@ -95,26 +117,31 @@ class Rackr
       @befores.concat(branch_befores)
       @branches_befores[name] = branch_befores
 
+      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
 
     private
 
-    def call_endpoint(endpoint, rack_request)
-      return endpoint.call(rack_request) if endpoint.respond_to?(:call)
+    def call_endpoint(endpoint, content)
+      return endpoint.call(content) if endpoint.respond_to?(:call)
 
-      if endpoint.include?(Rackr::Action)
-        return endpoint.new(route: @route, config: @config).call(rack_request)
+      if endpoint.include?(Rackr::Action) || endpoint.include?(Rackr::Callback)
+        return endpoint.new(route: @route, config: @config).call(content)
       end
 
-      endpoint.new.call(rack_request)
+      endpoint.new.call(content)
     end
 
     def ensure_array(list)

data/lib/rackr.rb

@@ -5,10 +5,12 @@ require_relative 'rackr/action'
 require_relative 'rackr/callback'
 
 class Rackr
+  class NotFound < StandardError; end
+
   include Action
 
-  def initialize(config = {})
-    @router = Router.new(config)
+  def initialize(config = {}, before: [], after: [])
+    @router = Router.new(config, before: before, after: after)
   end
 
   def call(&block)
@@ -29,8 +31,13 @@ class Rackr
     @router.config[:db]
   end
 
-  def r(name, before: [], as: nil, &block)
-    @router.append_branch(name, before, as)
+  def r(name, before: [], after: [], as: nil, &block)
+    @router.append_branch(
+      name,
+      branch_befores: before,
+      branch_afters: after,
+      as: as
+    )
     instance_eval(&block)
 
     @router.clear_last_branch
@@ -53,11 +60,25 @@ class Rackr
   end
 
   %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |http_method|
-    define_method(http_method.downcase.to_sym) do |path = '', endpoint = -> {}, as: nil, before: nil, &block|
+    define_method(http_method.downcase.to_sym) do |path = '', endpoint = -> {}, as: nil, before: nil, after: nil, &block|
       if block.respond_to?(:call)
-        @router.add(http_method, path, block, as, before)
+        @router.add(
+          http_method,
+          path,
+          block,
+          as: as,
+          route_befores: before,
+          route_afters: after
+        )
       else
-        @router.add(http_method, path, endpoint, as, before)
+        @router.add(
+          http_method,
+          path,
+          endpoint,
+          as: as,
+          route_befores: before,
+          route_afters: after
+        )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.44
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi