effective_assets 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270d9c01d088e1274797ab996187bc92f77564c3
-  data.tar.gz: 590af797beb1b2b7014ff636806d509038c2cebd
+  metadata.gz: de50de960170c291dc68a6ed080085e7fe94b7c3
+  data.tar.gz: 604c94ab2c3b532ee4cefe65dd4d74477c99d0cd
 SHA512:
-  metadata.gz: 68913570e88a23c127f525cf1fc9a3ca0bd87aa329f98551592a6423ba3705ed87192e677537cc33eec0180c5c3f6431062a1076e60d01cc0b140bfd17572f33
-  data.tar.gz: d6a316a1f9b3d314a79322eb47606fc10b40307657de82537643c00944c78530bda477a1a9101e425590aa885fb85bbf9842045758297382da1694b6ed80e3cc
+  metadata.gz: 5556bd6ec9b1d637b6a26e2e0d4570dcfd2b6500036cc674a977bd273a748b08b4b817597e986f164ad0d3c264cd4a57e9ec2306fad937c7eb5fcf1fb701ce38
+  data.tar.gz: 3c98e8f97e9fd3af581bd7587dde513455dc14851187131ada2486eb89188e2e1a366c3f33393e86a2e7bdeda6bdf860b89b0abc73431529bf8cdc3fef96d01c

data/app/controllers/effective/assets_controller.rb

@@ -14,9 +14,11 @@ module Effective
       if params[:only] == 'images'
         @assets = @assets.images
         @file_types = [:jpg, :gif, :png, :bmp, :ico]
+        @aws_acl = EffectiveAssets::AWS_PUBLIC
       elsif params[:only] == 'nonimages'
         @assets = @assets.nonimages
         @file_types = [:pdf, :zip, :doc, :docx, :xls, :xlsx, :txt, :csv, :avi, :m4v, :m2v, :mov, :mp3, :mp4, :eml]
+        @aws_acl = EffectiveAssets.aws_acl
       end
 
       @user_uploads = IframeUploads.new(@assets)

data/app/models/effective/snippets/effective_asset.rb

@@ -15,8 +15,16 @@ if defined?(EffectiveRegions)
           :span
         end
 
+        def private_url
+          super || aws_private?
+        end
+
         def is_private?
-          private_url == true || (asset.try(:aws_acl) == EffectiveAssets::AWS_PRIVATE)
+          private_url == true
+        end
+
+        def aws_private?
+          (asset.try(:aws_acl) == EffectiveAssets::AWS_PRIVATE)
         end
 
       end

data/app/views/effective/assets/iframe.html.haml

@@ -24,4 +24,4 @@
         attachment_actions: [:insert, :delete],
         attachment_add_to: :top,
         file_types: (@file_types || :any),
-        aws_acl: EffectiveAssets::AWS_PUBLIC
+        aws_acl: (@aws_acl || EffectiveAssets.aws_acl)

data/lib/effective_assets/version.rb

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

metadata

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