lib/sitehub/middleware/candidate_route_mappings.rb in sitehub-0.5.0.alpha10 vs lib/sitehub/middleware/candidate_route_mappings.rb in sitehub-0.5.0.alpha11

- old
+ new

@@ -12,10 +12,11 @@ NIL_ROUTE = NilRoute.new include Equality extend GetterSetterMethods + getter_setter :sitehub_cookie_path, RECORDED_ROUTE_COOKIE_PATH getter_setter :sitehub_cookie_name, RECORDED_ROUTES_COOKIE def initialize self.default = NIL_ROUTE end @@ -31,19 +32,19 @@ def init values.each(&:build) self end - def add_route(url: nil, mapped_path: nil, route_builder: nil, &block) - unless route_builder - route_builder = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name, - mapped_path: mapped_path, - &block).tap do |builder| + def add_route(url: nil, mapped_path: nil, candidate_routes: nil, &block) + unless candidate_routes + candidate_routes = CandidateRoutes.new(sitehub_cookie_name: sitehub_cookie_name, + mapped_path: mapped_path, + &block).tap do |builder| builder.default(url: url) if url end end - self[route_builder.mapped_path] = route_builder + self[candidate_routes.mapped_path] = candidate_routes end def mapped_route(path:, request:) self[mapping(path)].resolve(id: request.cookies[sitehub_cookie_name], env: request.env) end