rails-uploader 0.5.3 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05f5c580e91d0d0b2702ad285f746f97afeffefd8c114088b96136bde737f8d
-  data.tar.gz: 9b7f11b41d7dc7ec839e570a1889e140f09b0866231fc8a5d4dfe545b1e5ed54
+  metadata.gz: 34cf4f5470bf2a9ab6e3758b81ece72f0197deb58beabc92bbffe5145bfa3b93
+  data.tar.gz: f0a17d1ee3751d67a1359b3078e468e4c213612d3cd17babfb274b3aaeb3717d
 SHA512:
-  metadata.gz: 9c0f890979f7ae8a766d6a2957a86c390ffa65413e90aaa5d996399728eab61e8398ccab92303010442154c2da261f6123571847f2e7688e110c3c5d657ea5d3
-  data.tar.gz: 3ee71e85c530ca477922d7d591ce5e2bad65c864b3fbd9535acf069d092ccb06c7ee109fa25583f72bebb26e8acd269bd62ea69dd49298f50f6e9216306dc54d
+  metadata.gz: 7aa4ad3a15cde45c9e7221bc458fb36a190b42ba23be7baab13b180e62ae2fe015590ec1eae5b0cb2f91ddf546a3fdae59b1a434b31870570005de2aa1d5868a
+  data.tar.gz: 9300908ab201f4763f13843cd3ed4508ebd6caac99156ee68fd38ece251cbd0c120e59d40657ec0e6ecfb1db7b5dbdf259d7541591512d6cabcd1b095904b06d

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/lib/uploader/asset.rb

@@ -51,7 +51,7 @@ module Uploader
     #
     def fileupload_create(params, _request = nil)
       self[Uploader.guid_column] = params[:guid]
-      return false unless update_attributes(self.class.fileupload_assetable_options(params))
+      return false unless update(self.class.fileupload_assetable_options(params))
 
       if fileupload_destroy_other_on_singular?(params)
         self.class.fileupload_find_assets(params).where.not(id: id).destroy_all

data/lib/uploader/helpers/field_tag.rb

@@ -76,7 +76,7 @@ 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] ||= extension_whitelist
+        @input_html[:accept] ||= extract_extension_whitelist
         @input_html
       end
 
@@ -84,7 +84,8 @@ module Uploader
         @options.reject { |key, _value| RESERVED_OPTIONS_KEYS.include?(key.to_s) }
       end
 
-      def extension_whitelist
+      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

data/lib/uploader/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-uploader
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.6
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-03-24 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)