rails-uploader 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1554bed2e981630207e781e2cb75015f00fedc24d3e539cde1f00ae4b6d1c9
-  data.tar.gz: 6b01480fbfdd9cba2721a1a082a61c2ea4c15f3faea2c2f4b30d6ee8161dfd6c
+  metadata.gz: 288f1b049430d69fe720b17b8db0888f196987f632c366150cb25b9ebada7081
+  data.tar.gz: 9dba7c65c0dab4ccebde808be6e867470c8c879133cf65461373c8f235311521
 SHA512:
-  metadata.gz: 3002afb2276e1261e757eb099145470af8e0363151bb4381c0154ec4c7940f49d19fc6b712bed1799a248743cb49468d960e229720b458bffc2845e93d4a44d9
-  data.tar.gz: d6f0918940ec2c5b66634398542a1c63854628416c3f506d04282b83869c1046a9221becf34e6677b47d4e486de917afbcb3e230f29bb7abaab17b2333ca7935
+  metadata.gz: 25ae58b3c31a0c2d9144b0c201bc5357ed42abef4e5cf3dad8323c1a11cbff3ba519f467efc7bf79754a4d978f39264d350e897458956be373e9db454238236b
+  data.tar.gz: 67e803051409302b8c64b81ed8a020dbd75373d19ab7432292a9b38d0e808b8f35d1a2e210a1c20225d8f32d206bf7dcdb7a8d5a2b5629d12cf3ac0f3c96af29

data/README.md

@@ -41,6 +41,23 @@ class Picture < Asset
     url(:thumb)
   end
 end
