diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/.gitignore b/MetricsEvaluatorCode/Ruby/fairmetrics/.gitignore index dcc5b36..ce3a220 100644 --- a/MetricsEvaluatorCode/Ruby/fairmetrics/.gitignore +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/.gitignore @@ -21,3 +21,4 @@ /yarn-error.log .byebug_history +Passenger.json \ No newline at end of file diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile b/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile index ef56604..0f05096 100644 --- a/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile @@ -10,8 +10,10 @@ end gem 'rails', '~> 5.1.4' # Use sqlite3 as the database for Active Record gem 'sqlite3' +# Use Passenger as the app server +gem 'passenger' # Use Puma as the app server -gem 'puma', '~> 3.7' +#gem 'puma', '~> 3.7' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -48,6 +50,7 @@ gem 'jwt' gem 'simple_command' gem 'json-ld', '~> 3.0.2' gem 'rest-client', '~> 2.0.2' +gem 'will_paginate', '~> 3.1.0' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile.lock b/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile.lock index a0af569..1345de8 100644 --- a/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile.lock +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/Gemfile.lock @@ -122,8 +122,10 @@ GEM addressable (~> 2.3) json-schema (~> 2.8) openssl (2.0.3) + passenger (6.0.2) + rack + rake (>= 0.8.1) public_suffix (3.0.1) - puma (3.11.2) rack (2.0.3) rack-cors (1.0.2) rack-test (0.8.2) @@ -233,6 +235,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.7) xpath (3.0.0) nokogiri (~> 1.8) @@ -253,7 +256,7 @@ DEPENDENCIES nokogiri open_api_parser openssl - puma (~> 3.7) + passenger rack-cors rails (~> 5.1.4) rdf-json @@ -270,6 +273,7 @@ DEPENDENCIES turbolinks (~> 5) uglifier (>= 1.3.0) web-console (>= 3.3.0) + will_paginate (~> 3.1.0) BUNDLED WITH - 2.0.1 + 1.17.3 diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/Passenger.json_template b/MetricsEvaluatorCode/Ruby/fairmetrics/Passenger.json_template new file mode 100644 index 0000000..29a7095 --- /dev/null +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/Passenger.json_template @@ -0,0 +1,6 @@ +{ + "environment": "production", + "port": 3000, + "daemonize": true, + "user": "yourusername" +} \ No newline at end of file diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/app/models/evaluation.rb b/MetricsEvaluatorCode/Ruby/fairmetrics/app/models/evaluation.rb index 5af4fbb..86fdd99 100644 --- a/MetricsEvaluatorCode/Ruby/fairmetrics/app/models/evaluation.rb +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/app/models/evaluation.rb @@ -3,4 +3,5 @@ class Evaluation < ApplicationRecord attr_accessor :subject validates_presence_of :collection, :resource, :executor, :title + self.per_page = 10 end diff --git a/MetricsEvaluatorCode/Ruby/fairmetrics/app/views/metrics/_metric.json.jbuilder b/MetricsEvaluatorCode/Ruby/fairmetrics/app/views/metrics/_metric.json.jbuilder index 44d514a..0fc955b 100644 --- a/MetricsEvaluatorCode/Ruby/fairmetrics/app/views/metrics/_metric.json.jbuilder +++ b/MetricsEvaluatorCode/Ruby/fairmetrics/app/views/metrics/_metric.json.jbuilder @@ -16,6 +16,6 @@ end metrics_url = "https://purl.org/fair-metrics/" -json.extract! metric, :name, :orcid, :creator, :description, :email, :test_of_metric, :smarturl, :created_at, :updated_at +json.extract! metric, :name, :orcid, :creator, :description, :email, :test_of_metric, :smarturl, :created_at, :updated_at, :deprecated json.principle metrics_url + metric.principle.to_s