s3_cors_fileupload 0.2.1 → 0.3.0

data/spec/features/uploads_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+feature 'Uploads' do
+  background { visit source_files_path }
+
+  describe 'GET #index' do
+    scenario { page.should have_selector('h2', :text => 'Upload file(s)') }
+
+    scenario :s3_cors_fileupload_form_tag do
+      within('form#fileupload') do
+        page.should have_selector('div.fileupload-buttonbar')
+        page.should have_selector('table#upload_files')
+        page.should have_selector('input[type=file]#file')
+      end
+    end
+
+    scenario "Attaching files", :js => true do
+      within('form#fileupload') do
+        within('table#upload_files tbody.files') do
+          page.should_not have_selector('tr')
+          page.text.should be_blank
+        end
+        attach_file('file', File.expand_path('../../support/dummy.pdf', __FILE__))
+        # After a file is attached, it should get added to the table#upload_files to be uploaded
+        within('table#upload_files tbody.files') do
+          page.should have_selector('tr.template-upload')
+          within('tr.template-upload') do
+            page.should have_selector('td', :text => 'dummy.pdf')
+            page.should have_selector('td', :text => '7.84 KB')
+            page.should have_selector('td', :text => 'Start')
+            page.should have_selector('td', :text => 'Cancel')
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/s3_cors_fileupload/rails/engine_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe S3CorsFileupload::Rails::Engine do
+  subject { S3CorsFileupload::Rails::Engine }
+
+  it { should be_instance_of(Class) }
+  its(:superclass) { should == ::Rails::Engine }
+end

data/spec/lib/s3_cors_fileupload/rails/form_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe S3CorsFileupload::FormHelper do
+  it { S3CorsFileupload::FormHelper.should be_instance_of(Module) }
+  it { ActionView::Base.should include(S3CorsFileupload::FormHelper) }
+
+  describe "Instance Methods" do
+    subject { ActionView::Base.new }
+
+    describe :s3_cors_fileupload_form_tag do
+      it { should respond_to(:s3_cors_fileupload_form_tag) }
+
+      it "should return HTML for the jQuery-File-Upload form" do
+        value = subject.s3_cors_fileupload_form_tag
+        value.should be_a(String)
+        value.should be_instance_of(ActiveSupport::SafeBuffer)
+        value.should be_html_safe
+        value.match(/<form/).should_not be_nil
+      end
+    end
+
+    describe :s3_cors_fileupload_form do
+      it { should respond_to(:s3_cors_fileupload_form) }
+
+      it "should be an alias for the `s3_cors_fileupload_form_tag` method" do
+        subject.method(:s3_cors_fileupload_form).should == subject.method(:s3_cors_fileupload_form_tag)
+      end
+    end
+  end
+end

data/spec/lib/s3_cors_fileupload/rails/policy_helper_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe S3CorsFileupload::PolicyHelper do
+  it { S3CorsFileupload::PolicyHelper.should be_instance_of(Class) }
+
+  let(:options) { {} }
+  let(:policy_helper) { S3CorsFileupload::PolicyHelper.new(options) }
+
+  describe "Constructor" do
+    context "no arguments" do
+      it "should build without error" do
+        policy_helper
+      end
+
+      it "should use default values" do
+        policy_helper.options[:acl].should == 'public-read'
+        policy_helper.options[:max_file_size].should == S3CorsFileupload::Config.max_file_size || 524288000
+        policy_helper.options[:bucket].should == S3CorsFileupload::Config.bucket
+        policy_helper.options[:secret_access_key].should == S3CorsFileupload::Config.secret_access_key
+      end
+    end
+
+    context "arguments" do
+      context :acl do
+        let(:options) { {:acl => 'private'} }
+        it { policy_helper.options[:acl].should == 'private' }
+      end
+
+      context :max_file_size do
+        let(:options) { {:max_file_size => 10} }
+        it { policy_helper.options[:max_file_size].should == 10 }
+      end
+
+      context :bucket do
+        let(:options) { {:bucket => 'foobar'} }
+        it { policy_helper.options[:bucket].should == 'foobar' }
+      end
+
+      context :bucket do
+        let(:options) { {:bucket => 'foobar'} }
+        it { policy_helper.options[:bucket].should == 'foobar' }
+      end
+    end
+  end
+
+  describe "Instance Methods" do
+    describe :policy_document do
+      it { should respond_to(:policy_document) }
+
+      it "should generate a policy document for AWS S3 and use `Base64` to encode it" do
+        value = policy_helper.policy_document
+        value.should be_instance_of(String)
+        # decode and then deserialize the value returned from the policy document
+        value = MultiJson.load Base64.decode64(value), symbolize_keys: true
+        value.should be_instance_of(Hash)
+        value.should have_key(:expiration)
+        value.should have_key(:conditions)
+        value[:conditions].should == [
+            { bucket: policy_helper.options[:bucket] },
+            { acl: policy_helper.options[:acl] },
+            { success_action_status: '201' },
+            ["content-length-range", 0, policy_helper.options[:max_file_size]],
+            ["starts-with", "$utf8", ""],
+            ["starts-with", "$key", ""],
+            ["starts-with", "$Content-Type", ""]
+          ]
+      end
+
+      it "should cache the return value in an instance variable" do
+        policy_helper.instance_variable_get(:@policy_document).should be_nil
+        value = policy_helper.policy_document
+        policy_helper.instance_variable_get(:@policy_document).should_not be_nil
+        policy_helper.instance_variable_get(:@policy_document).should == value
+      end
+    end
+
+    describe :upload_signature do
+      it { should respond_to(:upload_signature) }
+
+      it "should create an upload signature based off our secret_access_key, and convert it to a string" do
+        policy_helper.upload_signature.should == Base64.encode64(
+            OpenSSL::HMAC.digest(OpenSSL::Digest::SHA1.new, policy_helper.options[:secret_access_key], policy_helper.policy_document)
+          ).gsub(/\n/, '')
+      end
+
+      it "should cache the return value in an instance variable" do
+        policy_helper.instance_variable_get(:@upload_signature).should be_nil
+        value = policy_helper.upload_signature
+        policy_helper.instance_variable_get(:@upload_signature).should_not be_nil
+        policy_helper.instance_variable_get(:@upload_signature).should == value
+      end
+    end
+  end
+
+end

