uploader 0.2.4 → 0.2.5

data/test/rails_root/public/stylesheets/swfupload.css

@@ -22,5 +22,5 @@ div.uploadStatus{margin:5px;}
 .swfupload_container a.progressCancel{font-size:0;display:block;height:14px;width:14px;background-image:url(../images/cancelbutton.gif);background-repeat:no-repeat;background-position:-14px 0px;float:right;}
 .swfupload_container a.progressCancel:hover{background-position:0px 0px;}
 
-.swf-error-msg{background-color: #FFFF66; border-top: solid 4px #FF9966; border-bottom: solid 4px #FF9966; margin: 10px 25px; padding: 10px 15px;}
+.swf-error-msg{margin:1em 0;padding:10px 20px;border:solid 1px #FFDD99;background-color:#FFFFCC;overflow:hidden;}
 .swf_cancel_button{margin-left: 2px; height: 22px; font-size: 8pt;}

data/test/rails_root/test/functional/uploads_controller_test.rb

@@ -24,6 +24,58 @@ class UploadsControllerTest < ActionController::TestCase
         assert assigns(:upload).errors.empty?, assigns(:upload).errors
       end
     end
+    context "good text file" do
+      setup do
+        post :create, { :upload => { :local => VALID_TEXT_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+      end
+      should_redirect_to("/create_success") { '/create_success' }
+      should_set_the_flash_to(I18n.t('uploader.successful_upload'))
+      should "create a valid upload" do
+        assert_difference "@user.uploads.count", 1 do
+          post :create, { :upload => { :local => VALID_TEXT_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        assert assigns(:upload).errors.empty?, assigns(:upload).errors
+      end
+    end
+    context "good pdf file" do
+      setup do
+        post :create, { :upload => { :local => VALID_PDF_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+      end
+      should_redirect_to("/create_success") { '/create_success' }
+      should_set_the_flash_to(I18n.t('uploader.successful_upload'))
+      should "create a valid upload" do
+        assert_difference "@user.uploads.count", 1 do
+          post :create, { :upload => { :local => VALID_PDF_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        assert assigns(:upload).errors.empty?, assigns(:upload).errors
+      end
+    end
+    context "good doc file" do
+      setup do
+        post :create, { :upload => { :local => VALID_WORD_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+      end
+      should_redirect_to("/create_success") { '/create_success' }
+      should_set_the_flash_to(I18n.t('uploader.successful_upload'))
+      should "create a valid upload" do
+        assert_difference "@user.uploads.count", 1 do
+          post :create, { :upload => { :local => VALID_WORD_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        assert assigns(:upload).errors.empty?, assigns(:upload).errors
+      end
+    end
+    context "good excel file" do
+      setup do
+        post :create, { :upload => { :local => VALID_EXCEL_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+      end
+      should_redirect_to("/create_success") { '/create_success' }
+      should_set_the_flash_to(I18n.t('uploader.successful_upload'))
+      should "create a valid upload" do
+        assert_difference "@user.uploads.count", 1 do
+          post :create, { :upload => { :local => VALID_EXCEL_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        assert assigns(:upload).errors.empty?, assigns(:upload).errors
+      end
+    end
     context "bad file" do
       setup do
         post :create, { :upload => { :local => nil }, :parent_type => 'User', :parent_id => @user.to_param }
@@ -45,7 +97,7 @@ class UploadsControllerTest < ActionController::TestCase
     should_respond_with :success
     should "add an upload" do
       assert_difference "Upload.count", 1 do
-        post :swfupload, { :filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param }
+        post :swfupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param }
       end
     end
   end

data/test/rails_root/test/test_helper.rb

@@ -12,7 +12,11 @@ require File.expand_path(File.dirname(__FILE__) + '/factories')
 require File.join(File.dirname(__FILE__), 'shoulda_macros', 'paperclip')
 class ActiveSupport::TestCase
   
-  VALID_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'public/images/rails.png'), 'image/png')
+  VALID_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'public', 'images', 'rails.png'), 'image/png')
+  VALID_TEXT_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'Rakefile'), 'text/plain')
+  VALID_PDF_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'test', 'test.pdf'), 'application/pdf')
+  VALID_WORD_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'test', 'test.doc'), 'application/pdf')
+  VALID_EXCEL_FILE = ActionController::TestUploadedFile.new(File.join(RAILS_ROOT, 'test', 'test.xls'), 'application/pdf')
   
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false

data/uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "David South"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-17}
   s.description = %q{Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload and Paperclip}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -82,6 +82,7 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "public/images/SWFUploadButton.png",
+     "public/images/cancelbutton.gif",
      "public/images/file_icons/excel.gif",
      "public/images/file_icons/file.gif",
      "public/images/file_icons/file.png",
@@ -135,6 +136,7 @@ Gem::Specification.new do |s|
      "public/javascripts/swfupload/swfupload.cookies.js",
      "public/javascripts/swfupload/swfupload.js",
      "public/javascripts/swfupload/swfupload.queue.js",
+     "public/javascripts/swfupload/swfupload.speed.js",
      "public/javascripts/swfupload/swfupload.swfobject.js",
      "public/stylesheets/swfupload.css",
      "public/swf/swfupload.swf",
@@ -285,6 +287,9 @@ Gem::Specification.new do |s|
      "test/rails_root/test/mocks/development/.keep",
      "test/rails_root/test/mocks/test/.keep",
      "test/rails_root/test/shoulda_macros/paperclip.rb",
+     "test/rails_root/test/test.doc",
+     "test/rails_root/test/test.pdf",
+     "test/rails_root/test/test.xls",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/upload_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uploader
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -07:00
+date: 2009-11-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - public/images/SWFUploadButton.png
+- public/images/cancelbutton.gif
 - public/images/file_icons/excel.gif
 - public/images/file_icons/file.gif
 - public/images/file_icons/file.png
@@ -171,6 +172,7 @@ files:
 - public/javascripts/swfupload/swfupload.cookies.js
 - public/javascripts/swfupload/swfupload.js
 - public/javascripts/swfupload/swfupload.queue.js
+- public/javascripts/swfupload/swfupload.speed.js
 - public/javascripts/swfupload/swfupload.swfobject.js
 - public/stylesheets/swfupload.css
 - public/swf/swfupload.swf
@@ -321,6 +323,9 @@ files:
 - test/rails_root/test/mocks/development/.keep
 - test/rails_root/test/mocks/test/.keep
 - test/rails_root/test/shoulda_macros/paperclip.rb
+- test/rails_root/test/test.doc
+- test/rails_root/test/test.pdf
+- test/rails_root/test/test.xls
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/upload_test.rb