##// END OF EJS Templates
jro_apps » redmine
RSS
attachment: use repositories setting to convert contents character encoding (#2371)...
Toshi MARUYAMA -
r7746:77710ece26d8
parent child
Show More
Side by Side Unified
Context file:
r7746:77710ece26d8 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,59 +1,47
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 module AttachmentsHelper
19 19 # Displays view/delete links to the attachments of the given object
20 20 # Options:
21 21 # :author -- author names are not displayed if set to false
22 22 def link_to_attachments(container, options = {})
23 23 options.assert_valid_keys(:author)
24 24
25 25 if container.attachments.any?
26 26 options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
27 27 render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options}
28 28 end
29 29 end
30 30
31 31 def to_utf8(str)
32 if str.respond_to?(:force_encoding)
33 str.force_encoding('UTF-8')
34 return str if str.valid_encoding?
35 else
36 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
37 end
38
39 begin
40 Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
41 rescue Iconv::InvalidEncoding
42 # "UTF-8//IGNORE" is not supported on some OS
43 str
44 end
32 Redmine::CodesetUtil.to_utf8_by_setting(str)
45 33 end
46 34
47 35 def render_api_attachment(attachment, api)
48 36 api.attachment do
49 37 api.id attachment.id
50 38 api.filename attachment.filename
51 39 api.filesize attachment.filesize
52 40 api.content_type attachment.content_type
53 41 api.description attachment.description
54 42 api.content_url url_for(:controller => 'attachments', :action => 'download', :id => attachment, :filename => attachment.filename, :only_path => false)
55 43 api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
56 44 api.created_on attachment.created_on
57 45 end
58 46 end
59 47 end
Show file before | Show file after | Hide comments
@@ -1,213 +1,217
1 1 # encoding: utf-8
2 2 #
3 3 # Redmine - project management software
4 4 # Copyright (C) 2006-2011 Jean-Philippe Lang
5 5 #
6 6 # This program is free software; you can redistribute it and/or
7 7 # modify it under the terms of the GNU General Public License
8 8 # as published by the Free Software Foundation; either version 2
9 9 # of the License, or (at your option) any later version.
10 10 #
11 11 # This program is distributed in the hope that it will be useful,
12 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13 13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14 # GNU General Public License for more details.
15 15 #
16 16 # You should have received a copy of the GNU General Public License
17 17 # along with this program; if not, write to the Free Software
18 18 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19 19
20 20 require File.expand_path('../../test_helper', __FILE__)
21 21 require 'attachments_controller'
22 22
23 23 # Re-raise errors caught by the controller.
24 24 class AttachmentsController; def rescue_action(e) raise e end; end
25 25
26 26 class AttachmentsControllerTest < ActionController::TestCase
27 27 fixtures :users, :projects, :roles, :members, :member_roles,
28 28 :enabled_modules, :issues, :trackers, :attachments,
29 29 :versions, :wiki_pages, :wikis, :documents
30 30
31 31 def setup
32 32 @controller = AttachmentsController.new
33 33 @request = ActionController::TestRequest.new
34 34 @response = ActionController::TestResponse.new
35 35 Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
36 36 User.current = nil
37 37 end
38 38
39 39 def test_show_diff
40 40 ['inline', 'sbs'].each do |dt|
41 41 # 060719210727_changeset_utf8.diff
42 42 get :show, :id => 14, :type => dt
43 43 assert_response :success
44 44 assert_template 'diff'
45 45 assert_equal 'text/html', @response.content_type
46 46 assert_tag 'th',
47 47 :attributes => {:class => /filename/},
48 48 :content => /issues_controller.rb\t\(rΓ©vision 1484\)/
49 49 assert_tag 'td',
50 50 :attributes => {:class => /line-code/},
51 51 :content => /Demande créée avec succès/
52 52 end
53 53 end
54 54
55 def test_show_diff_should_strip_non_utf8_content
56 ['inline', 'sbs'].each do |dt|
57 # 060719210727_changeset_iso8859-1.diff
58 get :show, :id => 5, :type => dt
59 assert_response :success
60 assert_template 'diff'
61 assert_equal 'text/html', @response.content_type
62 assert_tag 'th',
63 :attributes => {:class => /filename/},
64 :content => /issues_controller.rb\t\(rvision 1484\)/
65 assert_tag 'td',
66 :attributes => {:class => /line-code/},
67 :content => /Demande cre avec succs/
55 def test_show_diff_replcace_cannot_convert_content
56 with_settings :repositories_encodings => 'UTF-8' do
57 ['inline', 'sbs'].each do |dt|
58 # 060719210727_changeset_iso8859-1.diff
59 get :show, :id => 5
60 assert_response :success
61 assert_template 'diff'
62 assert_equal 'text/html', @response.content_type
63 assert_tag 'th',
64 :attributes => {:class => "filename"},
65 :content => /issues_controller.rb\t\(r\?vision 1484\)/
66 assert_tag 'td',
67 :attributes => {:class => /line-code/},
68 :content => /Demande cr\?\?e avec succ\?s/
69 end
68 70 end
69 71 end
70 72
71 73 def test_show_text_file
72 74 get :show, :id => 4
73 75 assert_response :success
74 76 assert_template 'file'
75 77 assert_equal 'text/html', @response.content_type
76 78 end
77 79
78 80 def test_show_text_file_utf_8
79 81 set_tmp_attachments_directory
80 82 a = Attachment.new(:container => Issue.find(1),
81 83 :file => uploaded_test_file("japanese-utf-8.txt", "text/plain"),
82 84 :author => User.find(1))
83 85 assert a.save
84 86 assert_equal 'japanese-utf-8.txt', a.filename
85 87
86 88 str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
87 89 str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
88 90
89 91 get :show, :id => a.id
90 92 assert_response :success
91 93 assert_template 'file'
92 94 assert_equal 'text/html', @response.content_type
93 95 assert_tag :tag => 'th',
94 96 :content => '1',
95 97 :attributes => { :class => 'line-num' },
96 98 :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
97 99 end
98 100
99 def test_show_text_file_should_strip_non_utf8_content
101 def test_show_text_file_replcace_cannot_convert_content
100 102 set_tmp_attachments_directory
101 a = Attachment.new(:container => Issue.find(1),
102 :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
103 :author => User.find(1))
104 assert a.save
105 assert_equal 'iso8859-1.txt', a.filename
106
107 get :show, :id => a.id
108 assert_response :success
109 assert_template 'file'
110 assert_equal 'text/html', @response.content_type
111 assert_tag :tag => 'th',
112 :content => '7',
113 :attributes => { :class => 'line-num' },
114 :sibling => { :tag => 'td', :content => /Demande cre avec succs/ }
103 with_settings :repositories_encodings => 'UTF-8' do
104 a = Attachment.new(:container => Issue.find(1),
105 :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
106 :author => User.find(1))
107 assert a.save
108 assert_equal 'iso8859-1.txt', a.filename
109
110 get :show, :id => a.id
111 assert_response :success
112 assert_template 'file'
113 assert_equal 'text/html', @response.content_type
114 assert_tag :tag => 'th',
115 :content => '7',
116 :attributes => { :class => 'line-num' },
117 :sibling => { :tag => 'td', :content => /Demande cr\?\?e avec succ\?s/ }
118 end
115 119 end
116 120
117 121 def test_show_text_file_should_send_if_too_big
118 122 Setting.file_max_size_displayed = 512
119 123 Attachment.find(4).update_attribute :filesize, 754.kilobyte
120 124
121 125 get :show, :id => 4
122 126 assert_response :success
123 127 assert_equal 'application/x-ruby', @response.content_type
124 128 end
125 129
126 130 def test_show_other
127 131 get :show, :id => 6
128 132 assert_response :success
129 133 assert_equal 'application/octet-stream', @response.content_type
130 134 end
131 135
132 136 def test_show_file_from_private_issue_without_permission
133 137 get :show, :id => 15
134 138 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2F15'
135 139 end
136 140
137 141 def test_show_file_from_private_issue_with_permission
138 142 @request.session[:user_id] = 2
139 143 get :show, :id => 15
140 144 assert_response :success
141 145 assert_tag 'h2', :content => /private.diff/
142 146 end
143 147
144 148 def test_download_text_file
145 149 get :download, :id => 4
146 150 assert_response :success
147 151 assert_equal 'application/x-ruby', @response.content_type
148 152 end
149 153
150 154 def test_download_should_assign_content_type_if_blank
151 155 Attachment.find(4).update_attribute(:content_type, '')
152 156
153 157 get :download, :id => 4
154 158 assert_response :success
155 159 assert_equal 'text/x-ruby', @response.content_type
156 160 end
157 161
158 162 def test_download_missing_file
159 163 get :download, :id => 2
160 164 assert_response 404
161 165 end
162 166
163 167 def test_anonymous_on_private_private
164 168 get :download, :id => 7
165 169 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdownload%2F7'
166 170 end
167 171
168 172 def test_destroy_issue_attachment
169 173 issue = Issue.find(3)
170 174 @request.session[:user_id] = 2
171 175
172 176 assert_difference 'issue.attachments.count', -1 do
173 177 post :destroy, :id => 1
174 178 end
175 179 # no referrer
176 180 assert_redirected_to '/projects/ecookbook'
177 181 assert_nil Attachment.find_by_id(1)
178 182 j = issue.journals.find(:first, :order => 'created_on DESC')
179 183 assert_equal 'attachment', j.details.first.property
180 184 assert_equal '1', j.details.first.prop_key
181 185 assert_equal 'error281.txt', j.details.first.old_value
182 186 end
183 187
184 188 def test_destroy_wiki_page_attachment
185 189 @request.session[:user_id] = 2
186 190 assert_difference 'Attachment.count', -1 do
187 191 post :destroy, :id => 3
188 192 assert_response 302
189 193 end
190 194 end
191 195
192 196 def test_destroy_project_attachment
193 197 @request.session[:user_id] = 2
194 198 assert_difference 'Attachment.count', -1 do
195 199 post :destroy, :id => 8
196 200 assert_response 302
197 201 end
198 202 end
199 203
200 204 def test_destroy_version_attachment
201 205 @request.session[:user_id] = 2
202 206 assert_difference 'Attachment.count', -1 do
203 207 post :destroy, :id => 9
204 208 assert_response 302
205 209 end
206 210 end
207 211
208 212 def test_destroy_without_permission
209 213 post :destroy, :id => 3
210 214 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdestroy%2F3'
211 215 assert Attachment.find_by_id(3)
212 216 end
213 217 end
General Comments 0
You need to be logged in to leave comments. Login now