Merge pull request #187 from ncbo/develop

Develop to Master merge, release v6.3.0

Author: alexskr

.gitignore

@@ -45,6 +45,9 @@ test/data/ontology_files/repo/**/*
 # Ignore jEnv
 .java-version
 
+# Ignore Byebug
+.byebug_history
+
 # Ignore RubyMine editor files
 .idea
 

Gemfile

@@ -43,12 +43,12 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
 gem 'redcarpet'
 
 # NCBO gems (can be from a local dev path or from rubygems/git)
-gem 'goo', github: 'ncbo/goo', branch: 'master'
-gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
-gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
-gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
-gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
-gem 'sparql-client', github: 'ncbo/sparql-client', branch: 'master'
+gem 'goo', github: 'ncbo/goo', branch: 'develop'
+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'
 
 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
@@ -71,6 +71,7 @@ group :profiling do
 end
 
 group :test do
+  gem 'byebug', '~> 12.0'
   gem 'crack', '0.4.5'
   gem 'minitest', '~> 5.0'
   gem 'minitest-hooks', "~> 1.5"

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/ncbo/goo.git
-  revision: b9019ad9e1eb78c74105fc6c6a879085066da17d
-  branch: master
+  revision: c3f9a7f789bf2f52ed31f0272d2725117d3ac04e
+  branch: develop
   specs:
     goo (0.0.2)
       addressable (~> 2.8)
@@ -16,8 +16,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_annotator.git
-  revision: 4fb9114b80b99f0a654c7f70aaa96839c74fc615
-  branch: master
+  revision: 6671099a39fffa8b98f21db7593cef35dd296b65
+  branch: develop
   specs:
     ncbo_annotator (0.0.1)
       goo
@@ -27,8 +27,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_cron.git
-  revision: 6118e8275ea771e9e4de4132eccca293e8c8b739
-  branch: master
+  revision: 4ecc9cfe998b1df5cf4367f58dd77bffe1f2ac1a
+  branch: develop
   specs:
     ncbo_cron (0.0.1)
       dante
@@ -45,8 +45,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_ontology_recommender.git
-  revision: c6a18eb7700b23a1a4f1e32ebc94003bf75efe93
-  branch: master
+  revision: c508796d80764bf748b51e9f1c33e57ea9f14a1d
+  branch: develop
   specs:
     ncbo_ontology_recommender (0.0.1)
       goo
@@ -56,8 +56,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: 93e0844e19c3632bbd613a3e33869e267a6f2e25
-  branch: master
+  revision: 76c1c82e09fab6acd33617cc0de3fd99a144835c
+  branch: develop
   specs:
     ontologies_linked_data (0.0.1)
       activesupport
@@ -77,8 +77,8 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/sparql-client.git
-  revision: e89c26aa96f184dbe9b52d51e04fb3d9ba998dbc
-  branch: master
+  revision: 86c873a0d2873794489126c3c85165234785a96b
+  branch: develop
   specs:
     sparql-client (1.0.1)
       json_pure (>= 1.4)
@@ -121,6 +121,7 @@ GEM
     bcrypt_pbkdf (1.1.1-arm64-darwin)
     bigdecimal (3.2.2)
     builder (3.3.0)
+    byebug (12.0.0)
     capistrano (3.19.2)
       airbrussh (>= 1.0.0)
       i18n
@@ -240,7 +241,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0701)
+    mime-types-data (3.2025.0708)
     mini_mime (1.1.5)
     minitest (5.25.5)
     minitest-hooks (1.5.2)
@@ -425,6 +426,7 @@ DEPENDENCIES
   activesupport (~> 5)
   bcrypt_pbkdf (>= 1.0, < 2.0)
   bigdecimal
+  byebug (~> 12.0)
   capistrano (~> 3)
   capistrano-bundler
   capistrano-locally

config/environments/test.rb

@@ -42,11 +42,14 @@
   config.goo_redis_port                = REDIS_PORT.to_i
   config.http_redis_host               = REDIS_HTTP_CACHE_HOST.to_s
   config.http_redis_port               = REDIS_PORT.to_i
-  config.ontology_analytics_redis_host = REDIS_PERSISTENT_HOST.to_s
-  config.ontology_analytics_redis_port = REDIS_PORT.to_i
   config.search_server_url             = SOLR_TERM_SEARCH_URL.to_s
   config.property_search_server_url    = SOLR_PROP_SEARCH_URL.to_s
   #config.enable_notifications          = false
+
+  # Ontology analytics
+  config.ontology_analytics_redis_host  = REDIS_PERSISTENT_HOST.to_s
+  config.ontology_analytics_redis_port  = REDIS_PORT.to_i
+  config.ontology_analytics_redis_field = 'test_analytics'
 end
 
 Annotator.config do |config|