angularjs-file-upload-rails 1.1.0 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d75e239c01c206babcb6a20daadd072f18d7aeb
-  data.tar.gz: 73eda9a4f0029589e4f24b401bafcecf818502ed
+  metadata.gz: eb70a719506f44ab6f69a15b0eaf560faa90cb9d
+  data.tar.gz: cc88a54f125d537375f4b16988b1564d97728d3d
 SHA512:
-  metadata.gz: ba697fcd751277949893077876d04e50997ddcf64b1f10c9ef71cd3a71f671aa3a1b5c843f2077bc4f8e2781568b0fcf9fef24847f43f02ea76c20cbb39fb89b
-  data.tar.gz: 6832503e9ae59085135d6bd39dcb29fe054491fe43aab950c4b9e8f275690e580f4583c5738b5c60e07811a504ddd273c1c1c29333ca982f63948150d54c4e35
+  metadata.gz: f4161dab606fd0d2d9e05b4652d3bcbdf8e8433c4fc47c622efbf9d1be01b7f9215a4e7a078c029dade375c12184e6ece84605dbc2654908db38f0499a2d2620
+  data.tar.gz: e41661d20c722e602ffed5ffd2124ab676e5774061251891e9774a3d12ece76c126511317996c5cb25ef444a2fcd8d703ec3d26fe164ed876b9a5c329420a96f

data/README.md

