labimotion 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2c94d9d6147cab5fd823c611f65c6b41f5140bd018424aae86ca1bd697e1b0
-  data.tar.gz: e5ac11f1be750a698f7285776fc62a1850876b4fa5b53814460f9325d90a832a
+  metadata.gz: 1f0a3e834c8cd1519a060d72139c14407d8959f317ab33ac43f6a01988fd25d9
+  data.tar.gz: 565294e07a80e97bbd0c1d09bf9c35d3c464ac9eac3c6b11ad74e55e7fe56b45
 SHA512:
-  metadata.gz: 1430bdaa9a7721c6d5c09b35abde14ee6d2946a7f394fb65a12b9456b026c6734e027c1c36c24195cd36ec4e5701c7f4bba778f4d2fa31f4e6984e491f05eecb
-  data.tar.gz: 5518460a7151dce59e3c20e6e8ca0422a3d443b8aff7c95fecf63d915aa0a6c2e1555b221548bc58ef7194798c48cb4252c3f89454798d27366d9c4a844b1348
+  metadata.gz: cca7ebdf9dd1340b64ee59f38cc21266520d75f02e7b72b297b480b9da39172826e345e6dd4d8b09d216851e79a3e18b2c6f0faad3222badc6ac1259219d8010
+  data.tar.gz: 152ecf2e8009b39e1c0313536da76cde1134a5ac804e387e1be5898e24bea6510aa2d751cf8e394fa9434b659f460bc221506db21e1175f40055446e4ca828bd

data/lib/labimotion/apis/generic_dataset_api.rb

@@ -40,7 +40,7 @@ module Labimotion
         post do
           create_repo_klass(params, current_user)
           present DatasetKlass.all, with: Labimotion::DatasetKlassEntity, root: 'klass'
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end

data/lib/labimotion/apis/generic_element_api.rb

@@ -291,7 +291,7 @@ module Labimotion
               detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
             )
           end
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           raise e
         end
@@ -328,7 +328,7 @@ module Labimotion
                 attachments: Entities::AttachmentEntity.represent(element.attachments),
               }
             end
-          rescue => e
+          rescue StandardError => e
             Labimotion.log_exception(e, current_user)
             raise e
           end

data/lib/labimotion/apis/segment_api.rb

@@ -61,7 +61,7 @@ module Labimotion
         end
         post do
           update_segment_klass(current_user, params)
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
@@ -99,7 +99,7 @@ module Labimotion
           ))
 
           present segment_klass, with: Labimotion::SegmentKlassEntity, root: 'klass'
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
@@ -109,7 +109,7 @@ module Labimotion
         desc 'fetch segment templates from repository'
         get do
           fetch_repo_generic_template_list('Segment')
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
@@ -119,7 +119,7 @@ module Labimotion
         desc 'fetch Generic Segment Klass from Chemotion Repository'
         get do
           fetch_repo('SegmentKlass')
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
@@ -133,7 +133,7 @@ module Labimotion
         post do
           create_repo_klass(params, current_user)
           present SegmentKlass.all, with: Labimotion::SegmentKlassEntity, root: 'klass'
-        rescue => e
+        rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           ## { error: e.message }
           raise e

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -29,7 +29,7 @@ module Labimotion
         attributes['created_by'] = current_user.id
         Labimotion::DatasetKlass.create!(attributes)
       end
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }
       raise e

data/lib/labimotion/helpers/element_helpers.rb

@@ -38,7 +38,7 @@ module Labimotion
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
       klasses
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -58,7 +58,7 @@ module Labimotion
       klass.place = place
       klass.save!
       klass
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -97,7 +97,7 @@ module Labimotion
       element.save!
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -128,7 +128,7 @@ module Labimotion
       end
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -172,7 +172,7 @@ module Labimotion
         TransferFileFromTmpJob.set(queue: "transfer_file_from_tmp_#{current_user.id}").perform_now(attach_ary) unless attach_ary.empty?
       end
       true
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       ## false
       raise e
@@ -182,7 +182,7 @@ module Labimotion
       klass = Labimotion::Element.find(params[:id])
       list = klass.elements_revisions unless klass.nil?
       list&.sort_by(&:created_at)&.reverse
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -222,7 +222,7 @@ module Labimotion
       scope = scope.updated_time_from(Time.at(from)) if from && !by_created_at
       scope = scope.updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
       scope
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -260,7 +260,7 @@ module Labimotion
       scope = scope.updated_time_from(Time.at(from)) if from && !by_created_at
       scope = scope.updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
       scope
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end

data/lib/labimotion/helpers/generic_helpers.rb

@@ -15,7 +15,7 @@ module Labimotion
       klz = "Labimotion::#{name}".constantize.find_by(id: id)
       error!("#{name.gsub(/(Klass)/, '')} is invalid. Please re-select.", 500) if klz.nil?
       klz
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -25,7 +25,7 @@ module Labimotion
       klz&.update!(is_active: params[:is_active])
       generate_klass_file unless klz.class.name != 'ElementKlass'
       klz
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -36,7 +36,7 @@ module Labimotion
       klz&.destroy!
       generate_klass_file unless klz.class.name != 'ElementKlass'
       status 201
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -59,7 +59,7 @@ module Labimotion
       klz.reload
       klz.create_klasses_revision(current_user.id) if params[:is_release] == true
       klz
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -70,7 +70,7 @@ module Labimotion
       error!('Revision is invalid.', 404) if revision.nil?
       error!('Can not delete the active revision.', 405) if revision.uuid == klass.uuid
       revision&.destroy!
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -81,7 +81,7 @@ module Labimotion
       error!('Revision is invalid.', 404) if revision.nil?
       error!('Can not delete the active revision.', 405) if revision.uuid == element.uuid
       revision&.destroy!
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -90,7 +90,7 @@ module Labimotion
       klass = "Labimotion::#{params[:klass]}".constantize.find_by(id: params[:id])
       list = klass.send("#{params[:klass].underscore}es_revisions") unless klass.nil?
       list.sort_by(&:released_at).reverse
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -105,7 +105,7 @@ module Labimotion
       klass_names_file = File.join(klass_dir, 'klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -122,7 +122,7 @@ module Labimotion
         end
       end
       uploads
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -135,7 +135,7 @@ module Labimotion
       properties['layers'][pa[:layer]]['fields'][idx]['value']['files'][fidx]['aid'] = att.id
       properties['layers'][pa[:layer]]['fields'][idx]['value']['files'][fidx]['uid'] = att.identifier
       element.update_columns(properties: properties)
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -187,7 +187,7 @@ module Labimotion
         element.save!
       end
       attach_ary
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       error!('Error while uploading files.', 500)
       raise e
@@ -222,7 +222,7 @@ module Labimotion
                         type).update_all(attachable_id: nil)
       end
       attach_ary
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -244,7 +244,7 @@ module Labimotion
         end || []
       end
       filter_list || []
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end

data/lib/labimotion/helpers/sample_association_helpers.rb

@@ -30,7 +30,7 @@ module Labimotion
       subsample.save!
       subsample.reload
       subsample
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       nil
     end
@@ -68,7 +68,7 @@ module Labimotion
         end
       end
       sds
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       []
     end
@@ -119,7 +119,7 @@ module Labimotion
       Labimotion::ElementsSample.where(element_id: element.id).where.not(sample_id: sds)&.destroy_all
       Labimotion::ElementsElement.where(parent_id: element.id).where.not(element_id: els&.flatten)&.destroy_all
       properties
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
     end
   end

data/lib/labimotion/helpers/segment_helpers.rb

@@ -39,7 +39,7 @@ module Labimotion
       klass.reload
       klass.create_klasses_revision(current_user.id)
       klass
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
@@ -57,14 +57,13 @@ module Labimotion
       attributes[:place] = place
       segment&.update!(attributes)
       segment
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end
 
     def create_repo_klass(params, current_user)
       response = Labimotion::TemplateHub.fetch_identifier('SegmentKlass', params[:identifier])
-byebug
       attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
       attributes['properties_template'] = response['properties_release']
       attributes['place'] = ((Labimotion::SegmentKlass.all.length * 10) || 0) + 10
@@ -89,7 +88,7 @@ byebug
         attributes['created_by'] = current_user.id
         Labimotion::SegmentKlass.create!(attributes)
       end
-    rescue => e
+    rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
     end

data/lib/labimotion/libs/converter.rb

@@ -120,6 +120,7 @@ module Labimotion
           att.save!
         end
         if att.valid? && Labimotion::IS_RAILS5 == true
+          att.save!
           primary_store = Rails.configuration.storage.primary_store
           att.update!(storage: primary_store)
         end

data/lib/labimotion/models/concerns/generic_revisions.rb

@@ -21,7 +21,7 @@ module Labimotion
         properties: properties,
         properties_release: properties_release
       }
-      attributes["#{self.class.name.downcase.split('::').last}_id"] = id
+      attributes["#{Labimotion::Utils.element_name_dc(self.class.name)}_id"] = id
       attributes['name'] = name if self.class.name == 'Labimotion::Element'
       "#{self.class.name}sRevision".constantize.create(attributes)
     end

data/lib/labimotion/models/concerns/segmentable.rb

@@ -47,7 +47,7 @@ module Labimotion
         props = seg['properties']
         props['eln'] = Chemotion::Application.config.version
         props['labimotion'] = Labimotion::VERSION
-        segment = Labimotion::Segment.find_by(element_type: self.class.name.split('::').last, element_id: self.id, segment_klass_id: seg['segment_klass_id'])
+        segment = Labimotion::Segment.find_by(element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, segment_klass_id: seg['segment_klass_id'])
         if segment.present? && (segment.klass_uuid != props['klass_uuid'] || segment.properties != props)
           props['uuid'] = uuid
           props['eln'] = Chemotion::Application.config.version
@@ -64,8 +64,7 @@ module Labimotion
         props['eln'] = Chemotion::Application.config.version
         props['labimotion'] = Labimotion::VERSION
         props['klass'] = 'Segment'
-
-        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: self.class.name.split('::').last, element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
+        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
         segments.push(segment)
       end
       segments

data/lib/labimotion/utils/utils.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Labimotion
+  class Utils
+    def self.klass_by_collection(name)
+      names = name.split('::')
+      if names.size == 1
+        name[11..]
+      else
+        "#{names[0]}::#{names.last[11..]}"
+      end
+    rescue StandardError => e
+      Labimotion.log_exception(e, current_user)
+      name
+    end
+
+    def self.elname_by_collection(name)
+      names = name.split('::')
+      if names.size == 1
+        name[11..].underscore
+      else
+        names.last[11..].underscore
+      end
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      name.constantize
+    end
+
+    def self.col_by_element(name)
+      names = name.split('::')
+      if names.size == 1
+        "collections_#{name.underscore.pluralize}"
+      else
+        "collections_#{names.last.underscore.pluralize}"
+      end
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      name..underscore.pluralize
+    end
+
+    def self.element_name(name)
+      names = name.split('::')
+      if names.size == 1
+        name
+      else
+        names.last
+      end
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      name
+    end
+
+    def self.element_name_dc(name)
+      Labimotion::Utils.element_name(name)&.downcase
+    end
+  end
+end

data/lib/labimotion/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Labimotion
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
   IS_RAILS5 = true
 end

data/lib/labimotion.rb

@@ -12,6 +12,7 @@ module Labimotion
     Labimotion.logger.error(exception.backtrace.join("\n"))
   end
 
+  autoload :Utils, 'labimotion/utils/utils'
 
   ######## APIs
   autoload :GenericElementAPI, 'labimotion/apis/generic_element_api'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-13 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - lib/labimotion/utils/import.rb
 - lib/labimotion/utils/search.rb
 - lib/labimotion/utils/serializer.rb
+- lib/labimotion/utils/utils.rb
 - lib/labimotion/version.rb
 homepage: https://github.com/phuang26/labimotion
 licenses: