pageflow-linkmap-page 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf4cd722e530a4c6cd5415a63c213c591b843a48b4bc538750f1ab46c74ee67
-  data.tar.gz: c1e44bf9e9185529a86f6d6d9507c4f5ab006723a743fd08eb49d5c769723062
+  metadata.gz: 20fd794281e40b28b10018b90477fbb17bdac8444e406dca532d0e0fb6b59368
+  data.tar.gz: 0ae08ee96055ef4ceb0e005eeb3f498d9640a46cfcdf28e830bef5541dc41b8a
 SHA512:
-  metadata.gz: 32e50b565cc8badc9903468b367a2198130c0f25b34e15e480dc24a52a1473d0e5ffa60fbd8e569ecd9d4de1f96703d0d779e123b4190f51f9f43546987f3341
-  data.tar.gz: e1501cf8952a8b2f35cda9b97c8dc70afee99d92f00612fd6865d236c24de4fdf84f7d04193863af9d947584a8b099fe3f25ca15bc5b5b5ad9825eda8ee71586
+  metadata.gz: 356ef2fe7137f4e8050a584923dbe76408937241bbcfa02697b5cef01818f7b21bd0b565e8baa3265f6d313c9355be84dbdbf6692e76790638b4bb0f5c787808
+  data.tar.gz: 8fa009d774f3f2db7e5f66e9bbc1573e6dca6fa6a8c83cd0fc726773d1ac0c151303616247a9cf95fc0c43b95eff00a2c75ebba4e2536ba1280da5d82ab318e8

data/CHANGELOG.md

@@ -1,14 +1,18 @@
 # CHANGELOG
 
-### Version 2.4.0
+### Version 2.5.0
 
-2019-05-20
+2019-07-24
 
-[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/2-4-stable...v2.5.0)
 
-- Use theme variable for overlay text color
-  ([#58](https://github.com/codevise/pageflow-linkmap-page/pull/58))
+- 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))
 
 See
-[2-3-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-3-stable/CHANGELOG.md)
+[2-4-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-4-stable/CHANGELOG.md)
 for previous changes.

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

@@ -19,13 +19,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));
 
-            if (imageFile && colorMapFile && colorMapFile.isReady()) {
+            if (imageFile && colorMapFile) {
               this.setReference('linkmap_masked_' + attribute,
                                 maskedImageFiles().findOrCreateBy({
                                   source_image_file_id: imageFile.id,

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/masked_image_file.rb

@@ -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/models/pageflow/linkmap_page/processed_image_file.rb

@@ -23,6 +23,7 @@ module Pageflow
 
         job ProcessSourceImageFileJob do
           on_enter 'processing'
+          result :pending, retry_after: 3.seconds
           result ok: 'processed'
           result error: 'processing_failed'
         end
@@ -52,9 +53,17 @@ module Pageflow
         processed?
       end
 
+      def failed?
+        processing_failed?
+      end
+
       def basename
         'unused'
       end
+
+      def prerequisite_files
+        [source_image_file]
+      end
     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.5.0'.freeze
   end
 end

data/pageflow-linkmap-page.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 14.x'
+  spec.add_runtime_dependency 'pageflow', '~> 14.3.x'
   spec.add_runtime_dependency 'pageflow-external-links', '~> 2.x'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']
@@ -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/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.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-07-24 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: 14.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.x
+        version: 14.3.x
 - !ruby/object:Gem::Dependency
   name: pageflow-external-links
   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
@@ -328,9 +342,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
@@ -374,9 +389,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/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