@@ -9,7 +9,7 @@ A gem that uses [angular-file-upload](https://github.com/nervgh/angular-file-upl
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'angularjs-file-upload', '~> 1.0.1'
+gem 'angularjs-file-upload-rails', '~> 1.1.5'
 ```
 
 And then execute:
@@ -33,6 +33,66 @@ Include it in your JavaScript manifest (e.g. `application.js`)
 ```
 \* *be sure that angular is required before angularjs-file-upload*
 
+## Read more
+
+read more about the options in [angular-file-upload-wiki](https://github.com/nervgh/angular-file-upload/wiki/Introduction) 
+
+## Basic example 
+
+\* *assuming that you have setup an ```angularjs``` correctly in your rails app
+
+```ruby
+  gem 'angularjs-file-upload-rails', '~> 1.1.5'
+  gem 'carrierwave'
+  gem 'rails', '4.1.5'
+```
+
+Setup your carrierwave gem as discribed in the [carrierwave-readme](https://github.com/carrierwaveuploader/carrierwave)
+
+add ```angularjs-file-upload-rails``` to your gem file
+add 
+
+```javascript
+//= require angularjs-file-upload
+```
+
+to ```application.js```
+
+in the angular file
+
+```javascript
+  angular
+    .module('app', ['angularFileUpload'])
+    .controller('AppController', function($scope, FileUploader) {
+        $scope.uploader = new FileUploader({url: '<your controller path>'});
+    });
+```
+
+in your view
+
+```html
+<div ng-app="app">
+    <div ng-controller="AppController">
+        <input type="file" nv-file-select uploader="uploader"/><br/>
+    </div>
+</div>
+```
+
+in your controller
+
+```ruby
+class UsersController < ApplicationController
+
+  def create
+    user = User.new()
+    //other params
+    user.picture = params[:file]
+    user.save
+  end
+
+end
+```
+
 ## Contributing
 
 1. Fork it

data/angularjs-file-upload.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib", "app"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rails", "~> 3.1"

data/app/assets/javascripts/angularjs-file-upload.js

@@ -1,5 +1,5 @@
 /*
- angular-file-upload v1.1.0
+ angular-file-upload v1.1.5
  https://github.com/nervgh/angular-file-upload
 */
 (function(angular, factory) {
@@ -344,7 +344,7 @@ module
             FileUploader.prototype._getFilters = function(filters) {
                 if (angular.isUndefined(filters)) return this.filters;
                 if (angular.isArray(filters)) return filters;
-                var names = filters.split(/\s*,/);
+                var names = filters.match(/[^\s,]+/g);
                 return this.filters.filter(function(filter) {
                     return names.indexOf(filter.name) !== -1;
                 }, this);
@@ -400,12 +400,14 @@ module
             /**
              * Transforms the server response
              * @param {*} response
+             * @param {Object} headers
              * @returns {*}
              * @private
              */
-            FileUploader.prototype._transformResponse = function(response) {
+            FileUploader.prototype._transformResponse = function(response, headers) {
+                var headersGetter = this._headersGetter(headers);
                 angular.forEach($http.defaults.transformResponse, function(transformFn) {
-                    response = transformFn(response);
+                    response = transformFn(response, headersGetter);
                 });
                 return response;
             };
@@ -421,17 +423,10 @@ module
 
                 if (!headers) return parsed;
 
-                function trim(string) {
-                    return string.replace(/^\s+/, '').replace(/\s+$/, '');
-                }
-                function lowercase(string) {
-                    return string.toLowerCase();
-                }
-
                 angular.forEach(headers.split('\n'), function(line) {
                     i = line.indexOf(':');
-                    key = lowercase(trim(line.substr(0, i)));
-                    val = trim(line.substr(i + 1));
+                    key = line.slice(0, i).trim().toLowerCase();
+                    val = line.slice(i + 1).trim();
 
                     if (key) {
                         parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
@@ -440,6 +435,20 @@ module
 
                 return parsed;
             };
+            /**
+             * Returns function that returns headers
+             * @param {Object} parsedHeaders
+             * @returns {Function}
+             * @private
+             */
+            FileUploader.prototype._headersGetter = function(parsedHeaders) {
+                return function(name) {
+                    if (name) {
+                        return parsedHeaders[name.toLowerCase()] || null;
+                    }
+                    return parsedHeaders;
+                };
+            };
             /**
              * The XMLHttpRequest transport
              * @param {FileItem} item
@@ -458,7 +467,7 @@ module
                     });
                 });
 
-                form.append(item.alias, item._file);
+                form.append(item.alias, item._file, item.file.name);
 
                 xhr.upload.onprogress = function(event) {
                     var progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
@@ -467,7 +476,7 @@ module
 
                 xhr.onload = function() {
                     var headers = that._parseHeaders(xhr.getAllResponseHeaders());
-                    var response = that._transformResponse(xhr.response);
+                    var response = that._transformResponse(xhr.response, headers);
                     var gist = that._isSuccessCode(xhr.status) ? 'Success' : 'Error';
                     var method = '_on' + gist + 'Item';
                     that[method](item, response, xhr.status, headers);
@@ -476,14 +485,14 @@ module
 
                 xhr.onerror = function() {
                     var headers = that._parseHeaders(xhr.getAllResponseHeaders());
-                    var response = that._transformResponse(xhr.response);
+                    var response = that._transformResponse(xhr.response, headers);
                     that._onErrorItem(item, response, xhr.status, headers);
                     that._onCompleteItem(item, response, xhr.status, headers);
                 };
 
                 xhr.onabort = function() {
                     var headers = that._parseHeaders(xhr.getAllResponseHeaders());
-                    var response = that._transformResponse(xhr.response);
+                    var response = that._transformResponse(xhr.response, headers);
                     that._onCancelItem(item, response, xhr.status, headers);
                     that._onCompleteItem(item, response, xhr.status, headers);
                 };
@@ -519,7 +528,9 @@ module
 
                 angular.forEach(item.formData, function(obj) {
                     angular.forEach(obj, function(value, key) {
-                        form.append(angular.element('<input type="hidden" name="' + key + '" value="' + value + '" />'));
+                        var element = angular.element('<input type="hidden" name="' + key + '" />');
+                        element.val(value);
+                        form.append(element);
                     });
                 });
 
@@ -549,8 +560,8 @@ module
                     } catch (e) {}
 
                     var xhr = {response: html, status: 200, dummy: true};
-                    var response = that._transformResponse(xhr.response);
                     var headers = {};
+                    var response = that._transformResponse(xhr.response, headers);
 
                     that._onSuccessItem(item, response, xhr.status, headers);
                     that._onCompleteItem(item, response, xhr.status, headers);
@@ -1155,7 +1166,7 @@ module
              * Event handler
              */
             FileDrop.prototype.onDragLeave = function(event) {
-                if (event.target !== this.element[0]) return;
+                if (event.currentTarget !== this.element[0]) return;
                 this._preventAndStop(event);
                 angular.forEach(this.uploader._directives.over, this._removeOverClass, this);
             };
@@ -1316,5 +1327,6 @@ module
             }
         };
     }])
+
     return module;
-}));
+}));

data/lib/angularjs-file-upload/version.rb

@@ -1,3 +1,3 @@
 module AngularjsFileUpload
-  VERSION = '1.1.0'
+  VERSION = '1.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-file-upload-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.6
 platform: ruby
 authors:
 - Marthyn Olthof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- app
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: It supports drag-n-drop upload, upload progress, validation filters and a