Merge pull request #150 from ncbo/feature/multilingual-support-add-la…

…nguage-request-middleware Merge multilingual support branch into develop
ncbo · May 21, 2024 · 52f2315 · 52f2315
2 parents f439e21 + 0ee0a68
commit 52f2315
Show file tree

Hide file tree

Showing 33 changed files with 6,432 additions and 597 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,13 +40,15 @@ gem 'unicorn-worker-killer'
 gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
 gem 'redcarpet'
 
-# NCBO
-gem 'goo', github: 'ncbo/goo', branch: 'develop'
+
+# NCBO gems (can be from a local dev path or from rubygems/git)
 gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
 gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
 gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
-gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
 gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'develop'
+gem 'goo', github: 'ncbo/goo', branch: 'develop'
+gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'feature/multilingual-support-add-search-and-languages-serialization'
+
 
 group :development do
   # bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42
@@ -74,4 +76,5 @@ group :test do
   gem 'rack-test'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura' # for codecov.io
+  gem 'webmock', '~> 3.19.1'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: 33583fd1c1d72b449cd6bb91815e3422b8448983
+  revision: 70007faf43d0d96292809f89f15a27a757ccaa25
   branch: develop
   specs:
     goo (0.0.2)
@@ -27,7 +27,7 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_cron.git
-  revision: 26638bfdbec1e6b01f5eb6a8b655bfd70adac8ac
+  revision: 98dc1a9bb8aba4ef41a1687251ca1245edd5de57
   branch: develop
   specs:
     ncbo_cron (0.0.1)
@@ -56,8 +56,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: a3f6cf0493bb595011f98acf95efda33111c537b
-  branch: develop
+  revision: 112e39b0b75901c3e32ccd83e2e5f9e83ab73d42
+  branch: feature/multilingual-support-add-search-and-languages-serialization
   specs:
     ontologies_linked_data (0.0.1)
       activesupport
@@ -114,7 +114,9 @@ GEM
     backports (3.25.0)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bcrypt_pbkdf (1.1.0)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (1.4.2)
     builder (3.2.4)
     capistrano (3.18.1)
@@ -132,6 +134,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
+      rexml
     cube-ruby (0.0.3)
     dante (0.2.0)
     date (3.3.4)
@@ -170,7 +175,6 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-protobuf (3.25.3)
     google-protobuf (3.25.3-aarch64-linux)
     google-protobuf (3.25.3-arm64-darwin)
     google-protobuf (3.25.3-x86_64-darwin)
@@ -188,9 +192,6 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.63.0)
-      google-protobuf (~> 3.25)
-      googleapis-common-protos-types (~> 1.0)
     grpc (1.63.0-aarch64-linux)
       google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
@@ -206,6 +207,7 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
+    hashdiff (1.1.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -231,7 +233,7 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
     minitest (4.7.5)
     minitest-stub_any_instance (1.0.3)
@@ -240,7 +242,7 @@ GEM
     multi_json (1.15.0)
     mutex_m (0.2.0)
     net-http-persistent (2.9.4)
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -271,7 +273,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.5)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (1.6.13)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -287,7 +289,7 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rack-timeout (0.6.3)
+    rack-timeout (0.7.0)
     rainbow (3.1.1)
     raindrops (0.20.1)
     rake (10.5.0)
@@ -303,19 +305,20 @@ GEM
       redis-store (>= 1.6, < 2)
     redis-store (1.10.0)
       redis (>= 4, < 6)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
     request_store (1.7.0)
       rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rubocop (1.63.4)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -367,6 +370,7 @@ GEM
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
+    strscan (3.1.0)
     systemu (2.6.5)
     temple (0.10.3)
     tilt (2.3.0)
@@ -382,14 +386,16 @@ GEM
       unicorn (>= 4, < 7)
     uuid (2.3.9)
       macaddr (~> 1.0)
+    webmock (3.19.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   aarch64-linux
   arm64-darwin-22
   arm64-darwin-23
-  ruby
   x86_64-darwin-18
-  x86_64-darwin-21
   x86_64-darwin-23
   x86_64-linux
 
@@ -441,6 +447,7 @@ DEPENDENCIES
   sparql-client!
   unicorn
   unicorn-worker-killer
+  webmock (~> 3.19.1)
 
 BUNDLED WITH
    2.4.22
diff --git a/app.rb b/app.rb
@@ -27,13 +27,16 @@
 require_relative 'lib/rack/cube_reporter'
 require_relative 'lib/rack/param_translator'
 require_relative 'lib/rack/slice_detection'
+require_relative 'lib/rack/request_lang'
 
 # Logging setup
 require_relative "config/logging"
 
 # Inflector setup
 require_relative "config/inflections"
 
+require 'request_store'
+
 # Protection settings
 set :protection, :except => :path_traversal
 
@@ -141,6 +144,9 @@
 use Rack::PostBodyToParams
 use Rack::ParamTranslator
 
+use RequestStore::Middleware
+use Rack::RequestLang
+
 use LinkedData::Security::Authorization
 use LinkedData::Security::AccessDenied
 

diff --git a/config/solr/property_search/enumsconfig.xml b/config/solr/property_search/enumsconfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<enumsConfig>
+  <enum name="ontologyType">
+    <value>ONTOLOGY</value>
+    <value>VALUE_SET_COLLECTION</value>
+  </enum>
+  <enum name="propertyType">
+    <value>ANNOTATION</value>
+    <value>DATATYPE</value>
+    <value>OBJECT</value>
+  </enum>
+</enumsConfig>