jro_apps/redmine Commit - r10505:eff874b29a90

REST API for creating/updating wiki pages (#7082)....

Jean-Philippe Lang -

r10505:eff874b29a90

parent child

Context file:

r10505:eff874b29a90

Collapse all files

app/controllers/application_controller.rb +7 -2

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # 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.
              require 'uri'
              require 'cgi'
              class Unauthorized < Exception; end
              class ApplicationController < ActionController::Base
                include Redmine::I18n
                class_attribute :accept_api_auth_actions
                class_attribute :accept_rss_auth_actions
                class_attribute :model_object
                layout 'base'
                protect_from_forgery
                def handle_unverified_request
                  super
                  cookies.delete(:autologin)
                end
                before_filter :session_expiration, :user_setup, :check_if_login_required, :set_localization
                rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
                rescue_from ::Unauthorized, :with => :deny_access
                rescue_from ::ActionView::MissingTemplate, :with => :missing_template
                include Redmine::Search::Controller
                include Redmine::MenuManager::MenuController
                helper Redmine::MenuManager::MenuHelper
                def session_expiration
                  if session[:user_id]
                    if session_expired? && !try_to_autologin
                      reset_session
                      flash[:error] = l(:error_session_expired)
                      redirect_to signin_url
                    else
                      session[:atime] = Time.now.utc.to_i
                    end
                  end
                end
                def session_expired?
                  if Setting.session_lifetime?
                    unless session[:ctime] && (Time.now.utc.to_i - session[:ctime].to_i <= Setting.session_lifetime.to_i * 60)
                      return true
                    end
                  end
                  if Setting.session_timeout?
                    unless session[:atime] && (Time.now.utc.to_i - session[:atime].to_i <= Setting.session_timeout.to_i * 60)
                      return true
                    end
                  end
                  false
                end
                def start_user_session(user)
                  session[:user_id] = user.id
                  session[:ctime] = Time.now.utc.to_i
                  session[:atime] = Time.now.utc.to_i
                end
                def user_setup
                  # Check the settings cache for each request
                  Setting.check_cache
                  # Find the current user
                  User.current = find_current_user
                  logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})" : "anonymous")) if logger
                end
                # Returns the current user or nil if no user is logged in
                # and starts a session if needed
                def find_current_user
                  user = nil
                  unless api_request?
                    if session[:user_id]
                      # existing session
                      user = (User.active.find(session[:user_id]) rescue nil)
                    elsif autologin_user = try_to_autologin
                      user = autologin_user
                    elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
                      # RSS key authentication does not start a session
                      user = User.find_by_rss_key(params[:key])
                    end
                  end
                  if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
                    if (key = api_key_from_request)
                      # Use API key
                      user = User.find_by_api_key(key)
                    else
                      # HTTP Basic, either username/password or API key/random
                      authenticate_with_http_basic do |username, password|
                        user = User.try_to_login(username, password) || User.find_by_api_key(username)
                      end
                    end
                    # Switch user if requested by an admin user
                    if user && user.admin? && (username = api_switch_user_from_request)
                      su = User.find_by_login(username)
                      if su && su.active?
                        logger.info("  User switched by: #{user.login} (id=#{user.id})") if logger
                        user = su
                      else
                        render_error :message => 'Invalid X-Redmine-Switch-User header', :status => 412
                      end
                    end
                  end
                  user
                end
                def try_to_autologin
                  if cookies[:autologin] && Setting.autologin?
                    # auto-login feature starts a new session
                    user = User.try_to_autologin(cookies[:autologin])
                    if user
                      reset_session
                      start_user_session(user)
                    end
                    user
                  end
                end
                # Sets the logged in user
                def logged_user=(user)
                  reset_session
                  if user && user.is_a?(User)
                    User.current = user
                    start_user_session(user)
                  else
                    User.current = User.anonymous
                  end
                end
                # Logs out current user
                def logout_user
                  if User.current.logged?
                    cookies.delete :autologin
                    Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
                    self.logged_user = nil
                  end
                end
                # check if login is globally required to access the application
                def check_if_login_required
                  # no check needed if user is already logged in
                  return true if User.current.logged?
                  require_login if Setting.login_required?
                end
                def set_localization
                  lang = nil
                  if User.current.logged?
                    lang = find_language(User.current.language)
                  end
                  if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
                    accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
                    if !accept_lang.blank?
                      accept_lang = accept_lang.downcase
                      lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
                    end
                  end
                  lang ||= Setting.default_language
                  set_language_if_valid(lang)
                end
                def require_login
                  if !User.current.logged?
                    # Extract only the basic url parameters on non-GET requests
                    if request.get?
                      url = url_for(params)
                    else
                      url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
                    end
                    respond_to do |format|
                      format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                    end
                    return false
                  end
                  true
                end
                def require_admin
                  return unless require_login
                  if !User.current.admin?
                    render_403
                    return false
                  end
                  true
                end
                def deny_access
                  User.current.logged? ? render_403 : require_login
                end
                # Authorize the user for the requested action
                def authorize(ctrl = params[:controller], action = params[:action], global = false)
                  allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
                  if allowed
                    true
                  else
                    if @project && @project.archived?
                      render_403 :message => :notice_not_authorized_archived_project
                    else
                      deny_access
                    end
                  end
                end
                # Authorize the user for the requested action outside a project
                def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
                  authorize(ctrl, action, global)
                end
                # Find project of id params[:id]
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find project of id params[:project_id]
                def find_project_by_project_id
                  @project = Project.find(params[:project_id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find a project based on params[:project_id]
                # TODO: some subclasses override this, see about merging their logic
                def find_optional_project
                  @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                  allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                  allowed ? true : deny_access
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Finds and sets @project based on @object.project
                def find_project_from_association
                  render_404 unless @object.present?
                  @project = @object.project
                end
                def find_model_object
                  model = self.class.model_object
                  if model
                    @object = model.find(params[:id])
                    self.instance_variable_set('@' + controller_name.singularize, @object) if @object
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def self.model_object(model)
                  self.model_object = model
                end
                # Filter for bulk issue operations
                def find_issues
                  @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                  raise ActiveRecord::RecordNotFound if @issues.empty?
                  if @issues.detect {|issue| !issue.visible?}
                    deny_access
                    return
                  end
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # make sure that the user is a member of the project (or admin) if project is private
                # used as a before_filter for actions that do not require any particular permission on the project
                def check_project_privacy
                  if @project && !@project.archived?
                    if @project.visible?
                      true
                    else
                      deny_access
                    end
                  else
                    @project = nil
                    render_404
                    false
                  end
                end
                def back_url
                  url = params[:back_url]
                  if url.nil? && referer = request.env['HTTP_REFERER']
                    url = CGI.unescape(referer.to_s)
                  end
                  url
                end
                def redirect_back_or_default(default)
                  back_url = params[:back_url].to_s
                  if back_url.present?
                    begin
                      uri = URI.parse(back_url)
                      # do not redirect user to another host or to the login or register page
                      if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
                        redirect_to(back_url)
                        return
                      end
                    rescue URI::InvalidURIError
                      logger.warn("Could not redirect to invalid URL #{back_url}")
                      # redirect to default
                    end
                  end
                  redirect_to default
                  false
                end
                # Redirects to the request referer if present, redirects to args or call block otherwise.
                def redirect_to_referer_or(*args, &block)
                  redirect_to :back
                rescue ::ActionController::RedirectBackError
                  if args.any?
                    redirect_to *args
                  elsif block_given?
                    block.call
                  else
                    raise "#redirect_to_referer_or takes arguments or a block"
                  end
                end
                def render_403(options={})
                  @project = nil
                  render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
                  return false
                end
                def render_404(options={})
                  render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
                  return false
                end
                # Renders an error response
                def render_error(arg)
                  arg = {:message => arg} unless arg.is_a?(Hash)
                  @message = arg[:message]
                  @message = l(@message) if @message.is_a?(Symbol)
                  @status = arg[:status] || 500
                  respond_to do |format|
                    format.html {
                      render :template => 'common/error', :layout => use_layout, :status => @status
                    }
                    format.any { head @status }
                  end
                end
                # Handler for ActionView::MissingTemplate exception
                def missing_template
                  logger.warn "Missing template, responding with 404"
                  @project = nil
                  render_404
                end
                # Filter for actions that provide an API response
                # but have no HTML representation for non admin users
                def require_admin_or_api_request
                  return true if api_request?
                  if User.current.admin?
                    true
                  elsif User.current.logged?
                    render_error(:status => 406)
                  else
                    deny_access
                  end
                end
                # Picks which layout to use based on the request
                #
                # @return [boolean, string] name of the layout to use or false for no layout
                def use_layout
                  request.xhr? ? false : 'base'
                end
                def invalid_authenticity_token
                  if api_request?
                    logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
                  end
                  render_error "Invalid form authenticity token."
                end
                def render_feed(items, options={})
                  @items = items || []
                  @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                  @items = @items.slice(0, Setting.feeds_limit.to_i)
                  @title = options[:title] || Setting.app_title
                  render :template => "common/feed", :formats => [:atom], :layout => false,
                         :content_type => 'application/atom+xml'
                end
                def self.accept_rss_auth(*actions)
                  if actions.any?
                    self.accept_rss_auth_actions = actions
                  else
                    self.accept_rss_auth_actions || []
                  end
                end
                def accept_rss_auth?(action=action_name)
                  self.class.accept_rss_auth.include?(action.to_sym)
                end
                def self.accept_api_auth(*actions)
                  if actions.any?
                    self.accept_api_auth_actions = actions
                  else
                    self.accept_api_auth_actions || []
                  end
                end
                def accept_api_auth?(action=action_name)
                  self.class.accept_api_auth.include?(action.to_sym)
                end
                # Returns the number of objects that should be displayed
                # on the paginated list
                def per_page_option
                  per_page = nil
                  if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                    per_page = params[:per_page].to_s.to_i
                    session[:per_page] = per_page
                  elsif session[:per_page]
                    per_page = session[:per_page]
                  else
                    per_page = Setting.per_page_options_array.first || 25
                  end
                  per_page
                end
                # Returns offset and limit used to retrieve objects
                # for an API response based on offset, limit and page parameters
                def api_offset_and_limit(options=params)
                  if options[:offset].present?
                    offset = options[:offset].to_i
                    if offset < 0
                      offset = 0
                    end
                  end
                  limit = options[:limit].to_i
                  if limit < 1
                    limit = 25
                  elsif limit > 100
                    limit = 100
                  end
                  if offset.nil? && options[:page].present?
                    offset = (options[:page].to_i - 1) * limit
                    offset = 0 if offset < 0
                  end
                  offset ||= 0
                  [offset, limit]
                end
                # qvalues http header parser
                # code taken from webrick
                def parse_qvalues(value)
                  tmp = []
                  if value
                    parts = value.split(/,\s*/)
                    parts.each {|part|
                      if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                        val = m[1]
                        q = (m[2] or 1).to_f
                        tmp.push([val, q])
                      end
                    }
                    tmp = tmp.sort_by{|val, q| -q}
                    tmp.collect!{|val, q| val}
                  end
                  return tmp
                rescue
                  nil
                end
                # Returns a string that can be used as filename value in Content-Disposition header
                def filename_for_content_disposition(name)
                  request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
                end
                def api_request?
                  %w(xml json).include? params[:format]
                end
                # Returns the API key present in the request
                def api_key_from_request
                  if params[:key].present?
                    params[:key].to_s
                  elsif request.headers["X-Redmine-API-Key"].present?
                    request.headers["X-Redmine-API-Key"].to_s
                  end
                end
                # Returns the API 'switch user' value if present
                def api_switch_user_from_request
                  request.headers["X-Redmine-Switch-User"].to_s.presence
                end
                # Renders a warning flash if obj has unsaved attachments
                def render_attachment_warning_if_needed(obj)
                  flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
                end
                # Sets the `flash` notice or error based the number of issues that did not save
                #
                # @param [Array, Issue] issues all of the saved and unsaved Issues
                # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved
                def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
                  if unsaved_issue_ids.empty?
                    flash[:notice] = l(:notice_successful_update) unless issues.empty?
                  else
                    flash[:error] = l(:notice_failed_to_save_issues,
                                      :count => unsaved_issue_ids.size,
                                      :total => issues.size,
                                      :ids => '#' + unsaved_issue_ids.join(', #'))
                  end
                end
                # Rescues an invalid query statement. Just in case...
                def query_statement_invalid(exception)
                  logger.error "Query::StatementInvalid: #{exception.message}" if logger
                  session.delete(:query)
                  sort_clear if respond_to?(:sort_clear)
                  render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
                end
                # Renders a 200 response for successfull updates or deletions via the API
                def render_api_ok
-                 # head :ok would return a response body with one space
-                 render :text => '', :status => :ok, :layout => nil
+                 render_api_head :ok
+               end
+               # Renders a head API response
+               def render_api_head(status)
+                 # #head would return a response body with one space
+                 render :text => '', :status => status, :layout => nil
                end
                # Renders API response on validation failure
                def render_validation_errors(objects)
                  if objects.is_a?(Array)
                    @error_messages = objects.map {|object| object.errors.full_messages}.flatten
                  else
                    @error_messages = objects.errors.full_messages
                  end
                  render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil
                end
                # Overrides #_include_layout? so that #render with no arguments
                # doesn't use the layout for api requests
                def _include_layout?(*args)
                  api_request? ? false : super
                end
              end

app/controllers/wiki_controller.rb +36 -12

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # 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.
              require 'diff'
              # The WikiController follows the Rails REST controller pattern but with
              # a few differences
              #
              # * index - shows a list of WikiPages grouped by page or date
              # * new - not used
              # * create - not used
              # * show - will also show the form for creating a new wiki page
              # * edit - used to edit an existing or new page
              # * update - used to save a wiki page update to the database, including new pages
              # * destroy - normal
              #
              # Other member and collection methods are also used
              #
              # TODO: still being worked on
              class WikiController < ApplicationController
                default_search_scope :wiki_pages
                before_filter :find_wiki, :authorize
                before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
                before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy, :destroy_version]
-               accept_api_auth :index, :show
+               accept_api_auth :index, :show, :update
                helper :attachments
                include AttachmentsHelper
                helper :watchers
                include Redmine::Export::PDF
                # List of pages, sorted alphabetically and by parent (hierarchy)
                def index
                  load_pages_for_index
                  respond_to do |format|
                    format.html {
                      @pages_by_parent_id = @pages.group_by(&:parent_id)
                    }
                    format.api
                  end
                end
                # List of page, by last update
                def date_index
                  load_pages_for_index
                  @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
                end
                # display a page (in editing mode if it doesn't exist)
                def show
                  if @page.new_record?
                    if User.current.allowed_to?(:edit_wiki_pages, @project) && editable? && !api_request?
                      edit
                      render :action => 'edit'
                    else
                      render_404
                    end
                    return
                  end
                  if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
                    deny_access
                    return
                  end
                  @content = @page.content_for_version(params[:version])
                  if User.current.allowed_to?(:export_wiki_pages, @project)
                    if params[:format] == 'pdf'
                      send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
                      return
                    elsif params[:format] == 'html'
                      export = render_to_string :action => 'export', :layout => false
                      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                      return
                    elsif params[:format] == 'txt'
                      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                      return
                    end
                  end
                  @editable = editable?
                  @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
                    @content.current_version? &&
                    Redmine::WikiFormatting.supports_section_edit?
                  respond_to do |format|
                    format.html
                    format.api
                  end
                end
                # edit an existing page or a new one
                def edit
                  return render_403 unless editable?
                  if @page.new_record?
                    @page.content = WikiContent.new(:page => @page)
                    if params[:parent].present?
                      @page.parent = @page.wiki.find_page(params[:parent].to_s)
                    end
                  end
                  @content = @page.content_for_version(params[:version])
                  @content.text = initial_page_content(@page) if @content.text.blank?
                  # don't keep previous comment
                  @content.comments = nil
                  # To prevent StaleObjectError exception when reverting to a previous version
                  @content.version = @page.content.version
                  @text = @content.text
                  if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                    @section = params[:section].to_i
                    @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
                    render_404 if @text.blank?
                  end
                end
                # Creates a new page or updates an existing one
                def update
                  return render_403 unless editable?
+                 was_new_page = @page.new_record?
                  @page.content = WikiContent.new(:page => @page) if @page.new_record?
                  @page.safe_attributes = params[:wiki_page]
-                 @content = @page.content_for_version(params[:version])
-                 @content.text = initial_page_content(@page) if @content.text.blank?
-                 # don't keep previous comment
-                 @content.comments = nil
+                 @content = @page.content
+                 content_params = params[:content]
+                 if content_params.nil? && params[:wiki_page].is_a?(Hash)
+                   content_params = params[:wiki_page].slice(:text, :comments, :version)
+                 end
+                 content_params ||= {}
-                 if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
+                 if !@page.new_record? && content_params.present? && @content.text == content_params[:text]
                    attachments = Attachment.attach_files(@page, params[:attachments])
                    render_attachment_warning_if_needed(@page)
                    # don't save content if text wasn't changed
                    @page.save
                    redirect_to :action => 'show', :project_id => @project, :id => @page.title
                    return
                  end
-                 @content.comments = params[:content][:comments]
-                 @text = params[:content][:text]
+                 @content.comments = content_params[:comments]
+                 @text = content_params[:text]
                  if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                    @section = params[:section].to_i
                    @section_hash = params[:section_hash]
                    @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
                  else
-                   @content.version = params[:content][:version]
+                   @content.version = content_params[:version] if content_params[:version]
                    @content.text = @text
                  end
                  @content.author = User.current
                  @page.content = @content
                  if @page.save
                    attachments = Attachment.attach_files(@page, params[:attachments])
                    render_attachment_warning_if_needed(@page)
                    call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
-                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
+                   respond_to do |format|
+                     format.html { redirect_to :action => 'show', :project_id => @project, :id => @page.title }
+                     format.api {
+                       if was_new_page
+                         render :action => 'show', :status => :created, :location => url_for(:controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title)
                  else
-                   render :action => 'edit'
+                         render_api_ok
+                       end
+                     }
+                   end
+                 else
+                   respond_to do |format|
+                     format.html { render :action => 'edit' }
+                     format.api { render_validation_errors(@content) }
+                   end
                  end
                rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
                  # Optimistic locking exception
+                 respond_to do |format|
+                   format.html {
                  flash.now[:error] = l(:notice_locking_conflict)
                  render :action => 'edit'
+                   }
+                   format.api { render_api_head :conflict }
+                 end
                rescue ActiveRecord::RecordNotSaved
-                 render :action => 'edit'
+                 respond_to do |format|
+                   format.html { render :action => 'edit' }
+                   format.api { render_validation_errors(@content) }
+                 end
                end
                # rename a page
                def rename
                  return render_403 unless editable?
                  @page.redirect_existing_links = true
                  # used to display the *original* title if some AR validation errors occur
                  @original_title = @page.pretty_title
                  if request.post? && @page.update_attributes(params[:wiki_page])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to :action => 'show', :project_id => @project, :id => @page.title
                  end
                end
                def protect
                  @page.update_attribute :protected, params[:protected]
                  redirect_to :action => 'show', :project_id => @project, :id => @page.title
                end
                # show page history
                def history
                  @version_count = @page.content.versions.count
                  @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
                  # don't load text
                  @versions = @page.content.versions.find :all,
                                                          :select => "id, author_id, comments, updated_on, version",
                                                          :order => 'version DESC',
                                                          :limit  =>  @version_pages.items_per_page + 1,
                                                          :offset =>  @version_pages.current.offset
                  render :layout => false if request.xhr?
                end
                def diff
                  @diff = @page.diff(params[:version], params[:version_from])
                  render_404 unless @diff
                end
                def annotate
                  @annotate = @page.annotate(params[:version])
                  render_404 unless @annotate
                end
                # Removes a wiki page and its history
                # Children can be either set as root pages, removed or reassigned to another parent page
                def destroy
                  return render_403 unless editable?
                  @descendants_count = @page.descendants.size
                  if @descendants_count > 0
                    case params[:todo]
                    when 'nullify'
                      # Nothing to do
                    when 'destroy'
                      # Removes all its descendants
                      @page.descendants.each(&:destroy)
                    when 'reassign'
                      # Reassign children to another parent page
                      reassign_to = @wiki.pages.find_by_id(params[:reassign_to_id].to_i)
                      return unless reassign_to
                      @page.children.each do |child|
                        child.update_attribute(:parent, reassign_to)
                      end
                    else
                      @reassignable_to = @wiki.pages - @page.self_and_descendants
                      return
                    end
                  end
                  @page.destroy
                  redirect_to :action => 'index', :project_id => @project
                end
                def destroy_version
                  return render_403 unless editable?
                  @content = @page.content_for_version(params[:version])
                  @content.destroy
                  redirect_to_referer_or :action => 'history', :id => @page.title, :project_id => @project
                end
                # Export wiki to a single pdf or html file
                def export
                  @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)
                  respond_to do |format|
                    format.html {
                      export = render_to_string :action => 'export_multiple', :layout => false
                      send_data(export, :type => 'text/html', :filename => "wiki.html")
                    }
                    format.pdf {
                      send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
                    }
                  end
                end
                def preview
                  page = @wiki.find_page(params[:id])
                  # page is nil when previewing a new page
                  return render_403 unless page.nil? || editable?(page)
                  if page
                    @attachements = page.attachments
                    @previewed = page.content
                  end
                  @text = params[:content][:text]
                  render :partial => 'common/preview'
                end
                def add_attachment
                  return render_403 unless editable?
                  attachments = Attachment.attach_files(@page, params[:attachments])
                  render_attachment_warning_if_needed(@page)
                  redirect_to :action => 'show', :id => @page.title, :project_id => @project
                end
              private
                def find_wiki
                  @project = Project.find(params[:project_id])
                  @wiki = @project.wiki
                  render_404 unless @wiki
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Finds the requested page or a new page if it doesn't exist
                def find_existing_or_new_page
                  @page = @wiki.find_or_new_page(params[:id])
                  if @wiki.page_found_with_redirect?
                    redirect_to params.update(:id => @page.title)
                  end
                end
                # Finds the requested page and returns a 404 error if it doesn't exist
                def find_existing_page
                  @page = @wiki.find_page(params[:id])
                  if @page.nil?
                    render_404
                    return
                  end
                  if @wiki.page_found_with_redirect?
                    redirect_to params.update(:id => @page.title)
                  end
                end
                # Returns true if the current user is allowed to edit the page, otherwise false
                def editable?(page = @page)
                  page.editable_by?(User.current)
                end
                # Returns the default content of a new wiki page
                def initial_page_content(page)
                  helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                  extend helper unless self.instance_of?(helper)
                  helper.instance_method(:initial_page_content).bind(self).call(page)
                end
                def load_pages_for_index
                  @pages = @wiki.pages.with_updated_on.order("#{WikiPage.table_name}.title").includes(:wiki => :project).includes(:parent).all
                end
              end