data/spec/s3_cors_fileupload_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
 describe S3CorsFileupload do
-  
   it { should be_instance_of(Module) }
-  
-  # we will need to write some additional specs for the module within the context of a Rails app,
-  # since much of the functionality doesn't get required unless Rails is defined.
+
+  describe "Methods" do
+    describe :active_record_protected_attributes? do
+      it { should respond_to(:active_record_protected_attributes?) }
+
+      its(:active_record_protected_attributes?) { should be_false } # Since the dummy app isn't using `ProtectedAttributes`
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,14 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 # the gem's library gets included through a require statement on 'dummy/config/application.rb'
 require 'rspec/rails'
 require 'rspec/autorun'
+require 'capybara/rspec'
+require 'capybara/rails'
+require 'capybara/poltergeist'
+
+Capybara.javascript_driver = :poltergeist
+
+# Run any available migration in the dummy app
+ActiveRecord::Migrator.migrate("#{::Rails.root}/db/migrate")
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -38,12 +46,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-
-  # Prep for running the test suite
-  config.before(:all) do
-    # Invoke the generator for the gem.
-    # ::Rails::Generators.invoke('s3_cors_fileupload:install')
-    # Run any migrations for the dummy app prior to running the spec suite.
-    # ActiveRecord::Migrator.migrate "#{::Rails.root}/db/migrate"
-  end
 end

data/vendor/assets/javascripts/s3_cors_fileupload/index.js

@@ -1,6 +1,7 @@
 //= require s3_cors_fileupload/vendor/jquery.ui.widget
 //= require s3_cors_fileupload/vendor/tmpl
 //= require s3_cors_fileupload/vendor/load-image
+//= require s3_cors_fileupload/vendor/load-image-meta
 //= require s3_cors_fileupload/jquery.iframe-transport
 //= require s3_cors_fileupload/jquery.fileupload
 //= require s3_cors_fileupload/jquery.fileupload-process

data/vendor/assets/javascripts/s3_cors_fileupload/jquery.fileupload-image.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Image Preview & Resize Plugin 1.0
+ * jQuery File Upload Image Preview & Resize Plugin 1.2.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -10,7 +10,7 @@
  */
 
 /*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window */
