promethee 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89d94c8d1282c948884e23873c74e00fc72e658753f1eb8aa076ee9505446734
-  data.tar.gz: 7a70a00e4894432b9f19a63a29d7d130eb3c6ab49ad261ba79dc68222311580c
+  metadata.gz: 1f1fb7feeef8b939218cbbc2bd2644ccb3b76b0521c37baeceee9cca88c29d4d
+  data.tar.gz: b69b7bfd8d5d3be2b84d67dfacebc25b0bc5605e53b85c2bf7653b2e50722317
 SHA512:
-  metadata.gz: 6c8129394cc26e2721f115be0f3c47c3770803fdb4e3aefc44a3a300a738681a9c1045ee669a7bf0dd90b767119cde9715e6fd67fa0adc833f6d4e5db249e0aa
-  data.tar.gz: 0ab966b48559b1760973314fdc792afa54c92af80e572e5f2e4702a01f1d527b3bcfe261ff9a54fae989641a5e4fc8a67b1ac9d50422031138262922fed856ae
+  metadata.gz: 26dbfc8ec99d7fd08d3cdfd8cff440fbd57a793ba68b8d412122f74c419fd4ed202c48c96623f6f3a3813764a1d735deb6c9074f126fa16cc8aab39463af510f
+  data.tar.gz: 7e5afc38246c53b7b2f5c484e37c0db6d5c780f5cf60e05675788b3c4ab193a7f5633cda23d68085ef195a96b7c6edfb73979d5f4857f374a032742a785c215b

data/app/controllers/promethee_controller.rb

@@ -17,7 +17,17 @@ 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]
+    blob_id = params[:id]
+    if blob_id.to_i.to_s == blob_id
+      blob = ActiveStorage::Blob.find(blob_id)
+    else
+      begin
+        blob = ActiveStorage::Blob.find_signed(blob_id)
+      rescue
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
     if blob.image? && blob.variable?
       redirect_to url_for(blob.variant(resize: '720>'))
     elsif blob.video?

data/app/services/promethee/blob_upgrade_service.rb

@@ -0,0 +1,67 @@
+module Promethee
+  class BlobUpgradeService
+    attr_accessor :objects
+
+    def initialize(model_name)
+      begin
+        model_class = model_name.constantize
+        objects = model_class.all
+      rescue
+        puts 'Please provide a valid model name (e.g. `rake promethee:upgrade_blob_data[Page]`)'
+        exit
+      end
+      @objects = objects
+    end
+
+    def start
+      puts '= START BLOB UPGRADE ='
+      puts "Number of objects: #{@objects.count}"
+      @objects.each do |object|
+        puts "Processing object ##{object.id}"
+
+        object.data = upgrade_component(object.data.deep_symbolize_keys)
+        object.save
+        puts "End processing object ##{object.id}"
+      end
+      puts '====== END UPGRADER ========'
+    end
+
+    private
+
+    def upgrade_component(component)
+      component[:attributes] = upgrade_attribute(component[:attributes]) unless component[:attributes].nil?
+      component[:children].map { |child_component|
+        upgrade_component(child_component)
+      } unless component[:children].nil?
+
+      component
+    end
+
+    def upgrade_attribute(attribute_value)
+      return upgrade_blob_data(attribute_value) if is_blob_data?(attribute_value)
+
+      if attribute_value.is_a? Array
+        attribute_value.map { |item| upgrade_attribute(item) }
+      elsif attribute_value.is_a? Hash
+        attribute_value.map { |key, value| [key, upgrade_attribute(value)] }.to_h
+      else
+        attribute_value
+      end
+    end
+
+    def upgrade_blob_data(blob_data)
+      new_blob_data = blob_data.dup
+      blob_id = new_blob_data[:id]
+      return new_blob_data unless blob_id.present? && blob_id.is_a?(Integer)
+
+      blob = ActiveStorage::Blob.find_by(id: blob_id)
+      new_blob_data[:id] = blob.signed_id unless blob.nil?
+
+      new_blob_data
+    end
+
+    def is_blob_data?(hash)
+      hash.is_a?(Hash) && hash.keys == [:id, :name]
+    end
+  end
+end

data/app/services/promethee/table_upgrade_service.rb

@@ -7,7 +7,7 @@ module Promethee
         model_class = model_name.constantize
         objects = model_class.all.select { |page| page.data&.to_json&.include? '"type":"table"' }
       rescue
-        puts 'Please provide a valid model name (e.g. `rake promethee:clean_localizations[Page]`)'
+        puts 'Please provide a valid model name (e.g. `rake promethee:upgrade_table[Page]`)'
         exit
       end
       @objects = objects
@@ -23,7 +23,7 @@ module Promethee
         object.save
         puts "End processing object ##{object.id}"
       end
-      puts '====== END CLEANER ========'
+      puts '====== END UPGRADER ========'
     end
 
     private

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '2.0.9'
+    VERSION = '2.1.0'
   end
 end

data/lib/tasks/promethee/promethee.rake

@@ -12,4 +12,10 @@ namespace :promethee do
     service.start
   end
 
+  desc "Upgrade blob data from IDs to signed IDs"
+  task :upgrade_blob_data, [:model_name] => :environment do |task, args|
+    service = Promethee::BlobUpgradeService.new(args[:model_name])
+    service.start
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - app/assets/stylesheets/promethee.sass
 - app/controllers/promethee_controller.rb
 - app/models/concerns/promethee_data.rb
+- app/services/promethee/blob_upgrade_service.rb
 - app/services/promethee/localize_clean_service.rb
 - app/services/promethee/table_upgrade_service.rb
 - app/views/promethee/_edit.html.erb