app/models/wiki_page.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # 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.
              require 'diff'
              require 'enumerator'
              class WikiPage < ActiveRecord::Base
                include Redmine::SafeAttributes
                belongs_to :wiki
                has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
                acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
                acts_as_tree :dependent => :nullify, :order => 'title'
                acts_as_watchable
                acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                              :description => :text,
                              :datetime => :created_on,
                              :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
                acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
                                   :include => [{:wiki => :project}, :content],
                                   :permission => :view_wiki_pages,
                                   :project_key => "#{Wiki.table_name}.project_id"
                attr_accessor :redirect_existing_links
                validates_presence_of :title
                validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
                validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
                validates_associated :content
                validate :validate_parent_title
                before_destroy :remove_redirects
                before_save    :handle_redirects
                # eager load information about last updates, without loading text
                scope :with_updated_on, {
                  :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on, #{WikiContent.table_name}.version",
                  :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id"
                }
                # Wiki pages that are protected by default
                DEFAULT_PROTECTED_PAGES = %w(sidebar)
-               safe_attributes 'parent_id',
+               safe_attributes 'parent_id', 'parent_title',
                  :if => lambda {|page, user| page.new_record? || user.allowed_to?(:rename_wiki_pages, page.project)}
                def initialize(attributes=nil, *args)
                  super
                  if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)
                    self.protected = true
                  end
                end
                def visible?(user=User.current)
                  !user.nil? && user.allowed_to?(:view_wiki_pages, project)
                end
                def title=(value)
                  value = Wiki.titleize(value)
                  @previous_title = read_attribute(:title) if @previous_title.blank?
                  write_attribute(:title, value)
                end
                def handle_redirects
                  self.title = Wiki.titleize(title)
                  # Manage redirects if the title has changed
                  if !@previous_title.blank? && (@previous_title != title) && !new_record?
                    # Update redirects that point to the old title
                    wiki.redirects.find_all_by_redirects_to(@previous_title).each do |r|
                      r.redirects_to = title
                      r.title == r.redirects_to ? r.destroy : r.save
                    end
                    # Remove redirects for the new title
                    wiki.redirects.find_all_by_title(title).each(&:destroy)
                    # Create a redirect to the new title
                    wiki.redirects << WikiRedirect.new(:title => @previous_title, :redirects_to => title) unless redirect_existing_links == "0"
                    @previous_title = nil
                  end
                end
                def remove_redirects
                  # Remove redirects to this page
                  wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
                end
                def pretty_title
                  WikiPage.pretty_title(title)
                end
                def content_for_version(version=nil)
                  result = content.versions.find_by_version(version.to_i) if version
                  result ||= content
                  result
                end
                def diff(version_to=nil, version_from=nil)
                  version_to = version_to ? version_to.to_i : self.content.version
                  content_to = content.versions.find_by_version(version_to)
                  content_from = version_from ? content.versions.find_by_version(version_from.to_i) : content_to.previous
                  if content_from.version > content_to.version
                    content_to, content_from = content_from, content_to
                  end
                  (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
                end
                def annotate(version=nil)
                  version = version ? version.to_i : self.content.version
                  c = content.versions.find_by_version(version)
                  c ? WikiAnnotate.new(c) : nil
                end
                def self.pretty_title(str)
                  (str && str.is_a?(String)) ? str.tr('_', ' ') : str
                end
                def project
                  wiki.project
                end
                def text
                  content.text if content
                end
                def updated_on
                  unless @updated_on
                    if time = read_attribute(:updated_on)
                      # content updated_on was eager loaded with the page
                      begin
                        @updated_on = (self.class.default_timezone == :utc ? Time.parse(time.to_s).utc : Time.parse(time.to_s).localtime)
                      rescue
                      end
                    else
                      @updated_on = content && content.updated_on
                    end
                  end
                  @updated_on
                end
                # Returns true if usr is allowed to edit the page, otherwise false
                def editable_by?(usr)
                  !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
                end
                def attachments_deletable?(usr=User.current)
                  editable_by?(usr) && super(usr)
                end
                def parent_title
                  @parent_title || (self.parent && self.parent.pretty_title)
                end
                def parent_title=(t)
                  @parent_title = t
                  parent_page = t.blank? ? nil : self.wiki.find_page(t)
                  self.parent = parent_page
                end
                protected
                def validate_parent_title
                  errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
                  errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
                  errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)
                end
              end
              class WikiDiff < Redmine::Helpers::Diff
                attr_reader :content_to, :content_from
                def initialize(content_to, content_from)
                  @content_to = content_to
                  @content_from = content_from
                  super(content_to.text, content_from.text)
                end
              end
              class WikiAnnotate
                attr_reader :lines, :content
                def initialize(content)
                  @content = content
                  current = content
                  current_lines = current.text.split(/\r?\n/)
                  @lines = current_lines.collect {|t| [nil, nil, t]}
                  positions = []
                  current_lines.size.times {|i| positions << i}
                  while (current.previous)
                    d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
                    d.each_slice(3) do |s|
                      sign, line = s[0], s[1]
                      if sign == '+' && positions[line] && positions[line] != -1
                        if @lines[positions[line]][0].nil?
                          @lines[positions[line]][0] = current.version
                          @lines[positions[line]][1] = current.author
                        end
                      end
                    end
                    d.each_slice(3) do |s|
                      sign, line = s[0], s[1]
                      if sign == '-'
                        positions.insert(line, -1)
                      else
                        positions[line] = nil
                      end
                    end
                    positions.compact!
                    # Stop if every line is annotated
                    break unless @lines.detect { |line| line[0].nil? }
                    current = current.previous
                  end
                  @lines.each { |line|
                    line[0] ||= current.version
                    # if the last known version is > 1 (eg. history was cleared), we don't know the author
                    line[1] ||= current.author if current.version == 1
                  }
                end
              end