+
+class PictureUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  EXTENSION_WHITELIST = %w[jpg jpeg gif png].freeze
+
+  version :thumb do
+    process resize_to_fill: [100, 100]
+  end
+
+  def extension_whitelist
+    EXTENSION_WHITELIST
+  end
+end
 ```
 
 For example user has one picture:

data/app/assets/javascripts/uploader/jquery.uploader.js

@@ -0,0 +1,87 @@
+(function() {
+  var $, UploaderWidget;
+
+  $ = jQuery;
+
+  $.fn.uploaderWidget = function(options) {
+    if (options == null) {
+      options = {};
+    }
+    return this.each(function() {
+      var $this, data;
+      $this = $(this);
+      data = $this.data('uploaderWidget');
+      if (!data) {
+        $this.data('uploaderWidget', new UploaderWidget(this, options));
+      }
+      if (typeof options === 'string') {
+        return data[options]();
+      }
+    });
+  };
+
+  UploaderWidget = (function() {
+    function UploaderWidget(dom_id, options) {
+      var defaults;
+      this.dom_id = dom_id;
+      if (options == null) {
+        options = {};
+      }
+      defaults = {
+        dataType: 'json',
+        autoUpload: true,
+        paramName: 'asset[data]',
+        formData: function(form) {
+          return [];
+        },
+        namespace: 'uploader',
+        uploadTemplateId: 'template-upload-',
+        downloadTemplateId: 'template-download-'
+      };
+      this.options = $.extend(defaults, options);
+      this._setup();
+    }
+
+    UploaderWidget.prototype._setup = function() {
+      this.element = $(this.dom_id);
+      this.container = this.element.find('.uploader-files');
+      this.template = this.element.data('tpml');
+      this.input = this.element.find('input[type="file"]:eq(0)');
+      this.options['dropZone'] = this.element;
+      this.options['filesContainer'] = this.container;
+      this.options['uploadTemplateId'] += this.template;
+      this.options['downloadTemplateId'] += this.template;
+      this.options.singular = !this.input.prop('multiple');
+      return this._initFileupload();
+    };
+
+    UploaderWidget.prototype._initFileupload = function() {
+      this.input.fileupload(this.options);
+      this.uploader = this.input.data('blueimp-fileupload') || this.input.data('fileupload');
+      if (this.element.data('exists')) {
+        return this._load();
+      }
+    };
+
+    UploaderWidget.prototype._load = function() {
+      return $.ajax({
+        url: this.input.data('url'),
+        dataType: 'json',
+        method: 'GET',
+        success: (function(_this) {
+          return function(data) {
+            if (data['files'] != null) {
+              return _this.render(data['files']);
+            }
+          };
+        })(this)
+      });
+    };
+
+    UploaderWidget.prototype.render = function(files) {
+      return this.uploader._renderDownload(files).appendTo(this.container);
+    };
+
+    return UploaderWidget;
+  })();
+}).call(this);

data/app/views/uploader/default/_container.html.erb

@@ -1,6 +1,7 @@
 <%= content_tag(:div, id: field.id, class: 'uploader-dnd-area', data: { tpml: field.klass.to_s, exists: field.exists? }) do -%>
   <%= hidden_field(field.object_name, :fileupload_guid, object: field.object) if field.object.new_record? %>
 
+  <p class='uploader-errors'></p>
   <div class="uploader-files"></div>
 
   <div class="uploader-dnd-hints">

data/lib/uploader/helpers/field_tag.rb

@@ -76,12 +76,21 @@ module Uploader
         @input_html ||= { multiple: multiple?, class: 'uploader' }.merge(input_html_options)
         @input_html[:data] ||= {}
         @input_html[:data][:url] ||= attachments_path(singular: !multiple?)
+        @input_html[:accept] ||= extract_extension_whitelist
         @input_html
       end
 
       def input_html_options
         @options.reject { |key, _value| RESERVED_OPTIONS_KEYS.include?(key.to_s) }
       end
+
+      def extract_extension_whitelist
+        return unless klass.respond_to?(:uploaders)
+        return unless klass.uploaders[:data].try(:const_defined?, :EXTENSION_WHITELIST)
+
+        exts = klass.uploaders[:data]::EXTENSION_WHITELIST
+        ".#{exts.join(', .')}" if exts.any?
+      end
     end
   end
 end

data/lib/uploader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uploader
-  VERSION = '0.5.1'
+  VERSION = '0.5.5'
 end

data/spec/dummy/app/uploaders/picture_uploader.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class PictureUploader < CarrierWave::Uploader::Base
-
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
   include CarrierWave::MiniMagick
@@ -51,5 +50,4 @@ class PictureUploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
-
 end

data/vendor/assets/javascripts/uploader/jquery.fileupload-ui.js

@@ -173,6 +173,7 @@
                     deferred;
                 var options = that.options;
                 if (options.singular) { options.filesContainer.html(data.context || '') };
+                options.dropZone.find('.uploader-errors').text('');
                 if (data.context) {
                     data.context.each(function (index) {
                         var file = files[index] ||
@@ -220,6 +221,9 @@
                         $(this).data('fileupload'),
                     template,
                     deferred;
+                try { var errors = data._response.jqXHR.responseJSON.files[0].error || ''}
+                catch (e) { var errors = '' }
+                that.options.dropZone.find('.uploader-errors').text(errors);
                 if (data.context) {
                     data.context.each(function (index) {
                         if (data.errorThrown !== 'abort') {
@@ -239,6 +243,7 @@
                                             that._trigger('failed', e, data);
                                             that._trigger('finished', e, data);
                                             deferred.resolve();
+                                            data.context.remove();
                                         }
                                     );
                                 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -64,7 +64,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/uploader/application.js
-- app/assets/javascripts/uploader/jquery.uploader.js.coffee
+- app/assets/javascripts/uploader/jquery.uploader.js
 - app/assets/stylesheets/uploader/application.css
 - app/controllers/uploader/attachments_controller.rb
 - app/views/uploader/default/_container.html.erb

data/app/assets/javascripts/uploader/jquery.uploader.js.coffee

@@ -1,59 +0,0 @@
-$ = jQuery
-
-$.fn.uploaderWidget = (options = {}) ->
-  @each ->
-    $this = $(this)
-    data = $this.data('uploaderWidget')
-    if (!data)
-      $this.data('uploaderWidget', new UploaderWidget(this, options))
-    if (typeof options is 'string')
-      data[options]()
-
-class UploaderWidget
-  constructor: (@dom_id, options = {}) ->
-    defaults =
-      dataType: 'json'
-      autoUpload: true
-      paramName: 'asset[data]'
-      formData: (form) -> return []
-      namespace: 'uploader'
-      uploadTemplateId: 'template-upload-'
-      downloadTemplateId: 'template-download-'
-
-    @options = $.extend defaults, options
-
-    this._setup()
-
-  _setup: ->
-    @element = $(@dom_id)
-    @container = @element.find('.uploader-files')
-    @template = @element.data('tpml')
-    @input = @element.find('input[type="file"]:eq(0)')
-
-    @options['dropZone'] = @element
-    @options['filesContainer'] = @container
-    @options['uploadTemplateId'] += @template
-    @options['downloadTemplateId'] += @template
-    @options.singular = !@input.prop('multiple')
-
-    this._initFileupload()
-
-  _initFileupload: ->
-    @input.fileupload(@options)
-
-    @uploader = (@input.data('blueimp-fileupload') || @input.data('fileupload'))
-
-    this._load() if @element.data('exists')
-
-  _load: ->
-    $.ajax(
-      url: @input.data('url')
-      dataType: 'json'
-      method: 'GET'
-      success: (data) =>
-        if data['files']?
-          this.render(data['files'])
-    )
-
-  render: (files) ->
-    @uploader._renderDownload(files).appendTo(@container)