effective_assets 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4203bea664bf1bdd6bb31fb866375a10a186b51b
-  data.tar.gz: 0d8792dd7b61066eb0e13d671d8c591c98052a0e
+  metadata.gz: 366a2e6fe96f2009b7a8b5fde08d6c3bcb0ab73c
+  data.tar.gz: e4a72c773c655f15c672fce235e20858ee9343d0
 SHA512:
-  metadata.gz: 8b36113a751f8240e1929663e61e9f91128f336746d3848002c9fd84c5fb6425f19dd74fafa3513089ed70dd96b169dc801579fdf8ba8ef4102abb96ad49d623
-  data.tar.gz: e49cb21cfc006dc6116098d85a64cedabf170ab0780a9753862f3f1770b4953ac0d8599ca4bc645a0cc3d15557ce8126be95e82be9ca41a83d4c4ea5e8e0329e
+  metadata.gz: 95e1c356d67092ef2c5cd95cebc822e2d9809e38d2683885d9d35959abd6bbc951a0fd8509d2a5f1ca95db3f6c56f8575f4378a36c9bcb1e462997c657ac211f
+  data.tar.gz: 7e0fb528bc1c149f315a4048268fe9c2634ae518bab0580baf2d2a38c712c73d6e2cc35a9afa59308c74705a1ecd221537d735502fa208ed1d753716cc15e362

data/app/assets/javascripts/effective_assets/asset_box_initialize.js.coffee

@@ -0,0 +1,15 @@
+initialize = ->
+  $('div.asset-box-uploader:not(.initialized)').each (i, element) ->
+    element = $(element)
+    options = element.data('input-js-options') || {}
+
+    options['progress_bar_target'] = $(element).siblings('.uploads').first()
+    options['progress_bar_template'] = $(element).children("script[type='text/x-tmpl']").first()
+    options['dropZone'] = $(element).parent()
+
+    element.addClass('initialized').S3Uploader(options)
+
+$ -> initialize()
+$(document).on 'page:change', -> initialize()
+$(document).on 'turbolinks:load', -> initialize()
+$(document).on 'cocoon:after-insert', -> initialize()

data/app/assets/stylesheets/effective_assets/_asset_box_input.scss

@@ -35,6 +35,12 @@
     }
   }
 
+  .fileinput-button.disabled {
+    input {
+      cursor: not-allowed;
+    }
+  }
+
   // Display uploader bordered area
   .drop-files {
     border: 4px dashed #cfcfcf;

data/app/controllers/effective/s3_uploads_controller.rb

@@ -14,14 +14,14 @@ module Effective
 
     def create
       # Here we initialize an empty placeholder Asset, so we can reserve the ID
-      @asset = Effective::Asset.new(:user_id => ((current_user.try(:id) || 1) rescue 1), :upload_file => 'placeholder')
+      @asset = Effective::Asset.new(user_id: ((current_user.try(:id) || 1) rescue 1), upload_file: 'placeholder')
       @asset.extra = params[:extra] if params[:extra].kind_of?(Hash)
 
       EffectiveAssets.authorized?(self, :create, @asset)
 
       begin
         @asset.save!
-        render(:body => {:id => @asset.id, :s3_key => asset_s3_key(@asset)}.to_json, :status => 200)
+        render(body: {:id => @asset.id, :s3_key => asset_s3_key(@asset)}.to_json, :status => 200)
       rescue => e
         render(:body => e.message, :status => 500)
       end
@@ -30,7 +30,7 @@ module Effective
     def update
       @asset = Effective::Asset.find(params[:id])
 
-      EffectiveAssets.authorized?(self, :update, @asset)
+      EffectiveAssets.authorized?(self, :create, @asset)
 
       unless params[:skip_update]  # This is useful for the acts_as_asset_box Attach action
         if update_placeholder_asset(@asset, params) == false

data/app/helpers/effective_assets_s3_helper.rb

@@ -2,12 +2,19 @@ module EffectiveAssetsS3Helper
 
   def s3_uploader_fields(options = {})
     S3Uploader.new(options).fields.map do |name, value|
-      hidden_field_tag(name, value, :disabled => 'disabled')
+      hidden_field_tag(name, value, disabled: 'disabled')
     end.join.html_safe
   end
 
-  def s3_uploader_url
-    Effective::Asset.s3_base_path.chomp('/') + '/'
+  def s3_uploader_input_js_options(options = {})
+    {
+      url: (Effective::Asset.s3_base_path.chomp('/') + '/'),
+      remove_completed_progress_bar: true,
+      allow_multiple_files: (options[:limit].to_i > 1),
+      file_types: Array(options[:file_types]).flatten.join('|').to_s,
+      create_asset_url: effective_assets.s3_uploads_url,
+      update_asset_url: "#{effective_assets.s3_uploads_url}/:id",
+    }.to_json()
   end
 
   # Copied and modified from https://github.com/waynehoover/s3_direct_upload/blob/master/lib/s3_direct_upload/form_helper.rb

data/app/models/inputs/asset_box.rb

@@ -1,6 +1,6 @@
 module Inputs
   class AssetBox
-    delegate :content_tag, :render, :to => :@template
+    delegate :content_tag, :render, :current_user, :to => :@template
 
     def initialize(object, object_name, template, method, opts)
       @object = object
@@ -85,6 +85,14 @@ module Inputs
     end
 
     def uploader_html
+      # Check that we have permission to upload.
+      asset = Effective::Asset.new(user_id: ((current_user.try(:id) || 1) rescue 1), upload_file: 'placeholder')
+
+      unless (EffectiveAssets.authorized?(@template.controller, :create, asset) rescue false)
+        @options[:btn_title] = 'Unable to upload. (cannot :create Effective::Asset)'
+        @options[:disabled] = true
+      end
+
       render(
         :partial => 'asset_box_input/uploader',
         :locals => {
@@ -97,7 +105,8 @@ module Inputs
           :drop_files => @options[:uploader_drop_files],
           :drop_files_help_text => @options[:drop_files_help_text],
           :aws_acl => @options[:aws_acl],
-          :btn_label => @options[:btn_label]
+          :btn_label => @options[:btn_label],
+          :btn_title => @options[:btn_title]
         }
       ).html_safe
     end
@@ -158,7 +167,8 @@ module Inputs
         :dialog_url => @template.effective_assets.effective_assets_path,
         :disabled => false,
         :file_types => [:any],
-        :btn_label => "Upload..."
+        :btn_label => 'Upload...',
+        :btn_title => 'Click or drag & drop to upload a file'
       }.merge(opts).tap do |options|
         options[:method] = method.to_s
         options[:box] = method.to_s.pluralize

data/app/uploaders/effective_assets_uploader.rb

@@ -52,7 +52,7 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
   end
 
   def image?(new_file)
-    new_file.present? and new_file.content_type.to_s.include?('image') and !(new_file.content_type.include?('icon'))
+    new_file.present? && (new_file.uploader.model.image? rescue false)
   end
 
   def calculate_versions_info

data/app/views/asset_box_input/_progress_bar_template.html.haml

@@ -1,8 +1,8 @@
-%script{:type => 'text/x-tmpl'}
+%script{type: 'text/x-tmpl'}
   .upload
     = "{%=o.name%}"
     .progress
       %span
-        = image_tag('effective_assets/spinner.gif', :class => 'spinner')
+        = image_tag('effective_assets/spinner.gif', class: 'spinner')
         Uploading...
-      .bar{:style => 'width: 0%'}
+      .bar{style: 'width: 0%'}

data/app/views/asset_box_input/_uploader.html.haml

@@ -1,37 +1,22 @@
 .uploads
-.asset-box-uploader{:id => "s3_#{uid}", :class => ('drop-files' if drop_files) }
-  = s3_uploader_fields(:aws_acl => aws_acl)
+.asset-box-uploader{id: "s3_#{uid}", class: ('drop-files' if drop_files), 'data-input-js-options': s3_uploader_input_js_options(limit: limit, file_types: file_types) }
+  = s3_uploader_fields(aws_acl: aws_acl)
 
   - if drop_files
     %p= drop_files_help_text
 
-  %span.btn.btn-default.fileinput-button
+  %span.btn.btn-default.fileinput-button{class: ('disabled' if disabled)}
     %i.glyphicon.glyphicon-upload
     %span= btn_label
     - if limit > 1
       - if required
-        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, multiple: 'multiple', disabled: disabled, required: true}
+        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, multiple: 'multiple', disabled: disabled, required: true, title: btn_title}
       - else
-        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, multiple: 'multiple', disabled: disabled}
+        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, multiple: 'multiple', disabled: disabled, title: btn_title}
     - else
       - if required
-        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, disabled: disabled, required: true}
+        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, disabled: disabled, required: true, title: btn_title}
       - else
-        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, disabled: disabled}
+        %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, disabled: disabled, title: btn_title}
 
-  = render :partial => progress_bar_partial
-
-  %script{:type => 'text/javascript'}
-    :erb
-
-      $("#s3_<%= uid %>").S3Uploader({
-        url: '<%= s3_uploader_url %>',
-        progress_bar_target: $("#s3_<%= uid %>").siblings('.uploads').first(),
-        progress_bar_template: $("#s3_<%= uid %>").children("script[type='text/x-tmpl']").first(),
-        remove_completed_progress_bar: true,
-        allow_multiple_files: <%= limit > 1 %>,
-        file_types: '<%= [file_types].flatten.join('|').to_s %>',
-        create_asset_url: '<%= effective_assets.s3_uploads_url %>',
-        update_asset_url: '<%= effective_assets.s3_uploads_url %>/:id',
-        dropZone: $("#s3_<%= uid %>").parent()
-      });
+  = render partial: progress_bar_partial

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,6 +162,7 @@ files:
 - app/assets/javascripts/effective_assets/asset_box_dialog.js.coffee
 - app/assets/javascripts/effective_assets/asset_box_drag_and_drop.js.coffee
 - app/assets/javascripts/effective_assets/asset_box_filtering.js.coffee
+- app/assets/javascripts/effective_assets/asset_box_initialize.js.coffee
 - app/assets/javascripts/effective_assets/asset_box_sorting.js.coffee
 - app/assets/javascripts/effective_assets/cocoon.js.coffee
 - app/assets/javascripts/effective_assets/jquery_ui_sortable.js