effective_assets 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67c92237f6b56315688a9a7e3d99fda5003ae1a
-  data.tar.gz: 4342c97db0a74f2e3154feeb24d7f5ed3024aed0
+  metadata.gz: c006f8da2100d57927ae98097485ec52f1106af8
+  data.tar.gz: 7617b72b67b27d90d0cfc8fe3be3d4abb6fda416
 SHA512:
-  metadata.gz: 72ad719b4aca16a29444fb9fabed8c9fa32ae455aaee367678f0083b16f049c20b5c5ca7dd5349019ebd7d9fe7e287e03b7b40367af588f27c0ba5040a7b43d7
-  data.tar.gz: 06128f78aa8bc3d1ba9201c8ddca3ae68bc034e3db7c6c8580ed9137a6a7a33104c6658e6ebca4f3d2f018752f25eecb0bc55d64dc736b587443082796e37661
+  metadata.gz: 8176d543b54d8571828cd6343f71dae8883a43739eba4ec684b24e21a056e4896c020e9c9f448eda4569f98eab28ab5d8bb1c33e704eb21098160b4e2d2d2b7e
+  data.tar.gz: cc46a87b4664f146a0577502de55907d263cbad1ededa68bb031a273fcd53fdd6bcb095f7c3524ff702dda875302fb4a205ef0d2f945d58ffbd975a0657b0205

data/app/helpers/effective_assets_helper.rb

@@ -57,7 +57,7 @@ module EffectiveAssetsHelper
     elsif asset.content_type.include? 'msword'
       image_path('mime-types/word.jpg')
     elsif asset.content_type.include? 'excel'
-      image_path('mime-types/excel.png')
+      image_path('mime-types/excel.jpg')
     elsif asset.content_type.include? 'application/pdf'
       image_path('mime-types/pdf.png')
     elsif asset.content_type.include? 'application/zip'

data/app/models/effective/asset.rb

@@ -133,7 +133,8 @@ module Effective
 
     def public_url(version = nil)
       if data.present?
-        version.present? ? data.send(version).file.url : data.file.url
+        url = (version.present? ? data.send(version).file.try(:url) : data.file.try(:url))
+        url || '#'
       else
        "#{Asset.s3_base_path.chomp('/')}/#{EffectiveAssets.aws_path.chomp('/')}/#{id.to_i}/#{file_name}"
       end
@@ -141,7 +142,8 @@ module Effective
 
     def authenticated_url(version = nil, expire_in = 60.minutes)
       data.aws_authenticated_url_expiration = expire_in
-      version.present? ? data.send(version).file.authenticated_url : data.file.authenticated_url
+      url = (version.present? ? data.send(version).file.try(:authenticated_url) : data.file.try(:authenticated_url))
+      url || '#'
     end
 
     def file_name

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails