From 5cdd7db7bc5a51ebd4b0c1022cd9331d1b0cc394 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Thu, 12 Mar 2015 08:38:45 -0300 Subject: [PATCH] folder: let word wrap work (do not short filenames) --- app/helpers/folder_helper.rb | 7 ++----- app/models/uploaded_file.rb | 4 ---- app/views/shared/_content_item.html.erb | 4 ++-- lib/short_filename.rb | 21 --------------------- plugins/context_content/views/blocks/context_content.html.erb | 2 +- test/unit/application_helper_test.rb | 12 ------------ test/unit/short_filename_test.rb | 34 ---------------------------------- 7 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 lib/short_filename.rb delete mode 100644 test/unit/short_filename_test.rb diff --git a/app/helpers/folder_helper.rb b/app/helpers/folder_helper.rb index 7911870..a1b43d0 100644 --- a/app/helpers/folder_helper.rb +++ b/app/helpers/folder_helper.rb @@ -1,8 +1,5 @@ -require 'short_filename' - module FolderHelper - include ShortFilename include ArticleHelper def list_contents(configure={}) @@ -10,8 +7,8 @@ module FolderHelper configure[:list_type] ||= :folder if !configure[:contents].blank? configure[:contents] = configure[:contents].paginate( - :order => "updated_at DESC", - :per_page => 10, + :order => "name ASC", + :per_page => 30, :page => params[:npage] ) diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index ee6bd60..dcb0008 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -1,5 +1,3 @@ -require 'short_filename' - # Article type that handles uploaded files. # # Limitation: only file metadata are versioned. Only the latest version @@ -14,8 +12,6 @@ class UploadedFile < Article track_actions :upload_image, :after_create, :keep_params => ["view_url", "thumbnail_path", "parent.url", "parent.name"], :if => Proc.new { |a| a.published? && a.image? && !a.parent.nil? && a.parent.gallery? }, :custom_target => :parent - include ShortFilename - def title if self.name.present? then self.name else self.filename end end diff --git a/app/views/shared/_content_item.html.erb b/app/views/shared/_content_item.html.erb index 7bd58c8..c8987d7 100644 --- a/app/views/shared/_content_item.html.erb +++ b/app/views/shared/_content_item.html.erb @@ -4,8 +4,8 @@ <%= display_content_icon(content) %> - <%= link_to(short_filename_upper_ext(content.name), content.url) %> + <%= link_to(content.name, content.url) %> <%= _("Published at: #{show_date(content.updated_at)}") %> - \ No newline at end of file + diff --git a/lib/short_filename.rb b/lib/short_filename.rb deleted file mode 100644 index f34e6b1..0000000 --- a/lib/short_filename.rb +++ /dev/null @@ -1,21 +0,0 @@ -module ShortFilename - - def short_filename(filename, limit_chars = 43) - extname = File.extname(filename) - basename = File.basename(filename,extname) - return shrink(basename, extname, limit_chars) + extname - end - - def short_filename_upper_ext(filename, limit_chars = 43) - extname = File.extname(filename) - display_name = shrink(File.basename(filename, extname), extname, limit_chars) - return extname.present? ? (display_name + ' - ' + extname.upcase.delete(".")) : display_name - end - - def shrink(filename, extname, limit_chars) - return filename if filename.size <= limit_chars - str_complement = '(...)' - return filename[0..(limit_chars - extname.size - str_complement.size - 1)] + str_complement - end - -end diff --git a/plugins/context_content/views/blocks/context_content.html.erb b/plugins/context_content/views/blocks/context_content.html.erb index 88c8f60..b68224a 100644 --- a/plugins/context_content/views/blocks/context_content.html.erb +++ b/plugins/context_content/views/blocks/context_content.html.erb @@ -6,7 +6,7 @@ <%= instance_eval(&block.content_image(content)) if block.show_image %> <% if block.show_name %> -
<%= short_filename(content.name, 30) %>
+
<%= content.name %>
<% end %> diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index 32c358a..9380071 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -564,18 +564,6 @@ class ApplicationHelperTest < ActionView::TestCase assert_equal environment.theme, current_theme end - should 'trunc to 15 chars the big filename' do - assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15) - end - - should 'trunc to default limit the big filename' do - assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3') - end - - should 'does not trunc short filename' do - assert_equal 'filename.mp3', short_filename('filename.mp3') - end - should 'return nil when :show_balloon_with_profile_links_when_clicked is not enabled in environment' do env = Environment.default env.stubs(:enabled?).with(:show_balloon_with_profile_links_when_clicked).returns(false) diff --git a/test/unit/short_filename_test.rb b/test/unit/short_filename_test.rb deleted file mode 100644 index 0d561ac..0000000 --- a/test/unit/short_filename_test.rb +++ /dev/null @@ -1,34 +0,0 @@ -require_relative "../test_helper" - -class NoosferoFilenamesTest < ActiveSupport::TestCase - - include ShortFilename - - should 'trunc to 15 chars the big filename' do - assert_equal 'AGENDA(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15) - end - - should 'trunc to default limit the big filename' do - assert_equal 'AGENDA_CULTURA_-_FESTA_DE_VAQUEIRO(...).mp3', short_filename('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3') - end - - should 'does not trunc short filename' do - assert_equal 'filename.mp3', short_filename('filename.mp3') - end - - should 'highlight the file extansion' do - assert_equal 'AGENDA(...) - MP3', short_filename_upper_ext('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.mp3',15) - - assert_equal 'AGENDA - MP3', short_filename_upper_ext('AGENDA.mp3',15) - end - - should 'return the full filename if its size is smaller than the limit' do - assert_equal 'AGENDA', shrink('AGENDA', 'mp3', 15) - end - - should 'shrink the filename if its size is bigger than the limit' do - assert_equal 'AGENDA(...)', shrink('AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA', 'mp3', 14) - end - -end - -- libgit2 0.21.2