effective_assets 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 366a2e6fe96f2009b7a8b5fde08d6c3bcb0ab73c
-  data.tar.gz: e4a72c773c655f15c672fce235e20858ee9343d0
+  metadata.gz: 270d9c01d088e1274797ab996187bc92f77564c3
+  data.tar.gz: 590af797beb1b2b7014ff636806d509038c2cebd
 SHA512:
-  metadata.gz: 95e1c356d67092ef2c5cd95cebc822e2d9809e38d2683885d9d35959abd6bbc951a0fd8509d2a5f1ca95db3f6c56f8575f4378a36c9bcb1e462997c657ac211f
-  data.tar.gz: 7e0fb528bc1c149f315a4048268fe9c2634ae518bab0580baf2d2a38c712c73d6e2cc35a9afa59308c74705a1ecd221537d735502fa208ed1d753716cc15e362
+  metadata.gz: 68913570e88a23c127f525cf1fc9a3ca0bd87aa329f98551592a6423ba3705ed87192e677537cc33eec0180c5c3f6431062a1076e60d01cc0b140bfd17572f33
+  data.tar.gz: d6a316a1f9b3d314a79322eb47606fc10b40307657de82537643c00944c78530bda477a1a9101e425590aa885fb85bbf9842045758297382da1694b6ed80e3cc

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

@@ -156,7 +156,7 @@ $.fn.S3Uploader = (options) ->
 
     content.filename         = file.name
     content.filesize         = file.size if 'size' of file
-    content.lastModifiedDate = file.lastModifiedDate if 'lastModifiedDate' of file
+    content.lastModified     = file.lastModified if 'lastModified' of file
     content.filetype         = file.type if 'type' of file
     content.asset_id         = file.asset_id if 'asset_id' of file
     content.relativePath     = build_relativePath(file) if has_relativePath(file)

data/app/models/effective/asset.rb

@@ -17,7 +17,7 @@ module Effective
     # 3.  But it doesn't belong to anything yet.  It might be attached to a user's asset_boxes, or a page, or a post through attachments
     #
 
-    has_many :attachments, :dependent => :delete_all
+    has_many :attachments, dependent: :delete_all
 
     # structure do
     #   title           :string
@@ -125,6 +125,10 @@ module Effective
       end
     end # End of Class methods
 
+    def to_s
+      title
+    end
+
     def title
       self[:title].presence || file_name
     end
@@ -172,26 +176,18 @@ module Effective
       content_type.include? 'audio/'
     end
 
+    def placeholder?
+      upload_file.blank? || upload_file == 'placeholder'.freeze
+    end
+
     def versions_info
       self[:versions_info] || {}
     end
 
-    def to_s
-      title
-    end
 
-    def placeholder?
-      upload_file.blank? || upload_file == 'placeholder'.freeze
-    end
 
     # This method is called asynchronously by an after_commit filter
     def process!
-      # Make sure carrierwave-aws sets the correct permissions
-      if data.respond_to?(:aws_acl) && aws_acl.present?
-        data.aws_acl = aws_acl
-        data.versions.each { |_, data| data.aws_acl = aws_acl }
-      end
-
       if placeholder?
         puts 'Placeholder Asset processing not required (this is a soft error)'
         # Do nothing

data/app/uploaders/effective_assets_uploader.rb

@@ -1,6 +1,8 @@
 class EffectiveAssetsUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
+  storage :aws
+
   def store_dir
     "#{EffectiveAssets.aws_path.chomp('/')}/#{model.id.to_i}"
   end
@@ -23,6 +25,18 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
     @aws_authenticated_url_expiration = expires_in
   end
 
+  def aws_acl
+    model.aws_acl
+  end
+
+  def aws_write_options
+    { acl: aws_acl }
+  end
+
+  def self.image?
+    proc { |uploader| (uploader.model.image? rescue false) }
+  end
+
   protected
 
   # record_info

data/app/uploaders/test_asset_uploader.rb

@@ -17,7 +17,7 @@ class TestAssetUploader < EffectiveAssetsUploader
   # Keep in mind, resize_to_fit will scale up images if they are smaller than 100px.
   # If you don't want it to do that, then replace that with resize_to_limit.
 
-  version :thumb, :if => :image? do
+  version :thumb, :if => image? do
     process :resize_to_fit => [70, 70]
     process :record_info => :thumb
   end

data/lib/effective_assets/version.rb

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

data/lib/generators/templates/asset_uploader.rb

@@ -17,7 +17,7 @@ class AssetUploader < EffectiveAssetsUploader
   # Keep in mind, resize_to_fit will scale up images if they are smaller than 100px.
   # If you don't want it to do that, then replace that with resize_to_limit.
 
-  version :thumb, :if => :image? do
+  version :thumb, if: image? do
     process :resize_to_fit => [70, 70]
     process :record_info => :thumb
     # process :watermark! => [70, 70]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails