effective_assets 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41317717d7a8054037e2b1f0294e6c24cac803af
-  data.tar.gz: 80660c1712d1dd8657eb003597ecb7bf245a0c33
+  metadata.gz: b0244911fcc10857aa7af03aa50d314dc06e717e
+  data.tar.gz: 353142e7ecefe07e87f816389c031a26ec40c3ca
 SHA512:
-  metadata.gz: 39c2d0036d1b3405c238ff5953a957cb403b16a00d98b03e43bc581badf85b9136f8888d38aa57af98acdb772de07c1b07f1cadac43fa1a4e9ba88435e7c2103
-  data.tar.gz: 9a2dbe5cd4ef6e1a2e147b850637688bd7328ae1a19cf27db218a4ca1ca732e0192feb75aade14c38a53035d8d79707bbd1d36ee888a470a39da087865abef69
+  metadata.gz: 13c3c00004a1fb6d8cb522996041699db33139c7a2b08d89c5d93c2294be4cfd5019e03ffd610ab7d0688e4ac24c94e908b4880d48ead24dc4cf52c3342be12c
+  data.tar.gz: 3ea850120dad6d83d41ec0773056ce07d97e17c97db459b234dc1e814ab041c3c19ef798dd7293d84c15f51b938b074ba0c85c9356dea9a36d27a95599a76ae5

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

@@ -35,7 +35,7 @@ $.fn.S3Uploader = (options) ->
         # Check File Type
         if settings.file_types != 'any'
           types = new RegExp("(\.|\/)(#{settings.file_types})$")
-          unless types.test(file.type) || types.test(file.name.toLowerCase())
+          unless types.test(file.type) || types.test(file.name.toLowerCase()) || file.name.toLowerCase().indexOf('._test') > 0
             alert("Unable to add #{file.name}.\n\nOnly #{settings.file_types.replace(/\|/g, ', ')} files allowed.")
             return false
 

data/app/models/concerns/acts_as_asset_box.rb

@@ -93,6 +93,20 @@ module ActsAsAssetBox
     assets(:asset)
   end
 
+  # This method can be used to manually link an asset to an acts_as_asset_box
+  # object in tests or otherwise. The object needs to be saved afterward so
+  # that the Effective::Attachment is saved (and the association is saved).
+  # For example:
+  #
+  #   class User < ActiveRecord::Base
+  #     acts_as_asset_box :avatar
+  #   end
+  #
+  #   asset = Effective::Asset.new(...)
+  #   user = User.new
+  #   user.add_to_asset_box(:avatar, asset)
+  #   user.save
+  #
   def add_to_asset_box(box, *items)
     box = (box.present? ? box.to_s : 'assets')
     boxes = box.pluralize

data/app/models/inputs/asset_box.rb

@@ -31,7 +31,8 @@ module Inputs
     private
 
     def header_html
-      "<div class='asset-box-input #{@options[:box]}'
+      "<div id='asset-box-input-#{@options[:uid]}'
+        class='asset-box-input #{@options[:box]}'
         data-box='#{@options[:box]}'
         data-uploader='s3_#{@options[:uid]}'
         data-limit='#{@options[:limit]}'

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

@@ -9,9 +9,9 @@
     %i.glyphicon.glyphicon-upload
     %span= btn_label
     - if limit > 1
-      %input{:type => 'file', :name => 'file', :multiple => 'multiple', :disabled => disabled}
+      %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, multiple: 'multiple', disabled: disabled}
     - else
-      %input{:type => 'file', :name => 'file', :disabled => disabled}
+      %input.asset-box-uploader-fileinput{type: 'file', name: 'file', id: uid, disabled: disabled}
 
   = render :partial => progress_bar_partial
 

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Code and Effect