jro_apps/redmine Commit - r1506:80a7486f95a3

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

                  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
              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
-                 render_404
+               #rescue
+               #  render_404
                end
              end

app/helpers/application_helper.rb +8 0

              # 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
                  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

app/helpers/repositories_helper.rb 0 -7

              # 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

app/models/attachment.rb +4 0

                  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

test/fixtures/attachments.yml +37 -1

		@@ -36,4 +36,40 attachments_003:
36	36	filename: logo.gif
37	37	description: This is a logo
38	38	author_id: 2
39		No newline at end of file
	39	attachments_004:
	40	created_on: 2006-07-19 21:07:27 +02:00
	41	container_type: Issue
	42	container_id: 3
	43	downloads: 0
	44	disk_filename: 060719210727_source.rb
	45	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
	46	id: 4
	47	filesize: 153
	48	filename: source.rb
	49	author_id: 2
	50	description: This is a Ruby source file
	51	content_type: application/x-ruby
	52	attachments_005:
	53	created_on: 2006-07-19 21:07:27 +02:00
	54	container_type: Issue
	55	container_id: 3
	56	downloads: 0
	57	disk_filename: 060719210727_changeset.diff
	58	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
	59	id: 5
	60	filesize: 687
	61	filename: changeset.diff
	62	author_id: 2
	63	content_type: text/x-diff
	64	attachments_006:
	65	created_on: 2006-07-19 21:07:27 +02:00
	66	container_type: Issue
	67	container_id: 3
	68	downloads: 0
	69	disk_filename: 060719210727_archive.zip
	70	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
	71	id: 6
	72	filesize: 157
	73	filename: archive.zip
	74	author_id: 2
	75	content_type: application/octet-stream

test/functional/documents_controller_test.rb +2 0

                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',

test/functional/issues_controller_test.rb +2 0

                end
                def test_post_edit_with_attachment_only
+                 set_tmp_attachments_directory
                  # anonymous user
                  post :edit,
                       :id => 1,

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
                # 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',

test/test_helper.rb +6 0

                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

	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