labimotion 2.1.0.rc6 → 2.1.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a744e6da442dbc009b82f38a9522fcb0b601c89745c6379ad767d1e2299b86eb
-  data.tar.gz: effa0501f6523a2accc164b95811919d02a03e3c5c42d230b3b2f651227ef759
+  metadata.gz: 1ded6e04ed88c0888ce184a58663ac2f91bbeb00f8e8e67f1feb70f6d53a3a39
+  data.tar.gz: e7cc351ed12b84cc6dad32705bdb0297addb5a9400445c72cbb4fdf7417c8bb6
 SHA512:
-  metadata.gz: bb2c34f825fbb55e923ad69296f1f19406fa5fcaf83b0fb52f25a097b5e9b8548b0ead5e092952dea4219f4078dc97b32ca24c8517765646b106431bc5eb21f1
-  data.tar.gz: 99b53ef40be4745b7e417de46958eb424a4154a80291dead6d39cda95b4479bf00d55e7de542f7109fa1495330d989345f28fce194566b3aa29265d8d9627534
+  metadata.gz: 440d75c561f6ca9754f346bbdaf8da71efe2402a3ac569eb673ac24de94a654cbd45af1ef8d19edde2f9dfb488e9f1d692931eab9e8b3c77f1ba6a1858a93458
+  data.tar.gz: e86ff2f885489b280616f42d21806a33047cd2257296149ac56763efcb42e0d24b1ae303fce30d108b3431f0259b3204c2e223037321b0f2ee4908038f8ab73a

data/lib/labimotion/apis/generic_element_api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'cgi'
 require 'labimotion/conf'
 require 'labimotion/libs/export_element'
 
@@ -138,7 +139,7 @@ module Labimotion
           env['api.format'] = :binary
           content_type 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
           el_filename = export.res_name
-          filename = URI.escape(el_filename)
+          filename = CGI.escape(el_filename)
           # header['Content-Disposition'] = "attachment; filename=abc.docx"
           header('Content-Disposition', "attachment; filename=\"#{filename}\"")
 

data/lib/labimotion/apis/generic_klass_api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'cgi'
 require 'labimotion/version'
 require 'labimotion/libs/export_element'
 
@@ -20,7 +21,7 @@ module Labimotion
           entity.update_columns(identifier: SecureRandom.uuid) if entity&.identifier.nil?
           env['api.format'] = :binary
           content_type('application/json')
-          filename = URI.escape("LabIMotion_#{params[:klass]}_#{entity.label}-#{Time.new.strftime("%Y%m%d%H%M%S")}.json")
+          filename = CGI.escape("LabIMotion_#{params[:klass]}_#{entity.label}-#{Time.new.strftime("%Y%m%d%H%M%S")}.json")
           # header['Content-Disposition'] = "attachment; filename=abc.docx"
           header('Content-Disposition', "attachment; filename=\"#{filename}\"")
           "Labimotion::#{params[:klass]}Entity".constantize.represent(entity)

data/lib/labimotion/entities/element_revision_entity.rb

@@ -13,6 +13,8 @@ module Labimotion
       object.properties[Labimotion::Prop::LAYERS]&.keys.each do |key|
         field_sample_molecules = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE || ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
         field_sample_molecules.each do |field|
+          next unless field['value'].is_a?(Hash)
+
           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value', 'el_id')
           next unless sid.present?

data/lib/labimotion/entities/eln_element_entity.rb

@@ -30,6 +30,8 @@ module Labimotion
           ss['type'] == Labimotion::FieldType::DRAG_SAMPLE || ss['type'] == Labimotion::FieldType::DRAG_MOLECULE
         end
         field_sample_molecules.each do |field|
+          next unless field['value'].is_a?(Hash)
+
           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value', 'el_id')
           next unless sid.present?

data/lib/labimotion/entities/properties_entity.rb

@@ -58,6 +58,8 @@ module Labimotion
     end
 
     def update_sample_or_molecule_field(key, field, idx)
+      return unless field['value'].is_a?(Hash)
+
       sid = field.dig('value', 'el_id')
       return unless sid.present?
 
@@ -79,6 +81,8 @@ module Labimotion
     end
 
     def update_reaction_field(key, field, idx)
+      return unless field['value'].is_a?(Hash)
+
       sid = field.dig('value', 'el_id')
       return unless sid.present?
 

data/lib/labimotion/entities/segment_revision_entity.rb

@@ -12,6 +12,8 @@ module Labimotion
       object.properties[Labimotion::Prop::LAYERS]&.keys.each do |key|
         field_sample_molecules = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE || ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
         field_sample_molecules.each do |field|
+          next unless field['value'].is_a?(Hash)
+
           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value', 'el_id')
           next unless sid.present?

data/lib/labimotion/libs/export_element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'ostruct'
 require 'export_table'
 require 'labimotion/version'
 require 'labimotion/utils/units'

data/lib/labimotion/libs/properties_handler.rb

@@ -8,9 +8,9 @@ module Labimotion
       def check_val(field, type)
         case type
         when Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_ELEMENT
-          return field.dig('value', 'el_id').present?
+          return field['value'].is_a?(Hash) && field.dig('value', 'el_id').present?
         when Labimotion::FieldType::UPLOAD
-          return field.dig('value', 'files')&.length&.positive?
+          return field['value'].is_a?(Hash) && field.dig('value', 'files')&.length&.positive?
         when Labimotion::FieldType::TABLE
           return field[Labimotion::Prop::SUBFIELDS]&.length&.positive? && field['sub_values']&.length&.positive?
         end

data/lib/labimotion/libs/sample_association.rb

@@ -79,6 +79,7 @@ module Labimotion
         field_samples.each do |field|
           idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           return if field.is_a?(String) || properties.is_a?(String)
+          next unless field['value'].is_a?(Hash)
 
           sid = field.dig('value', 'el_id')
           next if sid.blank?
@@ -102,7 +103,8 @@ module Labimotion
         field_elements = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_ELEMENT }
         field_elements.each do |field|
           idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
-          next if field['value'].is_a?(String)
+          return if field.is_a?(String) || properties.is_a?(String)
+          next unless field['value'].is_a?(Hash)
 
           sid = field.dig('value', 'el_id')
           next if element.nil? || sid.blank? || sid == element.id

data/lib/labimotion/models/element_klass.rb

@@ -16,7 +16,7 @@ module Labimotion
     has_many :segment_klasses, dependent: :destroy, class_name: 'Labimotion::SegmentKlass'
     has_many :element_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::ElementKlassesRevision'
 
-    validates :name, presence: true, uniqueness: { message: 'is already in use.' }
+    validates :name, presence: true, uniqueness: { conditions: -> { where(deleted_at: nil) }, message: 'is already in use.' }
 
     # Scope for displayed_in_list - select only necessary columns for list view
     scope :for_list_display, lambda {

data/lib/labimotion/models/segment_klass.rb

@@ -15,7 +15,7 @@ module Labimotion
     has_many :segments, dependent: :destroy, class_name: 'Labimotion::Segment'
     has_many :segment_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::SegmentKlassesRevision'
 
-    validates :label, presence: true, uniqueness: { scope: :element_klass_id, message: 'is already in use.' }
+    validates :label, presence: true, uniqueness: { scope: :element_klass_id, conditions: -> { where(deleted_at: nil) }, message: 'is already in use.' }
 
     # Scope for displayed_in_list - select only necessary columns for list view
     scope :for_list_display, lambda {

data/lib/labimotion/utils/serializer.rb

@@ -37,6 +37,8 @@ module Labimotion
         # layer = object.properties[key]
         field_sample_molecules = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| Labimotion::FieldType::DRAG_ALL.include?(ss['type']) }
         field_sample_molecules.each do |field|
+          next unless field['value'].is_a?(Hash)
+
           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value') != '' && field.dig('value', 'el_id')
           next unless sid.present?

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.1.0.rc6'
+  VERSION = '2.1.0.rc8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc6
+  version: 2.1.0.rc8
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -175,6 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"