Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

DRY up Regexen into a ProjectIdentifier constraint

Alexander Brandon Coles0c9af0b8f9f1
diff --git a/lib/constraints/project_identifier.rb b/lib/constraints/project_identifier.rb
new file mode 100644
index 00000000000..6448c21da5f
--- /dev/null
+++ b/lib/constraints/project_identifier.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Constraints
+ class ProjectIdentifier
+ RESERVED = Project::RESERVED_IDENTIFIERS
+ private_constant :RESERVED
+
+ REGEX = /\A(?!#{Regexp.union(RESERVED)}\z)[\w-]+\z/
+ private_constant :REGEX
+
+ def self.matches?(request)
+ project_id = request.path_parameters[:project_id] || request.params[:project_id]
+ REGEX === project_id
+ end
+ end
+end
diff --git a/modules/grids/config/routes.rb b/modules/grids/config/routes.rb
index 0e89e330574..23a06676c9f 100644
--- a/modules/grids/config/routes.rb
+++ b/modules/grids/config/routes.rb
@@ -29,7 +29,7 @@
#++
Rails.application.routes.draw do
- constraints(project_id: Regexp.new("(?!(#{Project::RESERVED_IDENTIFIERS.join('|')})$)(\\w|-)+"), format: :html) do
+ constraints(Constraints::ProjectIdentifier) do
scope "projects/:project_id", as: "project" do
scope module: "grids" do
namespace :widgets do
diff --git a/modules/overviews/config/routes.rb b/modules/overviews/config/routes.rb
index a519839a7e8..08032b6db01 100644
--- a/modules/overviews/config/routes.rb
+++ b/modules/overviews/config/routes.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
Rails.application.routes.draw do
- constraints(project_id: Regexp.new("(?!(#{Project::RESERVED_IDENTIFIERS.join('|')})$)(\\w|-)+"), format: :html) do
+ constraints(Constraints::ProjectIdentifier) do
scope "projects/:project_id", as: "project" do
scope module: "overviews" do
resource :overview, path: "/", only: [:show]