uploader 3.1.0 → 3.1.1

data/test/rails_test/{test → spec}/factories.rb

@@ -10,5 +10,5 @@ Factory.define :upload do |f|
   f.creator {|a| a.association(:user)}
   f.uploadable {|a| a.association(:user)}
   f.caption { Factory.next(:name) }
-  f.local fixture_file_upload('rails.png', 'image/png')
+  f.local fixture_file_upload("#{::Rails.root}/spec/fixtures/rails.png", "image/png")
 end

data/test/rails_test/spec/models/upload_spec.rb

@@ -0,0 +1,149 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Upload do
+
+  it { should belong_to :uploadable }
+  it { should belong_to :creator }
+
+  it { should have_attached_file :local }
+  it { should have_attached_file :remote }
+  it { should_not allow_mass_assignment_of :creator_id }
+  it { should_not allow_mass_assignment_of :uploadable_id }
+  it { should_not allow_mass_assignment_of :uploadable_type }
+  it { should validate_attachment_size(:local).less_than(10.megabytes) }
+
+  it 'should use id_partitioning' do
+    upload = Upload.new
+    upload.stub(:id).and_return(12345)
+    upload.local = VALID_FILE
+    upload.local.path.should include("/public/system/locals/000/012/345/original/rails.png")
+    assert_equal '/system/locals/000/012/345/original/rails.png', upload.local.url(:original, false)
+  end
+
+  it 'should transliterate the filename' do
+    upload = Upload.new
+    file = fixture_file %Q{IT'sUPPERCASE!AND WeIRD.JPG}
+    upload.local = file
+    assert_equal 'itsuppercase-and-weird.jpg', upload.local.original_filename
+    file.close
+  end
+
+  it 'should set the filename using the hard file name' do
+    name = 'foo.jpg'
+    upload = Upload.new(:hard_file_name => name)
+    file = fixture_file %Q{IT'sUPPERCASE!AND WeIRD.JPG}
+    upload.local = file
+    assert_equal name, upload.local.original_filename
+    file.close
+  end
+
+  describe "Named scopes" do
+    describe "'newest' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload, :created_at => 1.day.ago)
+        @second = Factory(:upload, :created_at => 1.week.ago)
+      end
+      it "should sort by created_at" do
+        assert_equal @first, Upload.newest[0]
+        assert_equal @second, Upload.newest[1]
+      end
+    end
+    describe "'recent' named scope" do
+      before do
+        Upload.delete_all
+        @recent = Factory(:upload)
+        @not_recent = Factory(:upload, :created_at => 10.weeks.ago)
+      end
+      it "should get recent" do
+        Upload.recent.should include(@recent), "since didn't include recent upload"
+      end
+      it "should not get recent" do
+        Upload.recent.should_not include(@not_recent), "since did include recent upload"
+      end
+    end
+    describe "'by_filename' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload, :local_file_name => 'a')
+        @second = Factory(:upload, :local_file_name => 'b')
+      end
+      it "should sort by name" do
+        Upload.by_filename[0].should == @first
+        Upload.by_filename[1].should == @second
+      end
+    end
+    describe "'is_public' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload, :is_public => true)
+        @second = Factory(:upload, :is_public => false)
+      end
+      it "should find public files" do
+        Upload.is_public.should include(@first)
+        Upload.is_public.should_not include(@second)
+      end
+    end
+    describe "'pending_s3_migrations' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload)
+        @second = Factory(:upload, :remote_file_name => 'test.png')
+      end
+      it "should find pending_s3_migrations entries" do
+        Upload.pending_s3_migrations.should include(@first)
+        Upload.pending_s3_migrations.should_not include(@second)
+      end
+    end
+    describe "'images' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload) # default is png
+        @second = Factory(:upload, :local => fixture_file_upload("#{FIXTURES_PATH}test.doc", 'application/msword'))
+      end
+      it "should find images" do
+        Upload.images.should include(@first)
+        Upload.images.should_not include(@second)
+      end
+    end
+    describe "'documents' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload, :local => fixture_file_upload("#{FIXTURES_PATH}test.doc", 'application/msword'))
+        @second = Factory(:upload)
+      end
+      it "should find documents" do
+        Upload.documents.should include(@first)
+        Upload.documents.should_not include(@second)
+      end
+    end
+    describe "'files' named scope" do
+      before do
+        Upload.delete_all
+        @first = Factory(:upload, :local => fixture_file_upload("#{FIXTURES_PATH}test.pdf", 'application/pdf'))
+        @second = Factory(:upload)
+      end
+      it "should find files (not images)" do
+        Upload.files.should include(@first)
+        Upload.files.should_not include(@second)
+      end
+    end
+    describe "'created_by' named scope" do
+      before do
+        Upload.delete_all
+        @creator_id = 28
+        @first = Factory(:upload, :creator_id => @creator_id)
+        @second = Factory(:upload)
+      end
+      it "should find by creator" do
+        Upload.created_by(@creator_id).should include(@first)
+        Upload.created_by(@creator_id).should_not include(@second)
+      end
+    end
+  end
+
+  def fixture_file(name)
+    File.new(File.join(::Rails.root.to_s, 'spec', 'fixtures', 'files', name), 'rb')
+  end
+  
+end

data/test/rails_test/spec/models/user_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe User do
+        
+  before do
+    @user = Factory(:user)
+  end
+  
+  it { should have_many :uploads }
+
+  it 'should be able to upload' do
+    @user.can_upload?(@user).should be_true
+  end
+
+  it 'should not have methods from uploader mixin' do
+    assert !defined?(User.is_public)
+    assert !defined?(@user.is_image?)
+  end
+
+end

data/test/rails_test/spec/spec_helper.rb

@@ -0,0 +1,41 @@
+$:.reject! { |e| e.include? 'TextMate' }
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+
+require 'rspec/core'
+require 'rspec/mocks'
+require 'rspec/expectations'
+require 'rspec/rails'
+
+require 'shoulda'
+require 'factory_girl'
+require "paperclip/matchers"
+require 'authlogic/test_case'
+
+include ActionDispatch::TestProcess
+
+require File.expand_path(File.dirname(__FILE__) + '/factories')
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.color_enabled = true
+  config.include(RSpec::Mocks::Methods)
+  config.include(Authlogic::TestCase)
+  config.include(Paperclip::Shoulda::Matchers)
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.use_transactional_fixtures = true
+  config.use_instantiated_fixtures  = false  
+end
+
+FIXTURES_PATH = "#{::Rails.root}/spec/fixtures/"
+VALID_FILE = fixture_file_upload("#{FIXTURES_PATH}rails.png", "image/png")
+VALID_TEXT_FILE = fixture_file_upload("#{FIXTURES_PATH}test.txt", "text/plain")
+VALID_PDF_FILE = fixture_file_upload("#{FIXTURES_PATH}test.pdf", "application/pdf")
+VALID_WORD_FILE = fixture_file_upload("#{FIXTURES_PATH}test.doc", "application/word")
+VALID_EXCEL_FILE = fixture_file_upload("#{FIXTURES_PATH}test.xls", "application/excel")
+  
+class ActionController::TestRequest 
+  def set_header(name, value)
+    @env[name] = value
+  end
+end

data/uploader.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin", "David South"]
@@ -151,219 +151,6 @@ Gem::Specification.new do |s|
     "public/swf/uploadify.swf",
     "test/rails_test/.gitignore",
     "test/rails_test/.rake_tasks",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/001/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/002/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/003/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/004/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/005/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/006/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/007/original/test.pdf",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/008/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/009/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/010/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/011/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/012/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/013/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/014/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/015/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/016/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/017/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/018/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/019/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/020/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/024/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/025/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/026/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/027/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/028/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/029/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/030/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/031/original/test.doc",
-    "test/rails_test/:rails_test/public/system/locals/000/000/032/original/test.xls",
-    "test/rails_test/:rails_test/public/system/locals/000/000/033/original/test.xls",
-    "test/rails_test/:rails_test/public/system/locals/000/000/034/original/test.xls",
-    "test/rails_test/:rails_test/public/system/locals/000/000/035/original/test.xls",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/036/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/037/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/038/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/039/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/040/original/test.pdf",
-    "test/rails_test/:rails_test/public/system/locals/000/000/041/original/test.pdf",
-    "test/rails_test/:rails_test/public/system/locals/000/000/042/original/test.pdf",
-    "test/rails_test/:rails_test/public/system/locals/000/000/043/original/test.pdf",
-    "test/rails_test/:rails_test/public/system/locals/000/000/044/original/test.txt",
-    "test/rails_test/:rails_test/public/system/locals/000/000/045/original/test.txt",
-    "test/rails_test/:rails_test/public/system/locals/000/000/046/original/test.txt",
-    "test/rails_test/:rails_test/public/system/locals/000/000/047/original/test.txt",
-    "test/rails_test/:rails_test/public/system/locals/000/000/048/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/049/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/050/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/051/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/052/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/053/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/054/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/055/thumb/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/icon/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/large/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/medium/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/original/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/small/rails.png",
-    "test/rails_test/:rails_test/public/system/locals/000/000/056/thumb/rails.png",
     "test/rails_test/Gemfile",
     "test/rails_test/Gemfile.lock",
     "test/rails_test/README",
@@ -397,7 +184,6 @@ Gem::Specification.new do |s|
     "test/rails_test/db/.keep",
     "test/rails_test/db/migrate/20090517040220_create_uploads.rb",
     "test/rails_test/db/migrate/20090602041838_create_users.rb",
-    "test/rails_test/db/schema.rb",
     "test/rails_test/db/seeds.rb",
     "test/rails_test/doc/README_FOR_APP",
     "test/rails_test/features/step_definitions/webrat_steps.rb",
@@ -487,30 +273,24 @@ Gem::Specification.new do |s|
     "test/rails_test/public/swf/swfupload_fp9.swf",
     "test/rails_test/public/swf/uploadify.swf",
     "test/rails_test/script/rails",
-    "test/rails_test/test/factories.rb",
-    "test/rails_test/test/fixtures/files/5k.png",
-    "test/rails_test/test/fixtures/files/IT'sUPPERCASE!AND WeIRD.JPG",
-    "test/rails_test/test/fixtures/rails.png",
-    "test/rails_test/test/fixtures/test.doc",
-    "test/rails_test/test/fixtures/test.pdf",
-    "test/rails_test/test/fixtures/test.txt",
-    "test/rails_test/test/fixtures/test.xls",
-    "test/rails_test/test/functional/.keep",
-    "test/rails_test/test/functional/default_controller_test.rb",
-    "test/rails_test/test/functional/uploads_controller_test.rb",
-    "test/rails_test/test/integration/.keep",
-    "test/rails_test/test/performance/browsing_test.rb",
-    "test/rails_test/test/shoulda_macros/paperclip.rb",
-    "test/rails_test/test/test_helper.rb",
-    "test/rails_test/test/unit/.keep",
-    "test/rails_test/test/unit/upload_test.rb",
-    "test/rails_test/test/unit/user_test.rb",
+    "test/rails_test/spec/controllers/default_controller_spec.rb",
+    "test/rails_test/spec/controllers/uploads_controller_spec.rb",
+    "test/rails_test/spec/factories.rb",
+    "test/rails_test/spec/fixtures/files/5k.png",
+    "test/rails_test/spec/fixtures/files/IT'sUPPERCASE!AND WeIRD.JPG",
+    "test/rails_test/spec/fixtures/rails.png",
+    "test/rails_test/spec/fixtures/test.doc",
+    "test/rails_test/spec/fixtures/test.pdf",
+    "test/rails_test/spec/fixtures/test.txt",
+    "test/rails_test/spec/fixtures/test.xls",
+    "test/rails_test/spec/models/upload_spec.rb",
+    "test/rails_test/spec/models/user_spec.rb",
+    "test/rails_test/spec/spec_helper.rb",
     "uninstall.rb",
     "uploader.gemspec"
   ]
   s.homepage = %q{http://github.com/jbasdf/uploader}
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{uploader}
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Uploadify, SWFUpload + Paperclip wrapped in an engine with love.}