Revert "update rails dependencies"

Original commit broke the build, since some dependencies have breaking
changes.

This reverts commit f753392d49.

.rubocop.yml

@@ -12,7 +12,7 @@ Rails:
   Enabled: true
 
 Metrics/LineLength:
-  Max: 100
+  Max: 120
 
 Metrics/AbcSize:
   Max: 16
@@ -22,3 +22,8 @@ Style/Documentation:
 
 Style/EmptyMethod:
   EnforcedStyle: expanded
+
+# I like this cop, but occasionally code is more readable without a guard clause,
+# and I don't want to write rubocop:disable comments every time that happens
+Style/GuardClause:
+  Enabled: false

.ruby-gemset

@@ -1 +1 @@
-metamaps_uts
+metamaps

Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 ruby '2.3.0'
 
@@ -37,7 +38,7 @@ gem 'uglifier'
 
 group :test do
   gem 'brakeman', require: false
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'json-schema'
   gem 'rspec-rails'
   gem 'shoulda-matchers'
@@ -47,10 +48,10 @@ end
 group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'faker'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'rubocop'
-  gem 'tunemygc'
-  gem 'faker'
+  gem 'rubocop', '~> 0.48.1' # match code climate https://github.com/tootsuite/mastodon/issues/1758
   gem 'timecop'
+  gem 'tunemygc'
 end

Gemfile.lock

@@ -105,10 +105,10 @@ GEM
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
     execjs (2.7.0)
-    factory_girl (4.8.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
     faker (1.8.4)
       i18n (~> 0.5)
@@ -117,7 +117,8 @@ GEM
       activesupport (>= 4.2.0)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.8.6)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
     jmespath (1.3.1)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -153,22 +154,21 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
+    mini_portile2 (2.3.0)
+    minitest (5.11.1)
     multi_xml (0.6.0)
     nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
-    paperclip (5.1.0)
+    paperclip (5.2.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     pg (0.21.0)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -216,7 +216,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -241,14 +241,13 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.49.1)
-      parallel (~> 1.10)
+    rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     sass (3.5.1)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -285,7 +284,7 @@ GEM
     tilt (2.0.8)
     timecop (0.9.1)
     tunemygc (1.0.69)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -312,7 +311,7 @@ DEPENDENCIES
   doorkeeper
   dotenv-rails
   exception_notification
-  factory_girl_rails
+  factory_bot_rails
   faker
   httparty
   jquery-rails
@@ -333,7 +332,7 @@ DEPENDENCIES
   rails (~> 5.0.0)
   redis (~> 3.3.3)
   rspec-rails
-  rubocop
+  rubocop (~> 0.48.1)
   sass-rails
   shoulda-matchers
   simplecov
@@ -348,4 +347,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

Rakefile

@@ -1,5 +1,6 @@
 #!/usr/bin/env rake
 # frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

app/assets/stylesheets/application.scss.erb

@@ -222,6 +222,7 @@ button.button.btn-no:hover {
 }
 
 .new_user{
+    height: 412px;
     margin-left:-166px;
     box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.23), 0px 3px 3px rgba(0, 0, 0, 0.16);
     font-family: din-medium;

app/assets/stylesheets/clean.css.erb

@@ -18,26 +18,10 @@
     font-weight: normal;
     font-style: normal;
 }
-@font-face {
-    font-family: 'noto-sans-regular';
-    src: url(<%= asset_path 'Fonts/notosansui-regular-webfont.woff2' %>) format('woff2'),
-         url(<%= asset_path 'Fonts/notosansui-regular-webfont.woff' %>) format('woff');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'noto-sans-bold';
-    src: url(<%= asset_path 'Fonts/notosansui-bold-webfont.woff2' %>) format('woff2'),
-         url(<%= asset_path 'Fonts/notosansui-bold-webfont.woff' %>) format('woff');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'noto-sans-bold-italic';
-    src: url(<%= asset_path 'Fonts/notosansui-bolditalic-webfont.woff2' %>) format('woff2'),
-         url(<%= asset_path 'Fonts/notosansui-bolditalic-webfont.woff' %>) format('woff');
-    font-weight: normal;
-    font-style: normal;
+
+.backface-visible {
+	-webkit-backface-visibility: visible !important;
+    backface-visibility: visible !important;
 }
 
 #yield {
@@ -243,109 +227,119 @@
 
 /* end map wrapper */
 
+/* yield */
+
+.famousYield {
+    overflow-y:auto;
+}
+
 /* homepage */
 
-body.unauthenticated.action-home {
-  background: white;
-  font-family: 'noto-sans', sans-serif;
-  font-weight: 200;
-}
-
-.home {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-}
-
-.homeLogo {
-  position: fixed;
-  top: 10px;
-  left: 20px;
-  font-family: 'noto-sans-bold-italic', sans-serif;
-  font-size: 22px;
-  color: #6D6D6D;
-  z-index: 1;
-}
-
-#particles-bg {
-  position: absolute;
-  top: 0;
-  width: 100%;
-  height: 100%;
-}
-
 .homeWrapper.homeText {
     margin-top: 5%;
 }
 
+.fullWidthWrapper {
+    width: 100%;
+}
+.fullWidthWrapper.withVideo {
+    height: 315px;
+    background: #757575;
+}
+
 .homeWrapper {
-    box-sizing: border-box;
-    position: relative;
-    z-index: 1;
-    border-radius: 3px;
-    color: #6D6D6D;
-    text-align: center;
-    padding: 30px;
-    background: white;
-    opacity: 0.8;
-}
-@media only screen and (max-width : 800px) {
-  .homeWrapper {
-    width: 90%;
-    margin: 0 5%;
-  }
-}
-@media only screen and (min-width : 801px) {
-  .homeWrapper {
     width: 800px;
     margin: 0 auto;
-  }
+    color: #424242;
 }
 
 .homeTitle {
     font-size: 64px;
-    line-height: 70px;
+    line-height: 48px;
+    text-align: center;
     margin-bottom: 20px;
-    font-family: 'noto-sans-bold', sans-serif;
 }
 
 .homeIntro {
     font-size: 22px;
     line-height: 26px;
+    text-align: justify;
     margin: 32px 0 20px;
-}
-
-.homeIntro div {
-  margin: 20px 0;
+    font-family: 'din-regular', helvetica, sans-serif;
 }
 
 .homeWrapper .green {
     color: #4fc059;
 }
