labimotion 1.5.0.rc1 → 1.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb234cedd28a03695520718330ec4b35e7ad7512dce48ccd82919a917f249c52
-  data.tar.gz: 06c95920f9e0c88705f6c1d3fac27dbc516d57f1025d4798876870cc48a51ddd
+  metadata.gz: 8c27e1abca5ba7bf25eb28196a873d27529c9f15a642c68359f548ab8908eb53
+  data.tar.gz: 2aec966843e9e8e1665afd6e6c874965bb7790d7a919802bb942c06548ce602a
 SHA512:
-  metadata.gz: 3c38b52e126ebb661704fcb5bdedcfaa723612e06b7ac5b1a51be30976821dfe5c3ff1cfc0cfd4ab06293d4d7f9706ab442b58674380735bd602ef43fd453dfa
-  data.tar.gz: cb91684b0d3c8b0b4eb03b43adee712bb16d2a7d402d08fd319e7fbf162dbf7cc2c4438e64429e3fe9d9fc82bbbab703544d924086539628348af0960c58c268
+  metadata.gz: 4e7c44330b99cb08d05a3f2402566bd6cde2e384d917e9a9ebd19963f5261ea8e08422d932b11d551b81e23b9c202896ab169091fd680eb962b1d6deb4f9a902
+  data.tar.gz: c7fb2ab0e3eead1f32601ad3b4b952ad9d45e56540f9add8e7520eb6790bc464a6778d515e002d6050dfd5f7b0b85fdac7a22bf6a06b5c3c7111d9a64cc6e9be

data/lib/labimotion/apis/vocabulary_api.rb

@@ -48,15 +48,16 @@ module Labimotion
         get do
           # 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
+          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
 
-          # list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
-          # present list, with: Labimotion::StdLayer, root: 'klass'
-          vocabularies = Labimotion::VocabularyHandler.load_all_vocabularies
-          combined_data = Labimotion::VocabularyEntity.represent(vocabularies, serializable: true)
+          list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
+          data = Labimotion::VocabularyEntity.represent(list, serializable: true)
+          combined_data = merged_data + data
           return { mc: 'ss00', data: combined_data }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)

data/lib/labimotion/version.rb

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

metadata

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