jro_apps/redmine Commit - r9830:537be80be26c

Adds a macro for inserting thumbnails in formatted text (#3510)....

Jean-Philippe Lang -

r9830:537be80be26c

parent child

Context file:

r9830:537be80be26c

Collapse all files

app/controllers/attachments_controller.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.
             class AttachmentsController < ApplicationController
               before_filter :find_project, :except => :upload
               before_filter :file_readable, :read_authorize, :only => [:show, :download, :thumbnail]
               before_filter :delete_authorize, :only => :destroy
               before_filter :authorize_global, :only => :upload
               accept_api_auth :show, :download, :upload
               def show
                 respond_to do |format|
                   format.html {
                     if @attachment.is_diff?
                       @diff = File.new(@attachment.diskfile, "rb").read
                       @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                       @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                       # Save diff type as user preference
                       if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                         User.current.pref[:diff_type] = @diff_type
                         User.current.preference.save
                       end
                       render :action => 'diff'
                     elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
                       @content = File.new(@attachment.diskfile, "rb").read
                       render :action => 'file'
                     else
                       download
                     end
                   }
                   format.api
                 end
               end
               def download
                 if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
                   @attachment.increment_download
                 end
                 if stale?(:etag => @attachment.digest)
                   # images are sent inline
                   send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                   :type => detect_content_type(@attachment),
                                                   :disposition => (@attachment.image? ? 'inline' : 'attachment')
                 end
               end
               def thumbnail
-                if @attachment.thumbnailable? && Setting.thumbnails_enabled? && thumbnail = @attachment.thumbnail
+                if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size])
                   if stale?(:etag => thumbnail)
                     send_file thumbnail,
                       :filename => filename_for_content_disposition(@attachment.filename),
                       :type => detect_content_type(@attachment),
                       :disposition => 'inline'
                   end
                 else
                   # No thumbnail for the attachment or thumbnail could not be created
                   render :nothing => true, :status => 404
                 end
               end
               def upload
                 # Make sure that API users get used to set this content type
                 # as it won't trigger Rails' automatic parsing of the request body for parameters
                 unless request.content_type == 'application/octet-stream'
                   render :nothing => true, :status => 406
                   return
                 end
                 @attachment = Attachment.new(:file => request.raw_post)
                 @attachment.author = User.current
                 @attachment.filename = Redmine::Utils.random_hex(16)
                 if @attachment.save
                   respond_to do |format|
                     format.api { render :action => 'upload', :status => :created }
                   end
                 else
                   respond_to do |format|
                     format.api { render_validation_errors(@attachment) }
                   end
                 end
               end
               def destroy
                 if @attachment.container.respond_to?(:init_journal)
                   @attachment.container.init_journal(User.current)
                 end
                 # Make sure association callbacks are called
                 @attachment.container.attachments.delete(@attachment)
                 redirect_to_referer_or project_path(@project)
               end
             private
               def find_project
                 @attachment = Attachment.find(params[:id])
                 # Show 404 if the filename in the url is wrong
                 raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                 @project = @attachment.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Checks that the file exists and is readable
               def file_readable
                 @attachment.readable? ? true : render_404
               end
               def read_authorize
                 @attachment.visible? ? true : deny_access
               end
               def delete_authorize
                 @attachment.deletable? ? true : deny_access
               end
               def detect_content_type(attachment)
                 content_type = attachment.content_type
                 if content_type.blank?
                   content_type = Redmine::MimeType.of(attachment.filename)
                 end
                 content_type.to_s
               end
             end

app/models/attachment.rb +10 -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 "digest/md5"
             class Attachment < ActiveRecord::Base
               belongs_to :container, :polymorphic => true
               belongs_to :author, :class_name => "User", :foreign_key => "author_id"
               validates_presence_of :filename, :author
               validates_length_of :filename, :maximum => 255
               validates_length_of :disk_filename, :maximum => 255
               validates_length_of :description, :maximum => 255
               validate :validate_max_file_size
               acts_as_event :title => :filename,
                             :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
               acts_as_activity_provider :type => 'files',
                                         :permission => :view_files,
                                         :author_key => :author_id,
                                         :find_options => {:select => "#{Attachment.table_name}.*",
                                                           :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                     "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
               acts_as_activity_provider :type => 'documents',
                                         :permission => :view_documents,
                                         :author_key => :author_id,
                                         :find_options => {:select => "#{Attachment.table_name}.*",
                                                           :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                     "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
               cattr_accessor :storage_path
               @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
               cattr_accessor :thumbnails_storage_path
               @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
               before_save :files_to_final_location
               after_destroy :delete_from_disk
               # Returns an unsaved copy of the attachment
               def copy(attributes=nil)
                 copy = self.class.new
                 copy.attributes = self.attributes.dup.except("id", "downloads")
                 copy.attributes = attributes if attributes
                 copy
               end
               def validate_max_file_size
                 if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
                   errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))
                 end
               end
               def file=(incoming_file)
                 unless incoming_file.nil?
                   @temp_file = incoming_file
                   if @temp_file.size > 0
                     if @temp_file.respond_to?(:original_filename)
                       self.filename = @temp_file.original_filename
                       self.filename.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
                     end
                     if @temp_file.respond_to?(:content_type)
                       self.content_type = @temp_file.content_type.to_s.chomp
                     end
                     if content_type.blank? && filename.present?
                       self.content_type = Redmine::MimeType.of(filename)
                     end
                     self.filesize = @temp_file.size
                   end
                 end
               end
               def file
                 nil
               end
               def filename=(arg)
                 write_attribute :filename, sanitize_filename(arg.to_s)
                 if new_record? && disk_filename.blank?
                   self.disk_filename = Attachment.disk_filename(filename)
                 end
                 filename
               end
               # Copies the temporary file to its final location
               # and computes its MD5 hash
               def files_to_final_location
                 if @temp_file && (@temp_file.size > 0)
                   logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")
                   md5 = Digest::MD5.new
                   File.open(diskfile, "wb") do |f|
                     if @temp_file.respond_to?(:read)
                       buffer = ""
                       while (buffer = @temp_file.read(8192))
                         f.write(buffer)
                         md5.update(buffer)
                       end
                     else
                       f.write(@temp_file)
                       md5.update(@temp_file)
                     end
                   end
                   self.digest = md5.hexdigest
                 end
                 @temp_file = nil
                 # Don't save the content type if it's longer than the authorized length
                 if self.content_type && self.content_type.length > 255
                   self.content_type = nil
                 end
               end
               # Deletes the file from the file system if it's not referenced by other attachments
               def delete_from_disk
                 if Attachment.where("disk_filename = ? AND id <> ?", disk_filename, id).empty?
                   delete_from_disk!
                 end
               end
               # Returns file's location on disk
               def diskfile
                 File.join(self.class.storage_path, disk_filename.to_s)
               end
               def title
                 title = filename.to_s
                 if description.present?
                   title << " (#{description})"
                 end
                 title
               end
               def increment_download
                 increment!(:downloads)
               end
               def project
                 container.try(:project)
               end
               def visible?(user=User.current)
                 container && container.attachments_visible?(user)
               end
               def deletable?(user=User.current)
                 container && container.attachments_deletable?(user)
               end
               def image?
                 !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i)
               end
               def thumbnailable?
                 image?
               end
               # Returns the full path the attachment thumbnail, or nil
               # if the thumbnail cannot be generated.
-              def thumbnail
+              def thumbnail(options={})
                 if thumbnailable? && readable?
-                  size = Setting.thumbnails_size.to_i
+                  size = options[:size].to_i
+                  if size > 0
+                    # Limit the number of thumbnails per image
+                    size = (size / 50) * 50
+                    # Maximum thumbnail size
+                    size = 800 if size > 800
+                  else
+                    size = Setting.thumbnails_size.to_i
+                  end
                   size = 100 unless size > 0
                   target = File.join(self.class.thumbnails_storage_path, "#{id}_#{digest}_#{size}.thumb")
                   begin
                     Redmine::Thumbnail.generate(self.diskfile, target, size)
                   rescue => e
                     logger.error "An error occured while generating thumbnail for #{disk_filename} to #{target}\nException was: #{e.message}" if logger
                     return nil
                   end
                 end
               end
               # Deletes all thumbnails
               def self.clear_thumbnails
                 Dir.glob(File.join(thumbnails_storage_path, "*.thumb")).each do |file|
                   File.delete file
                 end
               end
               def is_text?
                 Redmine::MimeType.is_type?('text', filename)
               end
               def is_diff?
                 self.filename =~ /\.(patch|diff)$/i
               end
               # Returns true if the file is readable
               def readable?
                 File.readable?(diskfile)
               end
               # Returns the attachment token
               def token
                 "#{id}.#{digest}"
               end
               # Finds an attachment that matches the given token and that has no container
               def self.find_by_token(token)
                 if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
                   attachment_id, attachment_digest = $1, $2
                   attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
                   if attachment && attachment.container.nil?
                     attachment
                   end
                 end
               end
               # Bulk attaches a set of files to an object
               #
               # Returns a Hash of the results:
               # :files => array of the attached files
               # :unsaved => array of the files that could not be attached
               def self.attach_files(obj, attachments)
                 result = obj.save_attachments(attachments, User.current)
                 obj.attach_saved_attachments
                 result
               end
               def self.latest_attach(attachments, filename)
                 attachments.sort_by(&:created_on).reverse.detect {
                   |att| att.filename.downcase == filename.downcase
                  }
               end
               def self.prune(age=1.day)
                 Attachment.where("created_on < ? AND (container_type IS NULL OR container_type = '')", Time.now - age).destroy_all
               end
               private
               # Physically deletes the file from the file system
               def delete_from_disk!
                 if disk_filename.present? && File.exist?(diskfile)
                   File.delete(diskfile)
                 end
               end
               def sanitize_filename(value)
                 # get only the filename, not the whole path
                 just_filename = value.gsub(/^.*(\\|\/)/, '')
                 # Finally, replace invalid characters with underscore
                 @filename = just_filename.gsub(/[\/\?\%\*\:\|\"\'<>]+/, '_')
               end
               # Returns an ASCII or hashed filename
               def self.disk_filename(filename)
                 timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
                 ascii = ''
                 if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
                   ascii = filename
                 else
                   ascii = Digest::MD5.hexdigest(filename)
                   # keep the extension if any
                   ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
                 end
                 while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
                   timestamp.succ!
                 end
                 "#{timestamp}_#{ascii}"
               end
             end

config/routes.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.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin'
               match 'logout', :to => 'account#logout', :as => 'signout'
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news'
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue'
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue'
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue'
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post]
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu'
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes'
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               match '/projects/:project_id/issues/gantt', :to => 'gantts#show'
               match '/issues/gantt', :to => 'gantts#show'
               match '/projects/:project_id/issues/calendar', :to => 'calendars#show'
               match '/issues/calendar', :to => 'calendars#show'
               match 'projects/:id/issues/report', :to => 'reports#issue_report', :via => :get
               match 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :via => :get
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
               match 'watchers/new', :controller=> 'watchers', :action => 'new', :via => :get
               match 'watchers', :controller=> 'watchers', :action => 'create', :via => :post
               match 'watchers/append', :controller=> 'watchers', :action => 'append', :via => :post
               match 'watchers/destroy', :controller=> 'watchers', :action => 'destroy', :via => :post
               match 'watchers/watch', :controller=> 'watchers', :action => 'watch', :via => :post
               match 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', :via => :post
               match 'watchers/autocomplete_for_user', :controller=> 'watchers', :action => 'autocomplete_for_user', :via => :get
               match 'projects/:id/settings/:tab', :to => "projects#settings"
               resources :projects do
                 member do
                   get 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :create, :update, :destroy] do
                   collection do
                     get 'autocomplete'
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 match 'issues/:copy_from/copy', :to => 'issues#new'
                 resources :issues, :only => [:index, :new, :create] do
                   resources :time_entries, :controller => 'timelog' do
                     collection do
                       get 'report'
                     end
                   end
                 end
                 # issue form update
                 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 match 'versions.:format', :to => 'versions#index'
                 match 'roadmap', :to => 'versions#index', :format => false
                 match 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 resources :issue_categories, :shallow => true
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 resources :repositories, :shallow => true, :except => [:index, :show] do
                   member do
                     match 'committers', :via => [:get, :post]
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 match 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
                 match 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff'
                 resources :wiki, :except => [:index, :new, :create] do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 match 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               # TODO: port to be part of the resources route(s)
               match 'projects/:id/settings/:tab', :to => 'projects#settings', :via => :get
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               match 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/, :via => :get
               match 'attachments/download/:id', :controller => 'attachments', :action => 'download', :id => /\d+/, :via => :get
