Merge branch 'feature/create-graphs-endpoints' into stage

ontoportal-lirmm · Jan 14, 2025 · 96de490 · 96de490
2 parents fb15bc5 + d1c523f
commit 96de490
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.5
diff --git a/Gemfile b/Gemfile
@@ -48,7 +48,7 @@ gem 'redcarpet'
 
 # NCBO gems (can be from a local dev path or from rubygems/git)
 gem 'ncbo_annotator', git: 'https://github.com/ontoportal-lirmm/ncbo_annotator.git', branch: 'development'
-gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branch: 'feature/create-script-to-count-graphs'
+gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branch: 'development'
 gem 'ncbo_ontology_recommender', git: 'https://github.com/ontoportal-lirmm/ncbo_ontology_recommender.git', branch: 'development'
 gem 'goo', github: 'ontoportal-lirmm/goo', branch: 'development'
 gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'development'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -29,8 +29,8 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/ncbo_cron.git
-  revision: d5ca3d6a826bdcf70707af87207943e8b531ae1d
-  branch: feature/create-script-to-count-graphs
+  revision: 70de4d7a3f625e41b263015fdd11f54adea0545d
+  branch: development
   specs:
     ncbo_cron (0.0.1)
       dante
@@ -323,7 +323,7 @@ GEM
     redcarpet (3.6.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.23.0)
+    redis-client (0.23.1)
       connection_pool
     redis-rack-cache (2.2.1)
       rack-cache (>= 1.10, < 2)
@@ -401,13 +401,13 @@ GEM
     systemu (2.6.5)
     temple (0.10.3)
     thread_safe (0.3.6)
-    tilt (2.5.0)
+    tilt (2.6.0)
     timeout (0.4.3)
     trailblazer-option (0.1.2)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    unicode-display_width (3.1.3)
+    unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     unicorn (6.1.0)

diff --git a/controllers/admin_graphs_controller.rb b/controllers/admin_graphs_controller.rb
@@ -1,3 +1,4 @@
+require 'ncbo_cron/graphs_counts'
 class AdminGraphsController < ApplicationController
 
   namespace '/admin' do
@@ -10,7 +11,7 @@ class AdminGraphsController < ApplicationController
     get '/graphs' do
       file_path = NcboCron.settings.graph_counts_report_path
       output = NcboCron::GraphsCounts.new.read_graph_counts(file_path)
-      reply output.to_json
+      reply output
     end
 
     post '/graphs' do