+/*global define, window, document, DataView, Blob, Uint8Array */
 
 (function (factory) {
     'use strict';
@@ -19,6 +19,9 @@
         define([
             'jquery',
             'load-image',
+            'load-image-meta',
+            'load-image-exif',
+            'load-image-ios',
             'canvas-to-blob',
             './jquery.fileupload-process'
         ], factory);
@@ -34,37 +37,55 @@
 
     // Prepend to the default processQueue:
     $.blueimp.fileupload.prototype.options.processQueue.unshift(
+        {
+            action: 'loadImageMetaData',
+            disableImageHead: '@',
+            disableExif: '@',
+            disableExifThumbnail: '@',
+            disableExifSub: '@',
+            disableExifGps: '@',
+            disabled: '@disableImageMetaDataLoad'
+        },
         {
             action: 'loadImage',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
-            fileTypes: '@loadImageFileTypes',
-            maxFileSize: '@loadImageMaxFileSize',
-            noRevoke: '@loadImageNoRevoke',
+            // Use the action as prefix for the "@" options:
+            prefix: true,
+            fileTypes: '@',
+            maxFileSize: '@',
+            noRevoke: '@',
             disabled: '@disableImageLoad'
         },
         {
             action: 'resizeImage',
-            maxWidth: '@imageMaxWidth',
-            maxHeight: '@imageMaxHeight',
-            minWidth: '@imageMinWidth',
-            minHeight: '@imageMinHeight',
-            crop: '@imageCrop',
+            // Use "image" as prefix for the "@" options:
+            prefix: 'image',
+            maxWidth: '@',
+            maxHeight: '@',
+            minWidth: '@',
+            minHeight: '@',
+            crop: '@',
             disabled: '@disableImageResize'
         },
         {
             action: 'saveImage',
             disabled: '@disableImageResize'
         },
+        {
+            action: 'saveImageMetaData',
+            disabled: '@disableImageMetaDataSave'
+        },
         {
             action: 'resizeImage',
-            maxWidth: '@previewMaxWidth',
-            maxHeight: '@previewMaxHeight',
-            minWidth: '@previewMinWidth',
-            minHeight: '@previewMinHeight',
-            crop: '@previewCrop',
-            canvas: '@previewAsCanvas',
+            // Use "preview" as prefix for the "@" options:
+            prefix: 'preview',
+            maxWidth: '@',
+            maxHeight: '@',
+            minWidth: '@',
+            minHeight: '@',
+            crop: '@',
+            orientation: '@',
+            thumbnail: '@',
+            canvas: '@',
             disabled: '@disableImagePreview'
         },
         {
@@ -83,7 +104,7 @@
             // matched against the file type:
             loadImageFileTypes: /^image\/(gif|jpeg|png)$/,
             // The maximum file size of images to load:
-            loadImageMaxFileSize: 5000000, // 5MB
+            loadImageMaxFileSize: 10000000, // 10MB
             // The maximum width of resized images:
             imageMaxWidth: 1920,
             // The maximum height of resized images:
@@ -96,10 +117,15 @@
             previewMaxWidth: 80,
             // The maximum height of the preview images:
             previewMaxHeight: 80,
+            // Defines the preview orientation (1-8) or takes the orientation
+            // value from Exif data if set to true:
+            previewOrientation: true,
+            // Create the preview using the Exif data thumbnail:
+            previewThumbnail: true,
             // Define if preview images should be cropped or only scaled:
             previewCrop: false,
             // Define if preview images should be resized as canvas elements:
-            previewAsCanvas: true
+            previewCanvas: true
         },
 
         processActions: {
@@ -122,15 +148,14 @@
                         !loadImage(
                             file,
                             function (img) {
-                                if (!img.src) {
-                                    return dfd.rejectWith(that, [data]);
+                                if (img.src) {
+                                    data.img = img;
                                 }
-                                data.img = img;
                                 dfd.resolveWith(that, [data]);
                             },
                             options
                         )) {
-                    dfd.rejectWith(that, [data]);
+                    return data;
                 }
                 return dfd.promise();
             },
@@ -140,14 +165,38 @@
             // Accepts the options maxWidth, maxHeight, minWidth,
             // minHeight, canvas and crop:
             resizeImage: function (data, options) {
+                if (options.disabled) {
+                    return data;
+                }
+                var that = this,
+                    dfd = $.Deferred(),
+                    resolve = function (newImg) {
+                        data[newImg.getContext ? 'canvas' : 'img'] = newImg;
+                        dfd.resolveWith(that, [data]);
+                    },
+                    thumbnail,
+                    img,
+                    newImg;
                 options = $.extend({canvas: true}, options);
-                var img = (options.canvas && data.canvas) || data.img,
-                    canvas;
-                if (img && !options.disabled) {
-                    canvas = loadImage.scale(img, options);
-                    if (canvas && (canvas.width !== img.width ||
-                            canvas.height !== img.height)) {
-                        data[canvas.getContext ? 'canvas' : 'img'] = canvas;
+                if (data.exif) {
+                    if (options.orientation === true) {
+                        options.orientation = data.exif.get('Orientation');
+                    }
+                    if (options.thumbnail) {
+                        thumbnail = data.exif.get('Thumbnail');
+                        if (thumbnail) {
+                            loadImage(thumbnail, resolve, options);
+                            return dfd.promise();
+                        }
+                    }
+                }
+                img = (options.canvas && data.canvas) || data.img;
+                if (img) {
+                    newImg = loadImage.scale(img, options);
+                    if (newImg.width !== img.width ||
+                            newImg.height !== img.height) {
+                        resolve(newImg);
+                        return dfd.promise();
                     }
                 }
                 return data;
@@ -196,6 +245,36 @@
                 return dfd.promise();
             },
 
+            loadImageMetaData: function (data, options) {
+                if (options.disabled) {
+                    return data;
+                }
+                var that = this,
+                    dfd = $.Deferred();
+                loadImage.parseMetaData(data.files[data.index], function (result) {
+                    $.extend(data, result);
+                    dfd.resolveWith(that, [data]);
+                }, options);
+                return dfd.promise();
+            },
+
+            saveImageMetaData: function (data, options) {
+                if (!(data.imageHead && data.canvas &&
+                        data.canvas.toBlob && !options.disabled)) {
+                    return data;
+                }
+                var file = data.files[data.index],
+                    blob = new Blob([
+                        data.imageHead,
+                        // Resized images always have a head size of 20 bytes,
+                        // including the JPEG marker and a minimal JFIF header:
+                        this._blobSlice.call(file, 20)
+                    ], {type: file.type});
+                blob.name = file.name;
+                data.files[data.index] = blob;
+                return data;
+            },
+
             // Sets the resized version of the image as a property of the
             // file object, must be called after "saveImage":
             setImage: function (data, options) {