jro_apps/redmine Commit - r1506:80a7486f95a3

File viewer for attached text files....

Jean-Philippe Lang -

r1506:80a7486f95a3

parent child

Context file:

r1506:80a7486f95a3

Collapse all files

app/views/attachments/file.rhtml created 644 +15 0

@@ -0,0 +1,15
	1	<h2><%=h @attachment.filename %></h2>
	2
	3	<div class="attachments">
	4	<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
	5	<span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
	6	<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
	7	<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
	8
	9	</div>
	10
	11	<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
	12
	13	<% content_for :header_tags do -%>
	14	<%= stylesheet_link_tag "scm" -%>
	15	<% end -%>

test/fixtures/files/060719210727_archive.zip created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/fixtures/files/060719210727_changeset.diff created 644 +13 0

@@ -0,0 +1,13
	1	Index: trunk/app/controllers/issues_controller.rb
	2	===================================================================
	3	--- trunk/app/controllers/issues_controller.rb (r�vision 1483)
	4	+++ trunk/app/controllers/issues_controller.rb (r�vision 1484)
	5	@@ -149,7 +149,7 @@
	6	attach_files(@issue, params[:attachments])
	7	flash[:notice] = l(:notice_successful_create)
	8	Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
	9	- redirect_to :controller => 'issues', :action => 'show', :id => @issue, :project_id => @project
	10	+ redirect_to :controller => 'issues', :action => 'show', :id => @issue
	11	return
	12	end
	13	end

test/fixtures/files/060719210727_source.rb created 644 +10 0

@@ -0,0 +1,10
	1	# The Greeter class
	2	class Greeter
	3	def initialize(name)
	4	@name = name.capitalize
	5	end
	6
	7	def salute
	8	puts "Hello #{@name}!"
	9	end
	10	end

test/functional/attachments_controller_test.rb created 644 +59 0

@@ -0,0 +1,59
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'attachments_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class AttachmentsController; def rescue_action(e) raise e end; end
	23
	24
	25	class AttachmentsControllerTest < Test::Unit::TestCase
	26	fixtures :users, :projects, :issues, :attachments
	27
	28	def setup
	29	@controller = AttachmentsController.new
	30	@request = ActionController::TestRequest.new
	31	@response = ActionController::TestResponse.new
	32	Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
	33	User.current = nil
	34	end
	35
	36	def test_show_diff
	37	get :show, :id => 5
	38	assert_response :success
	39	assert_template 'diff'
	40	end
	41
	42	def test_show_text_file
	43	get :show, :id => 4
	44	assert_response :success
	45	assert_template 'file'
	46	end
	47
	48	def test_show_other
	49	get :show, :id => 6
	50	assert_response :success
	51	assert_equal 'application/octet-stream', @response.content_type
	52	end
	53
	54	def test_download_text_file
	55	get :download, :id => 4
	56	assert_response :success
	57	assert_equal 'application/x-ruby', @response.content_type
	58	end
	59	end

app/controllers/attachments_controller.rb +7 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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
               layout 'base'
               before_filter :find_project, :check_project_privacy
               def show
                 if @attachment.is_diff?
                   @diff = File.new(@attachment.diskfile, "rb").read
                   render :action => 'diff'
-                else
+                elsif @attachment.is_text?
+                  @content = File.new(@attachment.diskfile, "rb").read
+                  render :action => 'file'
+                elsif
                   download
                 end
               end
               def download
                 # images are sent inline
                 send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                 :type => @attachment.content_type,
                                                 :disposition => (@attachment.image? ? 'inline' : 'attachment')
               end
             private
               def find_project
                 @attachment = Attachment.find(params[:id])
-                render_404 and return false unless File.readable?(@attachment.diskfile)
+                #render_404 and return false unless File.readable?(@attachment.diskfile)
                 @project = @attachment.project
-              rescue
+              #rescue
-                render_404
+              #  render_404
               end
             end

app/helpers/application_helper.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'coderay'
+            require 'coderay/helpers/file_type'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               def current_role
                 @current_role ||= User.current.role_for_project(@project)
               end
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
               end
               def link_to_issue(issue, options={})
                 link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
               end
               def toggle_link(name, id, options={})
                 onclick = "Element.toggle('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def show_and_goto_link(name, id, options={})
                 onclick = "Element.show('#{id}'); "
                 onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
                 onclick << "Element.scrollTo('#{id}'); "
                 onclick << "return false;"
                 link_to(name, "#", options.merge(:onclick => onclick))
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def prompt_to_remote(name, text, param, url, html_options = {})
                 html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
                 link_to name, {}, html_options
               end
               def format_date(date)
                 return nil unless date
                 # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 date.strftime(@date_format)
               end
               def format_time(time, include_date = true)
                 return nil unless time
                 time = time.to_time if time.is_a?(String)
                 zone = User.current.time_zone
                 if time.utc?
                   local = zone ? zone.adjust(time) : time.getlocal
                 else
                   local = zone ? zone.adjust(time.getutc) : time
                 end
                 @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
                 @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
               def authoring(created, author)
                 time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
                 l(:label_added_time_by, author || 'Anonymous', time_tag)
               end
               def l_or_humanize(s)
                 l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
               end
               def day_name(day)
                 l(:general_day_names).split(',')[day-1]
               end
               def month_name(month)
                 l(:actionview_datehelper_select_month_names).split(',')[month-1]
               end
+              def syntax_highlight(name, content)
+                type = CodeRay::FileType[name]
+                type ? CodeRay.scan(content, type).html : h(content)
+              end
               def pagination_links_full(paginator, count=nil, options={})
                 page_param = options.delete(:page_param) || :page
                 url_param = params.dup
                 # don't reuse params if filters are present
                 url_param.clear if url_param.has_key?(:set_filter)
                 html = ''
                 html << link_to_remote(('&#171; ' + l(:label_previous)),
                                         {:update => 'content',
                                          :url => url_param.merge(page_param => paginator.current.previous),
                                          :complete => 'window.scrollTo(0,0)'},
                                         {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                 html << (pagination_links_each(paginator, options) do |n|
                   link_to_remote(n.to_s,
                                   {:url => {:params => url_param.merge(page_param => n)},
                                    :update => 'content',
                                    :complete => 'window.scrollTo(0,0)'},
                                   {:href => url_for(:params => url_param.merge(page_param => n))})
                 end || '')
                 html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
                                              {:update => 'content',
                                               :url => url_param.merge(page_param => paginator.current.next),
                                               :complete => 'window.scrollTo(0,0)'},
                                              {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
                 unless count.nil?
                   html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
                 end
                 html
               end
               def per_page_links(selected=nil)
                 url_param = params.dup
                 url_param.clear if url_param.has_key?(:set_filter)
                 links = Setting.per_page_options_array.collect do |n|
                   n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
                                                         {:href => url_for(url_param.merge(:per_page => n))})
                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
               def breadcrumb(*args)
                 content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb')
               end
               def html_title(*args)
                 if args.empty?
                   title = []
                   title << @project.name if @project
                   title += @html_title if @html_title
                   title << Setting.app_title
                   title.compact.join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               def accesskey(s)
                 Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = nil
                   text = args.shift
                 when 2
                   obj = args.shift
                   text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     style = $1
                     filename = $6
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                       desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
                       alt = desc.blank? ? nil : "(#{desc})"
                       "!#{style}#{image_url}#{alt}!"
                     else
                       "!#{style}#{filename}!"
                     end
                   end
                 end
                 text = (Setting.text_formatting == 'textile') ?
                   Redmine::WikiFormatting.to_html(text) { |macro, args| exec_macro(macro, obj, args) } :
                   simple_format(auto_link(h(text)))
                 # different methods for formatting wiki links
                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
                   format_wiki_link = Proc.new {|project, title| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title| "##{title}" }
                 else
                   format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                 # Examples:
                 #   [[mypage]]
                 #   [[mypage|mytext]]
                 # wiki links can refer other project wikis, using project name or identifier:
                 #   [[project:]] -> wiki starting page
                 #   [[project:|mytext]]
                 #   [[project:mypage]]
                 #   [[project:mypage|mytext]]
                 text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
                       page = $2
                       title ||= $1 if page.blank?
                     end
                     if link_project && link_project.wiki
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       title || page
                     end
                   else
                     all
                   end
                 end
                 # Redmine links
                 #
                 # Examples:
                 #   Issues:
                 #     #52 -> Link to issue #52
                 #   Changesets:
                 #     r52 -> Link to revision 52
                 #     commit:a85130f -> Link to scmid starting with a85130f
                 #   Documents:
                 #     document#17 -> Link to document with id 17
                 #     document:Greetings -> Link to the document with title "Greetings"
                 #     document:"Some document" -> Link to the document with title "Some document"
                 #   Versions:
                 #     version#3 -> Link to version with id 3
                 #     version:1.0.0 -> Link to version named "1.0.0"
                 #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
                 #   Attachments:
                 #     attachment:file.zip -> Link to the attachment of the current object named file.zip
                 #   Source files:
                 #     source:some/file -> Link to the file located at /some/file in the project's repository
                 #     source:some/file@52 -> Link to the file's revision 52
                 #     source:some/file#L120 -> Link to line 120 of the file
                 #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                 #     export:some/file -> Force the download of the file
                 text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                   :class => 'changeset',
                                                   :title => truncate_single_line(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
                           link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
                                                     :class => (issue.closed? ? 'issue closed' : 'issue'),
                                                     :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = oid.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'commit'
                         if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
                           link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                        :class => 'changeset',
                                                        :title => truncate_single_line(changeset.comments, 100)
                         end
                       when 'source', 'export'
                         if project && project.repository
                           name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                           path, rev, anchor = $1, $3, $5
                           link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :path => path,
                                                                   :rev => rev,
                                                                   :anchor => anchor,
                                                                   :format => (prefix == 'export' ? 'raw' : nil)},
                                                                  :class => (prefix == 'export' ? 'source download' : 'source')
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'
                         end
                       end
                     end
                   end
                   leading + (link || "#{prefix}#{sep}#{oid}")
                 end
                 text
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     msg = msg.first if msg.is_a? Array
                     if attr == "base"
                       full_messages << l(msg)
                     else
                       full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
                   # retrieve custom values error messages
                   if object.errors[:custom_values]
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         next if msg.nil?
                         msg = msg.first if msg.is_a? Array
                         full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
                       end
                     end
                   end
                   content_tag("div",
                     content_tag(
                       options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) +
                   GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_tabular_form_for(name, object, options, &proc)
                 options[:html] ||= {}
                 options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
                 form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
               end
               def back_url_hidden_field_tag
                 hidden_field_tag 'back_url', (params[:back_url] || request.env['HTTP_REFERER'])
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | " +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
                     (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
                     (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
                   ), :class => 'progress', :style => "width: #{width};") +
                   content_tag('p', legend, :class => 'pourcent')
               end
               def context_menu_link(name, url, options={})
                 options[:class] ||= ''
                 if options.delete(:selected)
                   options[:class] << ' icon-checked disabled'
                   options[:disabled] = true
                 end
                 if options.delete(:disabled)
                   options.delete(:method)
                   options.delete(:confirm)
                   options.delete(:onclick)
                   options[:class] << ' disabled'
                   url = '#'
                 end
                 link_to name, url, options
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
                 javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     javascript_include_tag('calendar/calendar') +
                     javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
                     javascript_include_tag('calendar/calendar-setup') +
                     stylesheet_link_tag('calendar')
                   end
                 end
               end
               def wikitoolbar_for(field_id)
                 return '' unless Setting.text_formatting == 'textile'
                 help_link = l(:setting_text_formatting) + ': ' +
                   link_to(l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
                                           :onclick => "window.open(\"#{ compute_public_path('wiki_syntax', 'help', 'html') }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
                 javascript_include_tag('jstoolbar/jstoolbar') +
                   javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
                   javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.setHelpLink('#{help_link}'); toolbar.draw();")
               end
               def content_for(name, content = nil, &block)
                 @has_content ||= {}
                 @has_content[name] = true
                 super(name, content, &block)
               end
               def has_content?(name)
                 (@has_content && @has_content[name]) || false
               end
             end

app/helpers/repositories_helper.rb 0 -7

             # redMine - project management software
             # Copyright (C) 2006  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 'coderay'
-            require 'coderay/helpers/file_type'
             require 'iconv'
             module RepositoriesHelper
-              def syntax_highlight(name, content)
-                type = CodeRay::FileType[name]
-                type ? CodeRay.scan(content, type).html : h(content)
-              end
               def format_revision(txt)
                 txt.to_s[0,8]
               end
               def to_utf8(str)
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
                 @encodings.each do |encoding|
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here and try the next encoding
                   end
                 end
                 str
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
               end
               def scm_select_tag(repository)
                 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                 REDMINE_SUPPORTED_SCM.each do |scm|
                   scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
                 end
                 select_tag('repository_scm',
                            options_for_select(scm_options, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
                            )
               end
               def with_leading_slash(path)
                 path.to_s.starts_with?('/') ? path : "/#{path}"
               end
               def without_leading_slash(path)
                 path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />(http://, https://, svn://, file:///)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
                                                        :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                                        :onfocus => "this.value=''; this.name='repository[password]';",
                                                        :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def mercurial_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def git_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def cvs_field_tags(form, repository)
                   content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
                   content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
               end
               def bazaar_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def filesystem_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
             end

app/models/attachment.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 :container, :filename, :author
               validates_length_of :filename, :maximum => 255
               validates_length_of :disk_filename, :maximum => 255
               acts_as_event :title => :filename,
                             :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
               cattr_accessor :storage_path
               @@storage_path = "#{RAILS_ROOT}/files"
               def validate
                 errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
               end
               def file=(incoming_file)
                 unless incoming_file.nil?
                   @temp_file = incoming_file
                   if @temp_file.size > 0
                     self.filename = sanitize_filename(@temp_file.original_filename)
                     self.disk_filename = Attachment.disk_filename(filename)
                     self.content_type = @temp_file.content_type.to_s.chomp
                     self.filesize = @temp_file.size
                   end
                 end
               end
               def file
                 nil
               end
               # Copy temp file to its final location
               def before_save
                 if @temp_file && (@temp_file.size > 0)
                   logger.debug("saving '#{self.diskfile}'")
                   File.open(diskfile, "wb") do |f|
                     f.write(@temp_file.read)
                   end
                   self.digest = Digest::MD5.hexdigest(File.read(diskfile))
                 end
                 # 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 file on the disk
               def after_destroy
                 File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
               end
               # Returns file's location on disk
               def diskfile
                 "#{@@storage_path}/#{self.disk_filename}"
               end
               def increment_download
                 increment!(:downloads)
               end
               def project
                 container.project
               end
               def image?
                 self.filename =~ /\.(jpe?g|gif|png)$/i
               end
+              def is_text?
+                Redmine::MimeType.is_type?('text', filename)
+              end
               def is_diff?
                 self.filename =~ /\.(patch|diff)$/i
               end
             private
               def sanitize_filename(value)
                 # get only the filename, not the whole path
                 just_filename = value.gsub(/^.*(\\|\/)/, '')
                 # NOTE: File.basename doesn't work right with Windows paths on Unix
                 # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
                 # Finally, replace all non alphanumeric, hyphens or periods with underscore
                 @filename = just_filename.gsub(/[^\w\.\-]/,'_')
               end
               # Returns an ASCII or hashed filename
               def self.disk_filename(filename)
                 df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
                 if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
                   df << filename
                 else
                   df << Digest::MD5.hexdigest(filename)
                   # keep the extension if any
                   df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
                 end
                 df
               end
             end

test/fixtures/attachments.yml +37 -1

             ---
             attachments_001:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_error281.txt
               container_id: 3
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 1
               container_type: Issue
               filesize: 28
               filename: error281.txt
               author_id: 2
             attachments_002:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_document.txt
               container_id: 1
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 2
               container_type: Document
               filesize: 28
               filename: document.txt
               author_id: 2
             attachments_003:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: image/gif
               disk_filename: 060719210727_logo.gif
               container_id: 4
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 3
               container_type: WikiPage
               filesize: 280
               filename: logo.gif
               description: This is a logo
               author_id: 2
-  No newline at end of file
+            attachments_004:
+              created_on: 2006-07-19 21:07:27 +02:00
+              container_type: Issue
+              container_id: 3
+              downloads: 0
+              disk_filename: 060719210727_source.rb
+              digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+              id: 4
+              filesize: 153
+              filename: source.rb
+              author_id: 2
+              description: This is a Ruby source file
+              content_type: application/x-ruby
+            attachments_005:
+              created_on: 2006-07-19 21:07:27 +02:00
+              container_type: Issue
+              container_id: 3
+              downloads: 0
+              disk_filename: 060719210727_changeset.diff
+              digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+              id: 5
+              filesize: 687
+              filename: changeset.diff
+              author_id: 2
+              content_type: text/x-diff
+            attachments_006:
+              created_on: 2006-07-19 21:07:27 +02:00
+              container_type: Issue
+              container_id: 3
+              downloads: 0
+              disk_filename: 060719210727_archive.zip
+              digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+              id: 6
+              filesize: 157
+              filename: archive.zip
+              author_id: 2
+              content_type: application/octet-stream

test/functional/documents_controller_test.rb +2 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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.dirname(__FILE__) + '/../test_helper'
             require 'documents_controller'
             # Re-raise errors caught by the controller.
             class DocumentsController; def rescue_action(e) raise e end; end
             class DocumentsControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :enabled_modules, :documents, :enumerations
               def setup
                 @controller = DocumentsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:grouped)
               end
               def test_new_with_one_attachment
                 @request.session[:user_id] = 2
+                set_tmp_attachments_directory
                 post :new, :project_id => 'ecookbook',
                            :document => { :title => 'DocumentsControllerTest#test_post_new',
                                           :description => 'This is a new document',
                                           :category_id => 2},
                            :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 assert_redirected_to 'projects/ecookbook/documents'
                 document = Document.find_by_title('DocumentsControllerTest#test_post_new')
                 assert_not_nil document
                 assert_equal Enumeration.find(2), document.category
                 assert_equal 1, document.attachments.size
                 assert_equal 'testfile.txt', document.attachments.first.filename
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/documents'
                 assert_nil Document.find_by_id(1)
               end
             end

test/functional/issues_controller_test.rb +2 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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.dirname(__FILE__) + '/../test_helper'
             require 'issues_controller'
             # Re-raise errors caught by the controller.
             class IssuesController; def rescue_action(e) raise e end; end
             class IssuesControllerTest < Test::Unit::TestCase
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :issues,
                        :issue_statuses,
                        :trackers,
                        :projects_trackers,
                        :issue_categories,
                        :enabled_modules,
                        :enumerations,
                        :attachments,
                        :workflows,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers,
                        :time_entries,
                        :journals,
                        :journal_details
               def setup
                 @controller = IssuesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 # private projects hidden
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
                 assert_no_tag :tag => 'a', :content => /Issue on project 2/
               end
               def test_index_with_project
                 Setting.display_subprojects_issues = 0
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_no_tag :tag => 'a', :content => /Subproject issue/
               end
               def test_index_with_project_and_subprojects
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
               end
               def test_index_with_project_and_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 Setting.display_subprojects_issues = 1
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_tag :tag => 'a', :content => /Can't print recipes/
                 assert_tag :tag => 'a', :content => /Subproject issue/
                 assert_tag :tag => 'a', :content => /Issue of a private subproject/
               end
               def test_index_with_project_and_filter
                 get :index, :project_id => 1, :set_filter => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
               end
               def test_index_csv_with_project
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
               end
               def test_index_pdf
                 get :index, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
                 get :index, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
               end
               def test_changes
                 get :changes, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:journals)
                 assert_equal 'application/atom+xml', @response.content_type
               end
               def test_show_by_anonymous
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show.rhtml'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
                 # anonymous role is allowed to add a note
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_show_by_manager
                 @request.session[:user_id] = 2
                 get :show, :id => 1
                 assert_response :success
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Change properties/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Log time/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :tracker_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_tag :tag => 'input', :attributes => { :name => 'custom_fields[2]',
                                                              :value => 'Default string' }
               end
               def test_get_new_without_tracker_id
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal Project.find(1).trackers.first, issue.tracker
               end
               def test_update_new_form
                 @request.session[:user_id] = 2
                 xhr :post, :new, :project_id => 1,
                                  :issue => {:tracker_id => 2,
                                             :subject => 'This is the test_new issue',
                                             :description => 'This is the description',
                                             :priority_id => 5}
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5,
                                       :estimated_hours => ''},
                            :custom_fields => {'2' => 'Value for field 2'}
                 assert_redirected_to 'issues/show'
                 issue = Issue.find_by_subject('This is the test_new issue')
                 assert_not_nil issue
                 assert_equal 2, issue.author_id
                 assert_nil issue.estimated_hours
                 v = issue.custom_values.find_by_custom_field_id(2)
                 assert_not_nil v
                 assert_equal 'Value for field 2', v.value
               end
               def test_post_new_without_custom_fields_param
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1,
                            :issue => {:tracker_id => 1,
                                       :subject => 'This is the test_new issue',
                                       :description => 'This is the description',
                                       :priority_id => 5}
                 assert_redirected_to 'issues/show'
               end
               def test_copy_issue
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :copy_from => 1
                 assert_template 'new'
                 assert_not_nil assigns(:issue)
                 orig = Issue.find(1)
                 assert_equal orig.subject, assigns(:issue).subject
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
               end
               def test_get_edit_with_params
                 @request.session[:user_id] = 2
                 get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 }
                 assert_response :success
                 assert_template 'edit'
                 issue = assigns(:issue)
                 assert_not_nil issue
                 assert_equal 5, issue.status_id
                 assert_tag :select, :attributes => { :name => 'issue[status_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Closed',
                                                 :attributes => { :selected => 'selected' } }
                 assert_equal 7, issue.priority_id
                 assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
                                     :child => { :tag => 'option',
                                                 :content => 'Urgent',
                                                 :attributes => { :selected => 'selected' } }
               end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 get :reply, :id => 1
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_reply_to_note
                 @request.session[:user_id] = 2
                 get :reply, :id => 1, :journal_id => 2
                 assert_response :success
                 assert_select_rjs :show, "update"
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)
                 old_subject = issue.subject
                 new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
                 post :edit, :id => 1, :issue => {:subject => new_subject}
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal new_subject, issue.subject
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
                 assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
               end
               def test_post_edit_with_status_and_assignee_change
                 issue = Issue.find(1)
                 assert_equal 1, issue.status_id
                 @request.session[:user_id] = 2
                 assert_difference('TimeEntry.count', 0) do
                   post :edit,
                        :id => 1,
                        :issue => { :status_id => 2, :assigned_to_id => 3 },
                        :notes => 'Assigned to dlopper',
                        :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal 2, issue.status_id
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal 'Assigned to dlopper', j.notes
                 assert_equal 2, j.details.size
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?("Status changed from New to Assigned")
               end
               def test_post_edit_with_note_only
                 notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => notes
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert_equal notes, j.notes
                 assert_equal 0, j.details.size
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?(notes)
               end
               def test_post_edit_with_note_and_spent_time
                 @request.session[:user_id] = 2
                 spent_hours_before = Issue.find(1).spent_hours
                 assert_difference('TimeEntry.count') do
                   post :edit,
                        :id => 1,
                        :notes => '2.5 hours added',
                        :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 end
                 assert_redirected_to 'issues/show/1'
                 issue = Issue.find(1)
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal '2.5 hours added', j.notes
                 assert_equal 0, j.details.size
                 t = issue.time_entries.find(:first, :order => 'id DESC')
                 assert_not_nil t
                 assert_equal 2.5, t.hours
                 assert_equal spent_hours_before + 2.5, issue.spent_hours
               end
               def test_post_edit_with_attachment_only
+                set_tmp_attachments_directory
                 # anonymous user
                 post :edit,
                      :id => 1,
                      :notes => '',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert j.notes.blank?
                 assert_equal 1, j.details.size
                 assert_equal 'testfile.txt', j.details.first.value
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?('testfile.txt')
               end
               def test_post_edit_with_no_change
                 issue = Issue.find(1)
                 issue.journals.clear
                 ActionMailer::Base.deliveries.clear
                 post :edit,
                      :id => 1,
                      :notes => ''
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert issue.journals.empty?
                 # No email should be sent
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_bulk_edit
                 @request.session[:user_id] = 2
                 # update issues priority
                 post :bulk_edit, :ids => [1, 2], :priority_id => 7, :notes => 'Bulk editing', :assigned_to_id => ''
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
               end
               def test_bulk_unassign
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 2
                 # unassign issues
                 post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
                 assert_response 302
                 # check that the issues were updated
                 assert_nil Issue.find(2).assigned_to
               end
               def test_move_one_issue_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :id => 1, :new_project_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).project_id
               end
               def test_bulk_move_to_another_project
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_project_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 # Issues moved to project 2
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
                 # No tracker change
                 assert_equal 1, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_bulk_move_to_another_tracker
                 @request.session[:user_id] = 1
                 post :move, :ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_context_menu_one_issue
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/edit/1',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Closed',
                                         :attributes => { :href => '/issues/edit/1?issue%5Bstatus_id%5D=5',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Immediate',
                                         :attributes => { :href => '/issues/edit/1?issue%5Bpriority_id%5D=8',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Dave Lopper',
                                         :attributes => { :href => '/issues/edit/1?issue%5Bassigned_to_id%5D=3',
                                                          :class => '' }
                 assert_tag :tag => 'a', :content => 'Copy',
                                         :attributes => { :href => '/projects/ecookbook/issues/new?copy_from=1',
                                                          :class => 'icon-copy' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_one_issue_by_anonymous
                 get :context_menu, :ids => [1]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_context_menu_multiple_issues_of_same_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Edit',
                                         :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-edit' }
                 assert_tag :tag => 'a', :content => 'Move',
                                         :attributes => { :href => '/issues/move?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-move' }
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '/issues/destroy?ids%5B%5D=1&amp;ids%5B%5D=2',
                                                          :class => 'icon-del' }
               end
               def test_context_menu_multiple_issues_of_different_project
                 @request.session[:user_id] = 2
                 get :context_menu, :ids => [1, 2, 4]
                 assert_response :success
                 assert_template 'context_menu'
                 assert_tag :tag => 'a', :content => 'Delete',
                                         :attributes => { :href => '#',
                                                          :class => 'icon-del disabled' }
               end
               def test_destroy_issue_with_no_time_entries
                 assert_nil TimeEntry.find_by_issue_id(2)
                 @request.session[:user_id] = 2
                 post :destroy, :id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_nil Issue.find_by_id(2)
               end
               def test_destroy_issues_with_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3]
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil assigns(:hours)
                 assert Issue.find_by_id(1) && Issue.find_by_id(3)
               end
               def test_destroy_issues_and_destroy_time_entries
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'destroy'
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find_by_id([1, 2])
               end
               def test_destroy_issues_and_assign_time_entries_to_project
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'nullify'
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_nil TimeEntry.find(1).issue_id
                 assert_nil TimeEntry.find(2).issue_id
               end
               def test_destroy_issues_and_reassign_time_entries_to_another_issue
                 @request.session[:user_id] = 2
                 post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
                 assert_equal 2, TimeEntry.find(1).issue_id
                 assert_equal 2, TimeEntry.find(2).issue_id
               end
               def test_destroy_attachment
                 issue = Issue.find(3)
                 a = issue.attachments.size
                 @request.session[:user_id] = 2
                 post :destroy_attachment, :id => 3, :attachment_id => 1
                 assert_redirected_to 'issues/show/3'
                 assert_nil Attachment.find_by_id(1)
                 issue.reload
                 assert_equal((a-1), issue.attachments.size)
                 j = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal 'attachment', j.details.first.property
               end
             end

test/integration/issues_test.rb +18 0

+            # redMine - project management software
+            # Copyright (C) 2006-2008  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.dirname(__FILE__)}/../test_helper"
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
                        :trackers,
                        :projects_trackers,
                        :issue_statuses,
                        :issues,
                        :enumerations,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
                 get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
                 assert_template 'issues/new'
                 post 'projects/1/issues/new', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "3",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" },
                                              :custom_fields => {'2' => 'Value for field 2'}
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 assert_redirected_to "issues/show"
                 follow_redirect!
                 assert_equal issue, assigns(:issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
+                set_tmp_attachments_directory
                 post 'issues/edit/1',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
                 assert_redirected_to "issues/show/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 assert_equal 'This is an attachment', attachment.description
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               end
             end

test/test_helper.rb +6 0

             # redMine - project management software
             # Copyright (C) 2006  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.
             ENV["RAILS_ENV"] ||= "test"
             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               # between every test method.  Fewer database queries means faster tests.
               #
               # Read Mike Clark's excellent walkthrough at
               #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
               #
               # Every Active Record database supports transactions except MyISAM tables
               # in MySQL.  Turn off transactional fixtures in this case; however, if you
               # don't care one way or the other, switching from MyISAM to InnoDB tables
               # is recommended.
               self.use_transactional_fixtures = true
               # Instantiated fixtures are slow, but give you @david where otherwise you
               # would need people(:david).  If you don't want to migrate your existing
               # test cases which use the @david style and don't mind the speed hit (each
               # instantiated fixtures translates to a database query per test method),
               # then set this back to true.
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
               def log_user(login, password)
                 get "/account/login"
                 assert_equal nil, session[:user_id]
                 assert_response :success
                 assert_template "account/login"
                 post "/account/login", :username => login, :password => password
                 assert_redirected_to "my/page"
                 assert_equal login, User.find(session[:user_id]).login
               end
               def test_uploaded_file(name, mime)
                 ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
               end
+              # Use a temporary directory for attachment related tests
+              def set_tmp_attachments_directory
+                Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
+                Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
+              end
             end
             # ActionController::TestUploadedFile bug
             # see http://dev.rubyonrails.org/ticket/4635
             class String
               def original_filename
                 "testfile.txt"
               end
               def content_type
                 "text/plain"
               end
               def read
                 self.to_s
               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