-              match 'attachments/thumbnail/:id', :controller => 'attachments', :action => 'thumbnail', :id => /\d+/, :via => :get
+              match 'attachments/thumbnail/:id(/:size)', :controller => 'attachments', :action => 'thumbnail', :id => /\d+/, :via => :get, :size => /\d+/
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles, :except => :show do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post]
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

lib/redmine/wiki_formatting/macros.rb +18 0

             # 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.
             module Redmine
               module WikiFormatting
                 module Macros
                   module Definitions
                     def exec_macro(name, obj, args)
                       method_name = "macro_#{name}"
                       send(method_name, obj, args) if respond_to?(method_name)
                     end
                     def extract_macro_options(args, *keys)
                       options = {}
                       while args.last.to_s.strip =~ %r{^(.+)\=(.+)$} && keys.include?($1.downcase.to_sym)
                         options[$1.downcase.to_sym] = $2
                         args.pop
                       end
                       return [args, options]
                     end
                   end
                   @@available_macros = {}
                   class << self
                     # Called with a block to define additional macros.
                     # Macro blocks accept 2 arguments:
                     # * obj: the object that is rendered
                     # * args: macro arguments
                     #
                     # Plugins can use this method to define new macros:
                     #
                     #   Redmine::WikiFormatting::Macros.register do
                     #     desc "This is my macro"
                     #     macro :my_macro do |obj, args|
                     #       "My macro output"
                     #     end
                     #   end
                     def register(&block)
                       class_eval(&block) if block_given?
                     end
                   private
                     # Defines a new macro with the given name and block.
                     def macro(name, &block)
                       name = name.to_sym if name.is_a?(String)
                       @@available_macros[name] = @@desc || ''
                       @@desc = nil
                       raise "Can not create a macro without a block!" unless block_given?
                       Definitions.send :define_method, "macro_#{name}".downcase, &block
                     end
                     # Sets description for the next macro to be defined
                     def desc(txt)
                       @@desc = txt
                     end
                   end
                   # Builtin macros
                   desc "Sample macro."
                   macro :hello_world do |obj, args|
                     "Hello world! Object: #{obj.class.name}, " + (args.empty? ? "Called with no argument." : "Arguments: #{args.join(', ')}")
                   end
                   desc "Displays a list of all available macros, including description if available."
                   macro :macro_list do |obj, args|
                     out = ''.html_safe
                     @@available_macros.keys.collect(&:to_s).sort.each do |macro|
                       out << content_tag('dt', content_tag('code', macro))
                       out << content_tag('dd', textilizable(@@available_macros[macro.to_sym]))
                     end
                     content_tag('dl', out)
                   end
                   desc "Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:\n\n" +
                          "  !{{child_pages}} -- can be used from a wiki page only\n" +
                          "  !{{child_pages(Foo)}} -- lists all children of page Foo\n" +
                          "  !{{child_pages(Foo, parent=1)}} -- same as above with a link to page Foo"
                   macro :child_pages do |obj, args|
                     args, options = extract_macro_options(args, :parent)
                     page = nil
                     if args.size > 0
                       page = Wiki.find_page(args.first.to_s, :project => @project)
                     elsif obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)
                       page = obj.page
                     else
                       raise 'With no argument, this macro can be called from wiki pages only.'
                     end
                     raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project)
                     pages = ([page] + page.descendants).group_by(&:parent_id)
                     render_page_hierarchy(pages, options[:parent] ? page.parent_id : page.id)
                   end
                   desc "Include a wiki page. Example:\n\n  !{{include(Foo)}}\n\nor to include a page of a specific project wiki:\n\n  !{{include(projectname:Foo)}}"
                   macro :include do |obj, args|
                     page = Wiki.find_page(args.first.to_s, :project => @project)
                     raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project)
                     @included_wiki_pages ||= []
                     raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
                     @included_wiki_pages << page.title
                     out = textilizable(page.content, :text, :attachments => page.attachments, :headings => false)
                     @included_wiki_pages.pop
                     out
                   end
+                  desc "Displays a clickable thumbnail of an attached image. Examples:\n\n<pre>{{thumbnail(image.png)}}\n{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre>"
+                  macro :thumbnail do |obj, args|
+                    args, options = extract_macro_options(args, :size, :title)
+                    filename = args.first
+                    raise 'Filename required' unless filename.present?
+                    size = options[:size]
+                    raise 'Invalid size parameter' unless size.nil? || size.match(/^\d+$/)
+                    size = size.to_i
+                    size = nil unless size > 0
+                    if obj && obj.respond_to?(:attachments) && attachment = Attachment.latest_attach(obj.attachments, filename)
+                      title = options[:title] || attachment.title
+                      img = image_tag(url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment, :size => size), :alt => attachment.filename)
+                      link_to(img, url_for(:controller => 'attachments', :action => 'show', :id => attachment), :class => 'thumbnail', :title => title)
+                    else
+                      raise "Attachment #{filename} not found"
+                    end
+                  end
                 end
               end
             end

test/functional/attachments_controller_test.rb +24 -23

             # encoding: utf-8
             #
             # 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__)
             require 'attachments_controller'
             # Re-raise errors caught by the controller.
             class AttachmentsController; def rescue_action(e) raise e end; end
             class AttachmentsControllerTest < ActionController::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles,
                        :enabled_modules, :issues, :trackers, :attachments,
                        :versions, :wiki_pages, :wikis, :documents
               def setup
                 @controller = AttachmentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 set_fixtures_attachments_directory
               end
               def teardown
                 set_tmp_attachments_directory
               end
               def test_show_diff
                 ['inline', 'sbs'].each do |dt|
                   # 060719210727_changeset_utf8.diff
                   get :show, :id => 14, :type => dt
                   assert_response :success
                   assert_template 'diff'
                   assert_equal 'text/html', @response.content_type
                   assert_tag 'th',
                     :attributes => {:class => /filename/},
                     :content => /issues_controller.rb\t\(révision 1484\)/
                   assert_tag 'td',
                     :attributes => {:class => /line-code/},
                     :content => /Demande créée avec succès/
                 end
                 set_tmp_attachments_directory
               end
               def test_show_diff_replcace_cannot_convert_content
                 with_settings :repositories_encodings => 'UTF-8' do
                   ['inline', 'sbs'].each do |dt|
                     # 060719210727_changeset_iso8859-1.diff
                     get :show, :id => 5, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_equal 'text/html', @response.content_type
                     assert_tag 'th',
                       :attributes => {:class => "filename"},
                       :content => /issues_controller.rb\t\(r\?vision 1484\)/
                     assert_tag 'td',
                       :attributes => {:class => /line-code/},
                       :content => /Demande cr\?\?e avec succ\?s/
                   end
                 end
                 set_tmp_attachments_directory
               end
               def test_show_diff_latin_1
                 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                   ['inline', 'sbs'].each do |dt|
                     # 060719210727_changeset_iso8859-1.diff
                     get :show, :id => 5, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_equal 'text/html', @response.content_type
                     assert_tag 'th',
                       :attributes => {:class => "filename"},
                       :content => /issues_controller.rb\t\(révision 1484\)/
                     assert_tag 'td',
                       :attributes => {:class => /line-code/},
                       :content => /Demande créée avec succès/
                   end
                 end
                 set_tmp_attachments_directory
               end
               def test_save_diff_type
                 @request.session[:user_id] = 1 # admin
                 user = User.find(1)
                 get :show, :id => 5
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "inline", user.pref[:diff_type]
                 get :show, :id => 5, :type => 'sbs'
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "sbs", user.pref[:diff_type]
               end
               def test_show_text_file
                 get :show, :id => 4
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_text_file_utf_8
                 set_tmp_attachments_directory
                 a = Attachment.new(:container => Issue.find(1),
                                    :file => uploaded_test_file("japanese-utf-8.txt", "text/plain"),
                                    :author => User.find(1))
                 assert a.save
                 assert_equal 'japanese-utf-8.txt', a.filename
                 str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
                 str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                 get :show, :id => a.id
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
                 assert_tag :tag => 'th',
                            :content => '1',
                            :attributes => { :class => 'line-num' },
                            :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
               end
               def test_show_text_file_replcace_cannot_convert_content
                 set_tmp_attachments_directory
                 with_settings :repositories_encodings => 'UTF-8' do
                   a = Attachment.new(:container => Issue.find(1),
                                      :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
                                      :author => User.find(1))
                   assert a.save
                   assert_equal 'iso8859-1.txt', a.filename
                   get :show, :id => a.id
                   assert_response :success
                   assert_template 'file'
                   assert_equal 'text/html', @response.content_type
                   assert_tag :tag => 'th',
                              :content => '7',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Demande cr\?\?e avec succ\?s/ }
                 end
               end
               def test_show_text_file_latin_1
                 set_tmp_attachments_directory
                 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                   a = Attachment.new(:container => Issue.find(1),
                                      :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
                                      :author => User.find(1))
                   assert a.save
                   assert_equal 'iso8859-1.txt', a.filename
                   get :show, :id => a.id
                   assert_response :success
                   assert_template 'file'
                   assert_equal 'text/html', @response.content_type
                   assert_tag :tag => 'th',
                              :content => '7',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Demande créée avec succès/ }
                   end
               end
               def test_show_text_file_should_send_if_too_big
                 Setting.file_max_size_displayed = 512
                 Attachment.find(4).update_attribute :filesize, 754.kilobyte
                 get :show, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_other
                 get :show, :id => 6
                 assert_response :success
                 assert_equal 'application/octet-stream', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_file_from_private_issue_without_permission
                 get :show, :id => 15
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2F15'
                 set_tmp_attachments_directory
               end
               def test_show_file_from_private_issue_with_permission
                 @request.session[:user_id] = 2
                 get :show, :id => 15
                 assert_response :success
                 assert_tag 'h2', :content => /private.diff/
                 set_tmp_attachments_directory
               end
               def test_show_file_without_container_should_be_denied
                 set_tmp_attachments_directory
                 attachment = Attachment.create!(:file => uploaded_test_file("testfile.txt", "text/plain"), :author_id => 2)
                 @request.session[:user_id] = 2
                 get :show, :id => attachment.id
                 assert_response 403
               end
               def test_show_invalid_should_respond_with_404
                 get :show, :id => 999
                 assert_response 404
               end
               def test_download_text_file
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_download_version_file_with_issue_tracking_disabled
                 Project.find(1).disable_module! :issue_tracking
                 get :download, :id => 9
                 assert_response :success
               end
               def test_download_should_assign_content_type_if_blank
                 Attachment.find(4).update_attribute(:content_type, '')
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'text/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_download_missing_file
                 get :download, :id => 2
                 assert_response 404
                 set_tmp_attachments_directory
               end
               def test_download_should_be_denied_without_permission
                 get :download, :id => 7
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdownload%2F7'
                 set_tmp_attachments_directory
               end
               if convert_installed?
                 def test_thumbnail
                   Attachment.clear_thumbnails
                   @request.session[:user_id] = 2
-                  with_settings :thumbnails_enabled => '1' do
-                    get :thumbnail, :id => 16
+                  get :thumbnail, :id => 16
-                    assert_response :success
+                  assert_response :success
-                    assert_equal 'image/png', response.content_type
+                  assert_equal 'image/png', response.content_type
-                  end
                 end
-                def test_thumbnail_should_return_404_for_non_image_attachment
+                def test_thumbnail_should_not_exceed_maximum_size
+                  Redmine::Thumbnail.expects(:generate).with {|source, target, size| size == 800}
                   @request.session[:user_id] = 2
-                  with_settings :thumbnails_enabled => '1' do
+                  get :thumbnail, :id => 16, :size => 2000
-                    get :thumbnail, :id => 15
-                    assert_response 404
-                  end
                 end
-                def test_thumbnail_should_return_404_if_thumbnails_not_enabled
+                def test_thumbnail_should_round_size
+                  Redmine::Thumbnail.expects(:generate).with {|source, target, size| size == 250}
                   @request.session[:user_id] = 2
-                  with_settings :thumbnails_enabled => '0' do
+                  get :thumbnail, :id => 16, :size => 260
-                    get :thumbnail, :id => 16
+                end
-                    assert_response 404
-                  end
+                def test_thumbnail_should_return_404_for_non_image_attachment
+                  @request.session[:user_id] = 2
+                  get :thumbnail, :id => 15
+                  assert_response 404
                 end
                 def test_thumbnail_should_return_404_if_thumbnail_generation_failed
                   Attachment.any_instance.stubs(:thumbnail).returns(nil)
                   @request.session[:user_id] = 2
-                  with_settings :thumbnails_enabled => '1' do
-                    get :thumbnail, :id => 16
+                  get :thumbnail, :id => 16
-                    assert_response 404
+                  assert_response 404
-                  end
                 end
                 def test_thumbnail_should_be_denied_without_permission
-                  with_settings :thumbnails_enabled => '1' do
+                  get :thumbnail, :id => 16
-                    get :thumbnail, :id => 16
+                  assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fthumbnail%2F16'
-                    assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fthumbnail%2F16'
-                  end
                 end
               else
                 puts '(ImageMagick convert not available)'
               end
               def test_destroy_issue_attachment
                 set_tmp_attachments_directory
                 issue = Issue.find(3)
                 @request.session[:user_id] = 2
                 assert_difference 'issue.attachments.count', -1 do
                   assert_difference 'Journal.count' do
                     delete :destroy, :id => 1
                     assert_redirected_to '/projects/ecookbook'
                   end
                 end
                 assert_nil Attachment.find_by_id(1)
                 j = Journal.first(:order => 'id DESC')
                 assert_equal issue, j.journalized
                 assert_equal 'attachment', j.details.first.property
                 assert_equal '1', j.details.first.prop_key
                 assert_equal 'error281.txt', j.details.first.old_value
                 assert_equal User.find(2), j.user
               end
               def test_destroy_wiki_page_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 3
                   assert_response 302
                 end
               end
               def test_destroy_project_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 8
                   assert_response 302
                 end
               end
               def test_destroy_version_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 9
                   assert_response 302
                 end
               end
               def test_destroy_without_permission
                 set_tmp_attachments_directory
                 assert_no_difference 'Attachment.count' do
                   delete :destroy, :id => 3
                 end
                 assert_response 302
                 assert Attachment.find_by_id(3)
               end
             end

