rails-uploader 0.4.4 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 923e6d27b9d4b77ed8ffb9a07f48a262ddc0b666
-  data.tar.gz: 920fbd248ad7226f170b2f24551f9c04c70c068e
+SHA256:
+  metadata.gz: e05f5c580e91d0d0b2702ad285f746f97afeffefd8c114088b96136bde737f8d
+  data.tar.gz: 9b7f11b41d7dc7ec839e570a1889e140f09b0866231fc8a5d4dfe545b1e5ed54
 SHA512:
-  metadata.gz: 9739c073e1c859bc6734b246acd27eed10f386280adaac5fb43ae6a97afb82f40792d02c3db929a8dabc0bdfc7995ff95bc5c0623121731abd4ecb6377235658
-  data.tar.gz: 402440486120aa35e9ae63d2efd4e7400518f8e8abf17ed6f136ed4526822bf68cbbb7c56872f5308ef9eb517981a76cb331fd7088ddb2807484cb4d892a8614
+  metadata.gz: 9c0f890979f7ae8a766d6a2957a86c390ffa65413e90aaa5d996399728eab61e8398ccab92303010442154c2da261f6123571847f2e7688e110c3c5d657ea5d3
+  data.tar.gz: 3ee71e85c530ca477922d7d591ce5e2bad65c864b3fbd9535acf069d092ccb06c7ee109fa25583f72bebb26e8acd269bd62ea69dd49298f50f6e9216306dc54d

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/assets/javascripts/uploader/jquery.uploader.js.coffee

@@ -34,6 +34,7 @@ class UploaderWidget
     @options['filesContainer'] = @container
     @options['uploadTemplateId'] += @template
     @options['downloadTemplateId'] += @template
+    @options.singular = !@input.prop('multiple')
 
     this._initFileupload()
 

data/app/controllers/uploader/attachments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   class AttachmentsController < ActionController::Metal
     include AbstractController::Callbacks
@@ -5,8 +7,8 @@ module Uploader
     include Uploader::ChunkedUploads
 
     before_action :find_klass
-    before_action :build_asset, only: [:create]
-    before_action :find_asset, only: [:destroy]
+    before_action :build_asset, only: :create
+    before_action :find_asset, only: :destroy
 
     def index
       authorize!(:index, @klass)
@@ -67,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/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Uploader::Engine.routes.draw do
   resources :attachments, only: [:index, :create, :update, :destroy]
 end

data/lib/generators/uploader/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/migration'
 
 module Uploader
@@ -5,14 +7,16 @@ module Uploader
     class InstallGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
 
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
+
       desc 'add the migrations'
-      def self.next_migration_number(path)
-        unless @prev_migration_nr
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        else
+      def self.next_migration_number(_path)
+        if @prev_migration_nr
           @prev_migration_nr += 1
+        else
+          @prev_migration_nr = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
         end
+
         @prev_migration_nr.to_s
       end
 

data/lib/generators/uploader/install/templates/20130905144515_create_assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAssets < ActiveRecord::Migration
   def self.up
     create_table :assets do |t|

data/lib/rails-uploader.rb

@@ -1,2 +1,3 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'uploader'

data/lib/uploader.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'securerandom'
 require 'uploader/version'
 
@@ -64,6 +65,7 @@ module Uploader
 
   def self.constantize(klass)
     return if klass.blank?
+
     klass.safe_constantize
   end
 

data/lib/uploader/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 module Uploader
@@ -49,7 +51,22 @@ module Uploader
     #
     def fileupload_create(params, _request = nil)
       self[Uploader.guid_column] = params[:guid]
-      update_attributes(self.class.fileupload_assetable_options(params))
+      return false unless update_attributes(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
+      end
+      true
+    end
+
+    def fileupload_destroy_other_on_singular?(params)
+      return unless params[:singular].to_s.downcase == 'true'
+      return true if params[:guid].present?
+
+      [
+        params["#{Uploader.assetable_column}_id"],
+        params["#{Uploader.assetable_column}_type"]
+      ].all?(&:present?)
     end
 
     # Destroy asset
@@ -80,7 +97,7 @@ module Uploader
         name: filename,
         content_type: content_type,
         size: size,
-        url:  url,
+        url: url,
         thumb_url: thumb_url
       }
     end