test/integration/api_test/wiki_pages_test.rb +86 -3

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # 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.
              require File.expand_path('../../../test_helper', __FILE__)
              class ApiTest::WikiPagesTest < ActionController::IntegrationTest
                fixtures :projects, :users, :roles, :members, :member_roles,
                         :enabled_modules, :wikis, :wiki_pages, :wiki_contents,
                         :wiki_content_versions, :attachments
                def setup
                  Setting.rest_api_enabled = '1'
                end
                test "GET /projects/:project_id/wiki/index.xml should return wiki pages" do
                  get '/projects/ecookbook/wiki/index.xml'
-                 assert_response :success
+                 assert_response 200
                  assert_equal 'application/xml', response.content_type
                  assert_select 'wiki_pages[type=array]' do
                    assert_select 'wiki_page', :count => Wiki.find(1).pages.count
                    assert_select 'wiki_page' do
                      assert_select 'title', :text => 'CookBook_documentation'
                      assert_select 'version', :text => '3'
                      assert_select 'created_on'
                      assert_select 'updated_on'
                    end
+                   assert_select 'wiki_page' do
+                     assert_select 'title', :text => 'Page_with_an_inline_image'
+                     assert_select 'parent[title=?]', 'CookBook_documentation'
+                   end
                  end
                end
                test "GET /projects/:project_id/wiki/:title.xml should return wiki page" do
                  get '/projects/ecookbook/wiki/CookBook_documentation.xml'
