Alphabetize and cleanup

Author: matthewsullivan

Gemfile

@@ -5,57 +5,36 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '2.6.3'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
-# Use postgresql as the database for Active Record
-gem 'pg', '>= 0.18', '< 2.0'
-# Use Puma as the app server
-gem 'puma', '~> 4.1'
-# Use SCSS for stylesheets
-gem 'sass-rails', '>= 6'
-# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 4.0'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.7'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
-# Use Active Model has_secure_password
 gem 'bcrypt', '~> 3.1.7'
-
-# Use Active Storage variant
-# gem 'image_processing', '~> 1.2'
-
-# Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.2', require: false
-
 gem 'graphql'
+gem 'jbuilder', '~> 2.7'
 gem 'jwt'
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: %i[mri mingw x64_mingw]
-end
+gem 'pg', '>= 0.18', '< 2.0'
+gem 'puma', '~> 4.1'
+gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
+gem 'sass-rails', '>= 6'
+gem 'turbolinks', '~> 5'
+gem 'webpacker', '~> 4.0'
 
 group :development do
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'listen', '~> 3.2'
-  gem 'web-console', '>= 3.3.0'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'graphiql-rails'
+  gem 'listen', '~> 3.2'
   gem 'rubocop'
   gem 'rubocop-performance'
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'web-console', '>= 3.3.0'
+end
+
+group :development, :test do
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
 end
 
 group :test do
-  # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
   gem 'selenium-webdriver'
-  # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 end

app/controllers/graphql_controller.rb

@@ -28,7 +28,13 @@ def current_user(token)
     JwtHelper.logged_in_user(token)
   end
 
-  # Handle variables in form data, JSON body, or a blank value
+  def handle_error_in_development(e)
+    logger.error(e.message)
+    logger.error(e.backtrace.join("\n"))
+
+    render json: { errors: [{ message: e.message, backtrace: e.backtrace }], data: {} }, status: 500
+  end
+
   def prepare_variables(variables_param)
     case variables_param
     when String
@@ -40,19 +46,11 @@ def prepare_variables(variables_param)
     when Hash
       variables_param
     when ActionController::Parameters
-      variables_param.to_unsafe_hash # GraphQL-Ruby will validate name and type of incoming variables.
+      variables_param.to_unsafe_hash
     when nil
       {}
     else
       raise ArgumentError, "Unexpected parameter: #{variables_param}"
     end
   end
-
-  def handle_error_in_development(e)
-    logger.error(e.message)
-    logger.error(e.backtrace.join("\n"))
-
-    # render json: { errors: [{ message: e.message, backtrace: e.backtrace }], data: {} }, status: 500
-    render json: { errors: [{ message: e.message }], data: {} }, status: 500
-  end
 end

app/graph/authentication/mutations/login.rb

@@ -3,6 +3,7 @@
 module Authentication::Mutations
   class Login < Base::Mutations::BaseMutation
     argument :credentials, Authentication::Types::Input::AuthProviderCredentialsInput, required: false
+
     field :token, String, null: true
     field :user, User::Types::UserType, null: true
 

app/graph/user/mutations/register.rb

@@ -9,13 +9,14 @@ class AuthProviderSignupData < Base::Types::BaseInputObject
     argument :auth_provider, AuthProviderSignupData, required: false
     argument :last_name, String, required: true
     argument :first_name, String, required: true
+
     type User::Types::UserType
 
     def resolve(first_name: nil, last_name: nil, auth_provider: nil)
       User.create!(
+        email: auth_provider&.[](:credentials)&.[](:email),
         first_name: first_name,
         last_name: last_name,
-        email: auth_provider&.[](:credentials)&.[](:email),
         password: auth_provider&.[](:credentials)&.[](:password)
       )
     rescue ActiveRecord::RecordInvalid => e

app/graph/user/mutations/update_user.rb

@@ -3,6 +3,7 @@
 module User::Mutations
   class UpdateUser < Base::Mutations::BaseMutation
     argument :arguments, User::Types::Input::UpdateUser, required: true
+
     field :user, User::Types::UserType, null: true
 
     def resolve(arguments:)

app/graph/user/queries/fetch_user.rb

@@ -3,15 +3,15 @@
 module User::Queries
   class FetchUser < Base::Mutations::BaseMutation
     argument :arguments, User::Types::Input::FetchUser, required: true
+
     field :user, User::Types::UserType, null: true
 
     def resolve(arguments:)
       current_user = context[:current_user]
       raise StandardError unless current_user
 
       _type, item_id = RubyJwtPostgresAuthSchema.object_from_id(arguments[:id], nil)
-      user = User.find(item_id)
-      { user: user }
+      { user: User.find(item_id) }
     rescue ActiveRecord::RecordNotFound => e
       GraphQL::ExecutionError.new("Invalid input: #{e.message}")
     rescue StandardError

config/application.rb

@@ -1,25 +1,14 @@
 # frozen_string_literal: true
 
 require_relative 'boot'
-
 require 'rails/all'
 
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
-
 module RubyJwtPostgresAuth
   class Application < Rails::Application
     config.api_only = true
-
-    # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults(6.0)
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration can go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded after loading
-    # the framework and any gems in your application.
-
     config.before_configuration do
       env_file = File.join(Rails.root, 'config', 'local_env.yml')
       if File.exist?(env_file)

config/database.yml

@@ -1,83 +1,13 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
 default: &default
   adapter: postgresql
   encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
 development:
   <<: *default
   database: rjpa_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user that initialized the database.
-  #username: ruby_jwt_postgres_auth
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
   database: rjpa_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
 production:
   <<: *default
   database: rjpa_production

config/environment.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# Load the Rails application.
 require_relative 'application'
 
-# Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -1,64 +1,29 @@
 # frozen_string_literal: true
 
 Rails.application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports.
   config.consider_all_requests_local = true
+  config.eager_load = false
 
-  # Enable/disable caching. By default caching is disabled.
-  # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?
-    config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
-
+    config.action_controller.perform_caching = true
     config.cache_store = :memory_store
     config.public_file_server.headers = {
       "Cache-Control": "public, max-age=#{Integer(2.days, 10)}"
     }
   else
     config.action_controller.perform_caching = false
-
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options).
-  config.active_storage.service = :local
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
   config.action_mailer.perform_caching = false
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations.
+  config.action_mailer.raise_delivery_errors = false
   config.active_record.migration_error = :page_load
-
-  # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
+  config.active_storage.service = :local
+  config.active_support.deprecation = :log
   config.assets.debug = true
-
-  # Suppress logger output for asset requests.
   config.assets.quiet = true
-
-  # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
-
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end