From 95baaefd7a24126e270ca3002f2c6b8bae83f1a8 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 7 Dec 2022 11:59:27 +0100 Subject: [PATCH] Add img2zpl gem for ZPL image code generation [SCI-7551] --- Gemfile | 1 + Gemfile.lock | 7 +++++++ app/services/label_templates/repository_row_service.rb | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 08e6892e8..4e3beb4e7 100644 --- a/Gemfile +++ b/Gemfile @@ -97,6 +97,7 @@ gem 'devise-async', git: 'https://github.com/mhfs/devise-async.git', branch: 'devise-4.x' gem 'image_processing', '~> 1.12' +gem 'img2zpl', git: 'https://github.com/scinote-eln/img2zpl' gem 'rufus-scheduler', '~> 3.5' gem 'discard', '~> 1.0' diff --git a/Gemfile.lock b/Gemfile.lock index b765363c2..dfa40139d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,13 @@ GIT devise-async (0.10.2) devise (>= 4.0) +GIT + remote: https://github.com/scinote-eln/img2zpl + revision: 23d61cfc3e90ac4caa62dd08546fa0d7590a5140 + specs: + img2zpl (1.0.1) + mini_magick (~> 4.9) + GEM remote: http://rubygems.org/ specs: diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb index 37ccda5d5..25dd5729e 100644 --- a/app/services/label_templates/repository_row_service.rb +++ b/app/services/label_templates/repository_row_service.rb @@ -61,14 +61,14 @@ module LabelTemplates @repository_row.created_by.full_name when 'ADDED_ON' I18n.l(@repository_row.created_at, format: :full) - when 'LOGO' - logo + when /^LOGO/ + logo(key) else raise ColumnNotFoundError, I18n.t('label_templates.repository_row.errors.column_not_found') end end - def logo + def logo(_key) raise LogoNotFoundError, I18n.t('label_templates.repository_row.errors.logo_not_supported') end end