-                 assert_response :success
+                 assert_response 200
                  assert_equal 'application/xml', response.content_type
                  assert_select 'wiki_page' do
                    assert_select 'title', :text => 'CookBook_documentation'
                    assert_select 'version', :text => '3'
                    assert_select 'text'
                    assert_select 'author'
                    assert_select 'created_on'
                    assert_select 'updated_on'
                  end
                end
                test "GET /projects/:project_id/wiki/:title.xml with unknown title and edit permission should respond with 404" do
                  get '/projects/ecookbook/wiki/Invalid_Page.xml', {}, credentials('jsmith')
                  assert_response 404
                  assert_equal 'application/xml', response.content_type
                end
                test "GET /projects/:project_id/wiki/:title/:version.xml should return wiki page version" do
                  get '/projects/ecookbook/wiki/CookBook_documentation/2.xml'
-                 assert_response :success
+                 assert_response 200
                  assert_equal 'application/xml', response.content_type
                  assert_select 'wiki_page' do
                    assert_select 'title', :text => 'CookBook_documentation'
                    assert_select 'version', :text => '2'
                    assert_select 'text'
                    assert_select 'author'
                    assert_select 'created_on'
                    assert_select 'updated_on'
                  end
                end
                test "GET /projects/:project_id/wiki/:title/:version.xml without permission should be denied" do
                  Role.anonymous.remove_permission! :view_wiki_edits
                  get '/projects/ecookbook/wiki/CookBook_documentation/2.xml'
                  assert_response 401
                  assert_equal 'application/xml', response.content_type
                end
+               test "PUT /projects/:project_id/wiki/:title.xml should update wiki page" do
+                 assert_no_difference 'WikiPage.count' do
+                   assert_difference 'WikiContent::Version.count' do
+                     put '/projects/ecookbook/wiki/CookBook_documentation.xml',
+                       {:wiki_page => {:text => 'New content from API', :comments => 'API update'}},
+                       credentials('jsmith')
+                     assert_response 200
+                   end
+                 end
+                 page = WikiPage.find(1)
+                 assert_equal 'New content from API', page.content.text
+                 assert_equal 4, page.content.version
+                 assert_equal 'API update', page.content.comments
+                 assert_equal 'jsmith', page.content.author.login
+               end
+               test "PUT /projects/:project_id/wiki/:title.xml with current versino should update wiki page" do
+                 assert_no_difference 'WikiPage.count' do
+                   assert_difference 'WikiContent::Version.count' do
+                     put '/projects/ecookbook/wiki/CookBook_documentation.xml',
+                       {:wiki_page => {:text => 'New content from API', :comments => 'API update', :version => '3'}},
+                       credentials('jsmith')
+                     assert_response 200
+                   end
+                 end
+                 page = WikiPage.find(1)
+                 assert_equal 'New content from API', page.content.text
+                 assert_equal 4, page.content.version
+                 assert_equal 'API update', page.content.comments
+                 assert_equal 'jsmith', page.content.author.login
+               end
+               test "PUT /projects/:project_id/wiki/:title.xml with stale version should respond with 409" do
+                 assert_no_difference 'WikiPage.count' do
+                   assert_no_difference 'WikiContent::Version.count' do
+                     put '/projects/ecookbook/wiki/CookBook_documentation.xml',
+                       {:wiki_page => {:text => 'New content from API', :comments => 'API update', :version => '2'}},
+                       credentials('jsmith')
+                     assert_response 409
+                   end
+                 end
+               end
+               test "PUT /projects/:project_id/wiki/:title.xml should create the page if it does not exist" do
+                 assert_difference 'WikiPage.count' do
+                   assert_difference 'WikiContent::Version.count' do
+                     put '/projects/ecookbook/wiki/New_page_from_API.xml',
+                       {:wiki_page => {:text => 'New content from API', :comments => 'API create'}},
+                       credentials('jsmith')
+                     assert_response 201
+                   end
+                 end
+                 page = WikiPage.order('id DESC').first
+                 assert_equal 'New_page_from_API', page.title
+                 assert_equal 'New content from API', page.content.text
+                 assert_equal 1, page.content.version
+                 assert_equal 'API create', page.content.comments
+                 assert_equal 'jsmith', page.content.author.login
+                 assert_nil page.parent
+               end
+               test "PUT /projects/:project_id/wiki/:title.xml with parent" do
+                 assert_difference 'WikiPage.count' do
+                   assert_difference 'WikiContent::Version.count' do
+                     put '/projects/ecookbook/wiki/New_subpage_from_API.xml',
+                       {:wiki_page => {:parent_title => 'CookBook_documentation', :text => 'New content from API', :comments => 'API create'}},
+                       credentials('jsmith')
+                     assert_response 201
+                   end
+                 end
+                 page = WikiPage.order('id DESC').first
+                 assert_equal 'New_subpage_from_API', page.title
+                 assert_equal WikiPage.find(1), page.parent
+               end
              end

test/integration/routing/wiki_test.rb +41 -28

              # Redmine - project management software
              # Copyright (C) 2006-2012  Jean-Philippe Lang
              #
              # 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.
              require File.expand_path('../../../test_helper', __FILE__)
              class RoutingWikiTest < ActionController::IntegrationTest
                def test_wiki_matching
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki" },
                      { :controller => 'wiki', :action => 'show', :project_id => '567' }
                    )
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/lalala" },
                      { :controller => 'wiki', :action => 'show', :project_id => '567',
                        :id => 'lalala' }
                      )
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/lalala.pdf" },
                      { :controller => 'wiki', :action => 'show', :project_id => '567',
                        :id => 'lalala', :format => 'pdf' }
                      )
                  assert_routing(
-                     { :method => 'get', :path => "/projects/567/wiki/lalala.xml" },
-                     { :controller => 'wiki', :action => 'show', :project_id => '567',
-                       :id => 'lalala', :format => 'xml' }
+                     )
-                 assert_routing(
-                     { :method => 'get', :path => "/projects/567/wiki/lalala.json" },
-                     { :controller => 'wiki', :action => 'show', :project_id => '567',
-                       :id => 'lalala', :format => 'json' }
+                     )
-                 assert_routing(
                       { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff" },
                       { :controller => 'wiki', :action => 'diff', :project_id => '1',
                         :id => 'CookBook_documentation' }
                     )
                  assert_routing(
                       { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2" },
                       { :controller => 'wiki', :action => 'show', :project_id => '1',
                         :id => 'CookBook_documentation', :version => '2' }
                     )
                  assert_routing(
-                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2.xml" },
-                      { :controller => 'wiki', :action => 'show', :project_id => '1',
-                        :id => 'CookBook_documentation', :version => '2', :format => 'xml' }
+                    )
-                 assert_routing(
-                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2.json" },
-                      { :controller => 'wiki', :action => 'show', :project_id => '1',
-                        :id => 'CookBook_documentation', :version => '2', :format => 'json' }
+                    )
-                 assert_routing(
                       { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/diff" },
                       { :controller => 'wiki', :action => 'diff', :project_id => '1',
                         :id => 'CookBook_documentation', :version => '2' }
                     )
                  assert_routing(
                       { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/annotate" },
                       { :controller => 'wiki', :action => 'annotate', :project_id => '1',
                         :id => 'CookBook_documentation', :version => '2' }
                     )
                end
                def test_wiki_misc
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/date_index" },
                      { :controller => 'wiki', :action => 'date_index', :project_id => '567' }
                    )
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/export" },
                      { :controller => 'wiki', :action => 'export', :project_id => '567' }
                    )
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/export.pdf" },
                      { :controller => 'wiki', :action => 'export', :project_id => '567', :format => 'pdf' }
                    )
                  assert_routing(
                       { :method => 'get', :path => "/projects/567/wiki/index" },
                       { :controller => 'wiki', :action => 'index', :project_id => '567' }
                     )
-                 assert_routing(
-                      { :method => 'get', :path => "/projects/567/wiki/index.xml" },
-                      { :controller => 'wiki', :action => 'index', :project_id => '567', :format => 'xml' }
+                    )
-                 assert_routing(
-                      { :method => 'get', :path => "/projects/567/wiki/index.json" },
-                      { :controller => 'wiki', :action => 'index', :project_id => '567', :format => 'json' }
+                    )
                end
                def test_wiki_resources
                  assert_routing(
                      { :method => 'get', :path => "/projects/567/wiki/my_page/edit" },
                      { :controller => 'wiki', :action => 'edit', :project_id => '567',
                        :id => 'my_page' }
                    )
                  assert_routing(
                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/history" },
                      { :controller => 'wiki', :action => 'history', :project_id => '1',
                        :id => 'CookBook_documentation' }
                    )
                  assert_routing(
                      { :method => 'get', :path => "/projects/22/wiki/ladida/rename" },
                      { :controller => 'wiki', :action => 'rename', :project_id => '22',
                        :id => 'ladida' }
                    )
                  ["post", "put"].each do |method|
                    assert_routing(
                        { :method => method, :path => "/projects/567/wiki/CookBook_documentation/preview" },
                        { :controller => 'wiki', :action => 'preview', :project_id => '567',
                          :id => 'CookBook_documentation' }
                      )
                  end
                  assert_routing(
                      { :method => 'post', :path => "/projects/22/wiki/ladida/rename" },
                      { :controller => 'wiki', :action => 'rename', :project_id => '22',
                        :id => 'ladida' }
                    )
                  assert_routing(
                      { :method => 'post', :path => "/projects/22/wiki/ladida/protect" },
                      { :controller => 'wiki', :action => 'protect', :project_id => '22',
                        :id => 'ladida' }
                    )
                  assert_routing(
                      { :method => 'post', :path => "/projects/22/wiki/ladida/add_attachment" },
                      { :controller => 'wiki', :action => 'add_attachment', :project_id => '22',
                        :id => 'ladida' }
                    )
                  assert_routing(
                      { :method => 'put', :path => "/projects/567/wiki/my_page" },
                      { :controller => 'wiki', :action => 'update', :project_id => '567',
                        :id => 'my_page' }
                    )
                  assert_routing(
                      { :method => 'delete', :path => "/projects/22/wiki/ladida" },
                      { :controller => 'wiki', :action => 'destroy', :project_id => '22',
                        :id => 'ladida' }
                    )
                  assert_routing(
                      { :method => 'delete', :path => "/projects/22/wiki/ladida/3" },
                      { :controller => 'wiki', :action => 'destroy_version', :project_id => '22',
                        :id => 'ladida', :version => '3' }
                    )
                end
+               def test_api
+                 assert_routing(
+                     { :method => 'get', :path => "/projects/567/wiki/my_page.xml" },
+                     { :controller => 'wiki', :action => 'show', :project_id => '567',
+                       :id => 'my_page', :format => 'xml' }
+                     )
+                 assert_routing(
+                     { :method => 'get', :path => "/projects/567/wiki/my_page.json" },
+                     { :controller => 'wiki', :action => 'show', :project_id => '567',
+                       :id => 'my_page', :format => 'json' }
+                     )
+                 assert_routing(
+                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2.xml" },
+                      { :controller => 'wiki', :action => 'show', :project_id => '1',
+                        :id => 'CookBook_documentation', :version => '2', :format => 'xml' }
+                    )
+                 assert_routing(
+                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2.json" },
+                      { :controller => 'wiki', :action => 'show', :project_id => '1',
+                        :id => 'CookBook_documentation', :version => '2', :format => 'json' }
+                    )
+                 assert_routing(
+                      { :method => 'get', :path => "/projects/567/wiki/index.xml" },
+                      { :controller => 'wiki', :action => 'index', :project_id => '567', :format => 'xml' }
+                    )
+                 assert_routing(
+                      { :method => 'get', :path => "/projects/567/wiki/index.json" },
+                      { :controller => 'wiki', :action => 'index', :project_id => '567', :format => 'json' }
+                    )
+                 assert_routing(
+                     { :method => 'put', :path => "/projects/567/wiki/my_page.xml" },
+                     { :controller => 'wiki', :action => 'update', :project_id => '567',
+                       :id => 'my_page', :format => 'xml' }
+                   )
+                 assert_routing(
+                     { :method => 'put', :path => "/projects/567/wiki/my_page.json" },
+                     { :controller => 'wiki', :action => 'update', :project_id => '567',
+                       :id => 'my_page', :format => 'json' }
+                   )
+               end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages