Move title to name on uploaded files

Braulio Bhavamitra
1 parent a8a8780b
Showing 5 changed files with 21 additions and 29 deletions Show diff stats
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/models/uploaded_file.rb
db/migrate/20140221142304_move_title_virtual_field_to_name_in_uploaded_file.rb
test/unit/uploaded_file_test.rb
@@ -2,7 +2,6 @@ module CommentHelper
   def article_title(article, args = {})
     title = article.title
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog?
       unless args[:no_link]
@@ -14,8 +14,7 @@ module ContentViewerHelper
   end
   def article_title(article, args = {})
-    title = article.display_title if article.kind_of?(UploadedFile) && article.image?
-    title = article.title if title.blank?
+    title = article.title
     title = content_tag('h1', h(title), :class => 'title')
     if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
@@ -12,15 +12,12 @@ class UploadedFile &lt; Article
   include ShortFilename
-  settings_items :title, :type => 'string'
-  xss_terminate :only => [ :title ]
-
-  def title_with_default
-    title_without_default || short_filename(name, 60)
+  def title
+    if self.name.present? then self.name else self.filename end
+  end
+  def title= value
+    self.name = value
   end
-  alias_method_chain :title, :default
-
-  validates_size_of :title, :maximum => 60, :if => (lambda { |file| !file.title.blank? })
   sanitize_filename
@@ -32,10 +29,6 @@ class UploadedFile &lt; Article
     self.image? ? self.full_filename(:display).gsub(File.join(RAILS_ROOT, 'public'), '') : nil
   end
-  def display_title
-    title.blank? ? name : title
-  end
-
   def first_paragraph
     ''
   end
@@ -0,0 +1,12 @@
+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
+  def self.up
+    UploadedFile.find_each do |uploaded_file|
+      uploaded_file.name = uploaded_file.setting.delete :title
+      uploaded_file.send :update_without_callbacks
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -119,24 +119,13 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
     assert_equal 'my title', UploadedFile.new(:title => 'my title').title
   end
-  should 'limit title to 140 characters' do
-    upload = UploadedFile.new
-
-    upload.title = '+' * 61; upload.valid?
-    assert upload.errors[:title]
-
-    upload.title = '+' * 60; upload.valid?
-    assert !upload.errors[:title]
-
-  end
-
   should 'always provide a display title' do
     upload = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    assert_equal 'test.txt',  upload.display_title
+    assert_equal 'test.txt',  upload.title
     upload.title = 'My text file'
-    assert_equal 'My text file', upload.display_title
+    assert_equal 'My text file', upload.title
     upload.title = ''
-    assert_equal 'test.txt', upload.display_title
+    assert_equal 'test.txt', upload.title
   end
   should 'use name as title by default' do
	@@ -2,7 +2,6 @@ module CommentHelper		@@ -2,7 +2,6 @@ module CommentHelper
2		2
3	def article_title(article, args = {})	3	def article_title(article, args = {})
4	title = article.title	4	title = article.title
5	- title = article.display_title if article.kind_of?(UploadedFile) && article.image?
6	title = content_tag('h1', h(title), :class => 'title')	5	title = content_tag('h1', h(title), :class => 'title')
7	if article.belongs_to_blog?	6	if article.belongs_to_blog?
8	unless args[:no_link]	7	unless args[:no_link]
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class MoveTitleVirtualFieldToNameInUploadedFile < ActiveRecord::Migration
	2	+ def self.up
	3	+ UploadedFile.find_each do \|uploaded_file\|
	4	+ uploaded_file.name = uploaded_file.setting.delete :title
	5	+ uploaded_file.send :update_without_callbacks
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ say "this migration can't be reverted"
	11	+ end
	12	+end