ActionItem24: checkpoint

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1157 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem24: checkpoint
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1157 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent eff1b783
Showing 10 changed files with 64 additions and 7 deletions Show diff stats
app/models/thumbnail.rb
app/models/uploaded_file.rb
db/migrate/007_create_articles.rb
db/migrate/020_create_thumbnails.rb
doc/README_FOR_APP
test/fixtures/files/rails.png
test/functional/cms_controller_test.rb
test/mocks/test/uploaded_file.rb
test/unit/thumbnail_test.rb
test/unit/uploaded_file_test.rb
@@ -0,0 +1,5 @@
+class Thumbnail < ActiveRecord::Base
+  has_attachment :storage => :file_system,
+    :content_type => :image
+  validates_as_attachment
+end
@@ -5,7 +5,10 @@
 class UploadedFile < Article
   # FIXME need to define min/max file size
-  has_attachment :thumbnails => { :icon => [24,24] }, :storage => :file_system
+  has_attachment :storage => :file_system,
+    :thumbnails => { :icon => [24,24] },
+    :thumbnail_class => Thumbnail
+      
   validates_as_attachment
@@ -35,11 +35,6 @@ class CreateArticles &lt; ActiveRecord::Migration
       # attachment_fu data for images
       t.column :height,       :integer  # in pixels
       t.column :width,        :integer  # in pixels
-
-      # attachment_fu data for thumbnails
-      t.column :parent_id,    :integer  # id of parent image (on the same table, a self-referencing foreign-key).
-      t.column :thumbnail,    :string   # the 'type' of thumbnail this attachment record describes.
-
     end
     Article.create_versioned_table
@@ -0,0 +1,22 @@
+class CreateThumbnails < ActiveRecord::Migration
+  def self.up
+    create_table :thumbnails do |t|
+      # attachment_fu data for all uploaded files
+      t.column :size,         :integer  # file size in bytes
+      t.column :content_type, :string   # mime type, ex: application/mp3
+      t.column :filename,     :string   # sanitized filename
+
+      # attachment_fu data for images
+      t.column :height,       :integer  # in pixels
+      t.column :width,        :integer  # in pixels
+
+      # attachment_fu data for thumbnails
+      t.column :parent_id,    :integer  # id of parent image (on the same table, a self-referencing foreign-key).
+      t.column :thumbnail,    :string   # the 'type' of thumbnail this attachment record describes.
+    end
+  end
+
+  def self.down
+    drop_table :thumbnails
+  end
+end
@@ -16,10 +16,11 @@ You need to have a Subversion client (svn) installed, as well as:
 * Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
 * rcov: http://eigenclass.org/hiki/rcov
 * Ferret: http://ferret.davebalmain.com/trac
+* RMagick: http://rmagick.rubyforge.org/
 There are Debian packages available for all of them but ferret. Try:
- # aptitude install subversion ruby rake libgettext-ruby libmocha-ruby libsqlite3-ruby rcov
+ # aptitude install subversion ruby rake libgettext-ruby libmocha-ruby libsqlite3-ruby rcov librmagick-ruby
 Ferret shall enter Debian soon (as <tt>libferret-ruby</tt>). until there you have two options:
@@ -179,6 +179,12 @@ class CmsControllerTest &lt; Test::Unit::TestCase
     assert_equal 2, file.versions(true).size
   end
+  should 'be able to upload an image' do
+    assert_difference UploadedFile, :count do
+      post :new, :type => UploadedFile.name, :profile => profile.identifier, :article => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
+    end
+  end
+
   should 'offer to create children' do
     Article.any_instance.stubs(:allow_children?).returns(true)
@@ -0,0 +1,7 @@
+require 'app/models/uploaded_file'
+
+class UploadedFile < Article
+
+  has_attachment(attachment_options.merge(:path_prefix => "test/tmp"))
+
+end
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ThumbnailTest < Test::Unit::TestCase
+
+  # FIXME add some tests
+  
+end
@@ -2,6 +2,11 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class UploadedFileTest < Test::Unit::TestCase
+  def setup
+    @profile = create_user('testinguser').person
+  end
+  attr_reader :profile
+
   should 'return a thumbnail as icon for images ' do
     f = UploadedFile.new
     f.expects(:image?).returns(true)
