uploader 3.1.0 → 3.1.1

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -13,12 +12,19 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+require 'rake/rdoctask'
 desc 'Generate documentation for the uploader plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Uploader'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -30,24 +36,20 @@ end
 
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "uploader"
-    gemspec.summary = "Uploadify, SWFUpload + Paperclip wrapped in an engine with love."
-    gemspec.email = "justinball@gmail.com"
-    gemspec.homepage = "http://github.com/jbasdf/uploader"
-    gemspec.description = "Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip"
-    gemspec.authors = ["Justin Ball", "Joel Duffin", "David South"]
-    gemspec.files.include %w( test/rails_test/db/schema.rb )
-    gemspec.rubyforge_project = 'uploader'
-    gemspec.add_dependency "mime-types"
-    gemspec.add_dependency "rack"
-    gemspec.add_dependency "paperclip"
-    gemspec.add_dependency "aws-s3"
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
+  Jeweler::Tasks.new do |gem|
+    gem.name = "uploader"
+    gem.summary = "Uploadify, SWFUpload + Paperclip wrapped in an engine with love."
+    gem.email = "justinball@gmail.com"
+    gem.homepage = "http://github.com/jbasdf/uploader"
+    gem.description = "Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip"
+    gem.authors = ["Justin Ball", "Joel Duffin", "David South"]
+    gem.add_dependency "mime-types"
+    gem.add_dependency "rack"
+    gem.add_dependency "paperclip"
+    gem.add_dependency "aws-s3"
+    gem.files.exclude 'test/**'
   end
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/app/controllers/uploader/uploads_controller.rb

@@ -39,8 +39,13 @@ class Uploader::UploadsController < ApplicationController
         redirect_to get_redirect(:create_failure)
       end
       format.js { render :text => message }
-      format.json { render :json => { :success => false, :message => message } }
-      # render :json => message, :status => :unprocessable_entity
+      format.json do
+        if Uploader.configuration.use_http_status_failures
+          render :json => message, :status => :unprocessable_entity
+        else
+          render :json => { :success => false, :message => message }
+        end
+      end
     end
   end
 
@@ -59,7 +64,13 @@ class Uploader::UploadsController < ApplicationController
     message = t('uploader.standard_file_upload_error', :error => ex)
     respond_to do |format|
       format.js { render :text => message }
-      format.json { render :json => { :success => false, :message => message } }
+      format.json do
+        if Uploader.configuration.use_http_status_failures
+          render :json => message, :status => :unprocessable_entity
+        else
+          render :json => { :success => false, :message => message }
+        end
+      end
     end
   end
 
@@ -79,7 +90,13 @@ class Uploader::UploadsController < ApplicationController
         redirect_to get_redirect(:destroy_success)
       end
       format.js { render :text => message }
-      format.json { render :json => { :success => success, :message => message } }
+      format.json do
+        if Uploader.configuration.use_http_status_failures
+          render :json => message, :status => :unprocessable_entity
+        else
+          render :json => { :success => success, :message => message }
+        end
+      end
     end
   end
 

data/lib/uploader/config.rb

@@ -42,6 +42,7 @@ module Uploader
     attr_accessor :keep_local_file
     attr_accessor :disable_halt_nonimage_processing
     attr_accessor :temp_dir
+    attr_accessor :use_http_status_failures # This only applies to json requests
 
     def initialize
       @enable_s3 = false
@@ -49,6 +50,7 @@ module Uploader
       @keep_local_file = true
       @disable_halt_nonimage_processing = false
       @temp_dir = Dir::tmpdir
+      @use_http_status_failures = false
       @has_attached_file_options = {
         :url               => "/system/:attachment/:id_partition/:style/:basename.:extension",
         :path              => ":rails_root/public:url", 

data/test/rails_test/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.0"
-gem "capybara", ">= 0.3.9"
+gem "rails", "3.0.10"
 gem 'mysql'
+gem 'authlogic', "3.0.2"
 
 gem "mime-types"
 gem "rack"
@@ -13,9 +13,19 @@ if RUBY_VERSION < '1.9'
   gem "ruby-debug"
 end
 
+group :test, :development do
+  gem "rspec-rails", ">=2.4.0"
+  gem "cucumber-rails"
+end
+
 group :test do
-  gem 'shoulda'
-  gem 'factory_girl'
-  gem 'mocha'
-  gem 'redgreen'
-end
+  gem "capybara", ">= 0.3.9"
+  gem "shoulda"
+  gem "factory_girl"
+  gem "cucumber"
+  gem "rcov"
+  gem "rspec", ">=2.4.0"
+  gem "database_cleaner"
+  gem "spork"
+  gem "launchy"
+end

data/test/rails_test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    uploader (3.0.2)
+    uploader (3.1.0)
       aws-s3
       mime-types
       paperclip
@@ -11,34 +11,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    addressable (2.2.6)
+    arel (2.0.10)
+    authlogic (3.0.2)
+      activerecord (~> 3.0.7)
+      activerecord (~> 3.0.7)
     aws-s3 (0.6.2)
       builder
       mime-types
@@ -55,12 +58,29 @@ GEM
       ffi (~> 1.0.6)
     cocaine (0.2.0)
     columnize (0.3.4)
+    cucumber (1.0.6)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.18)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.0.5)
+      capybara (>= 1.1.1)
+      cucumber (~> 1.0.6)
+      nokogiri (>= 1.5.0)
+    database_cleaner (0.6.7)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (2.1.0)
     ffi (1.0.9)
-    i18n (0.4.2)
+    gherkin (2.4.21)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    json (1.6.0)
     json_pure (1.6.0)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mail (2.2.19)
@@ -68,10 +88,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
     mime-types (1.16)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
     mysql (2.8.1)
     nokogiri (1.5.0)
     paperclip (2.4.1)
@@ -80,27 +97,42 @@ GEM
       cocaine (>= 0.0.2)
       mime-types
     polyglot (0.3.2)
-    rack (1.2.3)
+    rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
-    redgreen (1.2.2)
+    rcov (0.9.10)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -113,6 +145,8 @@ GEM
       json_pure
       rubyzip
     shoulda (2.11.3)
+    spork (0.8.5)
+    term-ansicolor (1.0.6)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
@@ -126,15 +160,22 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  authlogic (= 3.0.2)
   capybara (>= 0.3.9)
+  cucumber
+  cucumber-rails
+  database_cleaner
   factory_girl
+  launchy
   mime-types
-  mocha
   mysql
   paperclip
   rack
-  rails (= 3.0.0)
-  redgreen
+  rails (= 3.0.10)
+  rcov
+  rspec (>= 2.4.0)
+  rspec-rails (>= 2.4.0)
   ruby-debug
   shoulda
+  spork
   uploader!

data/test/rails_test/spec/controllers/default_controller_spec.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe DefaultController do
+  
+  render_views
+      
+  describe 'on GET to index' do
+    # The default view calls the upload_form helper.  This isn't a great test but
+    # it will make sure it doesn't blow up
+    before do
+      @user = Factory(:user)
+      get :index, :user_id => @user.to_param
+    end
+    it { should respond_with :success }
+    it "should have a_container_with_a_long_name in the body" do
+      @response.body.should include('a_container_with_a_long_name')
+    end
+    it "should have '1 MB' in the body" do
+      @response.body.should include('1 MB')
+    end
+    it "should have '*.jpg' in the body" do
+      @response.body.should include('*.jpg')
+    end
+  end
+
+  describe 'on GET to uploadify' do
+    # The default view calls the upload_form helper.  This isn't a great test but
+    # it will make sure it doesn't blow up
+    before do
+      @user = Factory(:user)
+      get :uploadify, :user_id => @user.to_param
+    end
+    it { should respond_with :success }
+    it "should have a_container_with_a_long_name in the body" do
+      @response.body.should include('a_container_with_a_long_name')
+    end
+    it "should have '1310720' in the body" do
+      @response.body.should include('1310720')
+    end
+    it "should have '*.jpg' in the body" do
+      @response.body.should include('*.jpg')
+    end
+  end
+    
+end

data/test/rails_test/spec/controllers/uploads_controller_spec.rb

@@ -0,0 +1,221 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe UploadsController do
+
+  before do
+    @user = Factory(:user)
+    @controller.stub!(:current_user).and_return(@user)
+  end
+
+  describe 'on POST to :create' do
+    describe "good file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => VALID_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_success") }
+        it { should set_the_flash.to(I18n.t('uploader.successful_upload')) }
+      end
+      it "should create a valid upload" do
+        expect {
+          post :create, { :upload => { :local => VALID_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should be_empty
+        }.to change(@user.uploads, :count).by(1)        
+      end
+    end
+    describe "good text file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => VALID_TEXT_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_success") }
+        it { should set_the_flash.to(I18n.t('uploader.successful_upload')) }
+      end
+      it "should create a valid upload" do        
+        expect {
+          post :create, { :upload => { :local => VALID_TEXT_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should be_empty
+        }.to change(@user.uploads, :count).by(1)
+      end
+    end
+    describe "good pdf file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => VALID_PDF_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_success") }
+        it { should set_the_flash.to(I18n.t('uploader.successful_upload')) }
+      end
+      it "should create a valid upload" do
+        expect {
+          post :create, { :upload => { :local => VALID_PDF_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should be_empty
+        }.to change(@user.uploads, :count).by(1)
+      end
+    end
+    describe "good doc file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => VALID_WORD_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_success") }
+        it { should set_the_flash.to(I18n.t('uploader.successful_upload')) }
+      end
+      it "should create a valid upload" do
+        expect {
+          post :create, { :upload => { :local => VALID_WORD_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should be_empty
+        }.to change(@user.uploads, :count).by(1)
+      end
+    end
+    describe "good excel file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => VALID_EXCEL_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_success") }
+        it { should set_the_flash.to(I18n.t('uploader.successful_upload')) }
+      end
+      it "should create a valid upload" do        
+        expect {
+          post :create, { :upload => { :local => VALID_EXCEL_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should be_empty
+        }.to change(@user.uploads, :count).by(1)
+      end
+    end
+    describe "bad file" do
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => nil }, :parent_type => 'User', :parent_id => @user.to_param }
+        end
+        it { should redirect_to("/create_failure") }
+        it { should set_the_flash.to(/An error occured while uploading the file/) }
+      end
+      it "should not create file" do        
+        expect {
+          post :create, { :upload => { :local => nil }, :parent_type => 'User', :parent_id => @user.to_param }
+          assigns(:upload).errors.should_not be_empty
+        }.to change(@user.uploads, :count).by(0)
+      end
+    end    
+    describe "use_http_status_failures set to true" do
+      before do
+        @use_http_status_failures_default = Uploader.configuration.use_http_status_failures
+        Uploader.configuration.use_http_status_failures = true
+      end
+      after do
+        Uploader.configuration.use_http_status_failures = @use_http_status_failures_default
+      end
+      describe "response" do
+        before do
+          post :create, { :upload => { :local => nil }, :parent_type => 'User', :parent_id => @user.to_param, :format => 'json' }
+        end
+        it "should set the response to unprocessable_entity" do
+          response.status.should == 422
+        end
+      end
+    end
+    describe "raw file upload" do
+      before do
+        @name = 'rails.png'
+        @request.set_header "HTTP_X_FILE_NAME", @name
+        @request.set_header "HTTP_X_FILE_UPLOAD", "true"
+        @request.set_header "rack.input", StringIO.new('some random file')       
+      end
+      it "should create a new upload" do
+        expect {
+          post :create
+        }.to change(Upload, :count).by(1)
+      end
+      it "should not have errors on the upload" do
+        post :create
+        assert assigns(:upload).errors.empty?
+      end
+      it "should set the name of the file" do
+        post :create
+        assert assigns(:upload).name == @name
+        assert assigns(:upload).local_file_name == @name
+      end      
+    end
+  end
+  describe 'on POST to :multiupload' do
+    describe 'js' do
+      describe "response" do
+        before do
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'js' }
+        end
+        it { should respond_with :success }
+      end
+      it "should add an upload" do
+        expect {
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'js' }
+        }.to change(Upload, :count).by(1)
+      end
+    end
+    describe 'json' do
+      describe "response" do
+        before do
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'json' }
+        end
+        it { should respond_with :success }
+      end
+      it "should add an upload" do
+        expect {
+          post :multiupload, { :Filedata => VALID_FILE, :parent_type => 'User', :parent_id => @user.to_param, :format => 'json' }
+        }.to change(Upload, :count).by(1)
+      end
+    end
+  end
+
+  describe 'permission denied' do
+    before do
+      @controller.stub!(:has_permission_to_upload).and_return(false)
+      post :create, { :upload => { :local => VALID_FILE }, :parent_type => 'User', :parent_id => @user.to_param }
+    end
+    it {should redirect_to("/permission_denied") }
+  end
+  
+  describe 'on DELETE to :destroy' do
+    before do
+      @upload = Factory(:upload)
+    end
+    describe "has permission" do
+      describe "controller" do
+        before do
+          delete :destroy, { :id => @upload.to_param }
+        end
+        it {should redirect_to("/destroy_success")}
+        it { should set_the_flash.to((I18n.t('uploader.file_deleted'))) }
+      end
+      describe "data changes" do
+        it "should delete the upload" do
+          expect {
+            delete :destroy, { :id => @upload.to_param }
+          }.to change(Upload, :count).by(-1)
+        end
+      end
+    end
+    describe "permission denied" do
+      before do
+        @upload.stub!(:can_edit?).and_return(false)
+        Upload.stub!(:find).and_return(@upload) # db version won't have can_edit? stubbed since it is a new object so we have to return @upload instead.
+      end
+      describe "controller" do
+        before do
+          delete :destroy, { :id => @upload.to_param }
+        end
+        it {should redirect_to("/destroy_success")}
+        it { should set_the_flash.to((I18n.t('uploader.file_delete_permission_denied'))) }
+      end
+      describe "data changes" do
+        it "should not delete the upload" do
+          expect {
+            delete :destroy, { :id => @upload.to_param }
+          }.to change(Upload, :count).by(0)
+        end
+      end
+    end
+    
+  end
+  
+end