data/lib/uploader/authorization.rb

@@ -1,11 +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
@@ -21,6 +25,7 @@ module Uploader
     # If the action is not allowd, it raises an Uploader::AccessDenied exception.
     def authorize!(action, subject = nil)
       return if authorized?(action, subject)
+
       raise Uploader::AccessDenied.new(current_uploader_user, action, subject)
     end
 
@@ -41,11 +46,12 @@ 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
       return if Uploader.current_user_proc.nil?
+
       @current_uploader_user ||= Uploader.current_user_proc.call(request)
     end
   end

data/lib/uploader/authorization_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   class AuthorizationAdapter
     attr_reader :user

data/lib/uploader/chunked_uploads.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   module ChunkedUploads
     extend ActiveSupport::Concern

data/lib/uploader/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails'
 
 module Uploader

data/lib/uploader/file_part.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   class FilePart < File
     def initialize(path, filename)

data/lib/uploader/fileupload_glue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   class FileuploadGlue
     attr_reader :record, :record_klass
@@ -5,8 +7,8 @@ module Uploader
     delegate :reflect_on_association, to: :record_klass
     delegate :fileupload_guid, :new_record?, to: :record
 
-    TARGET_TYPE = '_type'.freeze
-    TARGET_ID = '_id'.freeze
+    TARGET_TYPE = '_type'
+    TARGET_ID = '_id'
 
     def initialize(record)
       @record = record
@@ -36,6 +38,7 @@ module Uploader
 
     def asset(method_name)
       return unless available_fileuploads.include?(method_name.to_sym)
+
       find_asset_by_fileupload_guid(method_name, fileupload_guid) || build_asset(method_name)
     end
 
@@ -47,6 +50,7 @@ module Uploader
     # Find class by reflection
     def klass(method_name)
       return if association(method_name).nil?
+
       association(method_name).klass
     end
 
@@ -62,6 +66,7 @@ module Uploader
 
     def available_fileuploads
       return [] if @record_klass.fileupload_options.nil?
+
       @available_fileuploads ||= @record_klass.fileupload_options.keys
     end
 
@@ -97,7 +102,9 @@ module Uploader
     end
 
     def record_klass_type
-      if @record_klass.respond_to?(:base_class)
+      if @record_klass.respond_to?(:polymorphic_name)
+        @record_klass.polymorphic_name
+      elsif @record_klass.respond_to?(:base_class)
         @record_klass.base_class.name
       else
         @record_klass.name

data/lib/uploader/fileuploads.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/concern'
 
 module Uploader

data/lib/uploader/helpers/field_tag.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Uploader
   module Helpers
     class FieldTag
-      RESERVED_OPTIONS_KEYS = %(method_name object_name theme value object sortable).freeze
+      RESERVED_OPTIONS_KEYS = %w[method_name object_name theme value object sortable].freeze
 
       attr_reader :template, :object, :theme
 
@@ -73,12 +75,20 @@ module Uploader
       def input_html
         @input_html ||= { multiple: multiple?, class: 'uploader' }.merge(input_html_options)
         @input_html[:data] ||= {}
-        @input_html[:data][:url] ||= attachments_path
+        @input_html[:data][:url] ||= attachments_path(singular: !multiple?)
+        @input_html[:accept] ||= extension_whitelist
         @input_html
       end
 
       def input_html_options
-        @options.select { |key, _value| !RESERVED_OPTIONS_KEYS.include?(key.to_s) }
+        @options.reject { |key, _value| RESERVED_OPTIONS_KEYS.include?(key.to_s) }
+      end
+
+      def extension_whitelist
+        return unless klass.uploaders[:data].try(:const_defined?, :EXTENSION_WHITELIST)
+
+        exts = klass.uploaders[:data]::EXTENSION_WHITELIST
+        ".#{exts.join(', .')}" if exts.any?
       end
     end
   end

data/lib/uploader/helpers/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   module Helpers
     module FormBuilder

data/lib/uploader/helpers/form_tag_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
   module Helpers
     module FormTagHelper

data/lib/uploader/hooks/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 ActiveSupport.on_load :active_record do

