rack-http_router 0.0.31 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161320de9187e5cbb240dc21f2e8e0022de852686cc5d462d60c8b80c2a58a21
-  data.tar.gz: 65afaba8af50fa630e7f20d647de6531302352fce8e9b4de8e3589514e9923f4
+  metadata.gz: c0c64f3cfa73ac4138ffda97860742253fe931eb53de45281627a58def572c54
+  data.tar.gz: 369489457adc954e84ffb7fd8c30eb9cfdea5ec3e44e64eda8a310df04779928
 SHA512:
-  metadata.gz: 2e1e97f0bf724b0c6e279db38ffc38eb3a51cd5b1c2e0ec321efe7ae6ef5b364f9f862a1803a5ca0290b98c84b32123b3c5c053fd05301c595ae504ccc2673b7
-  data.tar.gz: e3d0df2a1110d94026a3eac1a0a84bf6ab1002ef61a43ac8d8a38a7314cd1f8d9f6cf7faced23efd8d77d2b50f24ac2c0c1b017810a53849869e89738c2d50b2
+  metadata.gz: 796e12240f741f5b5f771a0b97b433a79f1c2d28a0d72d6db27470d78f22ddcbcb4a20207665912af65ab6351ffd1e7b26c2901366c7553a2b8842e0bb82d1d9
+  data.tar.gz: 858a3256bbe6f8e2910a5934b7fe71f2d83276e30a0735e769f83f7d1d72aded1d45d3587ca0c6c1e7c9a07c857b92bd6d32ce8d8422cf3a7a05463606969ed5

data/lib/rack-http_router/action.rb

@@ -9,18 +9,22 @@ module Rack
     module Action
       def self.included(base)
         base.class_eval do
-          attr_reader :route, :config if self != Rack::HttpRouter
+          attr_reader :route, :config, :db if self != Rack::HttpRouter
 
-          def initialize(route, config)
+          def initialize(route: nil, config: nil)
             @route = route
             @config = config
+            @db = config[:db]
           end
 
           def view_response(a_path, a_view_params = {}, status: 200)
             Rack::HttpRouter::Action.view_response(
               a_path,
               a_view_params,
-              status: status, route: route
+              status: status,
+              config: config,
+              route: route,
+              db: db
             )
           end
 
@@ -30,7 +34,11 @@ module Rack
             Rack::HttpRouter::Action.view(
               a_path,
               a_view_params,
-              status: status, response_instance: response_instance, route: route
+              status: status,
+              config: config,
+              route: route,
+              db: db,
+              response_instance: response_instance
             )
           end
         end
@@ -85,12 +93,22 @@ module Rack
           Rack::Response.new(content, status, { 'Content-Type' => 'text/html' })
         end
 
-        def view_response(paths, view_params = {}, status: 200, route: nil)
+        def view_response(
+          paths,
+          view_params = {},
+          status: 200,
+          config: {},
+          route: nil,
+          db: nil
+        )
           view(
             paths,
             view_params,
-            status: status, response_instance: true,
-            route: route
+            status: status,
+            config: config,
+            route: route,
+            db: db,
+            response_instance: true
           )
         end
 
@@ -98,13 +116,15 @@ module Rack
           paths,
           view_params = {},
           status: 200,
-          response_instance: false,
-          route: nil
+          config: {},
+          route: nil,
+          db: nil,
+          response_instance: false
         )
           erb = if paths.is_a?(Array)
-                  paths.map { |path| erb("views/#{path}", route, view_params) }.join
+                  paths.map { |path| erb("views/#{path}", config, route, db, view_params) }.join
                 else
-                  erb("views/#{paths}", route, view_params)
+                  erb("views/#{paths}", config, route, db, view_params)
                 end
 
           if response_instance
@@ -142,11 +162,13 @@ module Rack
           )
         end
 
-        def erb(path, _route, view_params = {})
+        # rubocop:disable Lint/UnusedMethodArgument
+        def erb(path, config, route, db, view_params = {})
           @view = OpenStruct.new(view_params)
 
           eval(Erubi::Engine.new(::File.read("#{path}.html.erb")).src)
         end
+        # rubocop:enable Lint/UnusedMethodArgument
 
         def redirect_response(url)
           Rack::Response.new(

data/lib/rack-http_router/router.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'router/route'
 require_relative 'router/build_request'
 
@@ -16,9 +14,10 @@ module Rack
         %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |method|
           @routes[method] = { __instances: [] }
         end
-        @route = Hash.new do |_hash, key|
-          raise(UndefinedNamedRoute, "Undefined named route: '#{key}'")
-        end
+        @route =
+          Hash.new do |_hash, key|
+            raise(UndefinedNamedRoute, "Undefined named route: '#{key}'")
+          end
         @config = config
         @scopes = []
         @error = proc { |_req, e| raise e }
@@ -34,11 +33,14 @@ module Rack
         return render_not_found(request_builder.call) if route_instance.nil?
 
         if route_instance.endpoint.respond_to?(:call)
-          return route_instance.endpoint.call(request_builder.call(route_instance))
+          return route_instance.endpoint.call(
+            request_builder.call(route_instance)
+          )
         end
 
         if route_instance.endpoint.include?(Rack::HttpRouter::Action)
-          return route_instance.endpoint.new(@route, @config).call(request_builder.call(route_instance))
+          return route_instance.endpoint.new(route: @route, config: @config)
+            .call(request_builder.call(route_instance))
         end
 
         route_instance.endpoint.new.call(request_builder.call(route_instance))
@@ -54,7 +56,9 @@ module Rack
 
         route_instance = Route.new(path_with_scopes, endpoint)
 
-        return push_to_scope(method.to_s.upcase, route_instance) if @scopes.size >= 1
+        if @scopes.size >= 1
+          return push_to_scope(method.to_s.upcase, route_instance)
+        end
 
         @routes[method.to_s.upcase][:__instances].push(route_instance)
       end
@@ -78,7 +82,7 @@ module Rack
       private
 
       def push_to_scope(method, route_instance)
-        scopes_with_slash = @scopes + [:__instances]
+        scopes_with_slash = @scopes + %i[__instances]
         push_it(@routes[method], *scopes_with_slash, route_instance)
       end
 
@@ -126,9 +130,10 @@ module Rack
         end
 
         if tail.empty? || found_scopes == []
-          return @routes[env['REQUEST_METHOD']].dig(*(found_scopes << :__instances)).detect do |route_instance|
-            route_instance.match?(env)
-          end
+          return @routes[env['REQUEST_METHOD']].dig(
+            *(found_scopes << :__instances)
+          )
+            .detect { |route_instance| route_instance.match?(env) }
         end
 
         match_route(env, tail, found_scopes)

data/lib/rack-http_router.rb

@@ -8,7 +8,6 @@ module Rack
     include Action
 
     def initialize(config = {})
-      p "oi"
       @router = Router.new(config)
     end
 
@@ -26,6 +25,10 @@ module Rack
       @router.config
     end
 
+    def db
+      @router.config[:db]
+    end
+
     def scope(name, &block)
       @router.append_scope(name)
       instance_eval(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-http_router
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.33
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi