glebtv-rails-uploader 0.4.1 → 0.5.0

data/{app → vendor}/assets/javascripts/uploader/jquery.fileupload.js

@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.31.1
+ * jQuery File Upload Plugin 5.28.8
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -115,23 +115,6 @@
             // By default, uploads are started automatically when adding files:
             autoUpload: true,
 
-            // Error and info messages:
-            messages: {
-                uploadedBytes: 'Uploaded bytes exceed file size'
-            },
-
-            // Translation function, gets the message key to be translated
-            // and an object with context specific data as arguments:
-            i18n: function (message, context) {
-                message = this.messages[message] || message.toString();
-                if (context) {
-                    $.each(context, function (key, value) {
-                        message = message.replace('{' + key + '}', value);
-                    });
-                }
-                return message;
-            },
-
             // Additional form data to be sent along with the file uploads can be set
             // using this option, which accepts an array of objects with name and
             // value properties, a function returning such an array, a FormData
@@ -156,10 +139,9 @@
             // data.submit().done(func).fail(func).always(func);
             add: function (e, data) {
                 if (data.autoUpload || (data.autoUpload !== false &&
-                        $(this).fileupload('option', 'autoUpload'))) {
-                    data.process().done(function () {
-                        data.submit();
-                    });
+                        ($(this).data('blueimp-fileupload') ||
+                        $(this).data('fileupload')).options.autoUpload)) {
+                    data.submit();
                 }
             },
 
@@ -223,9 +205,8 @@
             cache: false
         },
 