@@ -49,4 +54,10 @@ class UploadedFileTest &lt; Test::Unit::TestCase
     assert_equal false, UploadedFile.new.allow_children?
   end
+  should 'properly save images' do
+    file = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    file.profile = profile
+    assert file.save
+  end
+
 end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class Thumbnail < ActiveRecord::Base
	2	+ has_attachment :storage => :file_system,
	3	+ :content_type => :image
	4	+ validates_as_attachment
	5	+end
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+class CreateThumbnails < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :thumbnails do \|t\|
	4	+ # attachment_fu data for all uploaded files
	5	+ t.column :size, :integer # file size in bytes
	6	+ t.column :content_type, :string # mime type, ex: application/mp3
	7	+ t.column :filename, :string # sanitized filename
	8	+
	9	+ # attachment_fu data for images
	10	+ t.column :height, :integer # in pixels
	11	+ t.column :width, :integer # in pixels
	12	+
	13	+ # attachment_fu data for thumbnails
	14	+ t.column :parent_id, :integer # id of parent image (on the same table, a self-referencing foreign-key).
	15	+ t.column :thumbnail, :string # the 'type' of thumbnail this attachment record describes.
	16	+ end
	17	+ end
	18	+
	19	+ def self.down
	20	+ drop_table :thumbnails
	21	+ end
	22	+end
	@@ -179,6 +179,12 @@ class CmsControllerTest < Test::Unit::TestCase		@@ -179,6 +179,12 @@ class CmsControllerTest < Test::Unit::TestCase
179	assert_equal 2, file.versions(true).size	179	assert_equal 2, file.versions(true).size
180	end	180	end
181		181
		182	+ should 'be able to upload an image' do
		183	+ assert_difference UploadedFile, :count do
		184	+ post :new, :type => UploadedFile.name, :profile => profile.identifier, :article => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')}
		185	+ end
		186	+ end
		187	+
182	should 'offer to create children' do	188	should 'offer to create children' do
183	Article.any_instance.stubs(:allow_children?).returns(true)	189	Article.any_instance.stubs(:allow_children?).returns(true)
184		190
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+require 'app/models/uploaded_file'
	2	+
	3	+class UploadedFile < Article
	4	+
	5	+ has_attachment(attachment_options.merge(:path_prefix => "test/tmp"))
	6	+
	7	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class ThumbnailTest < Test::Unit::TestCase
	4	+
	5	+ # FIXME add some tests
	6	+
	7	+end
	@@ -2,6 +2,11 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -2,6 +2,11 @@ require File.dirname(__FILE__) + '/../test_helper'
2		2
3	class UploadedFileTest < Test::Unit::TestCase	3	class UploadedFileTest < Test::Unit::TestCase
4		4
		5	+ def setup
		6	+ @profile = create_user('testinguser').person
		7	+ end
		8	+ attr_reader :profile
		9	+
5	should 'return a thumbnail as icon for images ' do	10	should 'return a thumbnail as icon for images ' do
6	f = UploadedFile.new	11	f = UploadedFile.new
7	f.expects(:image?).returns(true)	12	f.expects(:image?).returns(true)
	@@ -49,4 +54,10 @@ class UploadedFileTest < Test::Unit::TestCase		@@ -49,4 +54,10 @@ class UploadedFileTest < Test::Unit::TestCase
49	assert_equal false, UploadedFile.new.allow_children?	54	assert_equal false, UploadedFile.new.allow_children?
50	end	55	end
51		56
		57	+ should 'properly save images' do
		58	+ file = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
		59	+ file.profile = profile
		60	+ assert file.save
		61	+ end
		62	+
52	end	63	end