labimotion 1.5.0.rc2 → 1.5.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c27e1abca5ba7bf25eb28196a873d27529c9f15a642c68359f548ab8908eb53
-  data.tar.gz: 2aec966843e9e8e1665afd6e6c874965bb7790d7a919802bb942c06548ce602a
+  metadata.gz: 4bf785dda2ca949138e3d5f9b5047c3a8696c6171af31b54ee02072f98aa9d58
+  data.tar.gz: c90714bacc5941ca475ec8e75f2355ba4e2f5b347f14d49e649e0496799b1ba5
 SHA512:
-  metadata.gz: 4e7c44330b99cb08d05a3f2402566bd6cde2e384d917e9a9ebd19963f5261ea8e08422d932b11d551b81e23b9c202896ab169091fd680eb962b1d6deb4f9a902
-  data.tar.gz: c7fb2ab0e3eead1f32601ad3b4b952ad9d45e56540f9add8e7520eb6790bc464a6778d515e002d6050dfd5f7b0b85fdac7a22bf6a06b5c3c7111d9a64cc6e9be
+  metadata.gz: cbfb288dc3f358efe920ea49f135208024443e09512f122e7adac44defeafcc3391b4948f9cfea9bfc78fc6597134426bcbc6237733a9101ca69acc264c675f4
+  data.tar.gz: 9badebc9b2f3040b1d9c52d4a19bed4a05b7ba03677a044a1451dbf11c647b659a2875b054a2e20412cbcc6d049d568f208148a5312b7996194f74b2f76b89ed

data/lib/labimotion/apis/vocabulary_api.rb

@@ -48,16 +48,15 @@ module Labimotion
         get do
           # merged_data = []
           # Dir.glob(Rails.public_path.join('generic', 'vocabularies', '*.json')).each do |file_path|
-          merged_data = []
-          Dir.glob(Rails.public_path.join('generic', 'vocabularies', '*.json')).each do |file_path|
-            file_content = File.read(file_path)
-            json_data = JSON.parse(file_content)
-            merged_data.concat(json_data)
-          end
+          #   file_content = File.read(file_path)
+          #   json_data = JSON.parse(file_content)
+          #   merged_data.concat(json_data)
+          # end
 
-          list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
-          data = Labimotion::VocabularyEntity.represent(list, serializable: true)
-          combined_data = merged_data + data
+          # list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
+          # present list, with: Labimotion::StdLayer, root: 'klass'
+          combined_data = Labimotion::VocabularyHandler.load_all_vocabularies
+          # combined_data = Labimotion::VocabularyEntity.represent(vocabularies, serializable: true)
           return { mc: 'ss00', data: combined_data }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)

data/lib/labimotion/entities/properties_entity.rb

@@ -9,7 +9,7 @@ module Labimotion
       (object&.properties.is_a?(Hash) && object.properties[Labimotion::Prop::LAYERS]&.keys || []).each do |key|
         # layer = object.properties[key]
 
-#         field_vocabularies = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['is_vocabulary'] == true}
+#         field_vocabularies = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['is_voc'] == true}
 #         field_vocabularies.each do |field|
 #           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
 #           if field['identifier'] == '7c30cd4f-aef4-433a-946e-d0f81f8918f1'

data/lib/labimotion/libs/vocabulary_handler.rb

@@ -6,7 +6,7 @@ module Labimotion
     def self.update_vocabularies(properties, current_user, element)
       properties[Labimotion::Prop::LAYERS].keys.each do |key|
         layer = properties[Labimotion::Prop::LAYERS][key]
-        field_vocabularies = layer[Labimotion::Prop::FIELDS].select { |ss| ss['is_vocabulary'] == true && ss['opid'] == 9}
+        field_vocabularies = layer[Labimotion::Prop::FIELDS].select { |ss| ss['is_voc'] == true && ss['opid'] == 9}
         field_vocabularies.each do |field|
           idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           val = ''
@@ -72,18 +72,23 @@ module Labimotion
 
     def self.load_from_files
       merged_data = []
-      dir_path = Rails.root.join('lib', 'labimotion', 'libs', 'data', 'vocab')
-      Dir.glob(dir_path.join('*.json')).each do |file_path|
-        file_content = File.read(file_path)
-        json_data = JSON.parse(file_content)
-        merged_data.concat(json_data)
-      end
+     # byebug
+      sys_json = File.join(__dir__, 'data', 'vocab', 'System.json')
+    #  byebug
+      file_content = File.read(sys_json)
+      json_data = JSON.parse(file_content)
+      merged_data.concat(json_data)
+
+      std_json = File.join(__dir__, 'data', 'vocab', 'Standard.json')
+      file_content = File.read(std_json)
+      json_data = JSON.parse(file_content)
+      merged_data.concat(json_data)
       merged_data
     end
 
     def self.load_from_database
-      Labimotion::Vocabulary.all.sort_by(&:name)
-      # Labimotion::VocabularyEntity.represent(Labimotion::Vocabulary.all.sort_by(&:name), serializable: true)
+      vocabularies = Labimotion::Vocabulary.all.sort_by(&:name)
+      Labimotion::VocabularyEntity.represent(vocabularies, serializable: true)
     end
 
     private_class_method :load_from_files, :load_from_database

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.5.0.rc2'
+  VERSION = '1.5.0.rc3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc2
+  version: 1.5.0.rc3
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails