rails-uploader 0.4.3 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af962edb962aca8edc7a8996727d3a95fa41c843
-  data.tar.gz: 5bf8074ec2db68e2956f89b9ab817d6c80df36e7
+SHA256:
+  metadata.gz: 0ee8765eed0acd43fa3f0298b920818c61ce98dd87489357589617c253e08b78
+  data.tar.gz: 700490dfe078e643704fd6c08a6bb4d619ce62eaa776493f4ad11c26ee294851
 SHA512:
-  metadata.gz: 4bf1c5436485ad70c9c45e4f5a02fe6cb043d3a8da26dc09fa1b2583102f863782559092d6ab79fd703ff0c821e233733b3fa250fd9f4aa1fda879d578ee0983
-  data.tar.gz: fce54a2f91480eca89f22b435862d15ad6f765e085c8b1425376b90bda1456562ec1dd0628542345892a0495d9752ae347f37e73b20372b399b4460cd20d5b90
+  metadata.gz: 02c90581ef78112caa2392c0257c200714ef64b2266f4b851ec651a0dd45d4e6c73000bc7111b160f125f27c796dd8120a6205f29b45afe5f6c0de3797c11bb0
+  data.tar.gz: ec0e0cc1ab8417f7930b9decd0610fde73163568a49c75e8dc3565c3ccb6dad770d5968c1780d35ff5b83cab3db4f27e434c1789c2978efdd7114bf1c705a80a

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/superp/rails-uploader.svg?branch=master)](https://travis-ci.org/superp/rails-uploader)
+
 # HTML5 File uploader for rails
 
 This gem use https://github.com/blueimp/jQuery-File-Upload for upload files.
@@ -19,7 +21,7 @@ mount Uploader::Engine => '/uploader'
 Migration for ActiveRecord:
 
 ```bash
-$> rake uploader:install:migrations
+  $ bundle exec rails g uploader:install
 ```
 
 ## Usage

data/Rakefile

@@ -1,18 +1,8 @@
-# encoding: utf-8
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+# frozen_string_literal: true
 
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the rails-uploader plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+require 'rdoc/task'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 desc 'Generate documentation for the rails-uploader plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -22,3 +12,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

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)
@@ -46,7 +48,7 @@ module Uploader
 
     def find_klass
       @klass = Uploader.constantize(params[:klass])
-      raise ActionController::RoutingError, "Class not found #{params[:klass]}" if @klass.nil?
+      raise ActionController::ParameterMissing.new("klass parameter isn't set but #{params[:klass].inspect}") if @klass.nil?
     end
 
     def build_asset
@@ -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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails/generators/migration'
+
+module Uploader
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('templates', __dir__)
+
+      desc 'add the migrations'
+      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
+
+      def copy_migrations
+        migration_template '20130905144515_create_assets.rb', 'db/migrate/create_assets.rb'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class CreateAssets < ActiveRecord::Migration
+  def self.up
+    create_table :assets do |t|
+      t.string  :data_file_name, null: false
+      t.string  :data_content_type
+      t.integer :data_file_size
+
+      t.integer :assetable_id, null: false
+      t.string  :assetable_type, limit: 30, null: false
+      t.string  :type, limit: 30
+
+      t.string  :guid, limit: 30
+      t.string  :public_token, limit: 30
+
+      t.integer :user_id
+      t.integer :sort_order, default: 0
+      t.integer :width
+      t.integer :height
+
+      t.timestamps
+    end
+
+    add_index :assets, [:assetable_type, :type, :assetable_id]
+    add_index :assets, :user_id
+    add_index :assets, :guid
+    add_index :assets, :public_token
+  end
+
+  def self.down
+    drop_table :assets
+  end
+end

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,12 @@ 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
       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
     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