promethee 1.6.49 → 1.6.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496447f7f0b22debc78ac8e895a227c6b3992bdb
-  data.tar.gz: 500ff0356497020a42749c4b7af4fcba097cea54
+  metadata.gz: 87f17492f43679c029f58f0dcb85be62dbf71e80
+  data.tar.gz: 1982b0b142ac55ac43abb767d86b1c8240d625e1
 SHA512:
-  metadata.gz: af5728585f2ea8be4bffdb06ae539f88bc279e3986e6a11a4ff4ae666f4ac592241500a011299899cb87ca7e8d9bf3612e12e60117d456cfa77f87be308de152
-  data.tar.gz: d1e1ec26ae2afb63d2917925b3644d6a874f4c4d4160d420da24ac6cc3fd8c355aab4b5c9b1e91b3457945f8042a0a1be62a7b06419fb49e559b6cd3fe9eb610
+  metadata.gz: f8a3a40b13492aafb27a9aabdb0b23821c868c559ca13159a695b36ae1b581656e94c076cd4e0846db18e7b7be7873dbb0a4e6c38182b621e52c3c50e96e78aa
+  data.tar.gz: 94714fe4b0ccda407eb73da8a069bec152bf2801260dbed37e03a8a426f42d3c9352fb7f97bbda450e20d9ddff040243675af301a0dd74c8c4ece5dec606eefd

data/app/assets/stylesheets/promethee-edit.sass

@@ -113,10 +113,12 @@ $promethee-color: #ff9900 !default
 .promethee_uploader--preview
   float: right
   margin-top: 5px
-  img
+  img, video
     display: block
     margin: 0 0 0 auto
     max-height: 34px
+  video
+    max-width: 50px
   &__delete
     margin-left: 5px
     cursor: pointer

data/app/controllers/promethee_controller.rb

@@ -18,6 +18,12 @@ class PrometheeController < ApplicationController
   def blob_show
     # as this is called only from promethee preview it sends an image resized to 720
     blob = ActiveStorage::Blob.find params[:id]
-    redirect_to url_for(blob.variant(resize: '720>'))
+    if blob.image?
+      redirect_to url_for(blob.variant(resize: '720>'))
+    elsif blob.video?
+      redirect_to url_for(blob.preview(resize: '720>'))
+    else
+      redirect_to url_for(blob)
+    end
   end
 end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.6.49'
+    VERSION = '1.6.50'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.6.49
+  version: 1.6.50
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails