From 16e3a218962472e3e0dcebf02a82cc6085ad5643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Thu, 9 Dec 2021 15:40:14 +0100
Subject: [PATCH] github path generated clean
---
app/models/communication/website/page.rb | 2 +-
app/models/concerns/with_github_files.rb | 2 +-
app/models/research/journal.rb | 5 ++++-
app/models/research/journal/article.rb | 4 ----
app/models/research/journal/volume.rb | 5 -----
app/models/research/researcher.rb | 3 ++-
6 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb
index 726b1ad1c..c13b0e29f 100644
--- a/app/models/communication/website/page.rb
+++ b/app/models/communication/website/page.rb
@@ -76,7 +76,7 @@ class Communication::Website::Page < ApplicationRecord
# Override from WithGithubFiles
def github_path_generated
- "_pages/#{path}/index.html".gsub('///', '/').gsub('//', '/')
+ "_pages/#{path}/index.html".gsub(/\/+/, '/')
end
def list_of_other_pages
diff --git a/app/models/concerns/with_github_files.rb b/app/models/concerns/with_github_files.rb
index 5277e84a7..5da22da8a 100644
--- a/app/models/concerns/with_github_files.rb
+++ b/app/models/concerns/with_github_files.rb
@@ -14,7 +14,7 @@ module WithGithubFiles
end
def github_path_generated
- "_#{self.class.name.demodulize.pluralize.underscore}/#{self.id}.md"
+ "_#{self.class.name.demodulize.pluralize.underscore}/#{self.id}.html"
end
def to_jekyll(github_file)
diff --git a/app/models/research/journal.rb b/app/models/research/journal.rb
index a8a986936..f44d2707a 100644
--- a/app/models/research/journal.rb
+++ b/app/models/research/journal.rb
@@ -21,6 +21,8 @@
# fk_rails_... (university_id => universities.id)
#
class Research::Journal < ApplicationRecord
+ include WithGithubFiles
+
belongs_to :university
has_many :websites, class_name: 'Communication::Website', as: :about
has_many :volumes, foreign_key: :research_journal_id
@@ -32,7 +34,8 @@ class Research::Journal < ApplicationRecord
"#{title}"
end
- def github_path
+ def github_path_generated
+ # Override from WithGithubFiles
"_data/journal.yml"
end
diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb
index 4c9e45517..bde49caaa 100644
--- a/app/models/research/journal/article.rb
+++ b/app/models/research/journal/article.rb
@@ -56,10 +56,6 @@ class Research::Journal::Article < ApplicationRecord
"#{ title }"
end
- def github_path
- "_articles/#{id}.html"
- end
-
private
def update_researchers
diff --git a/app/models/research/journal/volume.rb b/app/models/research/journal/volume.rb
index 276b08dfb..676a48bfa 100644
--- a/app/models/research/journal/volume.rb
+++ b/app/models/research/journal/volume.rb
@@ -46,9 +46,4 @@ class Research::Journal::Volume < ApplicationRecord
def to_s
"##{ number } #{ title }"
end
-
- def github_path
- "_volumes/#{id}.html"
- end
-
end
diff --git a/app/models/research/researcher.rb b/app/models/research/researcher.rb
index 49b6ca04b..f80d439bf 100644
--- a/app/models/research/researcher.rb
+++ b/app/models/research/researcher.rb
@@ -37,7 +37,8 @@ class Research::Researcher < ApplicationRecord
"#{ first_name } #{ last_name }"
end
- def github_path
+ def github_path_generated
+ # Override from WithGithubFiles
"_authors/#{self.id}.md"
end
end
--
GitLab