-.homeWrapper .purple {
-    color: #a354cd;
-}
-.homeWrapper .yellow {
-    color: #dab539;
+
+.homeWrapper .din-medium {
+    font-family: 'din-medium', helvetica, sans-serif;
 }
 
-.ctaContainer {
-  margin: 0 auto;
+.homeVideo {
+    margin-bottom: 20px;
+    float: left;
 }
-.requestInviteCTA {
-    display: inline-block;
+
+.homeWrapper .callToAction {
+    float: left;
+    width: 216px;
+    padding: 8px 0 8px 24px;
+    color: #F5F5F5;
+}
+.callToAction h3 {
+    font-size: 24px;
+}
+.callToAction p {
+    margin: 8px 0 16px;
+    font-size: 13px;
+    line-height: 16px;
+    font-family: 'din-regular', helvetica, sans-serif;
+    text-align: left;
+}
+.callToAction a, .callToAction button {
+    display: block;
     width: 220px;
-    font-size: 20px;
+    height: 12px;
     padding: 16px 0;
     text-align: center;
-    border-radius: 3px;
-    border: 2px solid #a354cd;
-    margin: 12px 12px;
-    color: #a354cd;
-    font-family: 'noto-sans-bold', sans-serif;
+    border-radius: 2px;
+    font-size: 12px;
+    box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
+    margin: 0 auto;
+    color: #FFFFFF;
+    box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+}
+.callToAction .requestInviteCTA {
+    background-color: #4fc059;
+    margin-bottom: 12px;
+}
+.callToAction .requestInviteCTA:hover {
+    background-color: #49ad4e;
+}
+.callToAction .exploreFeaturedCTA {
+    background-color: #a354cd;
+    margin-bottom: 12px;
+}
+.callToAction .exploreFeaturedCTA:hover {
+    background-color: #9150bc;
+}
+.callToAction .learnMoreCTA {
+    background-color: #4fb5c0;
+    margin-bottom: 12px;
+}
+.callToAction .learnMoreCTA:hover {
+    background-color: #419599;
 }
-.requestInviteCTA:hover {
 
+.fullWidthWrapper.withPartners {
+    background: url(<%= asset_path('homepage_bg_fade.png') %>) no-repeat center -300px;
+}
+.homeWrapper.homePartners {
+    padding: 64px 0 280px;
+    height: 96px;
 }
 
 /* end home page */

app/assets/stylesheets/mobile.scss.erb

@@ -60,6 +60,19 @@
   .homeIntro {
     text-align: left;
   }
+  .fullWidthWrapper.withVideo {
+    height: auto;
+  }
+  .homeVideo {
+    width: 100% !important;
+    height: auto;
+  }
+  .fullWidthWrapper.withPartners {
+    display: none;
+  }
+  .learnMoreCTA {
+    display: none !important;
+  }
 
   #yield {
     padding-top: 50px;

app/channels/application_cable/channel.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

app/channels/application_cable/connection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
     identified_by :current_user

app/channels/map_channel.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MapChannel < ApplicationCable::Channel
   # Called when the consumer has successfully
   # become a subscriber of this channel.

app/controllers/access_controller.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 class AccessController < ApplicationController
-  before_action :require_user, only: [:access, :access_request,
-                                      :approve_access, :approve_access_post,
-                                      :deny_access, :deny_access_post, :request_access]
-  before_action :set_map, only: [:access, :access_request,
-                                 :approve_access, :approve_access_post,
-                                 :deny_access, :deny_access_post, :request_access]
+  before_action :require_user, only: %i[access access_request
+                                        approve_access approve_access_post
+                                        deny_access deny_access_post request_access]
+  before_action :set_map, only: %i[access access_request
+                                   approve_access approve_access_post
+                                   deny_access deny_access_post request_access]
   after_action :verify_authorized
 
   # GET maps/:id/request_access

app/controllers/api/v1/deprecated_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V1
     class DeprecatedController < ApplicationController

app/controllers/api/v2/mappings_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class MappingsController < WithUpdatesController

app/controllers/api/v2/maps_controller.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class MapsController < WithUpdatesController
       def searchable_columns
-        [:name, :desc]
+        %i[name desc]
       end
 
       def apply_filters(collection)

app/controllers/api/v2/metacodes_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class MetacodesController < RestfulController

app/controllers/api/v2/restful_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class RestfulController < ActionController::Base
@@ -7,7 +8,7 @@ module Api
 
       snorlax_used_rest!
 
-      before_action :load_resource, only: [:show, :update, :destroy]
+      before_action :load_resource, only: %i[show update destroy]
       after_action :verify_authorized
 
       def index
@@ -91,7 +92,7 @@ module Api
       end
 
       def doorkeeper_user
-        return unless doorkeeper_token.present?
+        return if doorkeeper_token.blank?
         doorkeeper_render_error unless valid_doorkeeper_token?
         @doorkeeper_user ||= User.find(doorkeeper_token.resource_owner_id)
       end

app/controllers/api/v2/sessions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class SessionsController < ApplicationController

app/controllers/api/v2/stars_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class StarsController < RestfulController

app/controllers/api/v2/synapses_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class SynapsesController < WithUpdatesController

app/controllers/api/v2/tokens_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class TokensController < RestfulController

app/controllers/api/v2/topics_controller.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class TopicsController < WithUpdatesController
       def searchable_columns
-        [:name, :desc, :link]
+        %i[name desc link]
       end
     end
   end

app/controllers/api/v2/users_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class UsersController < RestfulController

app/controllers/api/v2/with_updates_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Api
   module V2
     class WithUpdatesController < RestfulController

app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   include ApplicationHelper
   include Pundit

app/controllers/explore_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class ExploreController < ApplicationController
-  before_action :require_authentication, only: [:mine, :shared, :starred]
+  before_action :require_authentication, only: %i[mine shared starred]
   before_action :authorize_explore
   after_action :verify_authorized
   after_action :verify_policy_scoped

app/controllers/hacks_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # bad code that should be checked over before entering one of the
 # nice files from the right side of this repo
 class HacksController < ApplicationController

app/controllers/main_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MainController < ApplicationController
   before_action :authorize_main
   after_action :verify_authorized

app/controllers/mappings_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class MappingsController < ApplicationController
-  before_action :require_user, only: [:create, :update, :destroy]
+  before_action :require_user, only: %i[create update destroy]
   after_action :verify_authorized, except: :index
   after_action :verify_policy_scoped, only: :index
 

app/controllers/maps_controller.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
+
 class MapsController < ApplicationController
-  before_action :require_user, only: [:create, :update, :destroy, :events, :follow, :unfollow]
-  before_action :set_map, only: [:show, :conversation, :update, :destroy, :contains, :events, :export, :follow, :unfollow, :unfollow_from_email]
+  before_action :require_user, only: %i[create update destroy events follow unfollow]
+  before_action :set_map, only: %i[show conversation update destroy
+                                   contains events export
+                                   follow unfollow unfollow_from_email]
   after_action :verify_authorized
 
   # GET maps/:id

app/controllers/messages_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MessagesController < ApplicationController
   before_action :require_user, except: [:show]
   after_action :verify_authorized

app/controllers/metacode_sets_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MetacodeSetsController < ApplicationController
   before_action :require_admin
 

app/controllers/metacodes_controller.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class MetacodesController < ApplicationController
-  before_action :require_admin, except: [:index, :show]
-  before_action :set_metacode, only: [:edit, :update]
+  before_action :require_admin, except: %i[index show]
+  before_action :set_metacode, only: %i[edit update]
 
   # GET /metacodes
   # GET /metacodes.json

app/controllers/notifications_controller.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class NotificationsController < ApplicationController
-  before_action :set_receipts, only: [:index, :show, :mark_read, :mark_unread]
-  before_action :set_notification, only: [:show, :mark_read, :mark_unread]
-  before_action :set_receipt, only: [:show, :mark_read, :mark_unread]
+  before_action :set_receipts, only: %i[index show mark_read mark_unread]
+  before_action :set_notification, only: %i[show mark_read mark_unread]
+  before_action :set_receipt, only: %i[show mark_read mark_unread]
 
   def index
     @notifications = current_user.mailbox.notifications.page(params[:page]).per(25)

app/controllers/search_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class SearchController < ApplicationController
   include TopicsHelper
   include MapsHelper
@@ -7,7 +8,7 @@ class SearchController < ApplicationController
 
   before_action :authorize_search
   after_action :verify_authorized
-  after_action :verify_policy_scoped, only: [:maps, :mappers, :synapses, :topics]
+  after_action :verify_policy_scoped, only: %i[maps mappers synapses topics]
 
   # get /search/topics?term=SOMETERM
   def topics
@@ -140,13 +141,13 @@ class SearchController < ApplicationController
     topic1id = params[:topic1id]
     topic2id = params[:topic2id]
 
-    if term && !term.empty?
+    if term.present?
       @synapses = policy_scope(Synapse)
                   .where('LOWER("desc") like ?', '%' + term.downcase.strip + '%')
                   .order('"desc"')
 
       @synapses = @synapses.uniq(&:desc)
-    elsif topic1id && !topic1id.empty?
+    elsif topic1id.present?
       one = policy_scope(Synapse).where(topic1_id: topic1id, topic2_id: topic2id)
       two = policy_scope(Synapse).where(topic2_id: topic1id, topic1_id: topic2id)
       @synapses = one + two

app/controllers/stars_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class StarsController < ApplicationController
   before_action :require_user
   before_action :set_map

app/controllers/synapses_controller.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class SynapsesController < ApplicationController
   include TopicsHelper
 
-  before_action :require_user, only: [:create, :update, :destroy]
+  before_action :require_user, only: %i[create update destroy]
   after_action :verify_authorized, except: :index
   after_action :verify_policy_scoped, only: :index
 

app/controllers/tokens_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class TokensController < ApplicationController
   before_action :require_user, only: [:new]
 

app/controllers/topics_controller.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 class TopicsController < ApplicationController
   include TopicsHelper
 
-  before_action :require_user, only: [:create, :update, :destroy, :follow, :unfollow]
-  before_action :set_topic, only: [:show, :update, :relative_numbers,
-                                   :relatives, :network, :destroy,
-                                   :follow, :unfollow, :unfollow_from_email]
+  before_action :require_user, only: %i[create update destroy follow unfollow]
+  before_action :set_topic, only: %i[show update relative_numbers
+                                     relatives network destroy
+                                     follow unfollow unfollow_from_email]
   after_action :verify_authorized, except: :autocomplete_topic
 
   respond_to :html, :js, :json
@@ -13,7 +14,7 @@ class TopicsController < ApplicationController
   # GET /topics/autocomplete_topic
   def autocomplete_topic
     term = params[:term]
-    if term && !term.empty?
+    if term.present?
       topics = policy_scope(Topic)
                .where('LOWER("name") like ?', term.downcase + '%')
                .order('"name"')

app/controllers/users/confirmations_controller.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-module Users
-  class ConfirmationsController < Devise::ConfirmationsController
-    private
-    def after_confirmation_path_for(resource_name, resource)
-      sign_in_path
-    end
-  end
-end

app/controllers/users/passwords_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Users
   class PasswordsController < Devise::PasswordsController
     protected

app/controllers/users/registrations_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Users
   class RegistrationsController < Devise::RegistrationsController
     before_action :configure_sign_up_params, only: [:create]
@@ -7,10 +8,6 @@ module Users
 
     protected
 
-    def after_inactive_sign_up_path_for(resource)
-      sign_in_path
-    end
-
     def after_update_path_for(resource)
       signed_in_root_path(resource)
     end
@@ -33,7 +30,7 @@ module Users
     end
 
     def configure_sign_up_params
-      devise_parameter_sanitizer.permit(:sign_up, keys: [:name, :joinedwithcode])
+      devise_parameter_sanitizer.permit(:sign_up, keys: %i[name joinedwithcode])
     end
 
     def configure_account_update_params

app/controllers/users/sessions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Users
   class SessionsController < Devise::SessionsController
     after_action :store_location, only: [:new]

app/controllers/users_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class UsersController < ApplicationController
-  before_action :require_user, only: [:edit, :update, :updatemetacodes, :update_metacode_focus]
+  before_action :require_user, only: %i[edit update updatemetacodes update_metacode_focus]
 
   respond_to :html, :json
 
@@ -41,7 +42,7 @@ class UsersController < ApplicationController
       correct_pass = @user.valid_password?(params[:current_password])
 
       if correct_pass && @user.update_attributes(user_params)
-        update_follow_settings(@user, params[:settings]) if is_tester(@user)
+        update_follow_settings(@user, params[:settings])
         @user.image = nil if params[:remove_image] == '1'
         @user.save
         sign_in(@user, bypass: true)
@@ -100,7 +101,7 @@ class UsersController < ApplicationController
     @user.settings.metacode_focus = params[:value]
     @user.save
     respond_to do |format|
-      format.json { render json: { success: "success" }}
+      format.json { render json: { success: 'success' } }
     end
   end
 

app/decorators/notification_decorator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class NotificationDecorator
   class << self
     def decorate(notification, receipt)

app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApplicationHelper
   def invite_link
     "#{request.base_url}/join" + (current_user ? "?code=#{current_user.code}" : '')

app/helpers/content_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ContentHelper
   def resource_name
     :user

app/helpers/devise_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DeviseHelper
   def devise_error_messages!
     resource.errors.to_a[0]

app/helpers/in_metacode_sets_helper.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 module InMetacodeSetsHelper
 end

app/helpers/main_helper.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 module MainHelper
 end

app/helpers/map_mailer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MapMailerHelper
   def access_approved_subject(map)
     map.name + ' - access approved'

app/helpers/mapping_helper.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 module MappingHelper
 end

app/helpers/maps_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module MapsHelper
   # JSON autocomplete format for typeahead
   def autocomplete_map_array_json(maps)

app/helpers/metacodes_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module MetacodesHelper
   def metacodeset
     metacodes = current_user.settings.metacodes

app/helpers/synapses_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SynapsesHelper
   ## this one is for building our custom JSON autocomplete format for typeahead
   def autocomplete_synapse_generic_json(unique)

app/helpers/topic_mailer_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module TopicMailerHelper
   def added_to_map_subject(topic, map)
     topic.name + ' was added to map ' + map.name

app/helpers/topics_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module TopicsHelper
   ## this one is for building our custom JSON autocomplete format for typeahead
   def autocomplete_array_json(topics)
@@ -16,7 +17,7 @@ module TopicsHelper
 
         rtype: is_map ? 'map' : 'topic',
         inmaps: is_map ? [] : t.inmaps(current_user),
-        inmapsLinks: is_map ? [] : t.inmapsLinks(current_user),
+        inmapsLinks: is_map ? [] : t.inmaps_links(current_user),
         type: is_map ? metamap_metacode.name : t.metacode.name,
         typeImageURL: is_map ? metamap_metacode.icon : t.metacode.icon,
         mapCount: is_map ? 0 : t.maps.count,

app/helpers/users_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module UsersHelper
   # build custom json autocomplete for typeahead
   def autocomplete_user_array_json(users)

app/mailers/application_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: 'team@metamaps.cc'
   layout 'mailer'

app/mailers/map_activity_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MapActivityMailer < ApplicationMailer
   default from: 'team@metamaps.cc'
 

app/mailers/map_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MapMailer < ApplicationMailer
   include MapMailerHelper
   default from: 'team@metamaps.cc'

app/mailers/topic_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class TopicMailer < ApplicationMailer
   include TopicMailerHelper
   default from: 'team@metamaps.cc'

app/models/access_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class AccessRequest < ApplicationRecord
   belongs_to :user
   belongs_to :map

app/models/application_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

app/models/attachment.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Attachment < ApplicationRecord
   belongs_to :attachable, polymorphic: true
 

app/models/concerns/attachable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Attachable
   extend ActiveSupport::Concern
 

app/models/concerns/routing.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Routing
   extend ActiveSupport::Concern
   include Rails.application.routes.url_helpers

app/models/event.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
+
 class Event < ApplicationRecord
-  KINDS = %w(user_present_on_map user_not_present_on_map
+  KINDS = %w[user_present_on_map user_not_present_on_map
              conversation_started_on_map
              topic_added_to_map topic_moved_on_map topic_removed_from_map
              synapse_added_to_map synapse_removed_from_map
-             topic_updated synapse_updated).freeze
+             topic_updated synapse_updated].freeze
 
   belongs_to :eventable, polymorphic: true
   belongs_to :map
   belongs_to :user
 
-  scope :chronologically, -> { order('created_at asc') }
+  scope :chronologically, (-> { order('created_at asc') })
 
   after_create :notify_webhooks!, if: :map
 

app/models/events/conversation_started_on_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class ConversationStartedOnMap < Event
     # after_create :notify_users!

app/models/events/synapse_added_to_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class SynapseAddedToMap < Event
     # after_create :notify_users!

app/models/events/synapse_removed_from_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class SynapseRemovedFromMap < Event
     # after_create :notify_users!

app/models/events/synapse_updated.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class SynapseUpdated < Event
     # after_create :notify_users!

app/models/events/topic_added_to_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class TopicAddedToMap < Event
     after_create :notify_users!

app/models/events/topic_moved_on_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class TopicMovedOnMap < Event
     # after_create :notify_users!

app/models/events/topic_removed_from_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class TopicRemovedFromMap < Event
     # after_create :notify_users!

app/models/events/topic_updated.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Events
   class TopicUpdated < Event
-    #after_create :notify_users!
+    # after_create :notify_users!
 
     def self.publish!(topic, user, meta)
       create!(kind: 'topic_updated',

app/models/events/user_not_present_on_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class UserNotPresentOnMap < Event
     # after_create :notify_users!

app/models/events/user_present_on_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Events
   class UserPresentOnMap < Event
     # after_create :notify_users!

app/models/follow.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class Follow < ApplicationRecord
 
+class Follow < ApplicationRecord
   belongs_to :user
   belongs_to :followed, polymorphic: true
   has_one    :follow_reason, dependent: :destroy
@@ -11,13 +11,11 @@ class Follow < ApplicationRecord
 
   after_create :add_subsetting
 
-  scope :active, -> {
-    where(muted: false)
-  } 
+  scope :active, (-> { where(muted: false) })
 
   private
 
   def add_subsetting
-    follow_reason = FollowReason.create!(follow: self)
+    FollowReason.create!(follow: self)
   end
 end

app/models/follow_reason.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class FollowReason < ApplicationRecord
-  REASONS = %w(created commented contributed followed shared_on starred).freeze
+  REASONS = %w[created commented contributed followed shared_on starred].freeze
 
   belongs_to :follow
 

app/models/in_metacode_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class InMetacodeSet < ApplicationRecord
   belongs_to :metacode, class_name: 'Metacode', foreign_key: 'metacode_id'
   belongs_to :metacode_set, class_name: 'MetacodeSet', foreign_key: 'metacode_set_id'

app/models/map.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class Map < ApplicationRecord
-  ATTRS_TO_WATCH = %w(name desc permission).freeze
+  ATTRS_TO_WATCH = %w[name desc permission].freeze
 
   belongs_to :user
   belongs_to :source, class_name: :Map
@@ -15,7 +16,7 @@ class Map < ApplicationRecord
   has_many :messages, as: :resource, dependent: :destroy
   has_many :stars, dependent: :destroy
   has_many :follows, as: :followed, dependent: :destroy
-  has_many :followers, :through => :follows, source: :user
+  has_many :followers, through: :follows, source: :user
 
   has_many :access_requests, dependent: :destroy
   has_many :user_maps, dependent: :destroy
@@ -89,10 +90,10 @@ class Map < ApplicationRecord
 
   def as_json(_options = {})
     json = super(
-      methods: [:user_name, :user_image, :star_count, :topic_count, :synapse_count,
-                :contributor_count, :collaborator_ids, :screenshot_url],
-      except: [:screenshot_content_type, :screenshot_file_size, :screenshot_file_name,
-               :screenshot_updated_at]
+      methods: %i[user_name user_image star_count topic_count synapse_count
+                  contributor_count collaborator_ids screenshot_url],
+      except: %i[screenshot_content_type screenshot_file_size screenshot_file_name
+                 screenshot_updated_at]
     )
     json[:created_at_clean] = created_at_str
     json[:updated_at_clean] = updated_at_str
@@ -142,7 +143,7 @@ class Map < ApplicationRecord
   protected
 
   def after_created
-    FollowService.follow(self, self.user, 'created')
+    FollowService.follow(self, user, 'created')
     # notify users following the map creator
   end
 
@@ -152,12 +153,11 @@ class Map < ApplicationRecord
   end
 
   def after_updated_async
-    if ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+    return unless ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
     FollowService.follow(self, updated_by, 'contributed')
     # NotificationService.notify_followers(self, 'map_updated', changed_attributes)
     # or better yet publish an event
   end
-  end
   handle_asynchronously :after_updated_async
 
   def before_destroyed

app/models/mapping.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 class Mapping < ApplicationRecord
-  scope :topicmapping, -> { where(mappable_type: :Topic) }
-  scope :synapsemapping, -> { where(mappable_type: :Synapse) }
+  scope :topicmapping, (-> { where(mappable_type: :Topic) })
+  scope :synapsemapping, (-> { where(mappable_type: :Synapse) })
 
   belongs_to :mappable, polymorphic: true
   belongs_to :map, class_name: 'Map', foreign_key: 'map_id', touch: true
@@ -24,7 +25,7 @@ class Mapping < ApplicationRecord
   end
 
   def as_json(_options = {})
-    super(methods: [:user_name, :user_image])
+    super(methods: %i[user_name user_image])
   end
 
   def after_created
@@ -52,18 +53,18 @@ class Mapping < ApplicationRecord
   handle_asynchronously :after_created_async
 
   def after_updated
-    if (mappable_type == 'Topic') && (xloc_changed? || yloc_changed?)
+    return unless (mappable_type == 'Topic') && (xloc_changed? || yloc_changed?)
     meta = { 'x': xloc, 'y': yloc, 'mapping_id': id }
     Events::TopicMovedOnMap.publish!(mappable, map, updated_by, meta)
-      ActionCable.server.broadcast 'map_' + map.id.to_s, type: 'topicMoved', id: mappable.id, mapping_id: id, x: xloc, y: yloc
-    end
+    ActionCable.server.broadcast('map_' + map.id.to_s, type: 'topicMoved',
+                                                       id: mappable.id, mapping_id: id,
+                                                       x: xloc, y: yloc)
   end
 
   def after_updated_async
-    if (mappable_type == 'Topic') && (xloc_changed? || yloc_changed?)
+    return unless (mappable_type == 'Topic') && (xloc_changed? || yloc_changed?)
     FollowService.follow(map, updated_by, 'contributed')
   end
-  end
   handle_asynchronously :after_updated_async
 
   def before_destroyed

app/models/message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Message < ApplicationRecord
   belongs_to :user
   belongs_to :resource, polymorphic: true
@@ -6,15 +7,14 @@ class Message < ApplicationRecord
   delegate :name, to: :user, prefix: true
 
   after_create :after_created
-  #after_create :after_created_async
-
+  # after_create :after_created_async
 
   def user_image
     user.image.url
   end
 
   def as_json(_options = {})
-    json = super(methods: [:user_name, :user_image])
+    json = super(methods: %i[user_name user_image])
     json
   end
 

app/models/metacode.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
+
 class Metacode < ApplicationRecord
   has_many :in_metacode_sets
   has_many :metacode_sets, through: :in_metacode_sets
   has_many :topics
 
   # This method associates the attribute ":aws_icon" with a file attachment
-  has_attached_file :aws_icon, styles: {
-    ninetysix: ['96x96#', :png]
-  },
+  has_attached_file :aws_icon, styles: { ninetysix: ['96x96#', :png] },
                                default_url: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png'
 
   # Validate the attached icon is image/jpg, image/png, etc
-  validates_attachment_content_type :aws_icon, content_type: /\Aimage\/.*\Z/
+  validates_attachment_content_type :aws_icon, content_type: %r{\Aimage/.*\Z}
 
   validate :aws_xor_manual_icon
   validate :manual_icon_https
@@ -30,15 +29,13 @@ class Metacode < ApplicationRecord
   def as_json(options = {})
     default = super(options)
     default[:icon] = icon
-    default.except('aws_icon_file_name', 'aws_icon_content_type', 'aws_icon_file_size', 'aws_icon_updated_at', 'manual_icon')
+    default.except(
+      'aws_icon_file_name', 'aws_icon_content_type', 'aws_icon_file_size', 'aws_icon_updated_at',
+      'manual_icon'
+    )
   end
 
-  def hasSelected(user)
-    return true if user.settings.metacodes.include? id.to_s
-    false
-  end
-
-  def inMetacodeSet(metacode_set)
+  def in_metacode_set(metacode_set)
     return true if metacode_sets.include? metacode_set
     false
   end
@@ -55,10 +52,9 @@ class Metacode < ApplicationRecord
   end
 
   def manual_icon_https
-    if manual_icon.present?
+    return if manual_icon.blank?
     unless manual_icon.starts_with? 'https'
       errors.add(:base, 'Manual icon must begin with https')
     end
   end
-  end
 end

app/models/metacode_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class MetacodeSet < ApplicationRecord
   belongs_to :user
   has_many :in_metacode_sets

app/models/permitted_params.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
-class PermittedParams < Struct.new(:params)
-  %w(map synapse topic mapping token).each do |kind|
+
+class PermittedParams
+  %w[map synapse topic mapping token].each do |kind|
     define_method(kind) do
       permitted_attributes = send("#{kind}_attributes")
-      params.require(kind).permit(*permitted_attributes)
+      @params.require(kind).permit(*permitted_attributes)
     end
     alias_method :"api_#{kind}", kind.to_sym
   end
 
+  def initialize(params)
+    @params = params
+  end
+
   alias read_attribute_for_serialization send
 
   def token_attributes
@@ -15,18 +20,18 @@ class PermittedParams < Struct.new(:params)
   end
 
   def map_attributes
-    [:name, :desc, :permission, :arranged]
+    %i[name desc permission arranged]
   end
 
   def synapse_attributes
-    [:desc, :category, :weight, :permission, :topic1_id, :topic2_id]
+    %i[desc category weight permission topic1_id topic2_id]
   end
 
   def topic_attributes
-    [:name, :desc, :link, :permission, :metacode_id]
+    %i[name desc link permission metacode_id]
   end
 
   def mapping_attributes
-    [:xloc, :yloc, :map_id, :mappable_type, :mappable_id]
+    %i[xloc yloc map_id mappable_type mappable_id]
   end
 end

app/models/star.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
-class Star < ActiveRecord::Base
+
+class Star < ApplicationRecord
   belongs_to :user
   belongs_to :map
   validates :map, uniqueness: { scope: :user, message: 'You have already starred this map' }
 
-  #after_create :after_created_async
-  #before_destroy :before_destroyed
+  # after_create :after_created_async
+  # before_destroy :before_destroyed
 
   protected
 

app/models/synapse.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class Synapse < ApplicationRecord
-  ATTRS_TO_WATCH = %w(desc category permission defer_to_map_id).freeze
+  ATTRS_TO_WATCH = %w[desc category permission defer_to_map_id].freeze
 
   belongs_to :user
   belongs_to :defer_to_map, class_name: 'Map', foreign_key: 'defer_to_map_id'
@@ -21,9 +22,9 @@ class Synapse < ApplicationRecord
 
   validates :category, inclusion: { in: ['from-to', 'both'], allow_nil: true }
 
-  scope :for_topic, ->(topic_id = nil) {
+  scope :for_topic, (lambda do |topic_id = nil|
     where(topic1_id: topic_id).or(where(topic2_id: topic_id))
-  }
+  end)
 
   before_create :set_perm_by_defer
   after_create :after_created_async
@@ -38,7 +39,7 @@ class Synapse < ApplicationRecord
 
   def collaborator_ids
     if defer_to_map
-      defer_to_map.editors.select { |mapper| mapper != user }.map(&:id)
+      defer_to_map.editors.reject { |mapper| mapper == user }.map(&:id)
     else
       []
     end
@@ -54,7 +55,7 @@ class Synapse < ApplicationRecord
   end
 
   def as_json(_options = {})
-    super(methods: [:user_name, :user_image, :collaborator_ids])
+    super(methods: %i[user_name user_image collaborator_ids])
   end
 
   def as_rdf
@@ -72,7 +73,7 @@ class Synapse < ApplicationRecord
   protected
 
   def set_perm_by_defer
-    permission = defer_to_map.permission if defer_to_map
+    defer_to_map&.permission
   end
 
   def after_created_async
@@ -82,7 +83,8 @@ class Synapse < ApplicationRecord
   handle_asynchronously :after_created_async
 
   def after_updated
-    if ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+    return unless ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+
     new = attributes.select { |k| ATTRS_TO_WATCH.include?(k) }
     old = changed_attributes.select { |k| ATTRS_TO_WATCH.include?(k) }
     meta = new.merge(old) # we are prioritizing the old values, keeping them
@@ -92,11 +94,10 @@ class Synapse < ApplicationRecord
       ActionCable.server.broadcast 'map_' + map.id.to_s, type: 'synapseUpdated', id: id
     end
   end
-  end
 
   def before_destroyed
     # hard to know how to do this yet, because the synapse actually gets destroyed
-    #NotificationService.notify_followers(topic1, 'topic_disconnected', self)
-    #NotificationService.notify_followers(topic2, 'topic_disconnected', self)
+    # NotificationService.notify_followers(topic1, 'topic_disconnected', self)
+    # NotificationService.notify_followers(topic2, 'topic_disconnected', self)
   end
 end

app/models/token.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Token < ApplicationRecord
   belongs_to :user
 

app/models/topic.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 class Topic < ApplicationRecord
-  ATTRS_TO_WATCH = %w(name desc link metacode_id permission defer_to_map_id).freeze
+  ATTRS_TO_WATCH = %w[name desc link metacode_id permission defer_to_map_id].freeze
   include TopicsHelper
   include Attachable
 
@@ -16,7 +17,7 @@ class Topic < ApplicationRecord
   has_many :mappings, as: :mappable, dependent: :destroy
   has_many :maps, through: :mappings
   has_many :follows, as: :followed, dependent: :destroy
-  has_many :followers, :through => :follows, source: :user
+  has_many :followers, through: :follows, source: :user
 
   belongs_to :metacode
 
@@ -25,7 +26,7 @@ class Topic < ApplicationRecord
   after_create :after_created_async
   after_update :after_updated
   after_update :after_updated_async
-  #before_destroy :before_destroyed
+  # before_destroy :before_destroyed
 
   validates :permission, presence: true
   validates :permission, inclusion: { in: Perm::ISSIONS.map(&:to_s) }
@@ -38,13 +39,13 @@ class Topic < ApplicationRecord
     topics1.or(topics2)
   end
 
-  scope :relatives, ->(topic_id = nil, user = nil) {
+  scope :relatives, (lambda do |topic_id = nil, user = nil|
     # should only see topics through *visible* synapses
     # e.g. Topic A (commons) -> synapse (private) -> Topic B (commons) must be filtered out
     topic_ids = Pundit.policy_scope(user, Synapse.where(topic1_id: topic_id)).pluck(:topic2_id)
     topic_ids += Pundit.policy_scope(user, Synapse.where(topic2_id: topic_id)).pluck(:topic1_id)
     where(id: topic_ids.uniq)
-  }
+  end)
 
   delegate :name, to: :user, prefix: true
 
@@ -64,13 +65,13 @@ class Topic < ApplicationRecord
     Pundit.policy_scope(user, maps).map(&:name)
   end
 
-  def inmapsLinks(user)
+  def inmaps_links(user)
     Pundit.policy_scope(user, maps).map(&:id)
   end
 
   def as_json(options = {})
-    super(methods: [:user_name, :user_image, :collaborator_ids])
-      .merge(inmaps: inmaps(options[:user]), inmapsLinks: inmapsLinks(options[:user]),
+    super(methods: %i[user_name user_image collaborator_ids])
+      .merge(inmaps: inmaps(options[:user]), inmapsLinks: inmaps_links(options[:user]),
              map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user]))
   end
 
@@ -89,7 +90,7 @@ class Topic < ApplicationRecord
 
   def collaborator_ids
     if defer_to_map
-      defer_to_map.editors.select { |mapper| mapper != user }.map(&:id)
+      defer_to_map.editors.reject { |mapper| mapper == user }.map(&:id)
     else
       []
     end
@@ -126,15 +127,10 @@ class Topic < ApplicationRecord
         end
       end
     end
-    if output_format == 'array'
-      return output
-    elsif output_format == 'text'
-      return output.join('; ')
-    else
+    return output if output_format == 'array'
+    return output.join('; ') if output_format == 'text'
     raise 'invalid argument to synapses_csv'
   end
-    output
-  end
 
   def topic_autocomplete_method
     "Get: #{name}"
@@ -143,7 +139,7 @@ class Topic < ApplicationRecord
   protected
 
   def set_perm_by_defer
-    permission = defer_to_map.permission if defer_to_map
+    self.permission = defer_to_map.permission if defer_to_map
   end
 
   def create_metamap?
@@ -156,13 +152,14 @@ class Topic < ApplicationRecord
   end
 
   def after_created_async
-    FollowService.follow(self, self.user, 'created')
+    FollowService.follow(self, user, 'created')
     # notify users following the topic creator
   end
   handle_asynchronously :after_created_async
 
   def after_updated
-    if ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+    return unless ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+
     new = attributes.select { |k| ATTRS_TO_WATCH.include?(k) }
     old = changed_attributes.select { |k| ATTRS_TO_WATCH.include?(k) }
     meta = new.merge(old) # we are prioritizing the old values, keeping them
@@ -172,17 +169,16 @@ class Topic < ApplicationRecord
       ActionCable.server.broadcast 'map_' + map.id.to_s, type: 'topicUpdated', id: id
     end
   end
-  end
 
   def after_updated_async
-    if ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+    return unless ATTRS_TO_WATCH.any? { |k| changed_attributes.key?(k) }
+
     FollowService.follow(self, updated_by, 'contributed')
   end
-  end
   handle_asynchronously :after_updated_async
 
   def before_destroyed
     # hard to know how to do this yet, because the topic actually gets destroyed
-    #NotificationService.notify_followers(self, 'topic_deleted', ?)
+    # NotificationService.notify_followers(self, 'topic_deleted', ?)
   end
 end

app/models/user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'open-uri'
 
 class User < ApplicationRecord
@@ -17,7 +18,9 @@ class User < ApplicationRecord
 
   has_many :following, class_name: 'Follow'
 
-  devise :database_authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :registerable
+  after_create :generate_code
+
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable
 
   serialize :settings, UserPreference
 
@@ -33,7 +36,8 @@ class User < ApplicationRecord
   validates :email, presence: true # done by devise
   validates :name, uniqueness: true # done by devise
   validates :email, uniqueness: true # done by devise
-  validates_format_of :email, with: /\@uts\.edu\.au/, message: ' must end with @uts.edu.au'
+
+  validates :joinedwithcode, presence: true, inclusion: { in: $codes, message: '%{value} is not valid' }, on: :create
 
   # This method associates the attribute ":image" with a file attachment
   has_attached_file :image, styles: {
@@ -48,26 +52,24 @@ class User < ApplicationRecord
   validates_attachment_content_type :image, content_type: %r{\Aimage/.*\Z}
 
   # override default as_json
-  def as_json(_options = {})
+  def as_json(options = {})
     json = { id: id,
              name: name,
              image: image.url(:sixtyfour),
              admin: admin }
-    if (_options[:follows])
+    if options[:follows]
       json['follows'] = {
         topics: following.active.where(followed_type: 'Topic').to_a.map(&:followed_id),
         maps: following.active.where(followed_type: 'Map').to_a.map(&:followed_id)
       }
     end
-    if (_options[:follow_settings])
-      json['follow_topic_on_created'] = settings.follow_topic_on_created == "1"
-      json['follow_topic_on_contributed'] = settings.follow_topic_on_contributed == "1"
-      json['follow_map_on_created'] = settings.follow_map_on_created == "1"
-      json['follow_map_on_contributed'] = settings.follow_map_on_contributed == "1"
-    end
-    if (_options[:email])
-      json['email'] = email
+    if options[:follow_settings]
+      json['follow_topic_on_created'] = settings.follow_topic_on_created == '1'
+      json['follow_topic_on_contributed'] = settings.follow_topic_on_contributed == '1'
+      json['follow_map_on_created'] = settings.follow_map_on_created == '1'
+      json['follow_map_on_contributed'] = settings.follow_map_on_contributed == '1'
     end
+    json['email'] = email if options[:email]
     json
   end
 
@@ -104,10 +106,14 @@ class User < ApplicationRecord
   end
 
   def most_used_metacodes
-    topics.to_a.each_with_object(Hash.new(0)) do |topic, memo|
-      memo[topic.metacode_id] += 1
-      memo
-    end.to_a.sort { |a, b| b[1] <=> a[1] }.map { |i| i[0] }.slice(0, 5)
+    metacode_counts = topics.to_a.each_with_object(Hash.new(0)) do |topic, list_so_far|
+      list_so_far[topic.metacode_id] += 1
+      list_so_far
+    end
+    id_count_pairs = metacode_counts.to_a
+    id_count_pairs.sort! { |a, b| b[1] <=> a[1] }
+    metacode_ids = id_count_pairs.map { |i| i[0] }
+    metacode_ids.slice(0, 5)
   end
 
   # generate a random 8 letter/digit code that they can use to invite people
@@ -130,20 +136,20 @@ class User < ApplicationRecord
   end
 
   def has_map_open(map)
-    latestEvent = Event.where(map: map, user: self)
-                       .where(kind: ['user_present_on_map', 'user_not_present_on_map'])
+    latest_event = Event.where(map: map, user: self)
+                        .where(kind: %w[user_present_on_map user_not_present_on_map])
                         .order(:created_at)
                         .last
-    latestEvent && latestEvent.kind == 'user_present_on_map'
+    latest_event && latest_event.kind == 'user_present_on_map'
   end
 
   def has_map_with_synapse_open(synapse)
-    synapse.maps.any?{|map| has_map_open(map)}
+    synapse.maps.any? { |map| has_map_open(map) }
   end
 
   def settings
     self[:settings] = UserPreference.new if self[:settings].nil?
-    if not self[:settings].respond_to?(:follow_topic_on_created)
+    unless self[:settings].respond_to?(:follow_topic_on_created)
       self[:settings].initialize_follow_settings
     end
     self[:settings]

app/models/user_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UserMap < ApplicationRecord
   belongs_to :map
   belongs_to :user
@@ -18,7 +19,7 @@ class UserMap < ApplicationRecord
   def after_created_async
     FollowService.follow(map, user, 'shared_on')
     if access_request
-      NotificationService.access_approved(self.access_request)
+      NotificationService.access_approved(access_request)
     else
       NotificationService.invite_to_edit(self)
     end