-        // A list of options that require reinitializing event listeners and/or
-        // special initialization code:
-        _specialOptions: [
+        // A list of options that require a refresh after assigning a new value:
+        _refreshOptionsList: [
             'fileInput',
             'dropZone',
             'pasteZone',
@@ -567,20 +548,9 @@
             return this._enhancePromise(promise);
         },
 
-        // Adds convenience methods to the data callback argument:
+        // Adds convenience methods to the callback arguments:
         _addConvenienceMethods: function (e, data) {
-            var that = this,
-                getPromise = function (data) {
-                    return $.Deferred().resolveWith(that, [data]).promise();
-                };
-            data.process = function (resolveFunc, rejectFunc) {
-                if (resolveFunc || rejectFunc) {
-                    data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise(this))
-                            .pipe(resolveFunc, rejectFunc);
-                }
-                return this._processQueue || getPromise(this);
-            };
+            var that = this;
             data.submit = function () {
                 if (this.state() !== 'pending') {
                     data.jqXHR = this.jqXHR =
@@ -599,9 +569,6 @@
                 if (this.jqXHR) {
                     return that._getDeferredState(this.jqXHR);
                 }
-                if (this._processQueue) {
-                    return that._getDeferredState(this._processQueue);
-                }
             };
             data.progress = function () {
                 return this._progress;
@@ -645,7 +612,7 @@
                 return true;
             }
             if (ub >= fs) {
-                file.error = options.i18n('uploadedBytes');
+                file.error = 'Uploaded bytes exceed file size';
                 return this._getXHRPromise(
                     false,
                     options.context,
@@ -681,7 +648,7 @@
                         // Create a progress event if no final progress event
                         // with loaded equaling total has been triggered
                         // for this chunk:
-                        if (currentLoaded + o.chunkSize - o._progress.loaded) {
+                        if (o._progress.loaded === currentLoaded) {
                             that._onProgress($.Event('progress', {
                                 lengthComputable: true,
                                 loaded: ub - o.uploadedBytes,
@@ -1151,12 +1118,12 @@
         },
 
         _setOption: function (key, value) {
-            var reinit = $.inArray(key, this._specialOptions) !== -1;
-            if (reinit) {
+            var refresh = $.inArray(key, this._refreshOptionsList) !== -1;
+            if (refresh) {
                 this._destroyEventHandlers();
             }
             this._super(key, value);
-            if (reinit) {
+            if (refresh) {
                 this._initSpecialOptions();
                 this._initEventHandlers();
             }
@@ -1178,35 +1145,10 @@
             }
         },
 
-        _getRegExp: function (str) {
-            var parts = str.split('/'),
-                modifiers = parts.pop();
-            parts.shift();
-            return new RegExp(parts.join('/'), modifiers);
-        },
-
-        _isRegExpOption: function (key, value) {
-            return key !== 'url' && $.type(value) === 'string' &&
-                /^\/.*\/[igm]{0,3}$/.test(value);
-        },
-
-        _initDataAttributes: function () {
-            var that = this,
-                options = this.options;
-            // Initialize options set via HTML5 data-attributes:
-            $.each(
-                $(this.element[0].cloneNode(false)).data(),
-                function (key, value) {
-                    if (that._isRegExpOption(key, value)) {
-                        value = that._getRegExp(value);
-                    }
-                    options[key] = value;
-                }
-            );
-        },
-
         _create: function () {
-            this._initDataAttributes();
+            var options = this.options;
+            // Initialize options set via HTML5 data-attributes:
+            $.extend(options, $(this.element[0].cloneNode(false)).data());
             this._initSpecialOptions();
             this._slots = [];
             this._sequence = this._getXHRPromise(true);

data/{app → vendor}/assets/javascripts/uploader/jquery.iframe-transport.js

@@ -1,5 +1,5 @@
 /*
- * jQuery Iframe Transport Plugin 1.6.2
+ * jQuery Iframe Transport Plugin 1.6.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
@@ -61,10 +61,9 @@
                     // IE versions below IE8 cannot set the name property of
                     // elements that have already been added to the DOM,
                     // so we set the name along with the iframe HTML markup:
-                    counter += 1;
                     iframe = $(
                         '<iframe src="javascript:false;" name="iframe-transport-' +
-                            counter + '"></iframe>'
+                            (counter += 1) + '"></iframe>'
                     ).bind('load', function () {
                         var fileInputClones,
                             paramNames = $.isArray(options.paramName) ?
@@ -97,12 +96,7 @@
                                 // (happens on form submits to iframe targets):
                                 $('<iframe src="javascript:false;"></iframe>')
                                     .appendTo(form);
-                                window.setTimeout(function () {
-                                    // Removing the form in a setTimeout call
-                                    // allows Chrome's developer tools to display
-                                    // the response result
-                                    form.remove();
-                                }, 0);
+                                form.remove();
                             });
                         form
                             .prop('target', iframe.prop('name'))

data/vendor/assets/javascripts/uploader/load-image.min.js

@@ -0,0 +1 @@
+(function(a){"use strict";var b=function(a,c,d){var e=document.createElement("img"),f,g;return e.onerror=c,e.onload=function(){g&&b.revokeObjectURL(g),c(b.scale(e,d))},window.Blob&&a instanceof Blob||window.File&&a instanceof File?f=g=b.createObjectURL(a):f=a,f?(e.src=f,e):b.readFile(a,function(a){e.src=a})},c=window.createObjectURL&&window||window.URL&&URL||window.webkitURL&&webkitURL;b.scale=function(a,b){b=b||{};var c=document.createElement("canvas"),d=Math.max((b.minWidth||a.width)/a.width,(b.minHeight||a.height)/a.height);return d>1&&(a.width=parseInt(a.width*d,10),a.height=parseInt(a.height*d,10)),d=Math.min((b.maxWidth||a.width)/a.width,(b.maxHeight||a.height)/a.height),d<1&&(a.width=parseInt(a.width*d,10),a.height=parseInt(a.height*d,10)),!b.canvas||!c.getContext?a:(c.width=a.width,c.height=a.height,c.getContext("2d").drawImage(a,0,0,a.width,a.height),c)},b.createObjectURL=function(a){return c?c.createObjectURL(a):!1},b.revokeObjectURL=function(a){return c?c.revokeObjectURL(a):!1},b.readFile=function(a,b){if(window.FileReader&&FileReader.prototype.readAsDataURL){var c=new FileReader;return c.onload=function(a){b(a.target.result)},c.readAsDataURL(a),c}return!1},typeof define!="undefined"&&define.amd?define(function(){return b}):a.loadImage=b})(this);

data/vendor/assets/javascripts/uploader/tmpl.min.js

@@ -0,0 +1 @@
+(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"&lt;",">":"&gt;","&":"&amp;",'"':"&quot;","'":"&#39;"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this);

data/{app/assets/stylesheets/uploader/default.css → vendor/assets/stylesheets/uploader/default.css.scss}

@@ -35,6 +35,7 @@
   line-height: 31px;
 }
 .uploader-button {
+	display: inline-block;
 	background: #972da0;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#982da1', endColorstr='#892891'); 
 	background: -webkit-linear-gradient(left top, left bottom, #982da1, #892891); 
@@ -43,7 +44,7 @@
 	background: -ms-linear-gradient(top,  #982da1,  #892891); 
 	border: solid 1px #5f1c65;
 	border-radius: 2px;
-    -moz-border-radius: 2px;
+  -moz-border-radius: 2px;
 	padding: 0 15px;
 	margin: 0 3px 3px;
 	color: #fff;
@@ -53,16 +54,7 @@
 	text-shadow: 0 1px 0 #000;
 	cursor: pointer;
 	height: 31px;
-    width: 222px;
 }
-.uploader-button div {
-    height: 31px;
-    width: 222px;
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-}
-
 .uploader-button:hover {
 	background: #972da0;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#90179a', endColorstr='#7d2485'); 
@@ -140,7 +132,7 @@ input[disabled].uploader-button.gray {
   position: relative;
   float: left;
   margin: 0 20px 20px 0;
-  background: white;
+  background: #fff;
 }
 .uploader-dnd-area .attach_item:hover {
   -moz-box-shadow: 0 0 2px #ccc;

metadata

@@ -1,85 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
-- GlebTv
+- Igor Galeta
+- Pavlo Galeta
+- GlebTV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: glebtv-carrierwave-mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -101,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -115,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -129,108 +69,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails HTML5 FileUpload helpers
-email: glebtv@gmail.com
+email: superp1987@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- app/controllers/uploader/attachments_controller.rb
-- app/assets/images/uploader/progressBarFillBg.png
-- app/assets/images/uploader/ico_attach.png
-- app/assets/images/uploader/but_del_tag2.png
-- app/assets/images/uploader/preloader.gif
-- app/assets/javascripts/uploader/jquery.fileupload-ui.js
-- app/assets/javascripts/uploader/jquery.fileupload-validate.js
-- app/assets/javascripts/uploader/jquery.ui.widget.js
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/uploader/application.js
-- app/assets/javascripts/uploader/load-image.js
-- app/assets/javascripts/uploader/jquery.fileupload.js
-- app/assets/javascripts/uploader/locales/ru.js
-- app/assets/javascripts/uploader/locales/uk.js
-- app/assets/javascripts/uploader/locales/en.js
-- app/assets/javascripts/uploader/canvas-to-blob.js
-- app/assets/javascripts/uploader/tmpl.js
 - app/assets/javascripts/uploader/rails_admin.js
-- app/assets/javascripts/uploader/jquery.fileupload-angular.js
-- app/assets/javascripts/uploader/jquery.fileupload-process.js
-- app/assets/javascripts/uploader/jquery.fileupload-resize.js
-- app/assets/javascripts/uploader/jquery.iframe-transport.js
-- app/assets/stylesheets/uploader/application.css
-- app/assets/stylesheets/uploader/default.css
-- app/assets/stylesheets/uploader/jquery.fileupload-ui.css
+- app/assets/stylesheets/uploader/application.css.sass
+- app/assets/stylesheets/uploader/application.css.scss
+- app/controllers/uploader/attachments_controller.rb
 - app/views/rails_admin/main/_form_rails_uploader.haml
 - app/views/uploader/default/_container.html.erb
-- app/views/uploader/default/_sortable.html.erb
 - app/views/uploader/default/_download.html.erb
+- app/views/uploader/default/_sortable.html.erb
 - app/views/uploader/default/_upload.html.erb
-- lib/file_size_validator.rb
+- config/locales/en.yml
+- config/locales/ru.yml
+- config/locales/uk.yml
+- config/routes.rb
 - lib/glebtv-rails-uploader.rb
 - lib/uploader.rb
+- lib/uploader/asset.rb
+- lib/uploader/engine.rb
+- lib/uploader/fileuploads.rb
+- lib/uploader/helpers/field_tag.rb
 - lib/uploader/helpers/form_builder.rb
 - lib/uploader/helpers/form_tag_helper.rb
-- lib/uploader/helpers/field_tag.rb
-- lib/uploader/fileuploads.rb
-- lib/uploader/version.rb
-- lib/uploader/engine.rb
-- lib/uploader/asset.rb
-- lib/uploader/rails_admin/field.rb
 - lib/uploader/hooks/active_record.rb
-- lib/uploader/hooks/simple_form.rb
 - lib/uploader/hooks/formtastic.rb
-- config/locales/uk.yml
-- config/locales/en.yml
-- config/locales/ru.yml
-- config/routes.rb
-- vendor/assets/javascripts/uploader/jquery.ui.widget.js
-- vendor/assets/javascripts/uploader/jquery.fileupload-fp.js
-- MIT-LICENSE
-- Rakefile
-- README.md
-- spec/dummy/Rakefile
-- spec/dummy/db/migrate/20120508093830_create_articles.rb
-- spec/dummy/db/migrate/20120508093416_create_assets.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/500.html
+- lib/uploader/hooks/simple_form.rb
+- lib/uploader/rails_admin/field.rb
+- lib/uploader/version.rb
 - spec/dummy/README.rdoc
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/application.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/script/rails
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/asset.rb
 - spec/dummy/app/models/picture.rb
 - spec/dummy/app/uploaders/picture_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
-- spec/requests/attachments_controller_spec.rb
-- spec/uploader_spec.rb
-- spec/fileuploads_spec.rb
-- spec/mongoid.yml
-- spec/spec_helper.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20120508093416_create_assets.rb
+- spec/dummy/db/migrate/20120508093830_create_articles.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/script/rails
+- spec/factories/articles.rb
 - spec/factories/assets.rb
 - spec/factories/files/rails.png
-- spec/factories/articles.rb
+- spec/fileuploads_spec.rb
+- spec/mongoid.yml
 - spec/mongoid_spec.rb
+- spec/requests/attachments_controller_spec.rb
+- spec/spec_helper.rb
+- spec/uploader_spec.rb
+- vendor/assets/images/uploader/but_del_tag2.png
+- vendor/assets/images/uploader/ico_attach.png
+- vendor/assets/images/uploader/preloader.gif
+- vendor/assets/images/uploader/progressBarFillBg.png
+- vendor/assets/javascripts/uploader/jquery.fileupload-fp.js
+- vendor/assets/javascripts/uploader/jquery.fileupload-ui.js
+- vendor/assets/javascripts/uploader/jquery.fileupload.js
+- vendor/assets/javascripts/uploader/jquery.iframe-transport.js
+- vendor/assets/javascripts/uploader/jquery.ui.widget.js
+- vendor/assets/javascripts/uploader/load-image.min.js
+- vendor/assets/javascripts/uploader/locales/en.js
+- vendor/assets/javascripts/uploader/locales/ru.js
+- vendor/assets/javascripts/uploader/locales/uk.js
+- vendor/assets/javascripts/uploader/tmpl.min.js
+- vendor/assets/stylesheets/uploader/default.css.scss
+- vendor/assets/stylesheets/uploader/jquery.fileupload-ui.css.scss
 homepage: https://github.com/glebtv/rails-uploader
 licenses: []
 metadata: {}
@@ -249,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rails-uploader
-rubygems_version: 2.1.11
+rubyforge_project: 
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Rails file upload implementation with jQuery-File-Upload
@@ -277,7 +210,6 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/script/rails
 - spec/dummy/app/helpers/application_helper.rb