rails-uploader 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b602b1677568ea5d878174c76224c6a61d431efdb93046f8bd3b897dbed63f55
-  data.tar.gz: e2464535aa4a6f329bee939b98a32fba4193f472111bda3c669c5f8465d1ac62
+  metadata.gz: 566c841fcb9d098a1b256c3aff94e01950cdbb0ace03d1c657e8d9fa3c114314
+  data.tar.gz: 4ac9416e87c31176a81392e1a958fc90e65f3cc5c70d7faf72e37fdadcb21053
 SHA512:
-  metadata.gz: 194158c8d9f7540ed210e11b3cb1b98ff346c35562b960365dba01113caea71b808363832b613a804bcd45b2df2f815506d8c74c25532011384dd027f38f9660
-  data.tar.gz: d66527e6277747de70d148af352391998c83a75e08418e0a665c31130c1ea5117e06c2c039ce4b8fad73930e75fe5cfe45c77da72e509ee4da6fdb34ed72c5ee
+  metadata.gz: d535a4a9a2c9e40d24826c586f6ebf006934f3194f4600390e783659eadbe37955474b8430a1843ed8db6841afc13998cbaf46e2b935a88bc651fccf8806f33c
+  data.tar.gz: 1ddd6948b2fd9c202b1a1bfeb9ce491964823bd7a3b861a33f2ad34b7c7e09fd6b452c1b5da312344ccdc9f9de1c6b8f8e42c45a2bcd40489f872f4fedf2e322

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/Rakefile

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'

data/app/controllers/uploader/attachments_controller.rb

@@ -69,12 +69,6 @@ module Uploader
       end
     end
 
-    def render_json(hash_or_object, status = 200)
-      self.status = status
-      self.content_type = request.format
-      self.response_body = hash_or_object.to_json(root: false)
-    end
-
     def asset_params
       ActionController::Parameters.new(params).require(:asset).permit(:data)
     end

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/authorization.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require 'active_support/concern'
+require_relative 'json_rendering'
 
 module Uploader
   module Authorization
     extend ActiveSupport::Concern
 
     included do
-      include ActiveSupport::Rescuable
+      include JsonRendering
+      include ActionController::Rescue
 
       rescue_from Uploader::AccessDenied, with: :dispatch_uploader_access_denied
     end
@@ -44,7 +46,7 @@ module Uploader
     end
 
     def dispatch_uploader_access_denied(exception)
-      render json: { message: exception.message }, status: 403
+      render_json({ message: exception.message }, 403)
     end
 
     def current_uploader_user

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/json_rendering.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Uploader
+  module JsonRendering
+    def render_json(hash_or_object, status = 200)
+      self.status = status
+      self.content_type = request.format
+      self.response_body = hash_or_object.to_json(root: false)
+    end
+  end
+end

data/lib/uploader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uploader
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.4'
 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.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,6 +93,7 @@ files:
 - lib/uploader/hooks/active_record.rb
 - lib/uploader/hooks/formtastic.rb
 - lib/uploader/hooks/simple_form.rb
+- lib/uploader/json_rendering.rb
 - lib/uploader/upload_request.rb
 - lib/uploader/version.rb
 - spec/dummy/README.rdoc