Allow wiki pages to be renamed in the UI

1 files changed, 43 insertions, 35 deletions

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 148998bc9be..5c7c2204374 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -180,31 +180,50 @@ class WikiPage
   #
   # Returns the String SHA1 of the newly created page
   # or False if the save was unsuccessful.
-  def create(attr = {})
-    @attributes.merge!(attr)
+  def create(attrs = {})
+    @attributes.merge!(attrs)
 
-    save :create_page, title, content, format, message
+    save(page_details: title) do
+      wiki.create_page(title, content, format, message)
+    end
   end
 
   # Updates an existing Wiki Page, creating a new version.
   #
-  # new_content     - The raw markup content to replace the existing.
-  # format          - Optional symbol representing the content format.
-  #                   See ProjectWiki::MARKUPS Hash for available formats.
-  # message         - Optional commit message to set on the new version.
-  # last_commit_sha - Optional last commit sha to validate the page unchanged.
+  # attrs - Hash of attributes to be updated on the page.
+  #        :content         - The raw markup content to replace the existing.
+  #        :format          - Optional symbol representing the content format.
+  #                           See ProjectWiki::MARKUPS Hash for available formats.
+  #        :message         - Optional commit message to set on the new version.
+  #        :last_commit_sha - Optional last commit sha to validate the page unchanged.
+  #        :title           - The Title to replace existing title
   #
   # Returns the String SHA1 of the newly created page
   # or False if the save was unsuccessful.
-  def update(new_content, format: :markdown, message: nil, last_commit_sha: nil)
-    @attributes[:content] = new_content
-    @attributes[:format] = format
-
+  def update(attrs = {})
+    last_commit_sha = attrs.delete(:last_commit_sha)
     if last_commit_sha && last_commit_sha != self.last_commit_sha
       raise PageChangedError.new("You are attempting to update a page that has changed since you started editing it.")
     end
 
-    save :update_page, @page, content, format, message
+    attrs.slice!(:content, :format, :message, :title)
+    @attributes.merge!(attrs)
+    page_details =
+      if title.present? && @page.title != title
+        title
+      else
+        @page.url_path
+      end
+
+    save(page_details: page_details) do
+      wiki.update_page(
+        @page,
+        content: content,
+        format: format,
+        message: attrs[:message],
+        title: title
+      )
+    end
   end
 
   # Destroys the Wiki Page.
@@ -236,30 +255,19 @@ class WikiPage
     attributes[:format] = @page.format
   end
 
-  def save(method, *args)
-    saved = false
+  def save(page_details:)
+    return unless valid?
 
-    project_wiki = wiki
-    if valid? && project_wiki.send(method, *args)
-
-      page_details = if method == :update_page
-                       # Use url_path instead of path to omit format extension
-                       @page.url_path
-                     else
-                       title
-                     end
-
-      page_title, page_dir = project_wiki.page_title_and_dir(page_details)
-      gollum_wiki = project_wiki.wiki
-      @page = gollum_wiki.paged(page_title, page_dir)
+    unless yield
+      errors.add(:base, wiki.error_message)
+      return false
+    end
 
-      set_attributes
+    page_title, page_dir = wiki.page_title_and_dir(page_details)
+    gollum_wiki = wiki.wiki
+    @page = gollum_wiki.paged(page_title, page_dir)
 
-      @persisted = true
-      saved = true
-    else
-      errors.add(:base, project_wiki.error_message) if project_wiki.error_message
-    end
-    saved
+    set_attributes
+    @persisted = errors.blank?
   end
 end