data/lib/uploader/hooks/formtastic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'formtastic'
 
 module Formtastic

data/lib/uploader/hooks/simple_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simple_form'
 
 module SimpleForm

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/request'
 require 'fileutils'
 require 'digest/sha1'
@@ -5,7 +7,7 @@ require 'uri'
 
 module Uploader
   class UploadRequest < Rack::Request
-    SPLITTER = '/'.freeze
+    SPLITTER = '/'
 
     attr_reader :file
 
@@ -30,6 +32,7 @@ module Uploader
 
     def total_file_length
       return content_length.to_i unless chunked?
+
       @env['HTTP_CONTENT_RANGE'].split(SPLITTER).last.to_i
     end
 
@@ -73,7 +76,7 @@ module Uploader
 
     def extract_filename(value)
       value = value.match(/filename\s?=\s?\"?([^;"]+)\"?/i)[1]
-      URI.decode(value.force_encoding('binary'))
+      URI.decode_www_form(value.force_encoding('binary'))
     end
   end
 end

data/lib/uploader/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Uploader
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.5.3'
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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/spec/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/spec/dummy/config/environments/test.rb

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil

data/spec/requests/attachments_controller_spec.rb

@@ -7,16 +7,52 @@ describe Uploader::AttachmentsController do
     Dummy::Application
   end
 
+  before :each do
+    Picture.destroy_all
+  end
+
   it "should create new asset" do
     file = Rack::Test::UploadedFile.new('spec/factories/files/rails.png', "image/png")
+    article = FactoryGirl.create(:article)
+    post "/uploader/attachments", {
+      :klass => "Picture",
+      :assetable_id => article.id,
+      :assetable_type => article.class.name,
+      :guid => "SOMESTRING",
+      :asset => {:data => file}
+    }
+
+    Picture.count.should == 1
+
+    last_response.body.should include('thumb_url')
+    last_response.body.should include('name')
+  end
+
+  it "should destroy old asset on new asset for has_one" do
+    file = Rack::Test::UploadedFile.new('spec/factories/files/rails.png', "image/png")
+    article = FactoryGirl.create(:article)
     post "/uploader/attachments", {
       :klass => "Picture",
-      :assetable_id => "1",
-      :assetable_type => "Article",
+      :assetable_id => article.id,
+      :assetable_type => article.class.name,
       :guid => "SOMESTRING",
+      :singular => true,
       :asset => {:data => file}
     }
 
+    Picture.count.should == 1
+
+    post "/uploader/attachments", {
+      :klass => "Picture",
+      :assetable_id => article.id,
+      :assetable_type => article.class.name,
+      :guid => "SOMESTRING",
+      :singular => true,
+      :asset => {:data => file}
+    }
+
+    Picture.count.should == 1
+
     last_response.body.should include('thumb_url')
     last_response.body.should include('name')
   end

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

@@ -171,6 +171,9 @@
                     files = getFilesFromResponse(data),
                     template,
                     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] ||
@@ -218,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') {
@@ -237,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.4.4
+  version: 0.5.3
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,24 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,10 +93,12 @@ 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
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -183,50 +171,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails-uploader
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Rails file upload implementation with jQuery-File-Upload
 test_files:
+- spec/fileuploads_spec.rb
+- spec/requests/attachments_controller_spec.rb
+- spec/mongoid_spec.rb
+- spec/factories/assets.rb
+- spec/factories/articles.rb
+- spec/factories/files/rails.png
+- spec/spec_helper.rb
+- spec/uploader_spec.rb
+- spec/mongoid.yml
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/uploaders/picture_uploader.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/assets/config/manifest.js
 - 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/picture.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/README.rdoc
+- spec/dummy/public/500.html
+- spec/dummy/public/422.html
+- spec/dummy/public/404.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/Rakefile
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/environment.rb
+- spec/dummy/config/database.yml
 - 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/config.ru
 - 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/Rakefile
-- spec/dummy/README.rdoc
+- spec/dummy/config.ru
 - spec/dummy/script/rails
-- spec/factories/articles.rb
-- spec/factories/assets.rb
-- spec/factories/files/rails.png
-- 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