fixed specs and include extension in cleaned_filename

FacundoDiazMartinez · Oct 20, 2014 · 98be217 · 98be217
1 parent 63719d1
commit 98be217
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee
@@ -113,11 +113,11 @@ $.fn.S3Uploader = (options) ->
           name: "content-type"
           value: fileType
 
-        filename = @files[0].name.replace(/\.[^/.]+$/, '')
+        cleaned_filename = @files[0].name.replace(/\s/g, '_').replace(/[^\w.-]/gi, '')
         key = $uploadForm.data("key")
           .replace('{timestamp}', new Date().getTime())
           .replace('{unique_id}', @files[0].unique_id)
-          .replace('{cleaned_filename}', filename.replace(/\s/g, '_').replace(/[^\w.-]/gi, ''))
+          .replace('{cleaned_filename}', cleaned_filename)
           .replace('{extension}', @files[0].name.split('.').pop())
 
         # substitute upload timestamp and unique_id into key

diff --git a/spec/existance_spec.rb b/spec/existance_spec.rb
@@ -1,11 +1,11 @@
 require 'spec_helper'
 describe S3DirectUpload do
   it "version must be defined" do
-    S3DirectUpload::VERSION.should be_true
+    S3DirectUpload::VERSION.should be_present
   end
 
   it "config must be defined" do
-    S3DirectUpload.config.should be_true
+    S3DirectUpload.config.should be_present
   end
 
 end