Ticket #69: patch.69.diff

test/functional/wiki_controller_test.rb

@@ -238 +238 @@
-
-  def test_locked
-    @home.lock(Time.now, 'Locky')
-
+, 'attempted_action' => 'test'
-    assert_success
-    assert_equal @home, r.template_objects['page']
-  end

app/models/web.rb

@@ -49 +49 @@
-     page.revise(content, created_at, author)
-     @pages[page.name] = page
-   end
+
+  def rename_page(old_name, new_name, renamed_at, author)
+    # Ensures we are not overwriting another page
+    if @pages.has_key?(new_name)
+      raise Instiki::ValidationError.new("A page named #{new_name} already exists")
+    end
+
+    page = @pages[old_name]
+
+    page.references.each { |referencing_page|
+      referencing_page.change_all_references(old_name, new_name)
+    }
+
+    page.rename(new_name, renamed_at, author)
+
+    @pages[new_name] = page
+    @pages.delete(old_name)
+    refresh_pages_with_references(old_name)
+    refresh_pages_with_references(new_name)
+  end
-  
-  def address=(the_address)
-    if the_address != CGI.escape(the_address)

app/models/revision.rb

@@ -124 +124 @@
-    end
-  end
-
+  def change_all_references(old_name, new_name)
+    new_name = "[[" + new_name + "]]"
+    @content.gsub!( /\[\[#{old_name}\]\]/, new_name )
+
+    #if do_not_only_use_bracketted_names
+      @content.gsub!( /\b#{old_name}\b/, new_name )
+    #end
+  end
+
-end

app/models/wiki_service.rb

@@ -88 +88 @@
-    page.revise(content, revised_on, author)
-  end
-
+  def rename_page(web_address, page_name, new_page_name, renamed_on, author)
+    @webs[web_address].rename_page(page_name, new_page_name, renamed_on, author)
+  end
+
-  def rollback_page(web_address, page_name, revision_number, created_at, author_id = nil)
-    page = read_page(web_address, page_name)
-    page.rollback(revision_number, created_at, author_id)

app/models/page.rb

@@ -51 +51 @@
-    
-  end
-
+  def rename(new_name, renamed_at, author)
+
+    if new_name == @name
+      raise Instiki::ValidationError.new(
+          "The new name '#{new_name}' is the same as the old name")
+    end
+
+    # If there exists such a thing as an "invalid name," here would be the place to check
+
+    # Renames are not included in the revision history, so only the current revision need be changed
+    old_name = @name
+    @name = new_name
+
+    @revisions.last.created_at = created_at
+    @revisions.last.clear_display_cache
+
+    self.revisions.last.force_rendering
+    # at this point the page may not be inserted in the web yet, and therefore 
+    # references to the page itself are rendered as "unresolved". Clearing the cache allows 
+    # the page to re-render itself once again, hopefully _after_ it is inserted in the web
+    self.revisions.last.clear_display_cache
+    
+    self
+    
+  end
+
+  def change_all_references(old_name, new_name)
+    revisions.each { |rev|
+      rev.change_all_references(old_name, new_name)
+    }
+  end
+
-  def rollback(revision_number, created_at, author_ip = nil)
-    roll_back_revision = @revisions[revision_number].dup
-    revise(roll_back_revision.content, created_at, Author.new(roll_back_revision.author, author_ip))

app/controllers/wiki_controller.rb

@@ -113 +113 @@
-    end
-  end
-
+  def perform_rename
+    redirect_home if @page_name.nil?
+    redirect_home if @page.nil?
+    cookies['author'] = @params['author']
+
+    begin
+      wiki.rename_page(@web_name, @page_name, @params['newPageName'],
+          Time.now, Author.new(@params['author'], remote_ip))
+      @page.unlock
+      redirect_to_page @params['newPageName']
+    rescue => e
+      flash[:error] = e
+      flash[:newPageName] = @params['newPageName']
+      @page.unlock
+      redirect_to :action => 'rename', :web => @web_name, :id => @page_name
+    end
+  end
+
-  # Within a single page --------------------------------------------------------
-  
-  def cancel_edit
@@ -124 +142 @@
-    if @page.nil?
-      redirect_home
-    elsif @page.locked?(Time.now) and not @params['break_lock']
-
+, :attempted_action => "edit"
-    else
-      @page.lock(Time.now, @author)
-    end
-  end
-  
+  def rename
+    if @page.nil?
+      redirect_home
+    elsif @page.locked?(Time.now) and not @params['break_lock']
+      # This bit needs to be fixed up to support multiple locks on each referring page
+      redirect_to :web => @web_name, :action => 'locked', :id => @page_name, :attempted_action => "rename"
+    else
+      @page.lock(Time.now, @author)
+    end
+  end
+  
-  def locked
-    # to template
+    @attempted_action = @params['attempted_action']
+    if @attempted_action.nil? or @attempted_action.empty?
+      redirect_to :web => @web_name, :action => 'show', :id => @page_name
+    end
-  end
-  
-  def new

app/views/wiki/locked.rhtml

@@ -10 +10 @@
-</p>
-
-<p>
-'Edit the page anyway'
-'edit'
-E
+"#{@attempted_action.capitalize} the page anyway"
+@attempted_action
+F
-  %>
-
-  <%= link_to 'Cancel',

app/views/wiki/rename.rhtml

@@ +1 @@
+<% 
+  @title = "Renaming #{@page.name}"
+  @content_width = 720
+  @hide_navigation = true
+%>
+
+<%= form_tag({ :action => 'perform_rename', :web => @web.address, :id => @page.name},
+             {'id' => 'renameForm', 'method' => 'post', 'onSubmit' => 'cleanAuthorName()'})
+%>
+
+<p>
+    Please choose a new title:
+    <input type="text" name="newPageName" value="<%= @page.name %>" />
+</p>
+<p>
+    <input type="submit" value="Submit" accesskey="s"/> as 
+    <input type="text" name="author" id="authorName" value="<%= @author %>" 
+        onClick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
+    | 
+    <%= link_to('Cancel', {:web => @web.address, :action => 'cancel_edit', :id => @page.name},
+          {:accesskey => 'c'})
+    %>
+    <small>(unlocks page)</small>
+</p>
+<%= end_form_tag %>
+
+<script language="JavaScript1.2">
+function cleanAuthorName() {
+  if (document.getElementById('authorName').value == "") {
+    document.getElementById('authorName').value = 'AnonymousCoward';
+  }
+}
+</script>

app/views/wiki/page.rhtml

@@ -38 +38 @@
-          {:class => 'navlink', :accesskey => 'E', :name => 'edit'})
-    %>
-    | 
+    <%= link_to('Rename Page', 
+          {:web => @web.address, :action => 'rename', :id => @page.name}, 
+          {:class => 'navlink', :name => 'rename'})
+    %>
+    | 
-    <%= link_to('Edit Web', 
-            {:web => @web.address, :action => 'edit_web'}, 
-            {:class => 'navlink', :name => 'edit_web'})
@@ -47 +52 @@
-          {:web => @web.address, :action => 'edit', :id => @page.name}, 
-          {:class => 'navlink', :accesskey => 'E', :name => 'edit'})
-    %>
+    |
+    <%= link_to('Rename', 
+          {:web => @web.address, :action => 'rename', :id => @page.name}, 
+          {:class => 'navlink', :name => 'rename'})
+    %>
-  <% end %>
-
-  <% if @page.revisions.length > 1 %>