effective_assets 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5ec4c3fd08df8fd4fa4746c988c05a71bbeeb7
-  data.tar.gz: 2790762d8b17b592c521799b6ff6ae80fe9322f7
+  metadata.gz: d9f34cc6c231fc5a0e0fd39376ac231dd7f89423
+  data.tar.gz: 966f600d4f9f57a426436859291b9cfab2507a27
 SHA512:
-  metadata.gz: db6ff9491afe90ff7c22103317cbeae96327537ec82c39765a02ef218b6e67191556bfbc40d483e016d63f0ab467583bdd5048fed13cbfa3663bc9aa0bd8d3d0
-  data.tar.gz: 42a04fdcf8d9b682aa869ee976e0ace7f76e8674c8ee5fc3388b498c865c3fa0aafce4775910adb89839edbe7713d0440c247a44f5c345ac67334674eff8c39c
+  metadata.gz: cfcc2942bf0a5160758a2cbd542309ed66ebf8e6f52923efe4e59234977d1664b41f4678f7ee26dccd9dc88bb667e25da2e1767c3decf9c130852164edf5ff3d
+  data.tar.gz: ea43db44ef5ec857b4890f4608ae43facc1ef212fba8cf4d291c672ed5f5ec77c9149fa1c21e089e67af190b7acb3989184a05bb50529c98ca0b622594e59cb5

data/README.md

@@ -186,6 +186,12 @@ asset.url
 asset.url(:thumb)   # See image versions (below)
   => "http://aws_bucket.s3.amazonaws.com/assets/1/thumb_my_avatar.png"
 
+asset.authenticated_url   # See image versions (below)
+  => "http://aws_bucket.s3.amazonaws.com/assets/1/thumb_my_avatar.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-...""
+
+asset.authenticated_url(:thumb, expire_in: 10.minutes)
+  => "http://aws_bucket.s3.amazonaws.com/assets/1/thumb_my_avatar.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-...""
+
 user.photos
   => [Effective::Asset<1>, Effective::Asset<2>] # An array of Effective::Asset objects
 ```

data/app/models/effective/asset.rb

@@ -137,8 +137,8 @@ module Effective
       self[:extra] || {}
     end
 
-    def url(version = nil, expire_in = nil)
-      aws_acl == EffectiveAssets::AWS_PRIVATE ? authenticated_url(version, expire_in) : public_url(version)
+    def url(version = nil, expire_in: nil)
+      aws_acl == EffectiveAssets::AWS_PRIVATE ? authenticated_url(version, expire_in: expire_in) : public_url(version)
     end
 
     def public_url(version = nil)
@@ -150,10 +150,11 @@ module Effective
       end
     end
 
-    def authenticated_url(version = nil, expire_in = 60.minutes)
-      data.aws_authenticated_url_expiration = expire_in
-      url = (version.present? ? data.send(version).file.try(:authenticated_url) : data.file.try(:authenticated_url))
-      url || '#'
+    def authenticated_url(version = nil, expire_in: nil)
+      if data.present?
+        data.aws_authenticated_url_expiration = (expire_in || 60.minutes).to_i
+        (version.present? ? data.send(version).file.try(:authenticated_url) : data.file.try(:authenticated_url))
+      end || '#'
     end
 
     def file_name

data/app/uploaders/effective_assets_uploader.rb

@@ -18,7 +18,7 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
   end
 
   def aws_authenticated_url_expiration
-    @aws_authenticated_url_expiration || 10.minutes
+    @aws_authenticated_url_expiration || 10.minutes.to_i
   end
 
   def aws_authenticated_url_expiration=(expires_in)

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.9.9'.freeze
+  VERSION = '1.9.10'.freeze
 end

metadata

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