rails_uploads 0.1.5 → 0.2.0

data/test/{validators_test.rb → unit/local_validators_test.rb}

@@ -1,68 +1,62 @@
 require 'test_helper'
 
-class ValidatorsTest < ActiveSupport::TestCase
-  include ActionDispatch::TestProcess
+class LocalValidatorsTest < ActiveSupport::TestCase
 
-  setup :create_record
+  setup do
+    @record = ValidationUpload.new
+  end
 
   test "should check if file is present" do
-
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_presence')], @record.errors[:file_presence]
 
-    @record.image_presence = fixture_file_upload(::File.join('', 'image.jpg'), 'image/jpeg')
+    @record.image_presence = fixture_file_upload('/image.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [], @record.errors[:image_presence]
-
   end
 
   test "should check the file content type" do
-
-    @record.image_content_type = fixture_file_upload(::File.join('', 'file.txt'), 'text/plain')
+    @record.image_content_type = fixture_file_upload('/file.txt', 'text/plain')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_content_type', :types => 'jpg')], @record.errors[:image_content_type]
 
-    @record.file_content_type = fixture_file_upload(::File.join('', 'image.jpg'), 'image/jpeg')
+    @record.file_content_type = fixture_file_upload('/image.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_content_type', :types => 'txt')], @record.errors[:file_content_type]
-
   end
 
   test "should check the file size" do
-
-    @record.file_size = fixture_file_upload(::File.join('', 'file_big.txt'), 'text/plain')
+    @record.file_size = fixture_file_upload('/file_big.txt', 'text/plain')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_size_less_than', :less_than => 15.kilobytes)], @record.errors[:file_size]
 
-    @record.file_size = fixture_file_upload(::File.join('', 'file_empty.txt'), 'text/plain')
+    @record.file_size = fixture_file_upload('/file_empty.txt', 'text/plain')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_size_greater_than', :greater_than => 10.bytes)], @record.errors[:file_size]
 
-    @record.file_size = fixture_file_upload(::File.join('', 'file.txt'), 'text/plain')
+    @record.file_size = fixture_file_upload('/file.txt', 'text/plain')
     assert !@record.valid?
     assert_equal [], @record.errors[:file_size]
 
-    @record.image_size = fixture_file_upload(::File.join('', 'image_big.jpg'), 'image/jpeg')
+    @record.image_size = fixture_file_upload('/image_big.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_size_in', :greater_than => 2.kilobytes, :less_than => 60.kilobytes)], @record.errors[:image_size]
 
-    @record.image_size = fixture_file_upload(::File.join('', 'image_empty.jpg'), 'image/jpeg')
+    @record.image_size = fixture_file_upload('/image_empty.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [I18n.t('errors.messages.attachment_size_in', :greater_than => 2.kilobytes, :less_than => 60.kilobytes)], @record.errors[:image_size]
 
-    @record.image_size = fixture_file_upload(::File.join('', 'image.jpg'), 'image/jpeg')
+    @record.image_size = fixture_file_upload('/image.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [], @record.errors[:image_size]
-
   end
 
   test "should check all the validations together" do
-
-    @record.file_all = fixture_file_upload(::File.join('', 'file.txt'), 'text/plain')
+    @record.file_all = fixture_file_upload('/file.txt', 'text/plain')
     assert !@record.valid?
     assert_equal [], @record.errors[:file_all]
 
-    @record.image_all = fixture_file_upload(::File.join('', 'image.jpg'), 'image/jpeg')
+    @record.image_all = fixture_file_upload('/image.jpg', 'image/jpeg')
     assert !@record.valid?
     assert_equal [], @record.errors[:image_all]
 
@@ -71,13 +65,6 @@ class ValidatorsTest < ActiveSupport::TestCase
 
     assert !@record.valid?
     assert_equal [], @record.errors[:image_default]
-
-  end
-
-  protected
-
-  def create_record
-    @record = ValidationUpload.new
   end
 
 end 

data/test/unit/s3_file_record_tes.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class S3FileRecordTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    @record = FileUpload.create(:file => fixture_file_upload('/file.txt', 'text/plain'))
+  end
+
+  test "should maintain properties and delete correctly" do
+    assert @record.file.exists?
+    assert_equal 11, @record.file.size
+    assert_equal '.txt', @record.file.extname
+
+    uploads_url = @record.file.url
+    @record.destroy
+    assert_not_object_s3 uploads_url
+    assert !@record.file.exists?
+  end
+
+end

data/test/unit/s3_file_string_tes.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class S3FileStringTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    filename = 'file.txt'
+    fixture_file_upload_s3 "/#{filename}", 'text/plain', ::File.join('uploads', 'files', filename)
+    @file = RailsUploads::Types::File.new(filename)
+  end
+
+  test "should maintain properties and delete correctly" do
+    assert @file.exists?
+    assert_equal 11, @file.size
+    assert_equal '.txt', @file.extname
+    assert_equal ::File.join('uploads', 'files', @file.filename), @file.path
+
+    uploads_url = @file.url
+    @file.delete
+    assert_not_object_s3 uploads_url
+    assert !@file.exists?
+  end
+
+end

data/test/unit/s3_file_upload_tes.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class S3FileUploadTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3 
+    @file = RailsUploads::Types::File.new(fixture_file_upload('/image.jpg', 'image/jpeg'))
+  end
+
+  test "file should exists and mantain properties" do
+    assert @file.exists?
+    assert_equal 58841, @file.size
+    assert_equal '.jpg', @file.extname
+  end
+
+  test "should store/delete file correctly and accept cdn" do
+    @file.store
+    uploads_url = @file.url
+    assert_object_s3 uploads_url
+
+    base_url = 'http://cdn.example.com'
+    Rails.application.config.uploads.base_url = base_url
+    assert_equal ::File.join(base_url, @file.path), @file.url
+    Rails.application.config.uploads.base_url = ''
+
+    @file.delete
+    assert_not_object_s3 uploads_url
+    assert !@file.exists?
+  end
+
+end

data/test/unit/s3_image_record_tes.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class S3ImageRecordTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    @record = ImageUpload.create(:image => fixture_file_upload('/image.jpg', 'image/jpeg'))
+  end
+
+  test "should save/destory main image and thumbs" do
+    original = @record.image.url
+    big = @record.image.url(:big)
+    small = @record.image.url(:small)
+
+    assert_object_s3 original
+    assert_object_s3 big
+    assert_object_s3 small
+    
+    @record.destroy
+   
+    assert_not_object_s3 original
+    assert_not_object_s3 big
+    assert_not_object_s3 small
+  end
+
+end

data/test/unit/s3_image_string_tes.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class S3ImageStringTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    filename = 'image.jpg'
+    fixture_file_upload_s3 "/#{filename}", 'image/jpeg', ::File.join('uploads', 'images', 'original', filename)
+    fixture_file_upload_s3 "/#{filename}", 'image/jpeg', ::File.join('uploads', 'images', 'big', filename)
+    fixture_file_upload_s3 "/#{filename}", 'image/jpeg', ::File.join('uploads', 'images', 'small', filename)
+    options = { :presets => [:small, :big] }
+    @image = RailsUploads::Types::Image.new(filename, options)
+  end
+
+  test "should save/destory main image and thumbs" do
+    original = @image.url
+    big = @image.url(:big)
+    small = @image.url(:small)
+
+    assert_object_s3 original
+    assert_object_s3 big
+    assert_object_s3 small
+
+    @image.delete
+   
+    assert_not_object_s3 original
+    assert_not_object_s3 big
+    assert_not_object_s3 small
+  end
+
+end

data/test/unit/s3_image_upload_tes.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class S3ImageUploadTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    options = { :presets => [:small, :big] }
+    @image = RailsUploads::Types::Image.new(fixture_file_upload('/image.jpg', 'image/jpeg'), options)
+    @image.store
+  end
+
+  test "should save/destory main image and thumbs" do
+    original = @image.url
+    big = @image.url(:big)
+    small = @image.url(:small)
+
+    assert_object_s3 original
+    assert_object_s3 big
+    assert_object_s3 small
+
+    @image.delete
+   
+    assert_not_object_s3 original
+    assert_not_object_s3 big
+    assert_not_object_s3 small
+  end
+
+end

data/test/unit/s3_records_tes.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class S3RecordsTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+  end
+  
+  test "should save/update/destroy from the database and save/destroy the file" do
+    record = FileUpload.create(:file => fixture_file_upload('/image.jpg', 'image/jpeg'))
+    image_filename = record.file.filename
+    image_url = record.file.url
+    assert_object_s3 image_url
+
+    record.update_attributes :file => fixture_file_upload('/file.txt', 'text/plain')
+    file_filename = record.file.filename 
+    assert_not_equal image_filename, file_filename
+    file_url = record.file.url
+    assert_not_object_s3 image_url
+    assert_object_s3 file_url
+
+    record.destroy
+    assert_not_object_s3 file_url
+  end
+
+  test "should take default file/image and shouldn't store/delete it" do
+    record = FileUpload.create
+    file_filename = 'file.txt'
+    assert_equal ::File.join('uploads', 'files', file_filename), record.file.path
+    file_url = record.file.url
+    assert_object_s3 file_url
+
+    record.destroy
+    assert record.file.exists?
+    assert_object_s3 file_url
+  
+    record = ImageUpload.create
+    image_filename = 'image.jpg'
+    assert_equal ::File.join('uploads', 'images', 'original', image_filename), record.image.path
+    image_original_url = record.image.url
+    assert_object_s3 image_original_url
+    assert_equal ::File.join('uploads', 'images', 'small', image_filename), record.image.path(:small)
+    image_small_url = record.image.url(:small)
+    assert_object_s3 image_small_url
+    assert_equal ::File.join('uploads', 'images', 'big', image_filename), record.image.path(:big)
+    image_big_url = record.image.url(:big)
+    assert_object_s3 image_big_url
+
+    record.destroy
+    assert record.image.exists?
+    assert_object_s3 image_original_url
+    assert_object_s3 image_small_url
+    assert_object_s3 image_big_url
+  end
+
+end

data/test/unit/s3_validators_tes.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+class S3ValidatorsTest < ActiveSupport::TestCase
+
+  setup do
+    load_s3
+    @record = ValidationUpload.new
+  end
+
+  test "should check if file is present" do
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_presence')], @record.errors[:file_presence]
+
+    @record.image_presence = fixture_file_upload('/image.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [], @record.errors[:image_presence]
+  end
+
+  test "should check the file content type" do
+    @record.image_content_type = fixture_file_upload('/file.txt', 'text/plain')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_content_type', :types => 'jpg')], @record.errors[:image_content_type]
+
+    @record.file_content_type = fixture_file_upload('/image.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_content_type', :types => 'txt')], @record.errors[:file_content_type]
+  end
+
+  test "should check the file size" do
+    @record.file_size = fixture_file_upload('/file_big.txt', 'text/plain')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_size_less_than', :less_than => 15.kilobytes)], @record.errors[:file_size]
+
+    @record.file_size = fixture_file_upload('/file_empty.txt', 'text/plain')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_size_greater_than', :greater_than => 10.bytes)], @record.errors[:file_size]
+
+    @record.file_size = fixture_file_upload('/file.txt', 'text/plain')
+    assert !@record.valid?
+    assert_equal [], @record.errors[:file_size]
+
+    @record.image_size = fixture_file_upload('/image_big.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_size_in', :greater_than => 2.kilobytes, :less_than => 60.kilobytes)], @record.errors[:image_size]
+
+    @record.image_size = fixture_file_upload('/image_empty.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [I18n.t('errors.messages.attachment_size_in', :greater_than => 2.kilobytes, :less_than => 60.kilobytes)], @record.errors[:image_size]
+
+    @record.image_size = fixture_file_upload('/image.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [], @record.errors[:image_size]
+  end
+
+  test "should check all the validations together" do
+    @record.file_all = fixture_file_upload('/file.txt', 'text/plain')
+    assert !@record.valid?
+    assert_equal [], @record.errors[:file_all]
+
+    @record.image_all = fixture_file_upload('/image.jpg', 'image/jpeg')
+    assert !@record.valid?
+    assert_equal [], @record.errors[:image_all]
+
+    assert !@record.valid?
+    assert_equal [], @record.errors[:file_default]
+
+    assert !@record.valid?
+    assert_equal [], @record.errors[:image_default]
+  end
+
+end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_uploads
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.8
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +73,8 @@ files:
 - lib/rails_uploads/engine.rb
 - lib/rails_uploads/magick/image.rb
 - lib/rails_uploads/railtie.rb
+- lib/rails_uploads/storages/local.rb
+- lib/rails_uploads/storages/s3.rb
 - lib/rails_uploads/types/file.rb
 - lib/rails_uploads/types/image.rb
 - lib/rails_uploads/validators/attachment_content_type_validator.rb
@@ -93,6 +111,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/s3.yml
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20130108201834_create_file_uploads.rb
@@ -106,10 +125,10 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/uploads/files/default.txt
 - test/dummy/public/uploads/files/file.txt
-- test/dummy/public/uploads/images/original/default.jpg
+- test/dummy/public/uploads/images/big/image.jpg
 - test/dummy/public/uploads/images/original/image.jpg
+- test/dummy/public/uploads/images/small/image.jpg
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
@@ -119,22 +138,101 @@ files:
 - test/dummy/test/fixtures/image.jpg
 - test/dummy/test/fixtures/image_big.jpg
 - test/dummy/test/fixtures/image_empty.jpg
-- test/file_string_test.rb
-- test/file_upload_test.rb
+- test/dummy/tmp/uploads/files/13687482983108968.jpg
+- test/dummy/tmp/uploads/files/13687483348482658.jpg
+- test/dummy/tmp/uploads/files/13687483563901100.jpg
+- test/dummy/tmp/uploads/files/13687484108914220.jpg
+- test/dummy/tmp/uploads/files/13687489381697390.jpg
+- test/dummy/tmp/uploads/files/13687490968011022.jpg
+- test/dummy/tmp/uploads/files/13687491524768450.jpg
+- test/dummy/tmp/uploads/files/13687494425396302.jpg
+- test/dummy/tmp/uploads/files/13687513450654020.jpg
+- test/dummy/tmp/uploads/files/13687514839373922.txt
+- test/dummy/tmp/uploads/files/13688181722986792.jpg
+- test/dummy/tmp/uploads/files/13688181729459798.jpg
+- test/dummy/tmp/uploads/images/big/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/big/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/big/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/big/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/big/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/big/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/big/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/big/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/big/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/big/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/big/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/big/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/big/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/big/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/big/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/big/13688978966174670.jpg
+- test/dummy/tmp/uploads/images/original/13687482977916958.jpg
+- test/dummy/tmp/uploads/images/original/13687482979328390.jpg
+- test/dummy/tmp/uploads/images/original/13687482981277580.jpg
+- test/dummy/tmp/uploads/images/original/13687483343313990.jpg
+- test/dummy/tmp/uploads/images/original/13687483344710930.jpg
+- test/dummy/tmp/uploads/images/original/13687483346647770.jpg
+- test/dummy/tmp/uploads/images/original/13687483558679350.jpg
+- test/dummy/tmp/uploads/images/original/13687483560070410.jpg
+- test/dummy/tmp/uploads/images/original/13687483562001660.jpg
+- test/dummy/tmp/uploads/images/original/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/original/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/original/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/original/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/original/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/original/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/original/13688181723027610.jpg
+- test/dummy/tmp/uploads/images/original/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/original/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/original/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/original/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/original/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/original/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/original/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/original/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/original/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/original/13688978966174670.jpg
+- test/dummy/tmp/uploads/images/small/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/small/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/small/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/small/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/small/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/small/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/small/13688181723027610.jpg
+- test/dummy/tmp/uploads/images/small/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/small/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/small/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/small/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/small/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/small/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/small/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/small/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/small/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/small/13688978966174670.jpg
 - test/fixtures/file.txt
 - test/fixtures/file_big.txt
 - test/fixtures/file_empty.txt
 - test/fixtures/image.jpg
 - test/fixtures/image_big.jpg
 - test/fixtures/image_empty.jpg
-- test/generate_test.rb
-- test/image_presets_test.rb
-- test/image_string_test.rb
-- test/image_upload_test.rb
-- test/rails_uploads_test.rb
-- test/records_test.rb
+- test/integration/local_generate_test.rb
 - test/test_helper.rb
-- test/validators_test.rb
+- test/unit/local_file_record_test.rb
+- test/unit/local_file_string_test.rb
+- test/unit/local_file_upload_test.rb
+- test/unit/local_image_record_test.rb
+- test/unit/local_image_string_test.rb
+- test/unit/local_image_upload_test.rb
+- test/unit/local_records_test.rb
+- test/unit/local_validators_test.rb
+- test/unit/s3_file_record_tes.rb
+- test/unit/s3_file_string_tes.rb
+- test/unit/s3_file_upload_tes.rb
+- test/unit/s3_image_record_tes.rb
+- test/unit/s3_image_string_tes.rb
+- test/unit/s3_image_upload_tes.rb
+- test/unit/s3_records_tes.rb
+- test/unit/s3_validators_tes.rb
 homepage: https://github.com/mattways/rails_uploads
 licenses: []
 post_install_message: 
@@ -153,7 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- ImageMagick
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
@@ -184,6 +283,7 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/s3.yml
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20130108201834_create_file_uploads.rb
@@ -197,10 +297,10 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/uploads/files/default.txt
 - test/dummy/public/uploads/files/file.txt
-- test/dummy/public/uploads/images/original/default.jpg
+- test/dummy/public/uploads/images/big/image.jpg
 - test/dummy/public/uploads/images/original/image.jpg
+- test/dummy/public/uploads/images/small/image.jpg
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
@@ -210,19 +310,98 @@ test_files:
 - test/dummy/test/fixtures/image.jpg
 - test/dummy/test/fixtures/image_big.jpg
 - test/dummy/test/fixtures/image_empty.jpg
-- test/file_string_test.rb
-- test/file_upload_test.rb
+- test/dummy/tmp/uploads/files/13687482983108968.jpg
+- test/dummy/tmp/uploads/files/13687483348482658.jpg
+- test/dummy/tmp/uploads/files/13687483563901100.jpg
+- test/dummy/tmp/uploads/files/13687484108914220.jpg
+- test/dummy/tmp/uploads/files/13687489381697390.jpg
+- test/dummy/tmp/uploads/files/13687490968011022.jpg
+- test/dummy/tmp/uploads/files/13687491524768450.jpg
+- test/dummy/tmp/uploads/files/13687494425396302.jpg
+- test/dummy/tmp/uploads/files/13687513450654020.jpg
+- test/dummy/tmp/uploads/files/13687514839373922.txt
+- test/dummy/tmp/uploads/files/13688181722986792.jpg
+- test/dummy/tmp/uploads/files/13688181729459798.jpg
+- test/dummy/tmp/uploads/images/big/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/big/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/big/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/big/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/big/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/big/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/big/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/big/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/big/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/big/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/big/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/big/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/big/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/big/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/big/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/big/13688978966174670.jpg
+- test/dummy/tmp/uploads/images/original/13687482977916958.jpg
+- test/dummy/tmp/uploads/images/original/13687482979328390.jpg
+- test/dummy/tmp/uploads/images/original/13687482981277580.jpg
+- test/dummy/tmp/uploads/images/original/13687483343313990.jpg
+- test/dummy/tmp/uploads/images/original/13687483344710930.jpg
+- test/dummy/tmp/uploads/images/original/13687483346647770.jpg
+- test/dummy/tmp/uploads/images/original/13687483558679350.jpg
+- test/dummy/tmp/uploads/images/original/13687483560070410.jpg
+- test/dummy/tmp/uploads/images/original/13687483562001660.jpg
+- test/dummy/tmp/uploads/images/original/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/original/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/original/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/original/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/original/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/original/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/original/13688181723027610.jpg
+- test/dummy/tmp/uploads/images/original/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/original/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/original/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/original/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/original/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/original/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/original/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/original/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/original/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/original/13688978966174670.jpg
+- test/dummy/tmp/uploads/images/small/13687484103672162.jpg
+- test/dummy/tmp/uploads/images/small/13687484106303082.jpg
+- test/dummy/tmp/uploads/images/small/13687489377129980.jpg
+- test/dummy/tmp/uploads/images/small/13687489379459820.jpg
+- test/dummy/tmp/uploads/images/small/13687490965463210.jpg
+- test/dummy/tmp/uploads/images/small/13687491522552230.jpg
+- test/dummy/tmp/uploads/images/small/13688181723027610.jpg
+- test/dummy/tmp/uploads/images/small/13688181724596422.jpg
+- test/dummy/tmp/uploads/images/small/13688181727051510.jpg
+- test/dummy/tmp/uploads/images/small/13688259257147068.jpg
+- test/dummy/tmp/uploads/images/small/13688280071286788.jpg
+- test/dummy/tmp/uploads/images/small/13688281527981960.jpg
+- test/dummy/tmp/uploads/images/small/13688360981527310.jpg
+- test/dummy/tmp/uploads/images/small/13688360983686640.jpg
+- test/dummy/tmp/uploads/images/small/13688977138132322.jpg
+- test/dummy/tmp/uploads/images/small/13688977290079510.jpg
+- test/dummy/tmp/uploads/images/small/13688978966174670.jpg
 - test/fixtures/file.txt
 - test/fixtures/file_big.txt
 - test/fixtures/file_empty.txt
 - test/fixtures/image.jpg
 - test/fixtures/image_big.jpg
 - test/fixtures/image_empty.jpg
-- test/generate_test.rb
-- test/image_presets_test.rb
-- test/image_string_test.rb
-- test/image_upload_test.rb
-- test/rails_uploads_test.rb
-- test/records_test.rb
+- test/integration/local_generate_test.rb
 - test/test_helper.rb
-- test/validators_test.rb
+- test/unit/local_file_record_test.rb
+- test/unit/local_file_string_test.rb
+- test/unit/local_file_upload_test.rb
+- test/unit/local_image_record_test.rb
+- test/unit/local_image_string_test.rb
+- test/unit/local_image_upload_test.rb
+- test/unit/local_records_test.rb
+- test/unit/local_validators_test.rb
+- test/unit/s3_file_record_tes.rb
+- test/unit/s3_file_string_tes.rb
+- test/unit/s3_file_upload_tes.rb
+- test/unit/s3_image_record_tes.rb
+- test/unit/s3_image_string_tes.rb
+- test/unit/s3_image_upload_tes.rb
+- test/unit/s3_records_tes.rb
+- test/unit/s3_validators_tes.rb