pageflow-linkmap-page 2.4.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf4cd722e530a4c6cd5415a63c213c591b843a48b4bc538750f1ab46c74ee67
-  data.tar.gz: c1e44bf9e9185529a86f6d6d9507c4f5ab006723a743fd08eb49d5c769723062
+  metadata.gz: f3fb56e43873a0680f0aa09f672fdbe2653db7378a68fc8cda40489dafdb8f22
+  data.tar.gz: 17e6bf2a58871c3ceb2bfd4f700e3c20721228a74afca783dcdcd4e333ed7ad3
 SHA512:
-  metadata.gz: 32e50b565cc8badc9903468b367a2198130c0f25b34e15e480dc24a52a1473d0e5ffa60fbd8e569ecd9d4de1f96703d0d779e123b4190f51f9f43546987f3341
-  data.tar.gz: e1501cf8952a8b2f35cda9b97c8dc70afee99d92f00612fd6865d236c24de4fdf84f7d04193863af9d947584a8b099fe3f25ca15bc5b5b5ad9825eda8ee71586
+  metadata.gz: ba26260154e63ae7b2c0ca60cb504109c808a24118d665d7e8bd46c41262ac3bc04284a34145495b48677b806d8f1b7abafbf73411713a4fadf0a69cf3830393
+  data.tar.gz: ab0bb4eb2593f77eb5b1d522ecbbff44ea76cce3b82a19ccce70909c61fab5cb4f1f54dfb49112cc1bfddd3a883c86d8cfc576168ef87f8e779e1f53846fa29c

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,14 +1,25 @@
 # CHANGELOG
 
-### Version 2.4.0
+### Version 2.7.1
 
-2019-05-20
+2020-08-13
 
-[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-3-stable...v2.4.0)
+[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/v2.7.0...v2.7.1)
 
-- Use theme variable for overlay text color
-  ([#58](https://github.com/codevise/pageflow-linkmap-page/pull/58))
+- Bug fix: Use perma id for audio hotspot files
+  ([#72](https://github.com/codevise/pageflow-linkmap-page/pull/72))
+
+### Version 2.7.0
+
+2020-04-01
+
+[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-6-stable...v2.7.0)
+
+- Enabled video autoplay for mobile devices.
+  ([#70](https://github.com/codevise/pageflow-linkmap-page/pull/70))
+- Delete cleanup migration
+  ([#68](https://github.com/codevise/pageflow-linkmap-page/pull/68))
 
 See
-[2-3-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-3-stable/CHANGELOG.md)
+[2-6-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-6-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/area.js

@@ -11,7 +11,7 @@ pageflow.linkmapPage.Area = Backbone.Model.extend({
     //     pageflow.xxx.getPolymorphic(this.get('target_type'), this.get('target_id'));
     //
     if (this.get('target_type') === 'audio_file') {
-      return pageflow.audioFiles.get(this.get('target_id'));
+      return pageflow.audioFiles.getByPermaId(this.get('target_id'));
     }
     else if (this.get('target_type') === 'page') {
       return pageflow.pages.getByPermaId(this.get('target_id'));

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/new_area_file_selection_handler.js

@@ -2,7 +2,7 @@ pageflow.linkmapPage.NewAreaFileSelectionHandler = function(options) {
   var page = pageflow.pages.get(options.id);
 
   this.call = function(file) {
-    page.configuration.linkmapAreas().addAudioFile(file.id);
+    page.configuration.linkmapAreas().addAudioFile(file.get('perma_id'));
     return false;
   };
 

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 {
@@ -19,13 +21,12 @@
         this.listenTo(
           this,
           'change:' + attribute +
-            ' change:linkmap_color_map_file_id' +
-            ' change:linkmap_color_map_file_id:ready',
+            ' 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 && colorMapFile.isReady()) {
+            if (imageFile && colorMapFile && !colorMapFile.isNew()) {
               this.setReference('linkmap_masked_' + attribute,
                                 maskedImageFiles().findOrCreateBy({
                                   source_image_file_id: imageFile.id,
@@ -40,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/page_type.js

@@ -187,14 +187,20 @@ pageflow.pageType.register('linkmap_page', _.extend({
     wrapper
       .attr('data-width', template.data('videoWidth'))
       .attr('data-height', template.data('videoHeight'));
-
-    var videoPlayer = this.videoPlayer = new pageflow.VideoPlayer.Lazy(template, {
+    
+    var options = {
       volumeFading: true,
       fallbackToMutedAutoplay: true,
-
       width: '100%',
       height: '100%'
-    });
+    }
+    if (pageflow.browser.has('mobile platform')) {
+      // to enable autoplay videos on mobile, 'muted' and 'playsinline' needs to be set
+      // video can be unmuted on user interaction
+      options.muted = true;
+      options.playsinline = true;
+    }
+    var videoPlayer = this.videoPlayer = new pageflow.VideoPlayer.Lazy(template, options);
 
     videoPlayer.ready(function() {
       videoPlayer.on('playmuted', function() {
@@ -431,18 +437,25 @@ pageflow.pageType.register('linkmap_page', _.extend({
   },
 
   isVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      (configuration.background_type === 'video' || configuration.background_type === 'hover_video');
+    return this.isBackgroundVideoEnabled(configuration) || this.isHoverVideoEnabled(configuration)
   },
 
   isBackgroundVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      configuration.background_type === 'video';
+    if (pageflow.browser.has('mobile platform')) {
+      return configuration.background_type === 'video' && configuration.panorama_image_id == undefined
+    }
+    else{
+      return configuration.background_type === 'video'
+    }
   },
 
   isHoverVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      configuration.background_type === 'hover_video';
+    if (pageflow.browser.has('mobile platform')) {
+      return configuration.background_type === 'hover_video' && configuration.hover_image_id == undefined
+    }
+    else{
+      return configuration.background_type === 'hover_video'
+    }
   },
 
   updateNavigationMode: function(configuration) {

data/app/assets/javascript/pageflow/linkmap_page/widgets/hover_video.js

@@ -75,6 +75,11 @@
       }, 300);
 
       this.element.removeClass('playing');
+    },
+
+    unmute: function () {
+      var videoPlayer = this.options.video.data('videoPlayer');
+      videoPlayer.muted(false);
     }
   });
 }(jQuery));

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

@@ -33,6 +33,10 @@
         'click': function(event) {
           var area = this.areaAt(this.positionFromEvent(event));
 
+          if (area.length && area.hasClass('hover_area')){
+            this.options.hoverVideo.unmute();
+          }
+
           if (area.length && area.hasClass('enabled')) {
             area.first().trigger($.Event('linkmapareaclick', {originalEvent: event}));
           }

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/jobs/pageflow/linkmap_page/process_source_image_file_job.rb

@@ -6,8 +6,12 @@ module Pageflow
       include StateMachineJob
 
       def perform_with_result(file, _options)
+        return :error if file.prerequisite_files.any?(&:failed?)
+        return :pending unless file.prerequisite_files.all?(&:ready?)
+
         file.attachment = file.source_image_file.attachment
         file.save!
+
         :ok
       end
     end

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'
 
@@ -23,17 +23,23 @@ module Pageflow
 
         job ProcessSourceImageFileJob do
           on_enter 'processing'
+          result :pending, retry_after: 3.seconds
           result ok: 'processed'
           result error: 'processing_failed'
         end
       end
 
-      def url
-        ''
+      # ReusableFile-overrides:
+      def retryable?
+        processing_failed?
+      end
+
+      def ready?
+        processed?
       end
 
-      def original_url
-        ''
+      def failed?
+        processing_failed?
       end
 
       def retry!
@@ -44,16 +50,8 @@ module Pageflow
         process!
       end
 
-      def retryable?
-        processing_failed?
-      end
-
-      def ready?
-        processed?
-      end
-
-      def basename
-        'unused'
+      def prerequisite_files
+        [source_image_file]
       end
     end
   end

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|
@@ -39,6 +39,10 @@ module Pageflow
         color_map_file.present_colors
       end
 
+      def prerequisite_files
+        [color_map_file, source_image_file]
+      end
+
       private
 
       def update_processing_progress(style)

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/config/locales/de.yml

@@ -101,9 +101,7 @@ de:
             so viele Hotspots angelegt werden wie gewünscht.
 
             Der Panorama Typ entscheidet darüber, ob die Seite ein
-            Hintergrund-Bild oder Hintergrund-Video zeigt. (Beachte, dass
-            Hintergrund-Videos auf mobilen Geräten nicht abgespielt werden,
-            deshalb wähle ein zusätzliches Panorama-Bild für die mobile Version)
+            Hintergrund-Bild oder Hintergrund-Video zeigt. (Ein zusätzliches Fallback-Image für die mobile Version kann bereitgestellt werden, wenn das Video nicht passt)
 
             Die Hotspot-Seite ermöglicht auch die Nutzung von Panorama-Bildern,
             die größer sind, als der sichtbare Bildschirmbereich. So können Nutzer

data/config/locales/en.yml

@@ -98,7 +98,7 @@ en:
 
             Hotspots can play audio files, link to other pages in a Pageflow or to external websites. You can define as many hotspots as you want.
 
-            Decide if you want to show a background image or a background video. (Keep in mind, that background videos will not be played on mobile devices, therefore use an additional fallback image for the mobile version)
+            Decide if you want to show a background image or a background video. (An additional fallback image for the mobile version can be provided if video does not fit)
 
             The hotspot page type allows to use panoramic images that are wider and taller than the screen-size. It enables users to explore these images by horizontal or vertical scrolling.
 

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/paperclip_processors/colors.rb

@@ -186,6 +186,7 @@ module Pageflow
               .reject { |color| color == TRANSPARENT }
               .map { |color| color.tr('#', '') }
               .map(&:downcase)
+              .map { |color| color.gsub(/(.{6})ff/, '\1') }
               .sort
           end
 

data/lib/pageflow/linkmap_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module LinkmapPage
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.7.1'.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.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'
@@ -39,4 +39,7 @@ Gem::Specification.new do |spec|
 
   # Semantic versioning rake tasks
   spec.add_development_dependency 'semmy', '~> 1.0'
+
+  # Freeze time in tests
+  spec.add_development_dependency 'timecop', '~> 0.7.1'
 end

data/spec/factories/image_file.rb

@@ -2,6 +2,12 @@ FactoryBot.modify do
   fixtures = Pageflow::LinkmapPage::Engine.root.join('spec', 'support', 'fixtures')
 
   factory :image_file do
+    trait :not_yet_uploaded do
+      attachment { nil }
+      file_name { 'image.jpg' }
+      state { 'uploading' }
+    end
+
     trait :red_fixture do
       attachment { File.open(fixtures.join('red.png')) }
     end

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

data/spec/models/pageflow/linkmap_page/color_map_file_spec.rb

@@ -2,11 +2,31 @@ require 'spec_helper'
 
 module Pageflow
   module LinkmapPage
-    describe ColorMapFile, inline_resque: true do
+    describe ColorMapFile, perform_jobs: :except_enqued_at do
       let(:red_from_palette) { 'f65b57' }
       let(:green_from_palette) { '69a77b' }
 
       describe 'process' do
+        it 're-schedules job if source image file is not uploaded yet' do
+          image_file = create(:image_file, :not_yet_uploaded)
+          color_map_file = create(:color_map_file, source_image_file: image_file)
+
+          color_map_file.process
+
+          expect(ProcessSourceImageFileJob)
+            .to have_been_enqueued.at(3.seconds.from_now)
+        end
+
+        it 'fails if source image file failed' do
+          image_file = create(:image_file, :uploading_failed)
+          color_map_file = create(:color_map_file, source_image_file: image_file)
+
+          color_map_file.process
+          color_map_file.reload
+
+          expect(color_map_file).to be_failed
+        end
+
         it 'remaps colors to fixed palette' do
           image_file = create(:image_file, :red_fixture)
           color_map_file = create(:color_map_file, source_image_file: image_file)

data/spec/models/pageflow/linkmap_page/masked_image_file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Pageflow
   module LinkmapPage
-    describe MaskedImageFile, inline_resque: true do
+    describe MaskedImageFile, perform_jobs: :except_enqued_at do
       let :color_map_file do
         color_map_image_file = create(:image_file, :color_map_fixture)
 
@@ -29,6 +29,54 @@ module Pageflow
       let(:color_of_source_image) { '#ff0000' }
 
       describe 'process' do
+        it 're-schedules job if source image file is not uploaded yet' do
+          image_file = create(:image_file, :not_yet_uploaded)
+          masked_image_file = create(:masked_image_file,
+                                     color_map_file: color_map_file,
+                                     source_image_file: image_file)
+
+          masked_image_file.process
+
+          expect(ProcessSourceImageFileJob)
+            .to have_been_enqueued.at(3.seconds.from_now)
+        end
+
+        it 're-schedules job if color map file is not ready yet' do
+          color_map_file = create(:color_map_file, state: 'processing')
+          masked_image_file = create(:masked_image_file,
+                                     color_map_file: color_map_file,
+                                     source_image_file: single_color_source_image_file)
+
+          masked_image_file.process
+
+          expect(ProcessSourceImageFileJob)
+            .to have_been_enqueued.at(3.seconds.from_now)
+        end
+
+        it 'fails if source image file failed' do
+          image_file = create(:image_file, :uploading_failed)
+          masked_image_file = create(:masked_image_file,
+                                     color_map_file: color_map_file,
+                                     source_image_file: image_file)
+
+          masked_image_file.process
+          masked_image_file.reload
+
+          expect(masked_image_file).to be_failed
+        end
+
+        it 'fails if color map file failed' do
+          color_map_file = create(:color_map_file, state: 'processing_failed')
+          masked_image_file = create(:masked_image_file,
+                                     color_map_file: color_map_file,
+                                     source_image_file: single_color_source_image_file)
+
+          masked_image_file.process
+          masked_image_file.reload
+
+          expect(masked_image_file).to be_failed
+        end
+
         it 'creates images for each color in color map masked to the area of that color' do
           masked_image_file = create(:masked_image_file,
                                      color_map_file: color_map_file,

data/spec/pageflow/linkmap_page/paperclip_processors/colors_spec.rb

@@ -9,13 +9,47 @@ module Pageflow
             output = <<-OUTPUT.unindent
               # ImageMagick pixel enumeration: 3,1,255,srgba
               0,0: (246,91,87,1)  #F65B57  srgba(246,91,87,1)
-              1,0: (105,167,123,1)  #69A77B  srgba(105,167,123,1)
+              1,0: (105,167,123,1)  #69A77B66  srgba(105,167,123,0.4)
+            OUTPUT
+
+            result = Colors::ConvertOutput.parse_unique_colors(output)
+
+            expect(result).to eq(%w(69a77b66 f65b57))
+          end
+
+          it 'filters out transparent color' do
+            output = <<-OUTPUT.unindent
+              # ImageMagick pixel enumeration: 3,1,255,srgba
+              0,0: (246,91,87,1)  #F65B57  srgba(246,91,87,1)
               2,0: (0,0,0,0)  #00000000  none
             OUTPUT
 
             result = Colors::ConvertOutput.parse_unique_colors(output)
 
-            expect(result).to eq(%w(69a77b f65b57))
+            expect(result).to eq(%w(f65b57))
+          end
+
+          it 'removes trailing FF of rgba string added between ImageMagick 6.7 and 6.9' do
+            output = <<-OUTPUT.unindent
+              # ImageMagick pixel enumeration: 589,1,65535,srgba
+              0,0: (0,30069,48573,65535)  #0075BDFF  srgba(0,117,189,1)
+              1,0: (257,30069,48573,65535)  #0175BDFF  srgba(1,117,189,1)
+            OUTPUT
+
+            result = Colors::ConvertOutput.parse_unique_colors(output)
+
+            expect(result).to eq(%w(0075bd 0175bd))
+          end
+
+          it 'does not remove trailing FF of rgb string  ' do
+            output = <<-OUTPUT.unindent
+              # ImageMagick pixel enumeration: 589,1,65535,srgba
+              0,0: (0,30069,48573,65535)  #0075FF  srgba(0,117,255,1)
+            OUTPUT
+
+            result = Colors::ConvertOutput.parse_unique_colors(output)
+
+            expect(result).to eq(%w(0075ff))
           end
         end
 

data/spec/support/config/active_job.rb

@@ -0,0 +1,11 @@
+RSpec.configure do |config|
+  config.before(:each) do |example|
+    ActiveJob::Base.queue_adapter = :test
+    queue_adapter = ActiveJob::Base.queue_adapter
+
+    queue_adapter.perform_enqueued_jobs = !!example.metadata[:perform_jobs]
+
+    queue_adapter.perform_enqueued_at_jobs = (example.metadata[:perform_jobs] &&
+                                              example.metadata[:perform_jobs] != :except_enqued_at)
+  end
+end

data/spec/support/config/timecop.rb

@@ -0,0 +1,11 @@
+require 'timecop'
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Timecop.freeze(Time.local(2013))
+  end
+
+  config.after(:each) do
+    Timecop.return
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 15.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.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
@@ -184,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: 
 email:
 - info@codevise.de
@@ -216,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
@@ -286,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
@@ -315,7 +329,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
@@ -328,9 +341,10 @@ files:
 - spec/pageflow/linkmap_page/paperclip_processors/colors_spec.rb
 - spec/pageflow/linkmap_page/progress_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/active_job.rb
 - spec/support/config/devise.rb
 - spec/support/config/factory_bot.rb
-- spec/support/config/resque.rb
+- spec/support/config/timecop.rb
 - spec/support/fixtures/black_dots.png
 - spec/support/fixtures/color_map.png
 - spec/support/fixtures/dots_and_lines.png
@@ -358,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Pageflow page type for a page that contains customizable link areas
@@ -374,9 +388,10 @@ test_files:
 - spec/pageflow/linkmap_page/paperclip_processors/colors_spec.rb
 - spec/pageflow/linkmap_page/progress_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/active_job.rb
 - spec/support/config/devise.rb
 - spec/support/config/factory_bot.rb
-- spec/support/config/resque.rb
+- spec/support/config/timecop.rb
 - spec/support/fixtures/black_dots.png
 - spec/support/fixtures/color_map.png
 - spec/support/fixtures/dots_and_lines.png

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

data/spec/support/config/resque.rb

@@ -1,9 +0,0 @@
-RSpec.configure do |config|
-  config.before(:each, inline_resque: true) do
-    Resque.inline = true
-  end
-
-  config.after(:each, inline_resque: true) do
-    Resque.inline = false
-  end
-end