diff --git a/Gemfile b/Gemfile index 426905a..586f285 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' ruby '3.0.0' -gem 'rails' -gem 'pg' gem 'bootsnap' +gem 'pg' gem 'rack-cors' +gem 'rails' # A Ruby Web Server Built For Concurrency gem 'puma' @@ -16,9 +16,6 @@ gem 'bcrypt' # Doorkeeper is an OAuth 2 provider for Rails and Grape. gem 'doorkeeper' -# Templating system with JSON, XML and Plist support. -gem 'rabl' - # Simple, Fast, and Declarative Serialization Library for Ruby gem 'blueprinter' @@ -38,7 +35,7 @@ gem 'gemoji-parser' gem 'awesome_nested_set' # An email validator for Rails -gem "email_validator" +gem 'email_validator' # pg_search builds ActiveRecord named scopes that take advantage of PostgreSQL’s full text search gem 'pg_search' @@ -47,8 +44,8 @@ gem 'pg_search' gem 'will_paginate', '~> 3.3' group :doc do - gem 'sdoc' gem 'apipie-rails' + gem 'sdoc' end group :development, :test do @@ -56,16 +53,16 @@ group :development, :test do gem 'dotenv-rails' gem 'factory_bot_rails' gem 'faker' - gem 'rspec-rails' gem 'rspec_junit_formatter' + gem 'rspec-rails' end group :development do gem 'listen' gem 'rubocop' gem 'solargraph' - gem 'spring-commands-rspec' gem 'spring' + gem 'spring-commands-rspec' end group :test do @@ -73,5 +70,5 @@ group :test do gem 'byebug' gem 'database_cleaner' gem 'shoulda-matchers' - gem 'simplecov', :require => false + gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index ffabc4b..eb88c9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,8 +148,6 @@ GEM activesupport (>= 5.2) puma (5.5.2) nio4r (~> 2.0) - rabl (0.14.5) - activesupport (>= 2.3.14) racc (1.6.0) rack (2.2.3) rack-cors (1.1.1) @@ -303,7 +301,6 @@ DEPENDENCIES pg pg_search puma - rabl rack-cors rails responders diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8f3f575..13c271f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,8 +1,4 @@ # frozen_string_literal: true class ApplicationController < ActionController::API - # Not usually required for Rails 5 in API mode, but - # necessary here because we're using RABL. - include ActionView::Rendering - append_view_path "#{Rails.root}/app/views" end diff --git a/config/initializers/rabl.rb b/config/initializers/rabl.rb deleted file mode 100644 index 8bdb4fe..0000000 --- a/config/initializers/rabl.rb +++ /dev/null @@ -1,3 +0,0 @@ -Rabl.configure do |config| - config.view_paths = [Rails.root.join('app', 'views', 'api', 'v1')] -end \ No newline at end of file