test/integration/routing/attachments_test.rb +4 0

             # 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 RoutingAttachmentsTest < ActionController::IntegrationTest
               def test_attachments
                 assert_routing(
                        { :method => 'get', :path => "/attachments/1" },
                        { :controller => 'attachments', :action => 'show', :id => '1' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/1.xml" },
                        { :controller => 'attachments', :action => 'show', :id => '1', :format => 'xml' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/1.json" },
                        { :controller => 'attachments', :action => 'show', :id => '1', :format => 'json' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/1/filename.ext" },
                        { :controller => 'attachments', :action => 'show', :id => '1',
                          :filename => 'filename.ext' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/download/1" },
                        { :controller => 'attachments', :action => 'download', :id => '1' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/download/1/filename.ext" },
                        { :controller => 'attachments', :action => 'download', :id => '1',
                          :filename => 'filename.ext' }
                      )
                 assert_routing(
                        { :method => 'get', :path => "/attachments/thumbnail/1" },
                        { :controller => 'attachments', :action => 'thumbnail', :id => '1' }
                      )
                 assert_routing(
+                       { :method => 'get', :path => "/attachments/thumbnail/1/200" },
+                       { :controller => 'attachments', :action => 'thumbnail', :id => '1', :size => '200' }
+                     )
+                assert_routing(
                        { :method => 'delete', :path => "/attachments/1" },
                        { :controller => 'attachments', :action => 'destroy', :id => '1' }
                      )
                 assert_routing(
                        { :method => 'post', :path => '/uploads.xml' },
                        { :controller => 'attachments', :action => 'upload', :format => 'xml' }
                 )
                 assert_routing(
                        { :method => 'post', :path => '/uploads.json' },
                        { :controller => 'attachments', :action => 'upload', :format => 'json' }
                 )
               end
             end

test/unit/lib/redmine/wiki_formatting/macros_test.rb +20 0

             # 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 Redmine::WikiFormatting::MacrosTest < ActionView::TestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
               include ActionView::Helpers::SanitizeHelper
               include ERB::Util
               extend ActionView::Helpers::SanitizeHelper::ClassMethods
               fixtures :projects, :roles, :enabled_modules, :users,
                                   :repositories, :changesets,
                                   :trackers, :issue_statuses, :issues,
                                   :versions, :documents,
                                   :wikis, :wiki_pages, :wiki_contents,
                                   :boards, :messages,
                                   :attachments
               def setup
                 super
                 @project = nil
               end
               def teardown
               end
               def test_macro_registration
                 Redmine::WikiFormatting::Macros.register do
                   macro :foo do |obj, args|
                     "Foo macro output"
                   end
                 end
                 text = "{{foo}}"
                 assert_equal '<p>Foo macro output</p>', textilizable(text)
               end
               def test_macro_hello_world
                 text = "{{hello_world}}"
                 assert textilizable(text).match(/Hello world!/)
                 # escaping
                 text = "!{{hello_world}}"
                 assert_equal '<p>{{hello_world}}</p>', textilizable(text)
               end
               def test_macro_macro_list
                 text = "{{macro_list}}"
                 assert_match %r{<code>hello_world</code>}, textilizable(text)
               end
               def test_macro_include
                 @project = Project.find(1)
                 # include a page of the current project wiki
                 text = "{{include(Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 @project = nil
                 # include a page of a specific project wiki
                 text = "{{include(ecookbook:Another page)}}"
                 assert textilizable(text).match(/This is a link to a ticket/)
                 text = "{{include(ecookbook:)}}"
                 assert textilizable(text).match(/CookBook documentation/)
                 text = "{{include(unknowidentifier:somepage)}}"
                 assert textilizable(text).match(/Page not found/)
               end
               def test_macro_child_pages
                 expected =  "<p><ul class=\"pages-hierarchy\">\n" +
                              "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" +
                              "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" +
                              "</ul>\n</p>"
                 @project = Project.find(1)
                 # child pages of the current wiki page
                 assert_equal expected, textilizable("{{child_pages}}", :object => WikiPage.find(2).content)
                 # child pages of another page
                 assert_equal expected, textilizable("{{child_pages(Another_page)}}", :object => WikiPage.find(1).content)
                 @project = Project.find(2)
                 assert_equal expected, textilizable("{{child_pages(ecookbook:Another_page)}}", :object => WikiPage.find(1).content)
               end
               def test_macro_child_pages_with_option
                 expected =  "<p><ul class=\"pages-hierarchy\">\n" +
                              "<li><a href=\"/projects/ecookbook/wiki/Another_page\">Another page</a>\n" +
                              "<ul class=\"pages-hierarchy\">\n" +
                              "<li><a href=\"/projects/ecookbook/wiki/Child_1\">Child 1</a></li>\n" +
                              "<li><a href=\"/projects/ecookbook/wiki/Child_2\">Child 2</a></li>\n" +
                              "</ul>\n</li>\n</ul>\n</p>"
                 @project = Project.find(1)
                 # child pages of the current wiki page
                 assert_equal expected, textilizable("{{child_pages(parent=1)}}", :object => WikiPage.find(2).content)
                 # child pages of another page
                 assert_equal expected, textilizable("{{child_pages(Another_page, parent=1)}}", :object => WikiPage.find(1).content)
                 @project = Project.find(2)
                 assert_equal expected, textilizable("{{child_pages(ecookbook:Another_page, parent=1)}}", :object => WikiPage.find(1).content)
               end
               def test_macro_child_pages_without_wiki_page_should_fail
                 assert_match /can be called from wiki pages only/, textilizable("{{child_pages}}")
               end
+              def test_macro_thumbnail
+                assert_equal '<p><a href="/attachments/17" class="thumbnail" title="testfile.PNG"><img alt="testfile.PNG" src="/attachments/thumbnail/17" /></a></p>',
+                  textilizable("{{thumbnail(testfile.png)}}", :object => Issue.find(14))
+              end
+              def test_macro_thumbnail_with_size
+                assert_equal '<p><a href="/attachments/17" class="thumbnail" title="testfile.PNG"><img alt="testfile.PNG" src="/attachments/thumbnail/17/200" /></a></p>',
+                  textilizable("{{thumbnail(testfile.png, size=200)}}", :object => Issue.find(14))
+              end
+              def test_macro_thumbnail_with_title
+                assert_equal '<p><a href="/attachments/17" class="thumbnail" title="Cool image"><img alt="testfile.PNG" src="/attachments/thumbnail/17" /></a></p>',
+                  textilizable("{{thumbnail(testfile.png, title=Cool image)}}", :object => Issue.find(14))
+              end
+              def test_macro_thumbnail_with_invalid_filename_should_fail
+                assert_include 'test.png not found',
+                  textilizable("{{thumbnail(test.png)}}", :object => Issue.find(14))
+              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