* Removed Pixa/Tinami sources

* Upgraded to Rails 3.2.3
* Fixed tests

test/factories/upload.rb

@@ -1,44 +1,47 @@
 require 'fileutils'
 
-Factory.define(:upload) do |f|
-  f.rating "s"
-  f.uploader {|x| x.association(:user, :level => 200)}
-  f.uploader_ip_addr "127.0.0.1"
-  f.tag_string "special"
-  f.status "pending"
-end
+FactoryGirl.define do
+  factory(:upload) do
+    rating "s"
+    uploader :factory => :user, :level => 20
+    uploader_ip_addr "127.0.0.1"
+    tag_string "special"
+    status "pending"
+    
+    factory(:source_upload) do
+      source "http://www.google.com/intl/en_ALL/images/logo.gif"
+    end
 
-Factory.define(:source_upload, :parent => :upload) do |f|
-  f.source "http://www.google.com/intl/en_ALL/images/logo.gif"
-end
+    factory(:jpg_upload) do
+      content_type "image/jpeg"
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test.jpg", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test.jpg"
+      end
+    end
 
-Factory.define(:jpg_upload, :parent => :upload) do |f|
-  f.content_type "image/jpeg"
-  f.file_path do
-    FileUtils.cp("#{Rails.root}/test/files/test.jpg", "#{Rails.root}/tmp")
-    "#{Rails.root}/tmp/test.jpg"
+    factory(:large_jpg_upload) do
+      file_ext "jpg"
+      content_type "image/jpeg"
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test-large.jpg", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test-large.jpg"
+      end
+    end
+
+    factory(:png_upload) do
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test.png", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test.png"
+      end
+    end
+
+    factory(:gif_upload) do
+      file_path do
+        FileUtils.cp("#{Rails.root}/test/files/test.gif", "#{Rails.root}/tmp")
+        "#{Rails.root}/tmp/test.gif"
+      end
+    end
   end
 end
 
-Factory.define(:large_jpg_upload, :parent => :upload) do |f|
-  f.file_ext "jpg"
-  f.content_type "image/jpeg"
-  f.file_path do
-    FileUtils.cp("#{Rails.root}/test/files/test-large.jpg", "#{Rails.root}/tmp")
-    "#{Rails.root}/tmp/test-large.jpg"
-  end
-end
-
-Factory.define(:png_upload, :parent => :upload) do |f|
-  f.file_path do
-    FileUtils.cp("#{Rails.root}/test/files/test.png", "#{Rails.root}/tmp")
-    "#{Rails.root}/tmp/test.png"
-  end
-end
-
-Factory.define(:gif_upload, :parent => :upload) do |f|
-  f.file_path do
-    FileUtils.cp("#{Rails.root}/test/files/test.gif", "#{Rails.root}/tmp")
-    "#{Rails.root}/tmp/test.gif"
-  end
-end