labimotion 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5a4e5bede72cabd2f16bd75fbf033750939bbcb7cce96a4290382ddfd1026e
-  data.tar.gz: 86575f263c012a3c68a554d015ee94865ec145e31f62bcd7809d13c87837f13b
+  metadata.gz: a1c30f358902beeb863766ddb2ee02b980b3cca7055f45babe20fb4211277772
+  data.tar.gz: 86e1e46884b26fbfff1a91618698ab29072940109f9bc7c3d114b48a9b93ee86
 SHA512:
-  metadata.gz: 4954307a55b22171b0ac8cffd598cb4d976116ce3c802a2a0f89c58098e888fb5f06e7c26ac5fab312170ab20b18967f07f6a6ecbbfde67af0b3a59f2f5f64b0
-  data.tar.gz: 7042d287f388a5cd7e2b40c98092e61a60352e7eb7f9da9900c1fee1b5e0b4a4223deae5ba8bfe109940e4d429c053e10a5f3aef84ca0c4453ba339ab2d7dd25
+  metadata.gz: 41655a864b15b848116b370964ae6a05c707512d6ba80987cdec1f392d3fb647476fcf119612f116a2923c4992e32b00127371ac8a77d6e7de6cf1dc94773dbd
+  data.tar.gz: 8308707ad72ac2ebd38c725bc1336151712b5900fa4f35429674ee54f26cbe6fcc7ed43ef71777b6dd069701411540c776a7f183b183d147c1a3658a124e12a7

data/lib/labimotion/apis/converter_api.rb

@@ -39,11 +39,11 @@ module Labimotion
         helpers do
           def convert_structure(molfile)
             molecule_viewer = Matrice.molecule_viewer
-            if molecule_viewer.blank? || molecule_viewer[:chembox_api].blank?
+            if molecule_viewer.blank? || molecule_viewer[:chembox].blank?
               { molfile: molfile }
             else
               options = { timeout: 10, body: { mol: molfile }.to_json, headers: { 'Content-Type' => 'application/json' } }
-              response = HTTParty.post("#{molecule_viewer[:chembox_api]}/core/rdkit/v1/structure", options)
+              response = HTTParty.post("#{molecule_viewer[:chembox]}/core/rdkit/v1/structure", options)
               if response.code == 200
                 { molfile: (response.parsed_response && response.parsed_response['molfile']) || molfile }
               else

data/lib/labimotion/libs/converter.rb

@@ -125,7 +125,7 @@ module Labimotion
 
         name = response&.headers && response&.headers['content-disposition']&.split('=')&.last
         filename = oat.filename
-        name = "#{File.basename(filename, '.*')}.zip" if name.nil?
+        name = "#{File.basename(filename, '.*')}.zip"
 
         att = Attachment.new(
           filename: name,
@@ -172,7 +172,7 @@ module Labimotion
           Labimotion::ConState::ERROR
         end
       rescue StandardError => e
-        Labimotion::Converter.logger.error ["process fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
+        Labimotion::Converter.logger.error ["process fail: [#{data[:a]&.id}]", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
         Labimotion::ConState::ERROR
       ensure
         FileUtils.rm_f(ofile)
@@ -232,10 +232,12 @@ module Labimotion
       new_prop = dataset.properties
       dsr.each do |ds|
         layer = layers[ds[:layer]]
-        next if layer.nil? || layer[Labimotion::Prop::FIELDS].nil?
+        next if layer.blank? || layer[Labimotion::Prop::FIELDS].blank?
 
         fields = layer[Labimotion::Prop::FIELDS].select{ |f| f['field'] == ds[:field] }
         fi = fields&.first
+        next if fi.blank?
+
         idx = layer[Labimotion::Prop::FIELDS].find_index(fi)
         fi['value'] = ds[:value]
         fi['device'] = ds[:device] || ds[:value]

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails