promethee 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bfa00024f6948324144223153ca8281d61c5f2b0dbc7c7400eabbabc35bec46
-  data.tar.gz: 9773241dba38789dd987e323270c2e8a8f49fb224c7e63010554f57547631efe
+  metadata.gz: dc97d30606ee4b8e6a77b7186577d9dcf7fafde8c5f0d0ae22ffb0e1980cce01
+  data.tar.gz: bde68a84f5da02eae62c5246ee30753c596c6a1391415a8d0a53db2adbc0fcb3
 SHA512:
-  metadata.gz: 5ac403751dc86682e9faabb169e67a37838f7adce5b931088827cc7e0fb7fc4cf1f3b244751393b035c97586caa5732bdb4a0014bf48c22c1ad369cfac9769af
-  data.tar.gz: cb84e69a2280f3ba55e727e998dfb64a62c34413ed40d603cfe343624494072bb76cd5c096090947994cee5ce825fbe696e81fad5e0ca47bb5b7cfab8a740739
+  metadata.gz: d23868ae0d49e4356563727ad1dee9460b668ed8613c7aa9b095623e5fd02ab15796dbfde4095455797d9be21c3de530d1fe7a79b42efcc202f9a5a74594fa6c
+  data.tar.gz: 9feace9191db444cbf69f7fb96be2b88a4a084ad6ed67087b57d303121025cfec257747f7fe855767467eefb93c6427fc309669d12770a45fabf6d9873b9ddf8

data/app/views/promethee/components/collection_item/_show.html.erb

@@ -3,10 +3,7 @@ searchable_caption = component[:attributes][:searchable_caption]
 media_type = component[:attributes][:media_type]
 case media_type
 when 'image'
-  image_data = component[:attributes][:image]
-  if image_data && image_data[:id]
-    image_blob = ActiveStorage::Blob.find image_data[:id]
-  end
+  image_blob = blob_from_data component[:attributes][:image]
 when 'video'
   url = component[:attributes][:video][:url].to_s
   if 'vimeo'.in? url

data/app/views/promethee/components/cover/_show.html.erb

@@ -1,8 +1,5 @@
 <%
-image_data = component[:attributes][:image]
-if image_data && image_data[:id]
-  blob = ActiveStorage::Blob.find image_data[:id]
-end
+blob = blob_from_data component[:attributes][:image]
 
 searchable_surtitle = component[:attributes][:searchable_surtitle].to_s
 searchable_title = component[:attributes][:searchable_title].to_s

data/app/views/promethee/components/faq_item/_show.html.erb

@@ -3,10 +3,7 @@ title = component[:attributes][:searchable_title].to_s
 body = component[:attributes][:searchable_body].to_s
 special_question = component[:attributes][:special_question]
 
-image = component[:attributes][:image]
-if image && image[:id]
-  image_blob = ActiveStorage::Blob.find image[:id]
-end
+image_blob = blob_from_data component[:attributes][:image]
 %>
 
 <div class="<%= promethee_class_for component %> <%= 'promethee__component__faq_item--special' if special_question %>">

data/app/views/promethee/components/image/_show.html.erb

@@ -1,8 +1,5 @@
 <%
-image_data = component[:attributes][:image]
-if image_data && image_data[:id]
-  blob = ActiveStorage::Blob.find image_data[:id]
-end
+blob = blob_from_data component[:attributes][:image]
 
 searchable_alt = component[:attributes][:searchable_alt].to_s
 searchable_caption = component[:attributes][:searchable_caption].to_s

data/app/views/promethee/components/row/_show.html.erb

@@ -8,10 +8,8 @@ has_background = !(background_color =~ /rgba\(\s*255\s*,\s*255\s*,\s*255\s*,\s*0
 
 if component[:attributes] && component[:attributes].has_key?(:backgrounds) # retro-compatibility
   component[:attributes][:backgrounds].each do |item|
-    image_data = item[:image]
-    if image_data && image_data[:id]
-      blob_id = image_data[:id]
-      blob = ActiveStorage::Blob.find blob_id
+    blob = blob_from_data item[:image]
+    if blob
       url = "url(#{url_for(blob)})"
       position = "#{item[:posh]} #{item[:posv]}"
       background_images << url
@@ -22,6 +20,7 @@ if component[:attributes] && component[:attributes].has_key?(:backgrounds) # ret
 end
 %>
 
-<div class="row <%= promethee_class_for component %><%= ' promethee__component__row--background' if has_background %>" style="background-color: <%= background_color %>; <%= background_images.count > 0 ? "background-repeat: no-repeat; background-image: #{background_images.join(', ')}; background-position: #{background_positions.join(', ')}; background-size: #{background_sizes.join(', ')};" : '' %>">
+<div  class="row <%= promethee_class_for component %><%= ' promethee__component__row--background' if has_background %>"
+      style="background-color: <%= background_color %>; <%= background_images.count > 0 ? "background-repeat: no-repeat; background-image: #{background_images.join(', ')}; background-position: #{background_positions.join(', ')}; background-size: #{background_sizes.join(', ')};" : '' %>">
   <%= render 'promethee/show/components', components: component[:children] %>
 </div>

data/app/views/promethee/components/slider_item/_show.html.erb

@@ -3,10 +3,7 @@ media_type = component[:attributes][:media_type]
 searchable_caption = component[:attributes][:searchable_caption]
 case media_type
 when 'image'
-  image_data = component[:attributes][:image]
-  if image_data && image_data[:id]
-    image_blob = ActiveStorage::Blob.find image_data[:id]
-  end
+  image_blob = blob_from_data component[:attributes][:image]
 when 'video'
   url = component[:attributes][:video][:url].to_s
   if 'vimeo'.in? url
@@ -27,7 +24,7 @@ end
     <iframe frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="allowfullscreen" src="<%= iframe_src %>"></iframe>
   </div>
   <% elsif image_blob.present? %>
-  <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: searchable_caption %>
+    <%= render 'promethee/show/image.srcset', blob: image_blob, alt: '', caption: searchable_caption %>
   <% end %>
   <%= searchable_caption.to_s.html_safe %>
 </div>

data/lib/promethee/rails/helper.rb

@@ -38,6 +38,11 @@ module Promethee::Rails::Helper
     promethee_partials_for 'components/*/_localize.html.erb'
   end
 
+  def blob_from_data(blob_data = {})
+    return unless blob_data.has_key? :id
+    ActiveStorage::Blob.find_by(id: blob_data[:id])
+  end
+
   # promethee_bem_classes 'promethee-edit__move__droppable', '--{{type}}', '--first'
   # -> promethee-edit__move__droppable promethee-edit__move__droppable--{{type}} promethee-edit__move__droppable--{{type}}--first"
   def promethee_bem_classes(*args)

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '2.0.7'
+    VERSION = '2.0.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,22 +14,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: angularjs-rails
   requirement: !ruby/object:Gem::Requirement