pageflow-linkmap-page 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20fd794281e40b28b10018b90477fbb17bdac8444e406dca532d0e0fb6b59368
-  data.tar.gz: 0ae08ee96055ef4ceb0e005eeb3f498d9640a46cfcdf28e830bef5541dc41b8a
+  metadata.gz: 69769f94b00cc835ff6fa21c1aba78de3b00e39c6019f9819dad9bcb4072302f
+  data.tar.gz: 0d6aa6ab8692766983576bfa3ad9d17614fadf343b9a415046dcc49b291d497f
 SHA512:
-  metadata.gz: 356ef2fe7137f4e8050a584923dbe76408937241bbcfa02697b5cef01818f7b21bd0b565e8baa3265f6d313c9355be84dbdbf6692e76790638b4bb0f5c787808
-  data.tar.gz: 8fa009d774f3f2db7e5f66e9bbc1573e6dca6fa6a8c83cd0fc726773d1ac0c151303616247a9cf95fc0c43b95eff00a2c75ebba4e2536ba1280da5d82ab318e8
+  metadata.gz: 35f77e151491e8bbf30783b7b7d3c49998ca3e103c4bffa7f42cfe4e061b59b0c811ea0da4d265f2c19e9e26f3fd16ed9bebcef60e84943487097e9152cfbaba
+  data.tar.gz: cf62ebfb4b5504b49c68d50733a2b93762b308e2cd06296c7079c3274ba63baf2604e8a27c9246f03a77014be08ef4f1aa3245d4b8c17757c06a3e4edde487dc

data/.travis.yml

@@ -12,3 +12,6 @@ services:
 
 script:
   - bin/rspec
+
+services:
+  - mysql

data/CHANGELOG.md

@@ -1,18 +1,20 @@
 # CHANGELOG
 
-### Version 2.5.0
+### Version 2.6.0
 
-2019-07-24
+2019-11-04
 
-[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-4-stable...v2.5.0)
+[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-5-stable...v2.6.0)
 
-- Make processing jobs wait for prerequisites. Prevent cases where
-  masked processing already starts before image file has finished
-  uploading.
-  ([#62](https://github.com/codevise/pageflow-linkmap-page/pull/62))
-- Fix specs depending on color parsing with ImageMagick 6.9
-  ([#61](https://github.com/codevise/pageflow-linkmap-page/pull/61))
+- Specify mysql service for Travis build
+  ([#66](https://github.com/codevise/pageflow-linkmap-page/pull/66))
+- Use perma id for color map file and components
+  ([#65](https://github.com/codevise/pageflow-linkmap-page/pull/65))
+- Wait for color map file to be persisted
+  ([#64](https://github.com/codevise/pageflow-linkmap-page/pull/64))
+- Add import and export
+  ([#63](https://github.com/codevise/pageflow-linkmap-page/pull/63))
 
 See
-[2-4-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-4-stable/CHANGELOG.md)
+[2-5-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-5-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem 'spring-commands-rspec', group: :development
 gem 'spring-commands-teaspoon', group: :development
+
+gem 'pageflow-external-links', git: 'https://github.com/codevise/pageflow-external-links', branch: 'master'

data/app/assets/javascript/pageflow/linkmap_page/editor.js

@@ -1,6 +1,6 @@
 //= require_self
 
-//= require ./editor/models/processed_file
+//= require ./editor/models/generated_image_file
 //= require_tree ./editor/models
 //= require_tree ./editor/collections
 //= require_tree ./editor/routers

data/app/assets/javascript/pageflow/linkmap_page/editor/models/color_map_file.js

@@ -1,4 +1,4 @@
-pageflow.linkmapPage.ColorMapFile = pageflow.linkmapPage.ProcessedFile.extend({
+pageflow.linkmapPage.ColorMapFile = pageflow.linkmapPage.GeneratedImageFile.extend({
   toJSON: function() {
     return _.pick(this.attributes,
                   'source_image_file_id');

data/app/assets/javascript/pageflow/linkmap_page/editor/models/{processed_file.js → generated_image_file.js}

@@ -1,4 +1,4 @@
-pageflow.linkmapPage.ProcessedFile = pageflow.UploadedFile.extend({
+pageflow.linkmapPage.GeneratedImageFile = pageflow.ReusableFile.extend({
   stages: [
     {
       name: 'processing',

data/app/assets/javascript/pageflow/linkmap_page/editor/models/masked_image_file.js

@@ -1,4 +1,4 @@
-pageflow.linkmapPage.MaskedImageFile = pageflow.linkmapPage.ProcessedFile.extend({
+pageflow.linkmapPage.MaskedImageFile = pageflow.linkmapPage.GeneratedImageFile.extend({
   toJSON: function() {
     return _.pick(this.attributes,
                   'source_image_file_id',

data/app/assets/javascript/pageflow/linkmap_page/editor/models/page_configuration_mixin.js

@@ -3,11 +3,13 @@
     initialize: function(options) {
       this.listenTo(this,
                     'change:linkmap_color_map_image_id',
-                    function(model, imageFileId) {
-                      if (imageFileId) {
+                    function(model, imageFilePermaId) {
+                      if (imageFilePermaId) {
+                        var sourceImageFile = pageflow.imageFiles.getByPermaId(imageFilePermaId);
+
                         this.setReference('linkmap_color_map_file_id',
                                           colorMapFiles().findOrCreateBy({
-                                            source_image_file_id: imageFileId
+                                            source_image_file_id: sourceImageFile.id
                                           }));
                       }
                       else {
@@ -21,10 +23,10 @@
           'change:' + attribute +
             ' change:linkmap_color_map_file_id',
           function() {
-            var colorMapFile = colorMapFiles().get(this.get('linkmap_color_map_file_id'));
-            var imageFile = pageflow.imageFiles.get(this.get(attribute));
+            var colorMapFile = this.getReference('linkmap_color_map_file_id', colorMapFiles());
+            var imageFile = this.getReference(attribute, pageflow.imageFiles);
 
-            if (imageFile && colorMapFile) {
+            if (imageFile && colorMapFile && !colorMapFile.isNew()) {
               this.setReference('linkmap_masked_' + attribute,
                                 maskedImageFiles().findOrCreateBy({
                                   source_image_file_id: imageFile.id,
@@ -39,8 +41,8 @@
     },
 
     linkmapReadyColorMapFileId: function() {
-      var colorMapFile = colorMapFiles().get(this.get('linkmap_color_map_file_id'));
-      return colorMapFile && colorMapFile.isReady() ? colorMapFile.id : null;
+      var colorMapFile = this.getReference('linkmap_color_map_file_id', colorMapFiles());
+      return colorMapFile && colorMapFile.isReady() ? colorMapFile.get('perma_id') : null;
     },
 
     linkmapPageLinks: function() {

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap/color_map.js

@@ -5,7 +5,7 @@ pageflow.linkmapPage.ColorMap = (function() {
     var colorMapSprite = options.colorMapSprite;
 
     this.color = attributes.color;
-    this.permaId = options.colorMapId + ':' + attributes.color;
+    this.permaId = options.colorMapPermaId + ':' + attributes.color;
 
     this.draw = function(context, width) {
       var scale = width / attributes.width;
@@ -53,7 +53,7 @@ pageflow.linkmapPage.ColorMap = (function() {
   function ColorMap(attributes, sprite) {
     var components = _(attributes.components).map(function(componentAttributes) {
       return new ColorMapComponent(componentAttributes, {
-        colorMapId: attributes.id,
+        colorMapPermaId: attributes.perma_id,
         colorMapWidth: attributes.width,
         colorMapHeight: attributes.height,
         colorMapSprite: sprite
@@ -87,8 +87,8 @@ pageflow.linkmapPage.ColorMap = (function() {
     height: 0
   });
 
-  ColorMap.load = function(id) {
-    var colorMapFile = pageflow.entryData.getFile('pageflow_linkmap_page_color_map_files', id);
+  ColorMap.load = function(permaId) {
+    var colorMapFile = pageflow.entryData.getFile('pageflow_linkmap_page_color_map_files', permaId);
 
     if (!colorMapFile) {
       return $.when(ColorMap.empty);
@@ -100,4 +100,4 @@ pageflow.linkmapPage.ColorMap = (function() {
   };
 
   return ColorMap;
-}());
+}());

data/app/helpers/pageflow/linkmap_page/areas_helper.rb

@@ -2,6 +2,7 @@ module Pageflow
   module LinkmapPage
     module AreasHelper
       include BackgroundImageHelper
+      include RevisionFileHelper
 
       def linkmap_content_and_background_css_classes(configuration)
         hide_overlay_boxes =
@@ -16,11 +17,11 @@ module Pageflow
 
       def linkmap_areas_div(entry, configuration)
         color_map_file =
-          ColorMapFile.find_by_id(configuration['linkmap_color_map_file_id'])
+          find_file_in_entry(ColorMapFile, configuration['linkmap_color_map_file_id'])
         masked_hover_image_file =
-          MaskedImageFile.find_by_id(configuration['linkmap_masked_hover_image_id'])
+          find_file_in_entry(MaskedImageFile, configuration['linkmap_masked_hover_image_id'])
         masked_visited_image_file =
-          MaskedImageFile.find_by_id(configuration['linkmap_masked_visited_image_id'])
+          find_file_in_entry(MaskedImageFile, configuration['linkmap_masked_visited_image_id'])
 
         render('pageflow/linkmap_page/areas/div',
                entry: entry,
@@ -37,7 +38,7 @@ module Pageflow
         color_map_component_id = attributes['color_map_component_id'] || attributes['mask_perma_id']
         if color_map_file &&
           color_map_component_id.present? &&
-          color_map_component_id.split(':').first.to_i == color_map_file.id
+          color_map_component_id.split(':').first.to_i == color_map_file.perma_id
           background_image_div(configuration,
                                "linkmap_masked_#{prefix}_image",
                                class: "#{prefix}_image",

data/app/models/pageflow/linkmap_page/color_map_file.rb

@@ -1,7 +1,9 @@
 module Pageflow
   module LinkmapPage
-    class ColorMapFile < ProcessedImageFile
-      belongs_to :source_image_file, class_name: 'Pageflow::ImageFile'
+    class ColorMapFile < GeneratedImageFile
+      has_one :masked_image_file,
+              class_name: 'Pageflow::LinkmapPage::MaskedImageFile',
+              dependent: :destroy
 
       # Prevent anti aliasing. Otherwise, when processing color map
       # images, borders between areas are blurred.

data/app/models/pageflow/linkmap_page/{processed_image_file.rb → generated_image_file.rb}

@@ -1,9 +1,9 @@
 module Pageflow
   module LinkmapPage
-    class ProcessedImageFile < ActiveRecord::Base
+    class GeneratedImageFile < ActiveRecord::Base
       self.abstract_class = true
 
-      include Pageflow::UploadedFile
+      include Pageflow::ReusableFile
 
       belongs_to :source_image_file, class_name: 'Pageflow::ImageFile'
 
@@ -29,22 +29,7 @@ module Pageflow
         end
       end
 
-      def url
-        ''
-      end
-
-      def original_url
-        ''
-      end
-
-      def retry!
-        process!
-      end
-
-      def publish!
-        process!
-      end
-
+      # ReusableFile-overrides:
       def retryable?
         processing_failed?
       end
@@ -57,8 +42,12 @@ module Pageflow
         processing_failed?
       end
 
-      def basename
-        'unused'
+      def retry!
+        process!
+      end
+
+      def publish!
+        process!
       end
 
       def prerequisite_files

data/app/models/pageflow/linkmap_page/masked_image_file.rb

@@ -1,6 +1,6 @@
 module Pageflow
   module LinkmapPage
-    class MaskedImageFile < ProcessedImageFile
+    class MaskedImageFile < GeneratedImageFile
       belongs_to :color_map_file, class_name: 'Pageflow::LinkmapPage::ColorMapFile'
 
       STYLES = lambda do |attachment|

data/app/views/pageflow/linkmap_page/areas/_div.html.erb

@@ -7,8 +7,7 @@
                                             color_map_file) %>
 
       <% if configuration['background_type'] == 'hover_video' &&
-            !Pageflow::ImageFile.find_by_id(configuration['hover_image_id']) %>
-
+            !find_file_in_entry(Pageflow::ImageFile, configuration['hover_image_id']) %>
         <%= background_image_div(configuration,
                                  'panorama_video',
                                  file_type: 'video_file',

data/app/views/pageflow/linkmap_page/page.html.erb

@@ -7,7 +7,7 @@
         <div class="pan_zoom_safe_area_wrapper">
           <div class="panorama_wrapper">
             <% if configuration['background_type'] == 'video' &&
-                  !Pageflow::ImageFile.find_by_id(configuration['panorama_image_id']) %>
+                  !find_file_in_entry(Pageflow::ImageFile, configuration['panorama_image_id']) %>
 
               <%= background_image_div_with_size(configuration,
                                                  'panorama_video',

data/db/migrate/20190724114801_delete_orphaned_generated_image_files.rb

@@ -0,0 +1,9 @@
+# Deletes orphaned color map files, along with their usages
+# and the associated masked image files along with their usages
+class DeleteOrphanedGeneratedImageFiles < ActiveRecord::Migration[5.2]
+  def up
+    Pageflow::LinkmapPage::ColorMapFile.find_each do |color_map_file|
+      color_map_file.destroy unless color_map_file.source_image_file.present?
+    end
+  end
+end

data/lib/pageflow/linkmap_page/page_type.rb

@@ -25,21 +25,35 @@ module Pageflow
 
     def self.color_map_file_type
       FileType.new(model: ColorMapFile,
-                   custom_attributes: [:source_image_file_id],
                    partial: 'pageflow/linkmap_page/color_map_files/color_map_file',
-                   editor_partial: 'pageflow/linkmap_page/editor/color_map_files/color_map_file')
+                   editor_partial: 'pageflow/linkmap_page/editor/color_map_files/color_map_file',
+                   custom_attributes: {
+                     source_image_file_id: {
+                       model: 'Pageflow::ImageFile',
+                       permitted_create_param: true
+                     }
+                   })
     end
 
     def self.masked_image_file_type
       FileType.new(model: MaskedImageFile,
-                   custom_attributes: [:source_image_file_id, :color_map_file_id],
                    editor_partial: 'pageflow/linkmap_page/editor/' \
                      'masked_image_files/masked_image_file',
                    css_background_image_urls: lambda do |masked_image_file|
                      masked_image_file.present_styles.each_with_object({}) do |color, result|
                        result[color] = masked_image_file.url_for_color(color)
                      end
-                   end)
+                   end,
+                   custom_attributes: {
+                     source_image_file_id: {
+                       model: 'Pageflow::ImageFile',
+                       permitted_create_param: true
+                     },
+                     color_map_file_id: {
+                       model: 'Pageflow::LinkmapPage::ColorMapFile',
+                       permitted_create_param: true
+                     }
+                   })
     end
   end
 end

data/lib/pageflow/linkmap_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module LinkmapPage
-    VERSION = '2.5.0'.freeze
+    VERSION = '2.6.0'.freeze
   end
 end

data/pageflow-linkmap-page.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 14.3.x'
+  spec.add_runtime_dependency 'pageflow', '~> 15.x'
   spec.add_runtime_dependency 'pageflow-external-links', '~> 2.x'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
-  spec.add_development_dependency 'pageflow-support', '~> 14.x'
+  spec.add_development_dependency 'pageflow-support', '~> 15.x'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.7'
   spec.add_development_dependency 'factory_bot_rails', '~> 4.8'

data/spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
+require 'pageflow/used_file_test_helper'
+
 module Pageflow
   module LinkmapPage
     describe AreasHelper do
+      include UsedFileTestHelper
+
       describe '#linkmap_content_and_background_css_classes' do
         it 'contains default css classes' do
           classes = helper.linkmap_content_and_background_css_classes({}).split(' ')
@@ -50,6 +54,8 @@ module Pageflow
           entry = create(:entry)
           configuration = {}
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('div.linkmap_areas')
@@ -59,6 +65,8 @@ module Pageflow
           entry = create(:entry)
           configuration = {'linkmap_areas' => [{}]}
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('div a[href]')
@@ -68,35 +76,37 @@ module Pageflow
           entry = create(:entry)
           configuration = {'linkmap_areas' => [{}], 'hover_image_id' => 5}
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
-          expect(html).to have_selector('a div[class~="image_panorama_5"]')
+          expect(html).to have_selector("a div[class~='image_panorama_5']")
         end
 
         it 'renders masked hover image inside masked linkmap areas' do
-          entry = create(:entry)
-          color_map_file = create(:color_map_file)
-          masked_image_file = create(:masked_image_file)
+          entry = PublishedEntry.new(create(:entry, :published))
+          color_map_file = create_used_file(:color_map_file, entry: entry)
+          masked_image_file = create_used_file(:masked_image_file, entry: entry)
           configuration = {
-            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file.id}:aaa"}],
+            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file.perma_id}:aaa"}],
             'hover_image_id' => 5,
-            'linkmap_color_map_file_id' => color_map_file.id,
-            'linkmap_masked_hover_image_id' => masked_image_file.id
+            'linkmap_color_map_file_id' => color_map_file.perma_id,
+            'linkmap_masked_hover_image_id' => masked_image_file.perma_id
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
 
-          image_class = "pageflow_linkmap_page_masked_image_file_aaa_#{masked_image_file.id}"
+          image_class = "pageflow_linkmap_page_masked_image_file_aaa_#{masked_image_file.perma_id}"
           expect(html).to have_selector("a div[class~=#{image_class}]")
         end
 
         it 'only uses masked hover image if area is masked' do
-          entry = create(:entry)
-          masked_image_file = create(:masked_image_file)
+          entry = PublishedEntry.new(create(:entry, :published))
+          masked_image_file = create_used_file(:masked_image_file, entry: entry)
           configuration = {
             'linkmap_areas' => [{}],
             'hover_image_id' => 5,
-            'linkmap_masked_hover_image_id' => masked_image_file.id
+            'linkmap_masked_hover_image_id' => masked_image_file.perma_id
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
@@ -105,14 +115,15 @@ module Pageflow
         end
 
         it 'does not use masked hover image if area color map component id references other image' do
-          entry = create(:entry)
-          masked_image_file = create(:masked_image_file)
-          color_map_file = create(:color_map_file)
-          other_id = color_map_file.id + 1
+          entry = PublishedEntry.new(create(:entry, :published))
+          color_map_file = create_used_file(:color_map_file, entry: entry)
+          masked_image_file = create_used_file(:masked_image_file, entry: entry)
+
+          other_id = color_map_file.perma_id + 1
           configuration = {
             'linkmap_areas' => [{'color_map_component_id' => "#{other_id}:aaa"}],
             'hover_image_id' => 5,
-            'linkmap_masked_hover_image_id' => masked_image_file.id
+            'linkmap_masked_hover_image_id' => masked_image_file.perma_id
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
@@ -124,25 +135,27 @@ module Pageflow
           entry = create(:entry)
           configuration = {'linkmap_areas' => [{}], 'visited_image_id' => 5}
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('a div[class~="image_panorama_5"]')
         end
 
         it 'renders masked visited image inside masked linkmap areas' do
-          entry = create(:entry)
-          color_map_file = create(:color_map_file)
-          masked_image_file = create(:masked_image_file)
+          entry = PublishedEntry.new(create(:entry, :published))
+          color_map_file = create_used_file(:color_map_file, entry: entry)
+          masked_image_file = create_used_file(:masked_image_file, entry: entry)
           configuration = {
-            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file.id}:aaa"}],
+            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file.perma_id}:aaa"}],
             'hover_image_id' => 5,
-            'linkmap_color_map_file_id' => color_map_file.id,
-            'linkmap_masked_visited_image_id' => masked_image_file.id
+            'linkmap_color_map_file_id' => color_map_file.perma_id,
+            'linkmap_masked_visited_image_id' => masked_image_file.perma_id
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
 
-          image_class = "pageflow_linkmap_page_masked_image_file_aaa_#{masked_image_file.id}"
+          image_class = "pageflow_linkmap_page_masked_image_file_aaa_#{masked_image_file.perma_id}"
           expect(html).to have_selector("a div[class~='#{image_class}']")
         end
 
@@ -150,35 +163,37 @@ module Pageflow
           entry = create(:entry)
           configuration = {'linkmap_areas' => [{'color_map_component_id' => '1:aaa'}]}
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('a[data-color-map-component-id="1:aaa"]')
         end
 
         it 'uses color map component id if present, preceding mask perma id' do
-          entry = create(:entry)
-          color_map_file_1 = create(:color_map_file)
-          color_map_file_2 = create(:color_map_file)
+          entry = PublishedEntry.new(create(:entry, :published))
+          color_map_file_1 = create_used_file(:color_map_file, entry: entry)
+          color_map_file_2 = create_used_file(:color_map_file, entry: entry)
           configuration = {
-            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file_2.id}:aaa",
-                                 'mask_perma_id' => "#{color_map_file_1.id}:aaa"}]
+            'linkmap_areas' => [{'color_map_component_id' => "#{color_map_file_2.perma_id}:aaa",
+                                 'mask_perma_id' => "#{color_map_file_1.perma_id}:aaa"}]
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
 
-          expect(html).to have_selector("a[data-color-map-component-id='#{color_map_file_2.id}:aaa']")
+          expect(html).to have_selector("a[data-color-map-component-id='#{color_map_file_2.perma_id}:aaa']")
         end
 
         it 'uses mask perma id as fallback if present and color map component id is blank' do
-          entry = create(:entry)
-          color_map_file = create(:color_map_file)
+          entry = PublishedEntry.new(create(:entry, :published))
+          color_map_file = create_used_file(:color_map_file, entry: entry)
           configuration = {
-            'linkmap_areas' => [{'mask_perma_id' => "#{color_map_file.id}:aaa"}]
+            'linkmap_areas' => [{'mask_perma_id' => "#{color_map_file.perma_id}:aaa"}]
           }
 
           html = helper.linkmap_areas_div(entry, configuration)
 
-          expect(html).to have_selector("a[data-color-map-component-id='#{color_map_file.id}:aaa']")
+          expect(html).to have_selector("a[data-color-map-component-id='#{color_map_file.perma_id}:aaa']")
         end
 
         it 'does not set data-color-map-component-id attribute if background type is hover_video' do
@@ -188,6 +203,8 @@ module Pageflow
             'background_type' => 'hover_video'
           }
 
+          allow(helper).to receive(:find_file_in_entry).and_return(nil)
+
           html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).not_to have_selector('a[data-color-map-component-id]')

data/spec/integration/masked_image_file_type_spec.rb

@@ -6,10 +6,18 @@ module Pageflow
   module LinkmapPage
     Pageflow::Lint.file_type(:masked_image_file,
                              create_file_type: -> { LinkmapPage.masked_image_file_type },
-                             create_file: -> { create(:masked_image_file) })
+                             create_file: -> { create(:masked_image_file) },
+                             create_prerequisite_file_types: -> {
+                               [BuiltInFileType.image, LinkmapPage.color_map_file_type]
+                             },
+                             get_prerequisite_files: ->(file) {
+                               [*file.prerequisite_files, *file.color_map_file.prerequisite_files]
+                             })
 
     Pageflow::Lint.file_type(:color_map_file,
                              create_file_type: -> { LinkmapPage.color_map_file_type },
-                             create_file: -> { create(:color_map_file) })
+                             create_file: -> { create(:color_map_file) },
+                             create_prerequisite_file_types: -> { [BuiltInFileType.image] },
+                             get_prerequisite_files: ->(file) { file.prerequisite_files })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.3.x
+        version: 15.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.3.x
+        version: 15.x
 - !ruby/object:Gem::Dependency
   name: pageflow-external-links
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -230,11 +230,11 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/editor/models/color_map_delegator.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/color_map_file.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/external_link_area_type.js
+- app/assets/javascript/pageflow/linkmap_page/editor/models/generated_image_file.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/masked_image_file.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/new_area_file_selection_handler.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/page_configuration_mixin.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/page_link_area_type.js
-- app/assets/javascript/pageflow/linkmap_page/editor/models/processed_file.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/stored_mask_sprite.js
 - app/assets/javascript/pageflow/linkmap_page/editor/models/text_only_area_type.js
 - app/assets/javascript/pageflow/linkmap_page/editor/patterns/area_pattern.js
@@ -300,8 +300,8 @@ files:
 - app/helpers/pageflow/linkmap_page/areas_helper.rb
 - app/jobs/pageflow/linkmap_page/process_source_image_file_job.rb
 - app/models/pageflow/linkmap_page/color_map_file.rb
+- app/models/pageflow/linkmap_page/generated_image_file.rb
 - app/models/pageflow/linkmap_page/masked_image_file.rb
-- app/models/pageflow/linkmap_page/processed_image_file.rb
 - app/views/pageflow/linkmap_page/areas/_div.html.erb
 - app/views/pageflow/linkmap_page/color_map_files/_color_map_file.json.jbuilder
 - app/views/pageflow/linkmap_page/editor/color_map_files/_color_map_file.json.jbuilder
@@ -316,6 +316,7 @@ files:
 - db/migrate/20171106151700_create_masked_image_files.rb
 - db/migrate/20180111145100_create_color_map_files.rb
 - db/migrate/20180214201200_drop_mask_sprites.rb
+- db/migrate/20190724114801_delete_orphaned_generated_image_files.rb
 - lib/generators/pageflow_linkmap_page/install/install_generator.rb
 - lib/pageflow-linkmap-page.rb
 - lib/pageflow/linkmap_page/engine.rb
@@ -329,7 +330,6 @@ files:
 - lib/pageflow/linkmap_page/plugin.rb
 - lib/pageflow/linkmap_page/progress.rb
 - lib/pageflow/linkmap_page/version.rb
-- lib/tasks/pageflow_linkmap_page_tasks.rake
 - pageflow-linkmap-page.gemspec
 - spec/factories/color_map_file.rb
 - spec/factories/image_file.rb

data/lib/tasks/pageflow_linkmap_page_tasks.rake

@@ -1,149 +0,0 @@
-namespace :pageflow_linkmap_page do
-  desc 'Migrate to server generated files'
-  task migrate_to_masked_image_files: :environment do
-    Pageflow::LinkmapPage::MaskedImageFilesMigrator.run
-  end
-end
-
-module Pageflow
-  module LinkmapPage
-    module MaskedImageFilesMigrator
-      extend self
-
-      def run
-        Resque.inline = true
-        total = pages_with_mask_image.count
-
-        pages_with_mask_image.find_each.with_index do |page, index|
-          puts "== Migrating page #{page.id} (#{index}/#{total})"
-          color_map_file = create_files(page)
-
-          if color_map_file
-            puts '-- Migrating mask perma ids...'
-            migrate_mask_perma_ids(page, color_map_file)
-          end
-
-          page.save!
-        end
-      end
-
-      private
-
-      def create_files(page)
-        color_map_image_file =
-          ImageFile.find_by_id(page.configuration['linkmap_color_map_image_id'])
-
-        if color_map_image_file
-          revision = page.chapter.storyline.revision
-
-          puts "-- Color map file for image file #{color_map_image_file.id}"
-
-          color_map_file = color_map_file_for(color_map_image_file, revision)
-          page.configuration['linkmap_color_map_file_id'] = color_map_file.id
-
-          hover_image_file = ImageFile.find_by_id(page.configuration['hover_image_id'])
-
-          if hover_image_file
-            puts "-- Masked image file for hover image file #{hover_image_file.id}"
-
-            masked_image_file = masked_image_file_for(hover_image_file, color_map_file, revision)
-            page.configuration['linkmap_masked_hover_image_id'] = masked_image_file.id
-          end
-
-          visited_image_file = ImageFile.find_by_id(page.configuration['visited_image_id'])
-
-          if visited_image_file
-            puts "-- Masked image file for visited image file #{visited_image_file.id}"
-
-            masked_image_file = masked_image_file_for(visited_image_file, color_map_file, revision)
-            page.configuration['linkmap_masked_visited_image_id'] = masked_image_file.id
-          end
-
-          color_map_file
-        end
-      end
-
-      def color_map_file_for(image_file, revision)
-        color_map_file = ColorMapFile.find_or_create_by(source_image_file_id: image_file.id) do |c|
-          c.entry_id = revision.entry_id
-        end
-
-        unless color_map_file.processed?
-          puts '   Processing...'
-
-          color_map_file.process!
-          color_map_file.reload
-        end
-
-        revision.file_usages.find_or_create_by(file: color_map_file)
-        color_map_file
-      end
-
-      def masked_image_file_for(image_file, color_map_file, revision)
-        masked_image_file = MaskedImageFile.find_or_create_by(source_image_file: image_file,
-                                                              color_map_file: color_map_file) do |m|
-          m.entry_id = revision.entry_id
-        end
-
-        unless masked_image_file.processed?
-          puts '   Processing...'
-
-          masked_image_file.process!
-          masked_image_file.reload
-        end
-
-        revision.file_usages.find_or_create_by(file: masked_image_file)
-        masked_image_file
-      end
-
-      def migrate_mask_perma_ids(page, color_map_file)
-        areas = page.configuration['linkmap_areas'] || []
-
-        page.configuration['linkmap_areas'] = areas.map do |area_attributes|
-          mask_perma_id = area_attributes['mask_perma_id']
-
-          if mask_perma_id && !area_attributes['color_map_component_id']
-            sprite_id = page.configuration.fetch('linkmap_masks').fetch('id')
-            colors =
-              page
-              .configuration
-              .fetch('linkmap_masks')
-              .fetch('c')
-              .fetch('c')
-              .map { |component| component['c'] }
-
-            area_attributes.merge(color_map_component_id: convert_mask_perma_id(mask_perma_id,
-                                                                                colors,
-                                                                                color_map_file,
-                                                                                sprite_id))
-          else
-            area_attributes
-          end
-        end
-      end
-
-      def convert_mask_perma_id(perma_id, colors, color_map_file, sprite_id)
-        target_sprite_id, color_index = perma_id.split(':')
-
-        if target_sprite_id.to_i == sprite_id
-          "#{color_map_file.id}:#{nearest_color(color_map_file, *colors[color_index.to_i])}"
-        end
-      end
-
-      def nearest_color(color_map_file, r, g, b)
-        color_map_file.present_colors.min_by do |color|
-          (color[0..1].to_i(16) - r).abs +
-            (color[2..3].to_i(16) - g).abs +
-            (color[4..5].to_i(16) - b).abs
-        end
-      end
-
-      def pages_with_mask_image
-        Page
-          .where(template: 'linkmap_page')
-          .where('configuration LIKE "%linkmap_color_map_image_id%"')
-          .includes(chapter: {storyline: :revision})
-      end
-    end
-  end
-end