Merge pull request #14 from debtcollective/rails_v5

Upgrade to Rails v5.2.3

.ruby-gemset

@@ -0,0 +1 @@
+fundraising

.ruby-version

@@ -1 +1 @@
-2.3.7
+2.5.1

Gemfile

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-ruby '2.3.7'
+ruby '2.5.1'
+gem 'rails', '= 5.2.3'
 gem 'rake'
-gem 'rails', '3.2.22.5'
-gem 'rails_12factor'
 # https://stripe.com/docs/api
 gem 'stripe'
 
 # Compression of assets on heroku
 # https://github.com/romanbsd/heroku-deflater
-gem 'heroku-deflater', :group => :production
+gem 'heroku-deflater', group: :production
 
 # json serialization
 # https://github.com/nesquena/rabl
@@ -17,23 +18,20 @@ gem 'rabl'
 
 gem 'parallel'
 
-gem 'puma'
 gem 'bootsnap', require: false
-gem 'rack-timeout'
+gem 'puma'
 gem 'puma_worker_killer'
+gem 'rack-ssl'
+gem 'rack-timeout'
 
-gem 'test-unit', '~> 3.0'
 gem 'hamster'
+gem 'test-unit', '~> 3.0'
 
+gem 'aws-sdk', '~> 1'
 gem 'aws-ses'
-gem 'aws-sdk'
-
 # for blocking ip addressses
 gem 'rack-attack'
 
-# For modularizing javascript
-# https://github.com/browserify-rails/browserify-rails
-gem 'browserify-rails'
 gem 'sprockets'
 
 # for serving fonts on cdn
@@ -41,12 +39,13 @@ gem 'sprockets'
 gem 'font_assets', '~> 0.1.14'
 
 # Database (postgres)
-gem 'pg' # Postgresql
+
+gem 'pg', '~> 0.11'
 gem 'qx', path: 'gems/ruby-qx'
+
 gem 'dalli'
 gem 'memcachier'
 
-
 gem 'param_validation', path: 'gems/ruby-param-validation'
 
 # Print colorized text lol
@@ -73,7 +72,7 @@ gem 'httparty'
 
 # User authentication
 # https://github.com/plataformatec/devise
-gem 'devise'
+gem 'devise', '~> 4.4'
 gem 'devise-async'
 
 # http://www.rubygeocoder.com/
@@ -91,41 +90,41 @@ gem 'table_print'
 
 gem 'bunny', '>= 2.6.3'
 
-gem 'rails-i18n', '~> 3.0.0' # For 3.x
-gem 'i18n-js'
 gem 'countries'
-
+gem 'i18n-js'
+gem 'rails-i18n'
 
 group :development, :ci do
-  gem 'traceroute'
   gem 'debase'
   gem 'ruby-debug-ide'
+  gem 'traceroute'
 end
 
 group :development, :ci, :test do
-	gem 'timecop'
   gem 'pry'
   # gem 'pry-byebug'
   gem 'binding_of_caller'
-  gem 'rspec'
-	gem 'rspec-rails'
-	gem 'database_cleaner'
   gem 'dotenv-rails'
   gem 'ruby-prof', '0.15.9'
-	gem 'stripe-ruby-mock', '~> 2.4.1', :require => 'stripe_mock', git: 'https://github.com/commitchange/stripe-ruby-mock.git', :branch => '2.4.1'
+  gem 'solargraph'
-  gem 'factory_bot'
-	gem 'factory_bot_rails'
-	gem 'action_mailer_matchers'
-  gem 'simplecov', '~> 0.16.1', require: false
 end
 
-group :test do
+group :ci, :test do
+  gem 'timecop'
   gem 'webmock'
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'factory_bot'
+  gem 'factory_bot_rails'
+  gem 'simplecov', '~> 0.16.1', require: false
+  gem 'database_cleaner'
+  gem 'action_mailer_matchers'
+  gem 'stripe-ruby-mock', '~> 2.4.1', require: 'stripe_mock', git: 'https://github.com/commitchange/stripe-ruby-mock.git', branch: '2.4.1'
 end
 
 # Gems used for asset compilation
 gem 'sass', '3.2.19'
-gem 'sass-rails', '3.2.6'
+gem 'sass-rails'
 gem 'uglifier'
 
 # make logging less terrible in rails
@@ -136,10 +135,10 @@ gem 'dry-validation' # used only for config validation
 
 gem 'foreman'
 
-gem 'grape', '~> 1.1.0'
+gem 'grape'
-gem 'grape-entity', git: 'https://github.com/ruby-grape/grape-entity.git', ref: '0e04aa561373b510c2486282979085eaef2ae663'
+gem 'grape-entity'
 gem 'grape-swagger'
 gem 'grape-swagger-entity'
-gem 'grape_url_validator'
-gem 'grape_logging'
 gem 'grape_devise', path: 'gems/grape_devise'
+gem 'grape_logging'
+gem 'grape_url_validator'

Gemfile.lock

@@ -8,15 +8,6 @@ GIT
       multi_json (~> 1.0)
       stripe (>= 1.31.0, <= 1.58.0)
 
-GIT
-  remote: https://github.com/ruby-grape/grape-entity.git
-  revision: 0e04aa561373b510c2486282979085eaef2ae663
-  ref: 0e04aa561373b510c2486282979085eaef2ae663
-  specs:
-    grape-entity (0.7.1)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.3.2)
-
 PATH
   remote: gems/grape_devise
   specs:
@@ -42,169 +33,201 @@ GEM
   remote: https://rubygems.org/
   specs:
     action_mailer_matchers (1.0.0)
-    actionmailer (3.2.22.5)
+    actioncable (5.2.3)
-      actionpack (= 3.2.22.5)
+      actionpack (= 5.2.3)
-      mail (~> 2.5.4)
+      nio4r (~> 2.0)
-    actionpack (3.2.22.5)
+      websocket-driver (>= 0.6.1)
-      activemodel (= 3.2.22.5)
+    actionmailer (5.2.3)
-      activesupport (= 3.2.22.5)
+      actionpack (= 5.2.3)
-      builder (~> 3.0.0)
+      actionview (= 5.2.3)
-      erubis (~> 2.7.0)
+      activejob (= 5.2.3)
-      journey (~> 1.0.4)
+      mail (~> 2.5, >= 2.5.4)
-      rack (~> 1.4.5)
+      rails-dom-testing (~> 2.0)
-      rack-cache (~> 1.2)
+    actionpack (5.2.3)
-      rack-test (~> 0.6.1)
+      actionview (= 5.2.3)
-      sprockets (~> 2.2.1)
+      activesupport (= 5.2.3)
-    activemodel (3.2.22.5)
+      rack (~> 2.0)
-      activesupport (= 3.2.22.5)
+      rack-test (>= 0.6.3)
-      builder (~> 3.0.0)
+      rails-dom-testing (~> 2.0)
-    activerecord (3.2.22.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-      activemodel (= 3.2.22.5)
+    actionview (5.2.3)
-      activesupport (= 3.2.22.5)
+      activesupport (= 5.2.3)
-      arel (~> 3.0.2)
+      builder (~> 3.1)
-      tzinfo (~> 0.3.29)
+      erubi (~> 1.4)
-    activeresource (3.2.22.5)
+      rails-dom-testing (~> 2.0)
-      activemodel (= 3.2.22.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-      activesupport (= 3.2.22.5)
+    activejob (5.2.3)
-    activesupport (3.2.22.5)
+      activesupport (= 5.2.3)
-      i18n (~> 0.6, >= 0.6.4)
+      globalid (>= 0.3.6)
-      multi_json (~> 1.0)
+    activemodel (5.2.3)
-    addressable (2.3.8)
+      activesupport (= 5.2.3)
-    amq-protocol (2.2.0)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    amq-protocol (2.3.0)
     andand (1.3.3)
-    arel (3.0.3)
+    arel (9.0.0)
-    aws-sdk (1.66.0)
+    ast (2.4.0)
-      aws-sdk-v1 (= 1.66.0)
+    aws-eventstream (1.0.1)
-    aws-sdk-v1 (1.66.0)
+    aws-partitions (1.110.0)
+    aws-sdk (1.67.0)
+      aws-sdk-v1 (= 1.67.0)
+    aws-sdk-core (3.37.0)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.11.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.23.1)
+      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-v1 (1.67.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4)
+      nokogiri (~> 1)
     aws-ses (0.6.0)
       builder
       mail (> 2.2.5)
       mime-types
       xml-simple
+    aws-sigv4 (1.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bcrypt (3.1.11)
+    backport (0.3.0)
-    binding_of_caller (0.7.2)
+    bcrypt (3.1.12)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.1.7)
+    bootsnap (1.3.2)
       msgpack (~> 1.0)
-    browserify-rails (0.9.3)
+    builder (3.2.3)
-      sprockets (~> 2.2)
+    bunny (2.12.0)
-    builder (3.0.4)
+      amq-protocol (~> 2.3, >= 2.3.0)
-    bunny (2.7.1)
+    carrierwave (1.2.3)
-      amq-protocol (>= 2.2.0)
+      activemodel (>= 4.0.0)
-    carrierwave (0.10.0)
+      activesupport (>= 4.0.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
       mime-types (>= 1.16)
-    carrierwave-aws (0.5.0)
+    carrierwave-aws (1.3.0)
-      aws-sdk (~> 1.58)
+      aws-sdk-s3 (~> 1.0)
-      carrierwave (~> 0.7)
+      carrierwave (>= 0.7, < 2.0)
     chronic (0.10.2)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     config (1.7.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.2.1)
       dry-validation (>= 0.10.4)
-    countries (2.1.2)
+    countries (2.1.4)
       i18n_data (~> 0.8.0)
       money (~> 6.9)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    css_parser (1.3.6)
+    crass (1.0.4)
+    css_parser (1.6.0)
       addressable
-    dalli (2.7.6)
+    dalli (2.7.9)
     dante (0.2.0)
-    database_cleaner (1.6.1)
+    database_cleaner (1.7.0)
     debase (0.2.2)
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     deep_merge (1.2.1)
-    delayed_job (4.1.2)
+    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.1)
+      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.1)
+    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.1)
+      activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.10)
+    devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 6.0)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-async (0.9.0)
+    devise-async (1.0.0)
-      devise (~> 3.2)
+      activejob (>= 5.0)
-    diff-lcs (1.2.5)
+      devise (>= 4.0)
+    diff-lcs (1.3)
     docile (1.3.1)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.0.1)
+    dotenv (2.5.0)
-    dotenv-rails (2.0.1)
+    dotenv-rails (2.5.0)
-      dotenv (= 2.0.1)
+      dotenv (= 2.5.0)
+      railties (>= 3.2, < 6.0)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.5)
+    dry-core (0.4.7)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.0)
+    dry-equalizer (0.2.1)
+    dry-inflector (0.1.2)
     dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.12.2)
+    dry-types (0.13.2)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
-      inflecto (~> 0.0.0, >= 0.0.2)
+    dry-validation (0.12.2)
-    dry-validation (0.11.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.12.0)
+      dry-types (~> 0.13.1)
     equalizer (0.0.11)
-    erubis (2.7.0)
+    erubi (1.8.0)
-    execjs (2.5.2)
+    execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
+    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.8.2)
+      factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faraday (0.9.1)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_middleware (0.13.0)
-      faraday (>= 0.7.4, < 0.10)
+      faraday (>= 0.7.4, < 1.0)
     font_assets (0.1.14)
       rack
-    foreman (0.84.0)
+    foreman (0.85.0)
       thor (~> 0.19.1)
-    fullcontact (0.9.0)
+    fullcontact (0.18.0)
-      faraday (~> 0.9.0)
+      faraday (~> 0.11.0)
-      faraday_middleware (>= 0.9)
+      faraday_middleware (>= 0.10)
       hashie (>= 2.0, < 4.0)
-      plissken
+    geocoder (1.5.0)
-    geocoder (1.2.11)
+    get_process_mem (0.2.3)
-    get_process_mem (0.2.1)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
     grape (1.1.0)
       activesupport
       builder
@@ -212,11 +235,14 @@ GEM
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
-    grape-swagger (0.28.0)
+    grape-entity (0.7.1)
+      activesupport (>= 4.0)
+      multi_json (>= 1.3.2)
+    grape-swagger (0.31.1)
       grape (>= 0.16.2)
-    grape-swagger-entity (0.2.3)
+    grape-swagger-entity (0.3.0)
       grape-entity (>= 0.5.0)
-      grape-swagger (>= 0.20.4)
+      grape-swagger (>= 0.31.0)
     grape_logging (1.8.0)
       grape
       rack
@@ -224,44 +250,55 @@ GEM
       grape (>= 0.12.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.4.1)
+    hashdiff (0.3.7)
-    heroku-deflater (0.5.3)
+    hashie (3.6.0)
+    heroku-deflater (0.6.3)
       rack (>= 1.4.5)
-    hike (1.2.3)
+    htmlentities (4.3.4)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.13.3)
+    httparty (0.16.2)
-      json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.0.2)
+    i18n-js (3.1.0)
-      i18n (~> 0.6, >= 0.6.6)
+      i18n (>= 0.6.6, < 2)
     i18n_data (0.8.0)
     ice_nine (0.11.2)
-    inflecto (0.0.2)
+    jaro_winkler (1.5.2)
-    journey (1.0.4)
+    jmespath (1.4.0)
     json (1.8.6)
-    kdtree (0.3)
+    kdtree (0.4)
-    lograge (0.3.6)
+    kramdown (1.17.0)
-      actionpack (>= 3)
+    lograge (0.10.0)
-      activesupport (>= 3)
+      actionpack (>= 4)
-      railties (>= 3)
+      activesupport (>= 4)
-    mail (2.5.5)
+      railties (>= 4)
-      mime-types (~> 1.16)
+      request_store (~> 1.0)
-      treetop (~> 1.4.8)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     mail_view (2.0.4)
       tilt
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     memcachier (0.0.2)
-    method_source (0.9.0)
+    method_source (0.9.2)
-    mime-types (1.25.1)
+    mime-types (3.2.2)
-    mini_magick (4.9.5)
+      mime-types-data (~> 3.2015)
-    mini_portile2 (2.1.0)
+    mime-types-data (3.2018.0812)
-    money (6.10.0)
+    mimemagic (0.3.3)
-      i18n (>= 0.6.4, < 1.0)
+    mini_magick (4.9.2)
-    msgpack (1.2.0)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    money (6.13.1)
+      i18n (>= 0.6.4, <= 2)
+    msgpack (1.2.6)
     multi_json (1.13.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustermann (1.0.3)
     mustermann-grape (1.0.0)
@@ -271,164 +308,194 @@ GEM
       kdtree
       require_all
     netrc (0.11.0)
-    nokogiri (1.6.8.1)
+    nio4r (2.4.0)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    parallel (1.6.1)
+    parallel (1.13.0)
-    pg (0.18.3)
+    parser (2.6.0.0)
-    plissken (0.2.0)
+      ast (~> 2.4.0)
-      symbolize (~> 4.2)
+    pg (0.21.0)
-    polyglot (0.3.5)
+    power_assert (1.1.3)
-    power_assert (1.1.1)
+    powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.0)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    puma (3.11.2)
+    public_suffix (3.0.3)
+    puma (3.12.0)
     puma_worker_killer (0.1.0)
       get_process_mem (~> 0.2)
       puma (>= 2.7, < 4)
-    rabl (0.11.6)
+    rabl (0.14.0)
       activesupport (>= 2.3.14)
-    rack (1.4.7)
+    rack (2.0.7)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (4.2.0)
+    rack-attack (5.4.2)
+      rack (>= 1.0, < 3)
+    rack-ssl (1.4.1)
       rack
-    rack-cache (1.7.2)
+    rack-test (1.1.0)
-      rack (>= 0.4)
+      rack (>= 1.0, < 3)
-    rack-ssl (1.3.4)
+    rack-timeout (0.5.1)
-      rack
+    rails (5.2.3)
-    rack-test (0.6.3)
+      actioncable (= 5.2.3)
-      rack (>= 1.0)
+      actionmailer (= 5.2.3)
-    rack-timeout (0.4.2)
+      actionpack (= 5.2.3)
-    rails (3.2.22.5)
+      actionview (= 5.2.3)
-      actionmailer (= 3.2.22.5)
+      activejob (= 5.2.3)
-      actionpack (= 3.2.22.5)
+      activemodel (= 5.2.3)
-      activerecord (= 3.2.22.5)
+      activerecord (= 5.2.3)
-      activeresource (= 3.2.22.5)
+      activestorage (= 5.2.3)
-      activesupport (= 3.2.22.5)
+      activesupport (= 5.2.3)
-      bundler (~> 1.0)
+      bundler (>= 1.3.0)
-      railties (= 3.2.22.5)
+      railties (= 5.2.3)
-    rails-i18n (3.0.1)
+      sprockets-rails (>= 2.0.0)
-      i18n (~> 0.5)
+    rails-dom-testing (2.0.3)
-      rails (>= 3.0.0, < 4.0.0)
+      activesupport (>= 4.2.0)
-    rails_12factor (0.0.3)
+      nokogiri (>= 1.6)
-      rails_serve_static_assets
+    rails-html-sanitizer (1.0.4)
-      rails_stdout_logging
+      loofah (~> 2.2, >= 2.2.2)
-    rails_serve_static_assets (0.0.4)
+    rails-i18n (5.1.3)
-    rails_stdout_logging (0.0.3)
+      i18n (>= 0.7, < 2)
-    railties (3.2.22.5)
+      railties (>= 5.0, < 6)
-      actionpack (= 3.2.22.5)
+    railties (5.2.3)
-      activesupport (= 3.2.22.5)
+      actionpack (= 5.2.3)
-      rack-ssl (~> 1.3.2)
+      activesupport (= 5.2.3)
+      method_source
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
+      thor (>= 0.19.0, < 2.0)
-      thor (>= 0.14.6, < 2.0)
+    rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
-    rdoc (3.12.2)
+    request_store (1.4.1)
-      json (~> 1.4)
+      rack (>= 1.4)
-    require_all (1.3.2)
+    require_all (2.0.0)
-    responders (1.1.2)
+    responders (2.4.1)
-      railties (>= 3.2, < 4.2)
+      actionpack (>= 4.2.0, < 6.0)
-    rest-client (1.8.0)
+      railties (>= 4.2.0, < 6.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
+      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.7)
+      netrc (~> 0.8)
-    roadie (3.0.4)
+    reverse_markdown (1.1.0)
-      css_parser (~> 1.3.4)
+      nokogiri
-      nokogiri (~> 1.6.0)
+    roadie (3.4.0)
-    roadie-rails (1.0.5)
+      css_parser (~> 1.4)
-      railties (>= 3.0, < 4.3)
+      nokogiri (~> 1.5)
-      roadie (~> 3.0)
+    roadie-rails (1.3.0)
-    rspec (3.5.0)
+      railties (>= 3.0, < 5.3)
-      rspec-core (~> 3.5.0)
+      roadie (~> 3.1)
-      rspec-expectations (~> 3.5.0)
+    rspec (3.8.0)
-      rspec-mocks (~> 3.5.0)
+      rspec-core (~> 3.8.0)
-    rspec-core (3.5.1)
+      rspec-expectations (~> 3.8.0)
-      rspec-support (~> 3.5.0)
+      rspec-mocks (~> 3.8.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.8.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.8.0)
-    rspec-rails (3.5.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
+      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.5.0)
+      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.5.0)
+      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.8.0)
-    rspec-support (3.5.0)
+    rspec-support (3.8.0)
+    rubocop (0.63.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
     ruby-debug-ide (0.6.1)
       rake (>= 0.8.1)
     ruby-prof (0.15.9)
+    ruby-progressbar (1.10.0)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (3.2.6)
+    sass-rails (5.0.7)
-      railties (~> 3.2.0)
+      railties (>= 4.0.0, < 6)
-      sass (>= 3.1.10)
+      sass (~> 3.1)
-      tilt (~> 1.3)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sixarm_ruby_unaccent (1.2.0)
-    sprockets (2.2.3)
+    solargraph (0.31.2)
-      hike (~> 1.2)
+      backport (~> 0.3)
-      multi_json (~> 1.0)
+      htmlentities (~> 4.3, >= 4.3.4)
-      rack (~> 1.0)
+      jaro_winkler (~> 1.5)
-      tilt (~> 1.1, != 1.3.0)
+      kramdown (~> 1.16)
-    stripe (1.49.0)
+      parser (~> 2.3)
-      rest-client (>= 1.4, < 3.0)
+      reverse_markdown (~> 1.0, >= 1.0.5)
-    symbolize (4.5.2)
+      rubocop (~> 0.52)
-      activemodel (>= 3.2, < 5)
+      thor (~> 0.19, >= 0.19.4)
-      activesupport (>= 3.2, < 5)
+      tilt (~> 2.0)
-      i18n
+      yard (~> 0.9)
-    table_print (1.5.4)
+    sprockets (3.7.2)
-    test-unit (3.2.7)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    stripe (1.58.0)
+      rest-client (>= 1.4, < 4.0)
+    table_print (1.5.6)
+    test-unit (3.2.8)
       power_assert
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.9)
-    timecop (0.7.3)
+    timecop (0.9.1)
-    traceroute (0.5.0)
+    traceroute (0.8.0)
       rails (>= 3.0.0)
-    treetop (1.4.15)
+    tzinfo (1.2.5)
-      polyglot
+      thread_safe (~> 0.1)
-      polyglot (>= 0.3.1)
+    uglifier (4.1.19)
-    tzinfo (0.3.54)
+      execjs (>= 0.3.0, < 3)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.4.1)
     unicode_utils (1.4.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.7)
+    warden (1.2.8)
-      rack (>= 1.0)
+      rack (>= 2.0.6)
-    webmock (1.21.0)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     xml-simple (1.1.5)
+    yard (0.9.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   action_mailer_matchers
-  aws-sdk
+  aws-sdk (~> 1)
   aws-ses
   binding_of_caller
   bootsnap
-  browserify-rails
   bunny (>= 2.6.3)
   carrierwave
   carrierwave-aws
@@ -440,7 +507,7 @@ DEPENDENCIES
   database_cleaner
   debase
   delayed_job_active_record
-  devise
+  devise (~> 4.4)
   devise-async
   dotenv-rails
   dry-validation
@@ -450,8 +517,8 @@ DEPENDENCIES
   foreman
   fullcontact
   geocoder
-  grape (~> 1.1.0)
+  grape
-  grape-entity!
+  grape-entity
   grape-swagger
   grape-swagger-entity
   grape_devise!
@@ -468,17 +535,17 @@ DEPENDENCIES
   nearest_time_zone
   parallel
   param_validation!
-  pg
+  pg (~> 0.11)
   pry
   puma
   puma_worker_killer
   qx!
   rabl
   rack-attack
+  rack-ssl
   rack-timeout
-  rails (= 3.2.22.5)
+  rails (= 5.2.3)
-  rails-i18n (~> 3.0.0)
+  rails-i18n
-  rails_12factor
   rake
   roadie-rails
   rspec
@@ -486,8 +553,9 @@ DEPENDENCIES
   ruby-debug-ide
   ruby-prof (= 0.15.9)
   sass (= 3.2.19)
-  sass-rails (= 3.2.6)
+  sass-rails
   simplecov (~> 0.16.1)
+  solargraph
   sprockets
   stripe
   stripe-ruby-mock (~> 2.4.1)!
@@ -499,7 +567,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.3.7p456
+   ruby 2.5.1p57
 
 BUNDLED WITH
    1.17.3

Rakefile

@@ -1,7 +1,9 @@
 #!/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.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Commitchange::Application.load_tasks

app/api/houdini/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::API < Grape::API
   format :json

app/api/houdini/v1/api.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 require 'houdini/v1/validations'
 class Houdini::V1::API < Grape::API
   logger.formatter = GrapeLogging::Formatters::Rails.new
-	use GrapeLogging::Middleware::RequestLogger, { logger: logger }
+  use GrapeLogging::Middleware::RequestLogger, logger: logger
   content_type :json, 'application/json'
   default_format :json
   rescue_from Grape::Exceptions::ValidationErrors do |e|
@@ -16,7 +18,7 @@ class Houdini::V1::API < Grape::API
   # DON'T REMOVE THIS OR THE PREVIOUS LINES!!!
   uri_for_host = URI.parse(Settings.api_domain&.url || Settings.cdn.url)
   add_swagger_documentation \
-		host: "#{uri_for_host.host}#{uri_for_host.port ? ":#{uri_for_host.port}" : ""}",
+    host: "#{uri_for_host.host}#{uri_for_host.port ? ":#{uri_for_host.port}" : ''}",
     schemes: [uri_for_host.scheme],
     base_path: '/api/v1'
 end

app/api/houdini/v1/base_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::BaseAPI < Grape::API
   # helpers ApplicationHelper

app/api/houdini/v1/entities/nonprofit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::Entities::Nonprofit < Grape::Entity
   expose :id

app/api/houdini/v1/entities/validation_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::Entities::ValidationError < Grape::Entity
   expose :params, documentation: { type: 'String', desc: 'Params where the following had an error.', is_array: true }

app/api/houdini/v1/entities/validation_errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::Entities::ValidationErrors < Grape::Entity
   expose :errors, documentation: { type: ValidationError, desc: 'errors', is_array: true }

app/api/houdini/v1/helpers/application_helper.rb

@@ -1,16 +1,15 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Houdini::V1::Helpers::ApplicationHelper
   extend Grape::API::Helpers
 
-
   def session
     env['rack.session']
   end
 
   def protect_against_forgery
-    unless verified_request?
+    error!('Unauthorized', 401) unless verified_request?
-      error!('Unauthorized', 401)
-    end
   end
 
   def verified_request?
@@ -28,7 +27,6 @@ module Houdini::V1::Helpers::ApplicationHelper
     allow_forgery_protection.nil? || allow_forgery_protection
   end
 
-
   # def rescue_ar_invalid( *class_to_hash)
   #     rescue_with ActiveRecord::RecordInvalid do |error|
   #       output = []
@@ -40,6 +38,4 @@ module Houdini::V1::Helpers::ApplicationHelper
   #
   #     end
   # end
-
 end
-

app/api/houdini/v1/helpers/rescue_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Houdini::V1::Helpers::RescueHelper
   require 'active_support/concern'
 
@@ -8,11 +10,10 @@ module Houdini::V1::Helpers::RescueHelper
       rescue_with ActiveRecord::RecordInvalid do |error|
         output = []
         error.record.errors do |attr, message|
-        output.push({params: "#{class_to_hash[error.record.class]}['#{attr}']",
+          output.push(params: "#{class_to_hash[error.record.class]}['#{attr}']",
-                     message: message})
+                      message: message)
         end
-      raise Grape::Exceptions::ValidationErrors.new(output)
+        raise Grape::Exceptions::ValidationErrors, output
-
       end
   end
   end

app/api/houdini/v1/nonprofit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::Nonprofit < Houdini::V1::BaseAPI
   helpers Houdini::V1::Helpers::ApplicationHelper, Houdini::V1::Helpers::RescueHelper
@@ -27,19 +29,18 @@ class Houdini::V1::Nonprofit < Houdini::V1::BaseAPI
   end
 
   params do
-
     requires :nonprofit, type: Hash do
       requires :name, type: String, desc: 'Organization Name', allow_blank: false, documentation: { param_type: 'body' }
-      optional :website, type:String, desc: 'Organization website URL', allow_blank:true, regexp: URI::regexp, documentation: { param_type: 'body' }, coerce_with: ->(url) {
+      optional :website, type: String, desc: 'Organization website URL', allow_blank: true, regexp: URI::DEFAULT_PARSER.make_regexp, documentation: { param_type: 'body' }, coerce_with: lambda { |url|
         coerced_url = url
-        unless (url =~ /\Ahttp:\/\/.*/i || url =~ /\Ahttps:\/\/.*/i)
+        unless url =~ %r{\Ahttp://.*}i || url =~ %r{\Ahttps://.*}i
           coerced_url = 'http://' + coerced_url
         end
         coerced_url
       }
-      requires :zip_code, type:String, allow_blank: false, desc: "Organization Address ZIP Code", documentation: { param_type: 'body' }
+      requires :zip_code, type: String, allow_blank: false, desc: 'Organization Address ZIP Code', documentation: { param_type: 'body' }
-      requires :state_code, type:String, allow_blank: false, desc: "Organization Address State Code", documentation: { param_type: 'body' }
+      requires :state_code, type: String, allow_blank: false, desc: 'Organization Address State Code', documentation: { param_type: 'body' }
-      requires :city, type:String, allow_blank: false, desc: "Organization Address City", documentation: { param_type: 'body' }
+      requires :city, type: String, allow_blank: false, desc: 'Organization Address City', documentation: { param_type: 'body' }
       optional :email, type: String, desc: 'Organization email (public)', regexp: Email::Regex, documentation: { param_type: 'body' }
       optional :phone, type: String, desc: 'Organization phone (public)', documentation: { param_type: 'body' }
     end
@@ -50,30 +51,26 @@ class Houdini::V1::Nonprofit < Houdini::V1::BaseAPI
       requires :password, type: String, desc: 'Password', allow_blank: false, is_equal_to: :password_confirmation, documentation: { param_type: 'body' }
       requires :password_confirmation, type: String, desc: 'Password confirmation', allow_blank: false, documentation: { param_type: 'body' }
     end
-
-
   end
   post do
     declared_params = declared(params)
     np = nil
     u = nil
     Qx.transaction do
-      begin
       np = Nonprofit.new(OnboardAccounts.set_nonprofit_defaults(declared_params[:nonprofit]))
 
       begin
         np.save!
       rescue ActiveRecord::RecordInvalid => e
-          if (e.record.errors[:slug])
+        if e.record.errors[:slug]
           begin
             slug = SlugNonprofitNamingAlgorithm.new(np.state_code_slug, np.city_slug).create_copy_name(np.slug)
             np.slug = slug
             np.save!
           rescue UnableToCreateNameCopyError
             raise Grape::Exceptions::ValidationErrors.new(errors: [Grape::Exceptions::Validation.new(
-
+              params: ['nonprofit[name]'],
-                  params: ["nonprofit[name]"],
+              message: 'has an invalid slug. Contact support for help.'
-                  message: "has an invalid slug. Contact support for help."
             )])
           end
         else
@@ -93,28 +90,22 @@ class Houdini::V1::Nonprofit < Houdini::V1::BaseAPI
     rescue ActiveRecord::RecordInvalid => e
       class_to_name = { Nonprofit => 'nonprofit', User => 'user' }
       if class_to_name[e.record.class]
-          errors = e.record.errors.keys.map {|k|
+        errors = e.record.errors.keys.map do |k|
-
           errors = e.record.errors[k].uniq
-            errors.map{|error| Grape::Exceptions::Validation.new(
+          errors.map do |error|
-
+            Grape::Exceptions::Validation.new(
-                params: ["#{class_to_name[e.record.class]}[#{k.to_s}]"],
+              params: ["#{class_to_name[e.record.class]}[#{k}]"],
               message: error
-
+            )
-            )}
+          end
-          }
+        end
 
         raise Grape::Exceptions::ValidationErrors.new(errors: errors.flatten)
       else
         raise e
       end
-
-      end
     end
     # onboard callback
     present np, with: Houdini::V1::Entities::Nonprofit
   end
-
-
-
 end

app/api/houdini/v1/validations.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 require 'houdini/v1/validators/is_equal_to'

app/api/houdini/v1/validators/is_equal_to.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Houdini::V1::Validators::IsEqualTo < Grape::Validations::Base
   def validate_param!(attr_name, params)
     if params[attr_name] != params[@option]
-      fail Grape::Exceptions::Validation, params: [@scope.full_name(attr_name), @scope.full_name(@option)], message: message(:is_equal_to)
+      raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name), @scope.full_name(@option)], message: message(:is_equal_to)
     end
   end
 end

app/controllers/activities_controller.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ActivitiesController < ApplicationController
-
+  before_action :authenticate_user!, only: [:create]
-	before_filter :authenticate_user!, only: [:create]
 
   def create
     json_saved Activity.create(params[:activity])
   end
-
 end

app/controllers/application_controller.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ApplicationController < ActionController::Base
-	before_filter :set_locale, :redirect_to_maintenance
+  before_action :set_locale, :redirect_to_maintenance
 
   protect_from_forgery
 
@@ -20,9 +22,9 @@ class ApplicationController < ActionController::Base
   end
 
   def redirect_to_maintenance
-		if (Settings&.maintenance&.maintenance_mode && !current_user)
+    if Settings&.maintenance&.maintenance_mode && !current_user
-			unless (self.class == Users::SessionsController &&
+      unless self.class == Users::SessionsController &&
-							((Settings.maintenance.maintenance_token && params[:maintenance_token] == Settings.maintenance.maintenance_token) || params[:format] == 'json'))
+             ((Settings.maintenance.maintenance_token && params[:maintenance_token] == Settings.maintenance.maintenance_token) || params[:format] == 'json')
         redirect_to Settings.maintenance.maintenance_page
       end
     end
@@ -63,7 +65,7 @@ protected
       result = { status: 422, json: { error: e.message } }
     rescue Exception => e # a non-validation related exception
       logger.error "500: #{e}".red.bold
-      logger.error e.backtrace.take(5).map{|l| ">>".red.bold + " #{l}"}.join("\n").red
+      logger.error e.backtrace.take(5).map { |l| '>>'.red.bold + " #{l}" }.join("\n").red
       result = { status: 500, json: { error: e.message, backtrace: e.backtrace } }
     end
     render result
@@ -76,7 +78,7 @@ protected
 
   def store_location
     referrer = request.fullpath
-		no_redirects = ['/users', '/signup', '/signin', '/users/sign_in', '/users/sign_up', '/users/password', '/users/sign_out', /.*\.json.*/, /.*auth\/facebook.*/]
+    no_redirects = ['/users', '/signup', '/signin', '/users/sign_in', '/users/sign_up', '/users/password', '/users/sign_out', /.*\.json.*/, %r{.*auth/facebook.*}]
     unless request.format.symbol == :json || no_redirects.map { |p| referrer.match(p) }.any?
       session[:previous_url] = referrer
     end
@@ -89,18 +91,18 @@ protected
       redirect_to root_path
     else
       msg ||= 'We need to sign you in before you can do that.'
-      redirect_to new_user_session_path, :flash => {:error => msg}
+      redirect_to new_user_session_path, flash: { error: msg }
     end
   end
 
-	def authenticate_user!(options={})
+  def authenticate_user!(_options = {})
     block_with_sign_in unless current_user
   end
 
   def authenticate_confirmed_user!
     if !current_user
       block_with_sign_in
-		elsif !current_user.confirmed? && !current_role?([:super_associate, :super_admin])
+    elsif !current_user.confirmed? && !current_role?(%i[super_associate super_admin])
       redirect_to new_user_confirmation_path, flash: { error: 'You need to confirm your account to do that.' }
     end
   end
@@ -112,20 +114,20 @@ protected
   end
 
   def authenticate_super_admin!
-		unless current_role?(:super_admin)
+    block_with_sign_in 'Please login.' unless current_role?(:super_admin)
-			block_with_sign_in 'Please login.'
-		end
   end
 
   def current_role?(role_names, host_id = nil)
     return false unless current_user
+
     role_names = Array(role_names)
-		key = "current_role_user_#{current_user_id}_names_#{role_names.join("_")}_host_#{host_id}"
+    key = "current_role_user_#{current_user_id}_names_#{role_names.join('_')}_host_#{host_id}"
     QueryRoles.user_has_role?(current_user.id, role_names, host_id)
   end
 
   def nonprofit_in_trial?(npo_id = nil)
     return false if !npo_id && !administered_nonprofit
+
     npo_id ||= administered_nonprofit.id
     key = "in_trial_user_#{current_user_id}_nonprofit_#{npo_id}"
     QueryBillingSubscriptions.currently_in_trial?(npo_id)
@@ -133,33 +135,36 @@ protected
 
   def current_plan_tier(npo_id = nil)
     return 0 if !npo_id && !administered_nonprofit
+
     npo_id ||= administered_nonprofit.id
     return 2 if current_role?(:super_admin)
+
     key = "plan_tier_user_#{current_user_id}_nonprofit_#{npo_id}"
     administered_nonprofit ? QueryBillingSubscriptions.plan_tier(npo_id) : 0
   end
 
   def administered_nonprofit
     return nil unless current_user
+
     key = "administered_nonprofit_user_#{current_user_id}_nonprofit"
-    Nonprofit.where(id: QueryRoles.host_ids(current_user_id, [:nonprofit_admin, :nonprofit_associate])).last
+    Nonprofit.where(id: QueryRoles.host_ids(current_user_id, %i[nonprofit_admin nonprofit_associate])).last
   end
 
   # devise config
 
-	def after_sign_in_path_for(resource)
+  def after_sign_in_path_for(_resource)
     request.env['omniauth.origin'] || session[:previous_url] || root_path
   end
 
-	def after_sign_up_path_for(resource)
+  def after_sign_up_path_for(_resource)
     request.env['omniauth.origin'] || session[:previous_url] || root_path
   end
 
-	def after_update_path_for(resource)
+  def after_update_path_for(_resource)
     profile_path(current_user.profile)
   end
 
-	def after_inactive_sign_up_path_for(resource)
+  def after_inactive_sign_up_path_for(_resource)
     profile_path(current_user.profile)
   end
 
@@ -168,7 +173,6 @@ protected
   private
 
   def current_user_id
-		current_user && current_user.id
+    current_user&.id
   end
-
 end

app/controllers/aws_presigned_posts_controller.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class AwsPresignedPostsController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
 
   # post /presigned_posts
   # Create some keys using the AWS gem so the user can do direct-to-S3 uploads
   # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/PresignedPost.html
   def create
     uuid = SecureRandom.uuid
-    p = S3Bucket.presigned_post({
+    p = S3Bucket.presigned_post(
       key: "tmp/#{uuid}/${filename}",
       success_action_status: 201,
       acl: 'public-read',
       expiration: 30.days.from_now
-    })
+    )
 
     render json: {
       s3_presigned_post: p.fields.to_json,
@@ -20,5 +22,4 @@ class AwsPresignedPostsController < ApplicationController
       s3_uuid: uuid
     }
   end
-
 end

app/controllers/billing_subscriptions_controller.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class BillingSubscriptionsController < ApplicationController
   include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_admin!
+  before_action :authenticate_nonprofit_admin!
 
   def create_trial
-    render JsonResp.new(params){|params|
+    render JsonResp.new(params) do |_params|
       requires(:nonprofit_id).as_int
       requires(:stripe_plan_id).as_string
-    }.when_valid{|params| 
+    end.when_valid do |params|
       InsertBillingSubscriptions.trial(params[:nonprofit_id], params[:stripe_plan_id])
-    }
+    end
   end
 
   def create

app/controllers/button_debug_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ButtonDebugController < ApplicationController
   def embedded

app/controllers/campaign_gift_options_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class CampaignGiftOptionsController < ApplicationController
   include Controllers::CampaignHelper
 
-	before_filter :authenticate_campaign_editor!, only: [:create, :destroy, :update, :update_order]
+  before_action :authenticate_campaign_editor!, only: %i[create destroy update update_order]
 
   def index
     @gift_options = current_campaign.campaign_gift_options.order('"order", amount_recurring, amount_one_time')

app/controllers/campaign_gifts_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class CampaignGiftsController < ApplicationController
-
   # post /campaign_gifts
   def create
     json_saved CreateCampaignGift.create params[:campaign_gift]

app/controllers/campaigns/campaign_gift_options_controller.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-module Campaigns; class CampaignGiftOptionsController < ApplicationController
+module Campaigns
+  class CampaignGiftOptionsController < ApplicationController
     include Controllers::CampaignHelper
 
-	before_filter :authenticate_campaign_editor!, only: [:index]
+    before_action :authenticate_campaign_editor!, only: %i[create destroy update update_order report]
 
-	def index
+    def report
       respond_to do |format|
         format.json do
           render json: QueryCampaignGifts.report_metrics(current_campaign.id)
@@ -12,4 +15,37 @@ module Campaigns; class CampaignGiftOptionsController < ApplicationController
       end
     end
 
+    def index
+      @gift_options = current_campaign.campaign_gift_options.order('"order", amount_recurring, amount_one_time')
+      render json: { data: @gift_options }
+    end
+
+    def show
+      render json: { data: current_campaign.campaign_gift_options.find(params[:id]) }
+    end
+
+    def create
+      campaign = current_campaign
+      json_saved CreateCampaignGiftOption.create(campaign, params[:campaign_gift_option]),
+                 'Gift option successfully created!'
+    end
+
+    def update
+      @campaign = current_campaign
+      gift_option = @campaign.campaign_gift_options.find params[:id]
+      json_saved UpdateCampaignGiftOption.update(gift_option, params[:campaign_gift_option]), 'Successfully updated'
+    end
+
+    # put /nonprofits/:nonprofit_id/campaigns/:campaign_id/campaign_gift_options/update_order
+    # Pass in {data: [{id: 1, order: 1}]}
+    def update_order
+      updated_gift_options = UpdateOrder.with_data('campaign_gift_options', params[:data])
+      render json: updated_gift_options
+    end
+
+    def destroy
+      @campaign = current_campaign
+
+      render_json { DeleteCampaignGiftOption.delete(@campaign, params[:id]) }
+    end
 end; end

app/controllers/campaigns/donations_controller.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Campaigns
   class DonationsController < ApplicationController
     include Controllers::CampaignHelper
 
-	before_filter :authenticate_campaign_editor!, only: [:index]
+    before_action :authenticate_campaign_editor!, only: [:index]
 
     def index
       respond_to do |format|
         format.csv do
-				file_date = Date.today.strftime("%m-%d-%Y")
+          file_date = Date.today.strftime('%m-%d-%Y')
           donations = QueryDonations.campaign_export(current_campaign.id)
           send_data(Format::Csv.from_vectors(donations), filename: "campaign-donations-#{file_date}.csv")
         end
       end
     end
-
     end
 end

app/controllers/campaigns/supporters_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Campaigns
   class SupportersController < ApplicationController
     include Controllers::CampaignHelper
 
-	before_filter :authenticate_campaign_editor!, only: [:index]
+    before_action :authenticate_campaign_editor!, only: [:index]
 
     def index
       @panels_layout = true
@@ -17,6 +19,5 @@ class SupportersController < ApplicationController
         format.html
       end
     end
-
     end
 end

app/controllers/campaigns_controller.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class CampaignsController < ApplicationController
   include Controllers::CampaignHelper
 
   helper_method :current_campaign_editor?
-  before_filter :authenticate_confirmed_user!, only: [:create, :name_and_id, :duplicate]
+  before_action :authenticate_confirmed_user!, only: %i[create name_and_id duplicate]
-  before_filter :authenticate_campaign_editor!, only: [:update, :soft_delete]
+  before_action :authenticate_campaign_editor!, only: %i[update soft_delete]
-  before_filter :check_nonprofit_status, only: [:index, :show]
+  before_action :check_nonprofit_status, only: %i[index show]
 
   def index
     @nonprofit = current_nonprofit
-    if (current_nonprofit_user?)
+    if current_nonprofit_user?
       @campaigns = @nonprofit.campaigns.includes(:nonprofit).not_deleted.order('created_at desc')
       @deleted_campaigns = @nonprofit.campaigns.includes(:nonprofit).deleted.order('created_at desc')
     else
@@ -57,18 +59,7 @@ class CampaignsController < ApplicationController
   end
 
   def create
-    Time.use_zone(current_nonprofit.timezone || 'UTC') do
+    render json: CreateCampaign.create(params, current_nonprofit)
-      params[:campaign][:end_datetime] = Chronic.parse(params[:campaign][:end_datetime]) if params[:campaign][:end_datetime].present?
-    end
-
-    if !params[:campaign][:parent_campaign_id]
-      campaign = current_nonprofit.campaigns.create params[:campaign]
-      json_saved campaign, 'Campaign created! Well done.'
-    else
-      profile_id = params[:campaign][:profile_id]
-      Profile.find(profile_id).update_attributes params[:profile]
-      render json: CreatePeerToPeerCampaign.create(params[:campaign], profile_id)
-    end
   end
 
   def update
@@ -81,13 +72,10 @@ class CampaignsController < ApplicationController
 
   # post 'nonprofits/:np_id/campaigns/:campaign_id/duplicate'
   def duplicate
-
+    render_json do
-    render_json {
       InsertDuplicate.campaign(current_campaign.id, current_user.profile.id)
-    }
-
     end
-
+  end
 
   def soft_delete
     current_campaign.update_attribute(:deleted, params[:delete])
@@ -112,17 +100,17 @@ class CampaignsController < ApplicationController
   end
 
   def peer_to_peer
-    session[:donor_signup_url] = request.env["REQUEST_URI"]
+    session[:donor_signup_url] = request.env['REQUEST_URI']
     @nonprofit = Nonprofit.find_by_id(params[:npo_id])
     @parent_campaign = Campaign.find_by_id(params[:campaign_id])
 
     if params[:campaign_id].present? && !@parent_campaign
-      raise ActionController::RoutingError.new('Not Found')
+      raise ActionController::RoutingError, 'Not Found'
     end
 
     if current_user
       @profile = current_user.profile
-      if (@parent_campaign)
+      if @parent_campaign
         @child_campaign = Campaign.where(
           profile_id: @profile.id,
           parent_campaign_id: @parent_campaign.id
@@ -135,7 +123,7 @@ class CampaignsController < ApplicationController
 
   def check_nonprofit_status
     if !current_role?(:super_admin) && !current_nonprofit.published
-      raise ActionController::RoutingError.new('Not Found')
+      raise ActionController::RoutingError, 'Not Found'
     end
   end
 end

app/controllers/cards_controller.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class CardsController < ApplicationController
-
+  before_action :authenticate_user!, except: [:create]
-	before_filter :authenticate_user!, :except => [:create]
 
   # post /cards
   def create
     acct = Supporter.find(params[:card][:holder_id]).nonprofit.stripe_account_id
     render(
-      JsonResp.new(params) do |d|
+      JsonResp.new(params) do |_d|
         requires(:card).nested do
           requires(:name, :stripe_card_token).as_string
           requires(:holder_id).as_int
@@ -18,5 +19,4 @@ class CardsController < ApplicationController
       end
     )
   end
-
 end

app/controllers/direct_debit_details_controller.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class DirectDebitDetailsController < ApplicationController
-
-
   # POST /sepa
   # This endpoint is used for saving direct debit account details
   # when SEPA payment is selected in the donation widget. Actual charge is
   # happening offline, after donations are exported to an external CRM.
   def create
     render(
-      JsonResp.new(params) do |data|
+      JsonResp.new(params) do |_data|
         requires(:supporter_id).as_int
         requires(:sepa_params).nested do
           requires(:iban, :name, :bic).as_string
         end
-      end.when_valid do |data|
+      end.when_valid do |_data|
         InsertDirectDebitDetail.execute(params)
       end
     )

app/controllers/email_settings_controller.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class EmailSettingsController < ApplicationController
   include Controllers::NonprofitHelper
-  before_filter :authenticate_nonprofit_user!
+  before_action :authenticate_nonprofit_user!
 
   def index
     user = current_role?(:super_admin) ? User.find(params[:user_id]) : current_user
@@ -15,6 +17,4 @@ class EmailSettingsController < ApplicationController
     user = current_role?(:super_admin) ? User.find(params[:user_id]) : current_user
     render json: UpdateEmailSettings.save(params[:nonprofit_id], user.id, params[:email_settings])
   end
-
 end
-

app/controllers/emails_controller.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class EmailsController < ApplicationController
-	before_filter :authenticate_user!
+  before_action :authenticate_user!
 
   def create
     email = params[:email]
     GenericMailer.delay.generic_mail(email[:from_email], email[:from_name], email[:message], email[:subject], email[:to_email], email[:to_name])
-		render :json => {:notification => 'Email successfully sent'}, :status => :created
+    render json: { notification: 'Email successfully sent' }, status: :created
   end
-
 end

app/controllers/event_discounts_controller.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class EventDiscountsController < ApplicationController
   include Controllers::EventHelper
-	before_filter :authenticate_event_editor!, :except => [:index]
+  before_action :authenticate_event_editor!, except: [:index]
 
   def create
     params[:event_discount][:event_id] = current_event.id
 
-    render JsonResp.new(params[:event_discount]){|data|
+    render JsonResp.new(params[:event_discount]) do |_data|
       requires(:code, :name).as_string
       requires(:event_id, :percent).as_int
-    }.when_valid{|data|
+    end.when_valid do |data|
       { status: 200, json: { event_discount: current_event.event_discounts.create(data) } }
-    }
+    end
   end
 
   def index
@@ -31,10 +33,9 @@ class EventDiscountsController < ApplicationController
 
   def destroy
     Psql.execute(
-      Qexpr.new.delete_from("event_discounts")
+      Qexpr.new.delete_from('event_discounts')
-        .where("event_discounts.event_id=$id", id: params["event_id"])
+        .where('event_discounts.event_id=$id', id: params['event_id'])
-        .where("event_discounts.id=$id", id: params["id"])
+        .where('event_discounts.id=$id', id: params['id'])
     )
   end
-
 end

app/controllers/events_controller.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class EventsController < ApplicationController
   include Controllers::EventHelper
 
   helper_method :current_event_editor?
-  before_filter :authenticate_nonprofit_user!, only: :name_and_id
+  before_action :authenticate_nonprofit_user!, only: :name_and_id
-	before_filter :authenticate_event_editor!, only: [:update, :soft_delete, :stats, :create, :duplicate]
+  before_action :authenticate_event_editor!, only: %i[update soft_delete stats create duplicate]
-
 
   def index
     @nonprofit = current_nonprofit
@@ -76,6 +77,4 @@ class EventsController < ApplicationController
   def name_and_id
     render json: QueryEvents.name_and_id(current_nonprofit.id)
   end
-
-
 end

app/controllers/front_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class FrontController < ApplicationController
   def index
-		if !Nonprofit.any?
+    if Nonprofit.none?
       redirect_to onboard_path
-		elsif current_role?([:nonprofit_admin,:nonprofit_associate])
+    elsif current_role?(%i[nonprofit_admin nonprofit_associate])
       redirect_to NonprofitPath.dashboard(administered_nonprofit)
     elsif current_user
       redirect_to '/profiles/' + current_user.profile.id.to_s

app/controllers/image_attachments_controller.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ImageAttachmentsController < ApplicationController
-	before_filter :authenticate_confirmed_user!
+  before_action :authenticate_confirmed_user!
   def create
     # must return json with a link attr
     # http://editor.froala.com/server-integrations/php-image-upload
-		@image = ImageAttachment.new(:file => params[:file])
+    @image = ImageAttachment.new(file: params[:file])
     if @image.save
-			render :json => {:link => @image.file_url}
+      render json: { link: @image.file_url }
     else
-			render :json => @image.errors.full_messages, :status => :unprocessable_entity
+      render json: @image.errors.full_messages, status: :unprocessable_entity
     end
   end
 
@@ -16,9 +18,9 @@ class ImageAttachmentsController < ApplicationController
     @image = ImageAttachment.select { |img| img.file_url == params[:src] }.first
     if @image
       @image.destroy
-			render :json => @image
+      render json: @image
     else
-			render :json => {}, :status => :unprocessable_entity
+      render json: {}, status: :unprocessable_entity
     end
   end
 end

app/controllers/maps_controller.rb

@@ -1,34 +1,34 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class MapsController < ApplicationController
   include Controllers::NonprofitHelper
 
-	before_filter :authenticate_super_associate!, only: :all_supporters
+  before_action :authenticate_super_associate!, only: :all_supporters
-	before_filter :authenticate_nonprofit_user!, only: [:all_npo_supporters, :specific_npo_supporters]
+  before_action :authenticate_nonprofit_user!, only: %i[all_npo_supporters specific_npo_supporters]
 
   # used on admin/nonprofits_map and front page
   def all_npos
     respond_to do |format|
       format.html { redirect_to :root }
-			format.json { @map_data = Nonprofit.where("latitude IS NOT NULL").last(1000) }
+      format.json { @map_data = Nonprofit.where('latitude IS NOT NULL').last(1000) }
     end
   end
 
   # used on admin/supporters_map
   def all_supporters
-		@map_data = Supporter.where("latitude IS NOT NULL").last(1000)
+    @map_data = Supporter.where('latitude IS NOT NULL').last(1000)
   end
 
   # used on npo dashboard
   def all_npo_supporters
-		@map_data =  Nonprofit.find(params['npo_id']).supporters.where("latitude IS NOT NULL").last(100)
+    @map_data = Nonprofit.find(params['npo_id']).supporters.where('latitude IS NOT NULL').last(100)
   end
 
   # used on supporter dashboard
   def specific_npo_supporters
-		supporter_ids = params['supporter_ids'].split(",").map { |s| s.to_i }
+    supporter_ids = params['supporter_ids'].split(',').map(&:to_i)
     supporters = Nonprofit.find(params['npo_id']).supporters.find(supporter_ids).last(500)
     @map_data =  supporters.map { |s| s if s.latitude != '' }
   end
-
-
 end

app/controllers/nonprofits/activities_controller.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class ActivitiesController < ApplicationController
     include Controllers::NonprofitHelper
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     # get /nonprofits/:nonprofit_id/supporters/:supporter_id/activities
     def index
       render json: QueryActivities.for_timeline(params[:nonprofit_id], params[:supporter_id])
     end
-
   end
 end
-

app/controllers/nonprofits/bank_accounts_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class BankAccountsController < ApplicationController
     include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_admin!
+    before_action :authenticate_nonprofit_admin!
 
     # post /nonprofits/:nonprofit_id/bank_account
     # must pass in the user's password as params[:password]
@@ -11,7 +13,7 @@ class BankAccountsController < ApplicationController
       if password_was_confirmed(params[:pw_token])
         render_json { InsertBankAccount.with_stripe(current_nonprofit, current_user, params[:bank_account]) }
       else
-			render json: ["Please confirm your password"], status: :unprocessable_entity
+        render json: ['Please confirm your password'], status: :unprocessable_entity
       end
     end
 
@@ -27,10 +29,10 @@ class BankAccountsController < ApplicationController
       ba = npo.bank_account
       if params[:token] == ba.confirmation_token
         ba.update_attribute(:pending_verification, false)
-			flash[:notice] = "Your bank account is now confirmed!"
+        flash[:notice] = 'Your bank account is now confirmed!'
         redirect_to nonprofits_payouts_path(npo)
       else
-			redirect_to(nonprofits_donations_path(npo), {:flash => {:error => "We could not confirm this bank account. Please follow the exact link provided in the confirmation email."}})
+        redirect_to(nonprofits_donations_path(npo), flash: { error: 'We could not confirm this bank account. Please follow the exact link provided in the confirmation email.' })
       end
     end
 
@@ -46,10 +48,10 @@ class BankAccountsController < ApplicationController
       ba = npo.bank_account
       if params[:token] == ba.confirmation_token
         ba.destroy
-			flash[:notice] = "Your bank account has been removed."
+        flash[:notice] = 'Your bank account has been removed.'
         redirect_to nonprofits_donations_path(npo)
       else
-			redirect_to(nonprofits_donations_path(npo), {:flash => {:error => "We could not remove this bank account. Please follow the exact link provided in the email."}})
+        redirect_to(nonprofits_donations_path(npo), flash: { error: 'We could not remove this bank account. Please follow the exact link provided in the email.' })
       end
     end
 
@@ -59,6 +61,5 @@ class BankAccountsController < ApplicationController
       NonprofitMailer.delay.new_bank_account_notification(ba) if ba.valid?
       respond_to { |format| format.json { render json: {} } }
     end
-
   end
 end

app/controllers/nonprofits/button_controller.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class ButtonController < ApplicationController
     include Controllers::NonprofitHelper
 
-
+    before_action :authenticate_user!
-	before_filter :authenticate_user!
-
 
     def send_code
       NonprofitMailer.button_code(current_nonprofit, params[:to_email], params[:to_name], params[:from_email], params[:message], params[:code]).deliver
@@ -23,6 +23,5 @@ class ButtonController < ApplicationController
     def advanced
       @nonprofit = current_nonprofit
     end
-	
   end
 end

app/controllers/nonprofits/cards_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class CardsController < ApplicationController
     include Controllers::NonprofitHelper
 
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def edit
       @nonprofit = current_nonprofit
@@ -12,7 +14,7 @@ module Nonprofits
     # POST /nonprofits/:nonprofit_id/card
     def create
       render(
-        JsonResp.new(params) do |d|
+        JsonResp.new(params) do |_d|
           requires(:nonprofit_id).as_int
           requires(:card).nested do
             requires(:name, :stripe_card_token, :stripe_card_id).as_string
@@ -25,6 +27,5 @@ module Nonprofits
         end
       )
     end
-
   end
 end

app/controllers/nonprofits/charges_controller.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class ChargesController < ApplicationController
     include Controllers::NonprofitHelper
 
-		before_filter :authenticate_nonprofit_user!, only: :index
+    before_action :authenticate_nonprofit_user!, only: :index
 
     # get /nonprofit/:nonprofit_id/charges
     def index
       redirect_to controller: :payments, action: :index
     end # def index
-
   end
 end

app/controllers/nonprofits/custom_field_joins_controller.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class CustomFieldJoinsController < ApplicationController
-
     include Controllers::NonprofitHelper
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def index
       @custom_field_joins = current_nonprofit
@@ -21,7 +22,7 @@ module Nonprofits
       end
 
       if params[:selecting_all]
-				supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select("supporters.id").execute.map{|h| h['id']}
+        supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select('supporters.id').execute.map { |h| h['id'] }
       else
         supporter_ids = params[:supporter_ids]. map(&:to_i)
       end
@@ -29,13 +30,10 @@ module Nonprofits
       render InsertCustomFieldJoins.in_bulk(current_nonprofit.id, supporter_ids, params[:custom_fields])
     end
 
-
     def destroy
       supporter = current_nonprofit.supporters.find(params[:supporter_id])
       supporter.custom_field_joins.find(params[:id]).destroy
       render json: {}, status: :ok
     end
-
   end
 end
-

app/controllers/nonprofits/custom_field_masters_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class CustomFieldMastersController < ApplicationController
     include Controllers::NonprofitHelper
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def index
       @custom_field_masters = current_nonprofit
@@ -21,7 +23,5 @@ module Nonprofits
       custom_field_master.custom_field_joins.destroy_all
       render json: {}, status: :ok
     end
-
   end
 end
-

app/controllers/nonprofits/donations_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class DonationsController < ApplicationController
     include Controllers::NonprofitHelper
 
-		before_filter :authenticate_nonprofit_user!, only: [:index, :update]
+    before_action :authenticate_nonprofit_user!, only: %i[index update]
-		before_filter :authenticate_campaign_editor!, only: [:create_offsite]
+    before_action :authenticate_campaign_editor!, only: [:create_offsite]
 
     # get /nonprofit/:nonprofit_id/donations
     def index
@@ -13,40 +15,37 @@ module Nonprofits
 
     # post /nonprofits/:nonprofit_id/donations
     def create
-
       if params[:token]
         params[:donation][:token] = params[:token]
-			return render_json{ InsertDonation.with_stripe(params[:donation], current_user) }
+        render_json { InsertDonation.with_stripe(params[:donation], current_user) }
       elsif params[:direct_debit_detail_id]
-				render JsonResp.new(params[:donation]){|data|
+        render JsonResp.new(params[:donation]) do |_data|
           requires(:amount).as_int
           requires(:supporter_id, :nonprofit_id)
           # TODO
           # requires_either(:card_id, :direct_debit_detail_id).as_int
           optional(:dedication, :designation).as_string
           optional(:campaign_id, :event_id).as_int
-				}.when_valid{|data|
+        end.when_valid do |data|
-
 
           InsertDonation.with_sepa(data)
-
+        end
-				}
         end
     end
 
     # post /nonprofits/:nonprofit_id/donations/create_offsite
     def create_offsite
-      render JsonResp.new(params[:donation]){|data|
+      render JsonResp.new(params[:donation]) do |_data|
         requires(:amount).as_int.min(1)
         requires(:supporter_id, :nonprofit_id).as_int
         optional(:dedication, :designation).as_string
         optional(:campaign_id, :event_id).as_int
         optional(:date).as_date
-        optional(:offsite_payment).nested{
+        optional(:offsite_payment).nested do
           optional(:kind).one_of('cash', 'check')
           optional(:check_number)
-        }
+        end
-      }.when_valid{|data| InsertDonation.offsite(data)}
+      end.when_valid { |data| InsertDonation.offsite(data) }
     end
 
     def update
@@ -68,7 +67,7 @@ module Nonprofits
       if !@campaign && params[:donation] && params[:donation][:campaign_id]
         @campaign = Campaign.where('id = ? ', params[:donation][:campaign_id]).first
       end
-			return @campaign
+      @campaign
     end
 
     def current_campaign_editor?

app/controllers/nonprofits/email_lists_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class EmailListsController < ApplicationController
     include Controllers::NonprofitHelper
 
-  before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def index
       render_json { Qx.fetch(:email_lists, nonprofit_id: params[:nonprofit_id]) }

app/controllers/nonprofits/imports_controller.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class ImportsController < ApplicationController
     include Controllers::NonprofitHelper
 
-    before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
     # post /nonprofits/:nonprofit_id/imports
     def create
-      render_json{
+      render_json do
-        InsertImport.delay.from_csv_safe({
+        InsertImport.delay.from_csv_safe(
           nonprofit_id: params[:nonprofit_id],
           user_id: current_user.id,
           user_email: current_user.email,
           file_uri: params[:file_uri],
           header_matches: params[:header_matches]
-        })
+        )
-      }
+      end
     end
   end
 end

app/controllers/nonprofits/miscellaneous_np_infos_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class MiscellaneousNpInfosController < ApplicationController
     include Controllers::NonprofitHelper
 
     helper_method :current_nonprofit_user?
-    before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def show
       respond_to do |format|
@@ -12,18 +14,17 @@ module Nonprofits
           render_json { FetchMiscellaneousNpInfo.fetch(params[:nonprofit_id]) }
         end
       end
-
     end
 
     def update
       respond_to do |format|
-        format.json {
+        format.json do
-          render_json {
+          render_json do
             update = UpdateMiscellaneousNpInfo.update(params[:nonprofit_id], params[:miscellaneous_np_info])
             # flash[:notice] = "Your Miscellaneous Settings have been saved"
             update
-          }
+          end
-        }
+        end
       end
     end
   end

app/controllers/nonprofits/nonprofit_keys_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 
 module Nonprofits
   class NonprofitKeysController < ApplicationController
     include Controllers::NonprofitHelper
-  before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     # get /nonprofits/:nonprofit_id/nonprofit_keys
     # pass in the :select query param, which is the name of the column of the specific token you want
@@ -33,6 +35,5 @@ class NonprofitKeysController < ApplicationController
       end
       redirect_to nonprofits_supporters_path @nonprofit, 'show-modal' => 'mailchimpSettingsModal'
     end
-
     end
 end

app/controllers/nonprofits/payments_controller.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class PaymentsController < ApplicationController
     include Controllers::NonprofitHelper
 
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
-
 
     # get /nonprofit/:nonprofit_id/payments
     def index
@@ -25,8 +26,8 @@ module Nonprofits
       begin
         @nonprofit = current_nonprofit
         @user = current_user_id
-        ExportPayments::initiate_export(@nonprofit.id, params, @user)
+        ExportPayments.initiate_export(@nonprofit.id, params, @user)
-      rescue => e
+      rescue StandardError => e
         e
       end
       if e.nil?
@@ -68,6 +69,7 @@ module Nonprofits
       PaymentMailer.resend_donor_receipt(params[:id])
       render json: {}
     end
+
     # post /nonprofits/:nonprofit_id/payments/:id/resend_admin_receipt
     # pass user_id of the admin to send to
     def resend_admin_receipt

app/controllers/nonprofits/payouts_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class PayoutsController < ApplicationController
     include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_admin!, only: :create
+    before_action :authenticate_nonprofit_admin!, only: :create
-	before_filter :authenticate_nonprofit_user!, only: [:index, :show]
+    before_action :authenticate_nonprofit_user!, only: %i[index show]
 
     def create
       payout = InsertPayout.with_stripe(current_nonprofit.id, {
@@ -12,7 +14,7 @@ class PayoutsController < ApplicationController
                                           email: current_user.email,
                                           user_ip: current_user.current_sign_in_ip,
                                           bank_name: current_nonprofit.bank_account.name
-    }, {before_date: params[:before_date]})
+                                        }, before_date: params[:before_date])
 
       if payout['failure_message'].present?
         flash[:notice] = "The payout failed: #{payout['failure_message']}"
@@ -39,11 +41,10 @@ class PayoutsController < ApplicationController
         format.json { render json: payout }
         format.csv do
           payments = QueryPayments.for_payout(params[:nonprofit_id], params[:id])
-        filename = "payout-#{payout.created_at.strftime("%m-%d-%Y")}"
+          filename = "payout-#{payout.created_at.strftime('%m-%d-%Y')}"
           send_data(Format::Csv.from_vectors(payments), filename: "#{filename}.csv")
         end
       end
     end
-
     end
 end

app/controllers/nonprofits/recurring_donations_controller.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class RecurringDonationsController < ApplicationController
     include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_user!, except: [:create]
+    before_action :authenticate_nonprofit_user!, except: [:create]
 
     # get /nonprofits/:nonprofit_id/recurring_donations
     def index
@@ -25,22 +27,22 @@ class RecurringDonationsController < ApplicationController
       begin
         @nonprofit = current_nonprofit
         @user = current_user_id
-			#TODO move into javascript
+        # TODO: move into javascript
         if params.key?(:active_and_not_failed)
           params.delete(:active) if params.key?(:active)
           params.delete(:failed) if params.key?(:failed)
         end
 
-			[:active_and_not_failed, :active, :failed].each do |k|
+        %i[active_and_not_failed active failed].each do |k|
-				if (params.key?(k))
+          if params.key?(k)
             params[k] = ActiveRecord::ConnectionAdapters::Column.value_to_boolean(params[k])
           end
         end
 
         params[:root_url] = root_url
 
-			ExportRecurringDonations::initiate_export(@nonprofit.id, params, current_user.id)
+        ExportRecurringDonations.initiate_export(@nonprofit.id, params, current_user.id)
-		rescue => e
+      rescue StandardError => e
         e
       end
       if e.nil?
@@ -71,14 +73,14 @@ class RecurringDonationsController < ApplicationController
       if params[:recurring_donation][:token]
         render_json { InsertRecurringDonation.with_stripe(params[:recurring_donation]) }
       elsif params[:recurring_donation][:direct_debit_detail_id]
-      render JsonResp.new(params[:recurring_donation]){|data|
+        render JsonResp.new(params[:recurring_donation]) do |_data|
           requires(:amount).as_int
           requires(:supporter_id, :nonprofit_id, :direct_debit_detail_id).as_int
           optional(:dedication, :designation).as_string
           optional(:campaign_id, :event_id).as_int
-      }.when_valid{|data|
+        end.when_valid do |data|
           InsertRecurringDonation.with_sepa(data)
-      }
+        end
       else
         render json: {}, status: 422
       end
@@ -89,6 +91,5 @@ private
     def current_recurring_donation
       @recurring_donation ||= current_nonprofit.recurring_donations.find params[:id]
     end
-
     end
 end

app/controllers/nonprofits/refunds_controller.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class RefundsController < ApplicationController
     include Controllers::NonprofitHelper
 
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     # post /charges/:charge_id/refunds
     def create
-      charge = Qx.select("*").from("charges").where(id: params[:charge_id]).execute.first
+      charge = Qx.select('*').from('charges').where(id: params[:charge_id]).execute.first
       params[:refund][:user_id] = current_user.id
       render_json { InsertRefunds.with_stripe(charge, params['refund']) }
     end
@@ -18,4 +20,3 @@ module Nonprofits
     end
   end
 end
-

app/controllers/nonprofits/reports_controller.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class ReportsController < ApplicationController
     include Controllers::NonprofitHelper
-    before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def end_of_year
       respond_to do |format|
         format.csv do
           filename = "end-of-year-report-#{params[:year]}.csv"
-          data = QuerySupporters.year_aggregate_report(params[:nonprofit_id], {:year => params[:year]})
+          data = QuerySupporters.year_aggregate_report(params[:nonprofit_id], year: params[:year])
           send_data(Format::Csv.from_array(data), filename: filename)
         end
       end
@@ -18,17 +20,15 @@ module Nonprofits
       respond_to do |format|
         format.csv do
           name_description = nil
-          if (params[:year])
+          if params[:year]
             name_description = params[:year]
-          elsif (params[:start])
+          elsif params[:start]
             name_description = "from-#{params[:start]}"
-            if (params[:end])
+            name_description += "-to-#{params[:end]}" if params[:end]
-              name_description += "-to-#{params[:end]}"
-            end
           end
 
           filename = "aggregate-report-#{name_description}.csv"
-          data = QuerySupporters.year_aggregate_report(params[:nonprofit_id], {:year => params[:year], :start => params[:start], :end => params[:end]})
+          data = QuerySupporters.year_aggregate_report(params[:nonprofit_id], year: params[:year], start: params[:start], end: params[:end])
           send_data(Format::Csv.from_array(data), filename: filename)
         end
       end

app/controllers/nonprofits/supporter_emails_controller.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class SupporterEmailsController < ApplicationController
     include Controllers::NonprofitHelper
-    before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def create
       if params[:selecting_all]
         ids = QuerySupporters.full_filter_expr(params[:nonprofit_id], params[:query])
-          .select("supporters.id")
+                             .select('supporters.id')
                              .execute(format: 'csv')[1..-1].flatten
       elsif params[:supporter_ids]
         ids = params[:supporter_ids]
@@ -29,4 +31,3 @@ module Nonprofits
     end
   end
 end
-

app/controllers/nonprofits/supporter_notes_controller.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class SupporterNotesController < ApplicationController
     include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_user!, except: [:create]
+    before_action :authenticate_nonprofit_user!, except: [:create]
 
     # post /nonprofits/:nonprofit_id/supporters/:supporter_id/supporter_notes
     def create
-    params[:supporter_note][:user_id] ||= current_user && current_user.id
+      params[:supporter_note][:user_id] ||= current_user&.id
       render_json { InsertSupporterNotes.create([params[:supporter_note]]) }
     end
 
     # put /nonprofits/:nonprofit_id/supporters/:supporter_id/supporter_notes/:id
     def update
-    params[:supporter_note][:user_id] ||= current_user && current_user.id
+      params[:supporter_note][:user_id] ||= current_user&.id
       params[:supporter_note][:id] = params[:id]
       render_json { UpdateSupporterNotes.update(params[:supporter_note]) }
     end
@@ -22,6 +24,5 @@ class SupporterNotesController < ApplicationController
     def destroy
       render_json { UpdateSupporterNotes.delete(params[:id]) }
     end
-
     end
 end

app/controllers/nonprofits/supporters_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class SupportersController < ApplicationController
     include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_user!, except: [:new, :create]
+    before_action :authenticate_nonprofit_user!, except: %i[new create]
-	#before_filter(except: [:create, :mailchimp_landing]){authenticate_min_nonprofit_plan(2)}
+    # before_action(except: [:create, :mailchimp_landing]){authenticate_min_nonprofit_plan(2)}
 
     # get /nonprofit/:nonprofit_id/supporters
     def index
@@ -17,7 +19,7 @@ class SupportersController < ApplicationController
         end
 
         format.csv do
-        file_date = Date.today.strftime("%m-%d-%Y")
+          file_date = Date.today.strftime('%m-%d-%Y')
           supporters = QuerySupporters.for_export(params[:nonprofit_id], params)
           send_data(Format::Csv.from_vectors(supporters), filename: "supporters-#{file_date}.csv")
         end
@@ -28,8 +30,8 @@ class SupportersController < ApplicationController
       begin
         @nonprofit = current_nonprofit
         @user = current_user_id
-      ExportSupporters::initiate_export(@nonprofit.id, params, @user)
+        ExportSupporters.initiate_export(@nonprofit.id, params, @user)
-    rescue => e
+      rescue StandardError => e
         e
       end
       if e.nil?
@@ -67,7 +69,6 @@ class SupportersController < ApplicationController
       render json: QuerySupporters.for_info_card(params[:supporter_id])
     end
 
-	
     # post /nonprofits/:nonprofit_id/supporters
     def create
       render_json { InsertSupporter.create_or_update(params[:nonprofit_id], params[:supporter]) }
@@ -81,7 +82,7 @@ class SupportersController < ApplicationController
 
     def bulk_delete
       if params[:selecting_all]
-      supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select("supporters.id").execute.map{|h| h['id']}
+        supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select('supporters.id').execute.map { |h| h['id'] }
       else
         supporter_ids = params[:supporter_ids]. map(&:to_i)
       end
@@ -96,19 +97,18 @@ class SupportersController < ApplicationController
 
     # post /nonprofits/:nonprofit_id/supporters/merge
     def merge
-    render JsonResp.new(params){|params|
+      render JsonResp.new(params) do |_params|
         requires(:supporter)
         requires(:nonprofit_id).as_int
         requires(:supporter_ids).as_array
-    }.when_valid{|params|
+      end.when_valid do |params|
         params[:supporter][:nonprofit_id] = params[:nonprofit_id]
         MergeSupporters.selected(params[:supporter], params[:supporter_ids], params[:nonprofit_id], current_user.id)
-    }
+      end
     end
 
       # def new
       #   @nonprofit = current_nonprofit
       # end
-
     end
 end

app/controllers/nonprofits/tag_joins_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class TagJoinsController < ApplicationController
     include Controllers::NonprofitHelper
-		before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def index
       render_json do
@@ -13,16 +15,12 @@ module Nonprofits
     # used for modify a single supporter's tags or a group of
     # selected supporters' tags or all supporters' tags
     def modify
-
       if params[:selecting_all]
-        supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select("supporters.id").execute.map{|h| h['id']}
+        supporter_ids = QuerySupporters.full_filter_expr(current_nonprofit.id, params[:query]).select('supporters.id').execute.map { |h| h['id'] }
       else
         supporter_ids = params[:supporter_ids]. map(&:to_i)
       end
       render InsertTagJoins.in_bulk(current_nonprofit.id, current_user.profile.id, supporter_ids, params[:tags])
-
-
-
     end
 
     def destroy
@@ -30,7 +28,5 @@ module Nonprofits
       supporter.tag_joins.find(params[:id]).destroy
       render json: {}, status: :ok
     end
-
   end
 end
-

app/controllers/nonprofits/tag_masters_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class TagMastersController < ApplicationController
     include Controllers::NonprofitHelper
-    before_filter :authenticate_nonprofit_user!
+    before_action :authenticate_nonprofit_user!
 
     def index
       render json: { data:
@@ -10,9 +12,9 @@ module Nonprofits
           .from('tag_masters')
           .where(
             ['tag_masters.nonprofit_id = $id', id: current_nonprofit.id],
-            ["coalesce(deleted, FALSE) = FALSE"])
+            ['coalesce(deleted, FALSE) = FALSE']
-          .execute 
+          )
-        }
+          .execute }
     end
 
     def create
@@ -25,7 +27,5 @@ module Nonprofits
       tag_master.tag_joins.destroy_all
       render json: {}, status: :ok
     end
-
   end
 end
-

app/controllers/nonprofits/trackings_controller.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module Nonprofits
   class TrackingsController < ApplicationController
     # POST /nonprofits/:nonprofit_id/tracking
     def create
-      render JsonResp.new(params){|data|
+      render JsonResp.new(params) do |_data|
         requires(:donation_id).as_int
         optional(:utm_campaign, :utm_content, :utm_medium, :utm_source).as_string
-      }.when_valid{|data|
+      end.when_valid do |_data|
         InsertTracking.create(params)
-      }
+      end
     end
   end
 end

app/controllers/nonprofits_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class NonprofitsController < ApplicationController
   include Controllers::NonprofitHelper
 
   helper_method :current_nonprofit_user?
-	before_filter :authenticate_nonprofit_user!, only: [:dashboard, :dashboard_metrics, :dashboard_todos, :payment_history, :profile_todos, :recurring_donation_stats, :update, :verify_identity]
+  before_action :authenticate_nonprofit_user!, only: %i[dashboard dashboard_metrics dashboard_todos payment_history profile_todos recurring_donation_stats update verify_identity]
-	before_filter :authenticate_super_admin!, only: [:destroy]
+  before_action :authenticate_super_admin!, only: [:destroy]
 
   # get /nonprofits/:id
   # get /:state_code/:city/:name
@@ -30,7 +32,7 @@
 
     respond_to do |format|
       format.html
-			format.json {render json: @nonprofit}
+      format.json { @nonprofit }
     end
   end
 
@@ -132,13 +134,12 @@
     all_countries = ISO3166::Country.translations(locale)
 
     if Settings.intntl.all_countries
-      countries = all_countries.select{ |code, name| Settings.intntl.all_countries.include? code }
+      countries = all_countries.select { |code, _name| Settings.intntl.all_countries.include? code }
-      countries = countries.map{ |code, name| [code.upcase, name] }.sort{ |a, b| a[1] <=> b[1] }
+      countries = countries.map { |code, name| [code.upcase, name] }.sort_by { |a| a[1] }
       countries.push([Settings.intntl.other_country.upcase, I18n.t('nonprofits.donate.info.supporter.other_country')]) if Settings.intntl.other_country
       countries
     else
-      all_countries.map{ |code, name| [code.upcase, name] }.sort{ |a, b| a[1] <=> b[1] }
+      all_countries.map { |code, name| [code.upcase, name] }.sort_by { |a| a[1] }
     end
   end
-
 end

app/controllers/onboard_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OnboardController < ApplicationController
   layout 'layouts/apified'
   def index

app/controllers/profiles_controller.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ProfilesController < ApplicationController
-
   helper_method :authenticate_profile_owner!
 
-	before_filter :authenticate_profile_owner!, only: [:update, :fundraisers, :donations_history]
+  before_action :authenticate_profile_owner!, only: %i[update fundraisers donations_history]
 
   # get /profiles/:id
   # public profile
   def show
     @profile = Profile.find(params[:id])
-		@profile_nonprofits = Psql.execute(Qexpr.new.select("DISTINCT nonprofits.*").from(:nonprofits).join(:supporters, "supporters.nonprofit_id=nonprofits.id AND supporters.profile_id=#{@profile.id}"))
+    @profile_nonprofits = Psql.execute(Qexpr.new.select('DISTINCT nonprofits.*').from(:nonprofits).join(:supporters, "supporters.nonprofit_id=nonprofits.id AND supporters.profile_id=#{@profile.id}"))
     @campaigns = @profile.campaigns.published.includes(:nonprofit)
     if @profile.anonymous? && current_user_id != @profile.user_id && !:super_admin
       flash[:notice] = 'That user does not have a public profile.'
-			redirect_to(request.env["HTTP_REFERER"] || root_url)
+      redirect_to(request.env['HTTP_REFERER'] || root_url)
       return
     end
   end
@@ -22,7 +23,7 @@ class ProfilesController < ApplicationController
   def donations_history
     validate
     @profile = Profile.find(params[:id])
-		@recurring_donations = @profile.recurring_donations.where(:active => true).includes(:nonprofit)
+    @recurring_donations = @profile.recurring_donations.where(active: true).includes(:nonprofit)
     @donations = @profile.donations.includes(:nonprofit)
   end
 
@@ -31,7 +32,7 @@ class ProfilesController < ApplicationController
     validate
     current_user = Profile.find(params[:id]).user
     @profile = current_user.profile
-    @edited_campaigns = Campaign.where("profile_id=#{@profile.id}").order("end_datetime DESC")
+    @edited_campaigns = Campaign.where("profile_id=#{@profile.id}").order('end_datetime DESC')
   end
 
   # get /profiles/:id/events
@@ -41,10 +42,10 @@ class ProfilesController < ApplicationController
 
   # put /profiles/:id
   def update
-    if current_role?(:super_admin) # can update other profiles
+    @profile = if current_role?(:super_admin) # can update other profiles
-      @profile = Profile.find(params[:id])
+                 Profile.find(params[:id])
                else
-      @profile = current_user.profile
+                 current_user.profile
                end
     @profile.update_attributes(params[:profile])
     json_saved @profile, 'Profile updated'
@@ -52,12 +53,12 @@ class ProfilesController < ApplicationController
 
   private
 
-  def authenticate_profile_owner!()
+  def authenticate_profile_owner!
-    if (!current_role?(:super_associate) &&
+    if !current_role?(:super_associate) &&
        !current_role?(:super_admin) &&
        (!current_user ||
            !current_user.profile ||
-            current_user.profile.id != params[:id].to_i))
+           current_user.profile.id != params[:id].to_i)
       block_with_sign_in
     end
   end

app/controllers/recurring_donations_controller.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class RecurringDonationsController < ApplicationController
-
   def edit
     @data = QueryRecurringDonations.fetch_for_edit params[:id]
     if @data && params[:t] == @data['recurring_donation']['edit_token']
       @data['change_amount_suggestions'] = CalculateSuggestedAmounts.calculate(@data['recurring_donation']['amount'])
       @data['miscellaneous_np_info'] = FetchMiscellaneousNpInfo.fetch(@data['nonprofit']['id'])
       if @data['miscellaneous_np_info']['donate_again_url'].blank?
-        @data['miscellaneous_np_info']['donate_again_url'] = url_for(:controller => :nonprofits, :action=> :show, :id => @data['nonprofit']['id'], :only_path =>  false)
+        @data['miscellaneous_np_info']['donate_again_url'] = url_for(controller: :nonprofits, action: :show, id: @data['nonprofit']['id'], only_path: false)
       end
       respond_to do |format|
         format.html
       end
     else
-      flash[:notice] = "Unable to find donation. Please follow the exact link provided in your email"
+      flash[:notice] = 'Unable to find donation. Please follow the exact link provided in your email'
       redirect_to root_url
     end
   end
@@ -48,12 +49,11 @@ class RecurringDonationsController < ApplicationController
         amount_response = UpdateRecurringDonations.update_amount(rd, params[:token], params[:amount])
         flash[:notice] = "Your recurring donation amount has been successfully changed to $#{(amount_response.amount / 100).to_i}"
         render_json { amount_response }
-      rescue => e
+      rescue StandardError => e
         render_json { raise e }
       end
     else
       render json: { error: 'Invalid token' }, status: :unprocessable_entity
     end
   end
-
 end

app/controllers/roles_controller.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class RolesController < ApplicationController
   include Controllers::NonprofitHelper
 
-	before_filter :authenticate_nonprofit_admin!
+  before_action :authenticate_nonprofit_admin!
 
   def create
     role = Role.create_for_nonprofit(params[:role][:name].to_sym, params[:role][:email], FetchNonprofit.with_params(params))
-		json_saved role, "User successfully added!"
+    json_saved role, 'User successfully added!'
   end
 
   def destroy
     role = Role.find(params[:id])
     roles = role.user.roles.where(host_id: params[:nonprofit_id], name: role.name)
-		unless roles.empty?
+    if roles.empty?
+      render json: { error: "We couldn't find that admin" }, status: :unprocessable_entity
+    else
       roles.destroy_all
       flash[:notice] = 'User successfully removed'
       render json: {}
-		else
-			render json: {:error => "We couldn't find that admin"}, :status => :unprocessable_entity
      end
   end
 end

app/controllers/settings_controller.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class SettingsController < ApplicationController
   include Controllers::NonprofitHelper
 
   helper_method :current_nonprofit_user?
-	before_filter :authenticate_user!
+  before_action :authenticate_user!
 
   def index
     if current_role?(:super_admin) && params[:nonprofit_id]
       @nonprofit = Nonprofit.find(params[:nonprofit_id])
-		elsif current_role?([:nonprofit_admin, :nonprofit_associate])
+    elsif current_role?(%i[nonprofit_admin nonprofit_associate])
       @nonprofit = administered_nonprofit
     end
 
-    if current_role?(:super_admin) && params[:user_id]
+    @user = if current_role?(:super_admin) && params[:user_id]
-      @user = User.find_by_id(params[:user_id])
+              User.find_by_id(params[:user_id])
             elsif current_role?(:super_admin) && params[:user_email]
-      @user = User.find_by_email(params[:user_email])
+              User.find_by_email(params[:user_email])
             else
-      @user = current_user
+              current_user
             end
 
     @profile = @user.profile
@@ -25,7 +27,5 @@ class SettingsController < ApplicationController
     if @nonprofit
       @miscellaneous_np_info = FetchMiscellaneousNpInfo.fetch(@nonprofit.id)
     end
-
   end
-
 end

app/controllers/static_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class StaticController < ApplicationController
   layout 'layouts/static'
@@ -8,18 +10,17 @@ class StaticController < ApplicationController
 
   def ccs
     ccs_method = !Settings.ccs ? 'local_tar_gz' : Settings.ccs.ccs_method
-    if (ccs_method == 'local_tar_gz')
+    if ccs_method == 'local_tar_gz'
       temp_file = "#{Rails.root}/tmp/#{Time.current.to_i}.tar.gz"
       result = Kernel.system("git archive --format=tar.gz -o #{temp_file} HEAD")
       if result
-        send_file(temp_file, :type => "application/gzip")
+        send_file(temp_file, type: 'application/gzip')
       else
-        render :nothing => true, :status => 500
+        render body: nil, status: 500
       end
-    elsif (ccs_method == 'github')
+    elsif ccs_method == 'github'
       git_hash = File.read("#{Rails.root}/CCS_HASH")
       redirect_to "https://github.com/#{Settings.ccs.options.account}/#{Settings.ccs.options.repo}/tree/#{git_hash}"
     end
-
   end
 end

app/controllers/super_admins_controller.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class SuperAdminsController < ApplicationController
-  layout "layouts/page"
+  layout 'layouts/page'
 
-  before_filter :authenticate_super_associate!
+  before_action :authenticate_super_associate!
 
-  def index 
+  def index; end
-  end
 
   def search_nonprofits
     render json: QueryNonprofits.for_admin(params)
@@ -25,13 +26,12 @@ class SuperAdminsController < ApplicationController
   end
 
   def resend_user_confirmation
-    ParamValidation.new(params || {}, {
+    ParamValidation.new(params || {},
-       profile_id: {:required => true, is_integer: true}
+                        profile_id: { required: true, is_integer: true })
-    })
 
     profile = Profile.includes(:user).where('id = ?', params[:profile_id]).first
-    unless (profile.user)
+    unless profile.user
-      raise ArgumentError.new("#{params[:profile_id]} is a profile without a valid user")
+      raise ArgumentError, "#{params[:profile_id]} is a profile without a valid user"
     end
 
     profile.user.send_confirmation_instructions
@@ -40,24 +40,23 @@ class SuperAdminsController < ApplicationController
   end
 
   def recurring_donations_without_cards
-    odd_donations = QueryRecurringDonations::recurring_donations_without_cards
+    odd_donations = QueryRecurringDonations.recurring_donations_without_cards
     respond_to do |format|
       format.html
       format.csv do
-        csv_out = CSV.generate { |csv|
+        csv_out = CSV.generate do |csv|
           csv << ['supporter id', 'recurring donation id', 'rd created date', 'rd modified', 'donation id', 'donation card id',
                   'edit_token', 'nonprofit id',
                   'last charge succeeded id', 'last charge succeeded created at', 'last charge attempted id', 'last charge attempted created at', 'amount']
 
-          odd_donations.each { |rd|
+          odd_donations.each do |rd|
             csv << [rd.supporter.id, rd.id, rd.created_at, rd.updated_at, rd.donation.id, rd.donation.card_id, rd.edit_token, rd.nonprofit.id,
                     rd.most_recent_paid_charge.id, rd.most_recent_paid_charge.created_at, rd.most_recent_charge.id, rd.most_recent_charge.created_at,
                     rd.amount]
-          }
+          end
-        }
+        end
 
-
+        send_data(csv_out, filename: "recurring_donations_without_cards-#{Time.now.to_date}.csv")
-        send_data(csv_out, filename: "recurring_donations_without_cards-#{Time.now.to_date()}.csv")
       end
     end
   end
@@ -65,17 +64,13 @@ class SuperAdminsController < ApplicationController
   def export_supporters_with_rds
     np = params[:np]
     ids = params[:ids]
-    results = QuerySupporters.for_export(np, {ids: ids})
+    results = QuerySupporters.for_export(np, ids: ids)
-    results[0].push("Management URLS")
+    results[0].push('Management URLS')
-    results.drop(1).each {|row|
+    results.drop(1).each do |row|
-      rds = Supporter.includes(:recurring_donations).find(row.last).recurring_donations.select{|rd| rd.active}.map{|rd| "* #{root_url}recurring_donations/#{rd.id}/edit?t=#{rd.edit_token}"}.join("\n")
+      rds = Supporter.includes(:recurring_donations).find(row.last).recurring_donations.select(&:active).map { |rd| "* #{root_url}recurring_donations/#{rd.id}/edit?t=#{rd.edit_token}" }.join("\n")
       row.push(rds)
-    }
-
-
-    send_data(Format::Csv.from_vectors(results), filename: "supporters_with_multiple_donations.csv")
     end
 
-
+    send_data(Format::Csv.from_vectors(results), filename: 'supporters_with_multiple_donations.csv')
+  end
 end
-

app/controllers/ticket_levels_controller.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class TicketLevelsController < ApplicationController
   include Controllers::EventHelper
 
-	before_filter :authenticate_event_editor!, :except => [:index, :show]
+  before_action :authenticate_event_editor!, except: %i[index show]
 
   def index
     ev_id = current_event.id
@@ -40,5 +42,4 @@ private
   def current_ticket_level
     @ticket_level ||= current_event.ticket_levels.find params[:id]
   end
-
 end

app/controllers/tickets_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class TicketsController < ApplicationController
   include Controllers::EventHelper
 
   helper_method :current_event_admin?, :current_event_editor?
-	before_filter :authenticate_event_editor!, :except => [:create, :add_note]
+  before_action :authenticate_event_editor!, except: %i[create add_note]
-  before_filter :authenticate_nonprofit_user!, only: [:delete_card_for_ticket]
+  before_action :authenticate_nonprofit_user!, only: [:delete_card_for_ticket]
 
   # post /nonprofits/:nonprofit_id/events/:event_id/tickets
   def create
@@ -27,10 +29,11 @@ class TicketsController < ApplicationController
     @panels_layout = true
     @nonprofit = current_nonprofit
     @event = current_event
+
     respond_to do |format|
       format.html
       format.csv do
-				file_date = Date.today.strftime("%m-%d-%Y")
+        file_date = Date.today.strftime('%m-%d-%Y')
         filename = "tickets-#{file_date}"
         @tickets = QueryTickets.for_export(@event.id, params)
         send_data(Format::Csv.from_vectors(@tickets), filename: "#{filename}.csv")

app/controllers/users/confirmations_controller.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Users::ConfirmationsController < Devise::ConfirmationsController
-
   # get /confirm
   def show
     @user = User.confirm_by_token(params[:confirmation_token])
 
     if !@user.auto_generated || !@user.valid?
-			flash[:notice] = "We successfully confirmed your account"
+      flash[:notice] = 'We successfully confirmed your account'
       redirect_to session[:donor_signup_url] || root_url
     else
       respond_to do |format|
@@ -25,7 +26,7 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
     @user = User.find(params[:id])
 
     if @user.valid? && @user.update_attributes(params[:user].except(:confirmation_token))
-			flash[:notice] = "Your account is all set!"
+      flash[:notice] = 'Your account is all set!'
       sign_in @user
       redirect_to session[:donor_signup_url] || root_url
     else
@@ -37,5 +38,4 @@ class Users::ConfirmationsController < Devise::ConfirmationsController
   def is_confirmed
     render json: { is_confirmed: User.find(params[:user_id]).confirmed? }
   end
-
 end

app/controllers/users/registrations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Users::RegistrationsController < Devise::RegistrationsController
   respond_to :html, :json
@@ -12,9 +14,9 @@ class Users::RegistrationsController < Devise::RegistrationsController
     user = User.register_donor!(params[:user])
     if user.save
       sign_in user
-      render :json => user
+      render json: user
     else
-      render :json => user.errors.full_messages, :status => :unprocessable_entity
+      render json: user.errors.full_messages, status: :unprocessable_entity
       clean_up_passwords(user)
     end
   end
@@ -33,7 +35,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
       errs = current_user.errors.full_messages
     else
       success = false
-      errs = {:password => :incorrect}
+      errs = { password: :incorrect }
     end
 
     if success
@@ -43,10 +45,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
         flash[:notice] = 'Account updated!'
       end
 
-      sign_in(current_user, :bypass => true)
+      sign_in(current_user, bypass: true)
-      render :json => current_user
+      render json: current_user
     else
-      render :json => {:errors => errs}, :status => :unprocessable_entity
+      render json: { errors: errs }, status: :unprocessable_entity
     end
   end
 end

app/controllers/users/sessions_controller.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Users::SessionsController < Devise::SessionsController
   layout 'layouts/apified', only: :new
-
+  respond_to :json, only: :new
 
   def new
     @theme = 'minimal'
@@ -12,13 +14,12 @@ class Users::SessionsController < Devise::SessionsController
     @theme = 'minimal'
 
     respond_to do |format|
-			format.json {  
+      format.json do
-				warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")  
+        warden.authenticate!(scope: resource_name, recall: "#{controller_path}#new")
-				render :status => 200, :json => { :status => "Success" }  
+        render status: 200, json: { status: 'Success' }
-			}
+      end
     end
   end
-
 
   # post /users/confirm_auth
   # A simple action to confirm an entered password for a user who is already signed in
@@ -32,6 +33,4 @@ class Users::SessionsController < Devise::SessionsController
       render json: ["Incorrect password. Please enter your #{Settings.general.name} %> password."], status: :unprocessable_entity
     end
   end
-	
 end
-

app/helpers/application_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module ApplicationHelper
-
   def resource_name
     :user
   end
@@ -13,11 +14,10 @@ module ApplicationHelper
     @devise_mapping ||= Devise.mappings[:user]
   end
 
-	def print_currency(cents, unit="EUR", sign=true)
+  def print_currency(cents, unit = 'EUR', sign = true)
-            
     dollars = cents.to_f / 100.0
-		dollars = number_to_currency(dollars, :unit => "#{unit}", :precision => (dollars.round == dollars) ? 0 : 2)
+    dollars = number_to_currency(dollars, unit: unit.to_s, precision: dollars.round == dollars ? 0 : 2)
-		dollars = dollars[1..-1] if !sign
+    dollars = dollars[1..-1] unless sign
     dollars
   end
 
@@ -27,29 +27,31 @@ module ApplicationHelper
 
   ## Dates
 
-	def simple_date date_object, timezone=nil
+  def simple_date(date_object, timezone = nil)
     return '' if date_object.nil?
+
     date_object = date_object.in_time_zone(timezone) if timezone
-		date_object.strftime("%m/%d/%Y")
+    date_object.strftime('%m/%d/%Y')
   end
 
-	def simple_time time_object, timezone=nil
+  def simple_time(time_object, timezone = nil)
     return '' if time_object.nil?
+
     time_object = time_object.in_time_zone(timezone) if timezone
-		time_object.strftime("%l:%M%P")
+    time_object.strftime('%l:%M%P')
   end
 
-	def readable_date date_object
+  def readable_date(date_object)
-		date_object.strftime("%B %d, %Y")
+    date_object.strftime('%B %d, %Y')
   end
 
-	def date_and_time date_object, timezone=nil
+  def date_and_time(date_object, timezone = nil)
     date_object = date_object.in_time_zone(timezone) if timezone
-		date_object.strftime("%m/%d/%Y %I:%M%P (%Z)")
+    date_object.strftime('%m/%d/%Y %I:%M%P (%Z)')
   end
 
   def us_states
-		[ ['Alabama', 'AL'], ['Alaska', 'AK'], ['Arizona', 'AZ'], ['Arkansas', 'AR'], ['California', 'CA'], ['Colorado', 'CO'], ['Connecticut', 'CT'], ['Delaware', 'DE'], ['District of Columbia', 'DC'], ['Florida', 'FL'], ['Georgia', 'GA'], ['Hawaii', 'HI'], ['Idaho', 'ID'], ['Illinois', 'IL'], ['Indiana', 'IN'], ['Iowa', 'IA'], ['Kansas', 'KS'], ['Kentucky', 'KY'], ['Louisiana', 'LA'], ['Maine', 'ME'], ['Maryland', 'MD'], ['Massachusetts', 'MA'], ['Michigan', 'MI'], ['Minnesota', 'MN'], ['Mississippi', 'MS'], ['Missouri', 'MO'], ['Montana', 'MT'], ['Nebraska', 'NE'], ['Nevada', 'NV'], ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], ['Ohio', 'OH'], ['Oklahoma', 'OK'], ['Oregon', 'OR'], ['Pennsylvania', 'PA'], ['Puerto Rico', 'PR'], ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], ['Tennessee', 'TN'], ['Texas', 'TX'], ['Utah', 'UT'], ['Vermont', 'VT'], ['Virginia', 'VA'], ['Washington', 'WA'], ['West Virginia', 'WV'], ['Wisconsin', 'WI'], ['Wyoming', 'WY'] ]
+    [%w[Alabama AL], %w[Alaska AK], %w[Arizona AZ], %w[Arkansas AR], %w[California CA], %w[Colorado CO], %w[Connecticut CT], %w[Delaware DE], ['District of Columbia', 'DC'], %w[Florida FL], %w[Georgia GA], %w[Hawaii HI], %w[Idaho ID], %w[Illinois IL], %w[Indiana IN], %w[Iowa IA], %w[Kansas KS], %w[Kentucky KY], %w[Louisiana LA], %w[Maine ME], %w[Maryland MD], %w[Massachusetts MA], %w[Michigan MI], %w[Minnesota MN], %w[Mississippi MS], %w[Missouri MO], %w[Montana MT], %w[Nebraska NE], %w[Nevada NV], ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w[Ohio OH], %w[Oklahoma OK], %w[Oregon OR], %w[Pennsylvania PA], ['Puerto Rico', 'PR'], ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], %w[Tennessee TN], %w[Texas TX], %w[Utah UT], %w[Vermont VT], %w[Virginia VA], %w[Washington WA], ['West Virginia', 'WV'], %w[Wisconsin WI], %w[Wyoming WY]]
   end
 
   # Append a parameter to a URL string
@@ -59,12 +61,11 @@ module ApplicationHelper
 
   # Prepend 'http://' if it is not present in a given url
   # Used for linking to nonprofit-provided website
-	def add_http url
+  def add_http(url)
-		if url[/^http:\/\//] || url[/^https:\/\//]
+    if url[%r{^http://}] || url[%r{^https://}]
       url
     else
       'http://' + url
     end
   end
-
 end

app/helpers/card_helper.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module CardHelper
-
   def brand_file(brand)
     if brand == 'Visa' || brand == 'visa' || brand == 'VISA'
       'visa'
@@ -14,7 +15,7 @@ module CardHelper
   end
 
   def current_card
-		current_user && current_user.profile.card
+    current_user&.profile&.card
   end
 
   def expiration_years

app/helpers/devise_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module DeviseHelper
   def devise_error_messages!

app/helpers/nonprofits_helper.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module NonprofitsHelper
-
   def managed_npo_card_json
     if current_user
       if params[:nonprofit_id] && current_role?(:super_admin)
         raw(Nonprofit.find(params[:nonprofit_id]).active_card.to_json)
-			elsif administered_nonprofit && administered_nonprofit.active_card
+      elsif administered_nonprofit&.active_card
         raw(administered_nonprofit.active_card.to_json)
       end
     else
       'undefined'
     end
   end
-
 end

app/helpers/onboard_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module OnboardHelper
 end

app/helpers/pricing_helper.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module PricingHelper
   private
+
   def nonprofit_email
     return nil if @nonprofit.nil?
+
     @nonprofit.email || GetData.chain(@nonprofit.users.first, :email)
   end
 end

app/helpers/profiles_helper.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 module ProfilesHelper
-
+  def get_shortened_name(name)
-  def get_shortened_name name
     if name
       name.length > 18 ? name[0..18] + '...' : name
     else
       'Your Account'
     end
   end
-
 end

app/jobs/application_job.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
+
+class ApplicationJob < ActiveJob::Base
+end

app/mailers/admin_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class AdminMailer < BaseMailer
-
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #

app/mailers/base_mailer.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class BaseMailer < ActionMailer::Base
   include Roadie::Rails::Automatic
   include Devise::Controllers::UrlHelpers
   add_template_helper(ApplicationHelper)
-  default :from => Settings.mailer.default_from
+  default from: Settings.mailer.default_from
   layout 'email'
 end

app/mailers/billing_subscription_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class BillingSubscriptionMailer < BaseMailer
-
   def failed_notice(np_id)
     @nonprofit = Nonprofit.find(np_id)
     @billing_subscription = @nonprofit.billing_subscription
@@ -9,5 +10,4 @@ class BillingSubscriptionMailer < BaseMailer
     @emails = QueryUsers.all_nonprofit_user_emails(@nonprofit.id)
     mail(to: @emails, subject: "Action Needed, Please Update Your #{Settings.general.name} Account")
   end
-
 end

app/mailers/campaign_mailer.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class CampaignMailer < BaseMailer
-
   def creation_followup(campaign)
     @creator_profile = campaign.profile
     @campaign = campaign
-		mail(:to => @creator_profile.user.email, :subject => "Get your new campaign rolling! (via #{Settings.general.name})")
+    mail(to: @creator_profile.user.email, subject: "Get your new campaign rolling! (via #{Settings.general.name})")
   end
 
   def federated_creation_followup(campaign)
     @creator_profile = campaign.profile
     @campaign = campaign
-		mail(:to => @creator_profile.user.email, :subject => "Get your new campaign rolling! (via #{Settings.general.name})")
+    mail(to: @creator_profile.user.email, subject: "Get your new campaign rolling! (via #{Settings.general.name})")
   end
 end

app/mailers/donation_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class DonationMailer < BaseMailer
-
   # Used for both one-time and recurring donations
   # can pass in array of admin user_ids to send to only some -- if falsey/empty, will send to all
   def donor_payment_notification(donation_id, locale = I18n.locale)
@@ -9,7 +10,7 @@ class DonationMailer < BaseMailer
     if @donation.campaign && ActionView::Base.full_sanitizer.sanitize(@donation.campaign.receipt_message).present?
       @thank_you_note = @donation.campaign.receipt_message
     else
-      @thank_you_note = Format::Interpolate.with_hash(@nonprofit.thank_you_note, {'NAME' => @donation.supporter.name})
+      @thank_you_note = Format::Interpolate.with_hash(@nonprofit.thank_you_note, 'NAME' => @donation.supporter.name)
     end
     @charge = @donation.charges.last
     reply_to = @nonprofit.email.blank? ? @nonprofit.users.first.email : @nonprofit.email
@@ -19,7 +20,8 @@ class DonationMailer < BaseMailer
         to: @donation.supporter.email,
         from: from,
         reply_to: reply_to,
-                  subject: I18n.t('mailer.donations.donor_direct_debit_notification.subject', nonprofit_name: @nonprofit.name))
+        subject: I18n.t('mailer.donations.donor_direct_debit_notification.subject', nonprofit_name: @nonprofit.name)
+      )
     end
   end
 
@@ -30,7 +32,7 @@ class DonationMailer < BaseMailer
     if @donation.campaign && ActionView::Base.full_sanitizer.sanitize(@donation.campaign.receipt_message).present?
       @thank_you_note = @donation.campaign.receipt_message
     else
-      @thank_you_note = Format::Interpolate.with_hash(@nonprofit.thank_you_note, {'NAME' => @donation.supporter.name})
+      @thank_you_note = Format::Interpolate.with_hash(@nonprofit.thank_you_note, 'NAME' => @donation.supporter.name)
     end
 
     reply_to = @nonprofit.email.blank? ? @nonprofit.users.first.email : @nonprofit.email
@@ -127,5 +129,4 @@ class DonationMailer < BaseMailer
     @previous_amount = previous_amount
     mail(to: @donation.supporter.email, from: from, reply_to: reply_to, subject: "Recurring donation amount changed for #{@nonprofit.name}")
   end
-
 end

app/mailers/event_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class EventMailer < BaseMailer
-
   helper :application
 
   include Devise::Controllers::UrlHelpers
@@ -8,7 +9,6 @@ class EventMailer < BaseMailer
   def creation_followup(event)
     @creator_profile = event.profile
     @event = event
-		mail(:to => @creator_profile.user.email, :subject => "Get your new event rolling on #{Settings.general.name}!")
+    mail(to: @creator_profile.user.email, subject: "Get your new event rolling on #{Settings.general.name}!")
   end
-
 end

app/mailers/export_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ExportMailer < BaseMailer
-
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
@@ -18,7 +19,6 @@ class ExportMailer < BaseMailer
     mail(to: @export.user.email, subject: 'Your payment export has failed')
   end
 
-
   def export_recurring_donations_completed_notification(export)
     @export = export
 

app/mailers/generic_mailer.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class GenericMailer < BaseMailer
-
+  def generic_mail(from_email, from_name, message, subject, to_email, _to_name)
-  def generic_mail(from_email, from_name, message, subject, to_email, to_name)
     @from_email = from_email
     @from_name = from_name
     @message = message
-    mail(:to => to_email, :from => "#{from_name} <#{Settings.mailer.email}>", :reply_to => from_email, :subject => "#{subject}")
+    mail(to: to_email, from: "#{from_name} <#{Settings.mailer.email}>", reply_to: from_email, subject: subject.to_s)
   end
 
   # For sending a system notice to super admins
@@ -16,5 +17,4 @@ class GenericMailer < BaseMailer
     emails = QueryUsers.super_admin_emails
     mail(to: emails, from: "#{@from_name} <#{@from_email}>", reply_to: @from_email, subject: options[:subject], template_name: 'generic_mail')
   end
-
 end

app/mailers/import_mailer.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class ImportMailer < BaseMailer
-
   def import_completed_notification(import_id)
     @import = Import.find(import_id)
     @nonprofit = @import.nonprofit
-		mail(to: @import.user.email, subject: "Your import is complete!")
+    mail(to: @import.user.email, subject: 'Your import is complete!')
   end
-
 end

app/mailers/nonprofit_admin_mailer.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class NonprofitAdminMailer < BaseMailer
-
   def new_invite(role, raw_token)
     @user = role.user
     @title_with_article = Format::Indefinitize.with_article(role.name.to_s.titleize)
     @nonprofit = role.host
     @token = raw_token
-		mail(:to => @user.email, :subject => "You're now #{@title_with_article} of #{@nonprofit.name} on #{Settings.general.name}. Let's set your password.")
+    mail(to: @user.email, subject: "You're now #{@title_with_article} of #{@nonprofit.name} on #{Settings.general.name}. Let's set your password.")
   end
 
   def existing_invite(role)
     @user = role.user
     @title_with_article = Format::Indefinitize.with_article(role.name.to_s.titleize)
     @nonprofit = role.host
-		mail(:to => @user.email, :subject => "You're now #{@title_with_article} of #{@nonprofit.name} on #{Settings.general.name}.")
+    mail(to: @user.email, subject: "You're now #{@title_with_article} of #{@nonprofit.name} on #{Settings.general.name}.")
   end
 
   def supporter_fundraiser(event_or_campaign)
@@ -25,4 +26,3 @@ class NonprofitAdminMailer < BaseMailer
     mail(to: recipients, subject: "A Supporter has created #{Format::Indefinitize.with_article(@kind.capitalize)} for your Nonprofit!")
   end
 end
-

app/mailers/nonprofit_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class NonprofitMailer < BaseMailer
-
   def failed_verification_notice(np)
     @nonprofit = np
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_payouts')
@@ -26,48 +27,48 @@ class NonprofitMailer < BaseMailer
     @nonprofit = ba.nonprofit
     @bank_account = ba
     @emails = QueryUsers.all_nonprofit_user_emails(@nonprofit.id)
-		mail(to: @emails, subject: "We need to confirm the new bank account")
+    mail(to: @emails, subject: 'We need to confirm the new bank account')
   end
 
   def pending_payout_notification(payout_id)
     @payout = Payout.find(payout_id)
     @nonprofit = @payout.nonprofit
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_payouts')
-		mail(to: @emails, subject: "Payout of available balance now pending")
+    mail(to: @emails, subject: 'Payout of available balance now pending')
   end
 
   def successful_payout_notification(payout)
     @nonprofit = payout.nonprofit
     @payout = payout
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_payouts')
-		mail(to: @emails, subject: "Payout of available balance succeeded")
+    mail(to: @emails, subject: 'Payout of available balance succeeded')
   end
 
   def failed_payout_notification(payout)
     @nonprofit = payout.nonprofit
     @payout = payout
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_payouts')
-		mail(to: @emails, subject: "Payout could not be completed")
+    mail(to: @emails, subject: 'Payout could not be completed')
   end
 
   def failed_recurring_donation(recurring_donation)
     @recurring_donation = recurring_donation
     @nonprofit = recurring_donation.nonprofit
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_recurring_donations')
-		mail(to: @emails, subject: "A recurring donation from one of your supporters had a payment failure.")
+    mail(to: @emails, subject: 'A recurring donation from one of your supporters had a payment failure.')
   end
 
   def cancelled_recurring_donation(recurring_donation)
     @recurring_donation = recurring_donation
     @nonprofit = recurring_donation.nonprofit
     @emails = QueryUsers.nonprofit_user_emails(@nonprofit.id, 'notify_recurring_donations')
-		mail(to: @emails, subject: "A recurring donation from one of your supporters was cancelled.")
+    mail(to: @emails, subject: 'A recurring donation from one of your supporters was cancelled.')
   end
 
   def verified_notification(nonprofit)
     @nonprofit = nonprofit
     @emails = QueryUsers.all_nonprofit_user_emails(@nonprofit.id)
-		mail(to: @emails, subject: "Your nonprofit has been verified!")
+    mail(to: @emails, subject: 'Your nonprofit has been verified!')
   end
 
   def button_code(nonprofit, to_email, to_name, from_email, message, code)
@@ -78,7 +79,7 @@ class NonprofitMailer < BaseMailer
     @message = message
     @code = code
     from = Format::Name.email_from_np(@nonprofit.name)
-		mail(to: to_email, from: from, reply_to: from_email, subject: "Please include this donate button code on the website")
+    mail(to: to_email, from: from, reply_to: from_email, subject: 'Please include this donate button code on the website')
   end
 
   def invoice_payment_notification(nonprofit_id, payment)
@@ -93,6 +94,7 @@ class NonprofitMailer < BaseMailer
   # {is_unsubscribed_from_emails, supporter_email, message, email_unsubscribe_uuid, nonprofit_id, from_email, subject}
   def supporter_message(args)
     return if args[:is_unsubscribed_from_emails] || args[:supporter_email].blank?
+
     @message = args[:message]
     @uuid = args[:email_unsubscribe_uuid]
     @nonprofit = Nonprofit.find args[:nonprofit_id]
@@ -113,6 +115,4 @@ class NonprofitMailer < BaseMailer
     @emails = QueryUsers.all_nonprofit_user_emails(np_id, [:nonprofit_admin])
     mail(to: @emails, reply_to: 'support@commitchange.com', from: "#{Settings.general.name} Support", subject: "A hearty welcome from the #{Settings.general.name} team")
   end
-
 end
-

app/mailers/payment_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class PaymentMailer < BaseMailer
-
   # Send a donation receipt to a single admin
   # or a ticket receipt
   def resend_admin_receipt(payment_id, user_id)
@@ -22,5 +23,4 @@ class PaymentMailer < BaseMailer
       return TicketMailer.followup(payment.tickets.pluck(:id), payment.charge.id).deliver
     end
   end
-
 end

app/mailers/recurring_donation_mailer.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class RecurringDonationMailer < BaseMailer
-
   def send_cancellation_notices(recurring_donation)
     UserMailer.recurring_donation_cancelled(recurring_donation).deliver
     NonprofitMailer.cancelled_recurring_donation(recurring_donation).deliver
-		return recurring_donation
+    recurring_donation
   end
 
   def send_failure_notifications(recurring_donation)

app/mailers/testing.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class Testing < ActionMailer::Base
-  default from: "from@example.com"
+  default from: 'from@example.com'
 end

app/mailers/ticket_mailer.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class TicketMailer < BaseMailer
-
   helper :application
 
   # Pass in ticket_ids, event_id, and supporter
   def followup(ticket_ids, charge_id = nil)
     @charge = charge_id ? Charge.find(charge_id) : nil
-    @tickets = Ticket.where("id IN(?)", ticket_ids)
+    @tickets = Ticket.where('id IN(?)', ticket_ids)
     @event = @tickets.last.event
     @supporter = @tickets.last.supporter
     @nonprofit = @supporter.nonprofit
@@ -16,7 +17,7 @@ class TicketMailer < BaseMailer
   end
 
   def receipt_admin(ticket_ids, user_id = nil)
-    @tickets = Ticket.where("id IN (?)", ticket_ids)
+    @tickets = Ticket.where('id IN (?)', ticket_ids)
     @charge = @tickets.last.charge
     @supporter = @tickets.last.supporter
     @event = @tickets.last.event
@@ -25,9 +26,9 @@ class TicketMailer < BaseMailer
     if user_id
       em = User.find(user_id).email
       return unless recipients.include?(em)
+
       recipients = [em]
     end
     mail(to: recipients, subject: "Ticket redeemed for #{@event.name} - #{@supporter.name}")
   end
-
 end

app/mailers/user_mailer.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 class UserMailer < BaseMailer
-
   def refund_receipt(refund_id)
     @refund = Refund.find(refund_id)
     @nonprofit = @refund.payment.nonprofit
@@ -13,14 +14,13 @@ class UserMailer < BaseMailer
 
   def recurring_donation_failure(recurring_donation)
     @recurring_donation = recurring_donation
-		mail(:to => @recurring_donation.email,
+    mail(to: @recurring_donation.email,
-				 :subject => ("We couldn't process your recurring donation towards #{@recurring_donation.nonprofit.name}."))
+         subject: "We couldn't process your recurring donation towards #{@recurring_donation.nonprofit.name}.")
   end
 
   def recurring_donation_cancelled(recurring_donation)
     @recurring_donation = recurring_donation
-		mail(:to => @recurring_donation.email,
+    mail(to: @recurring_donation.email,
-				 :subject => ("Your recurring donation towards #{@recurring_donation.nonprofit.name} was successfully cancelled."))
+         subject: "Your recurring donation towards #{@recurring_donation.nonprofit.name} was successfully cancelled.")
   end
-
 end

app/models/activity.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
+
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-class Activity < ActiveRecord::Base
+class Activity < ApplicationRecord
-
 end
-

app/models/application_record.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
+
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

app/models/bank_account.rb

@@ -1,18 +1,20 @@
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
+# frozen_string_literal: true
-class BankAccount < ActiveRecord::Base
 
-	attr_accessible \
+# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-	:name, # str (readable bank name identifier, eg. "Wells Fargo *1234")
+class BankAccount < ApplicationRecord
-	:confirmation_token, # str (randomly generated private token for email confirmation)
+  # TODO
-	:account_number, # str (last digits only)
+  # attr_accessible \
-	:bank_name, # str
+  # :name, # str (readable bank name identifier, eg. "Wells Fargo *1234")
-	:pending_verification, # bool (whether this bank account is still awaiting email confirmation)
+  # :confirmation_token, # str (randomly generated private token for email confirmation)
-	:status, # str
+  # :account_number, # str (last digits only)
-	:email, # str (contact email associated with the user who created this bank account)
+  # :bank_name, # str
-	:deleted, # bool (soft delete flag)
+  # :pending_verification, # bool (whether this bank account is still awaiting email confirmation)
-	:stripe_bank_account_token, # str
+  # :status, # str
-	:stripe_bank_account_id, # str
+  # :email, # str (contact email associated with the user who created this bank account)
-	:nonprofit_id, :nonprofit
+  # :deleted, # bool (soft delete flag)
+  # :stripe_bank_account_token, # str
+  # :stripe_bank_account_id, # str
+  # :nonprofit_id, :nonprofit
 
   # validates :stripe_bank_account_token, presence: true, uniqueness: true
   # validates :stripe_bank_account_id, presence: true, uniqueness: true
@@ -25,17 +27,15 @@ class BankAccount < ActiveRecord::Base
   belongs_to :nonprofit
 
   def nonprofit_must_be_vetted
-		errors.add(:nonprofit, "must be vetted") unless self.nonprofit && self.nonprofit.vetted
+    errors.add(:nonprofit, 'must be vetted') unless nonprofit&.vetted
   end
 
-
   def nonprofit_has_stripe_account
-		errors.add(:nonprofit, 'must have a Stripe account id') if !self.nonprofit || self.nonprofit.stripe_account_id.blank?
+    errors.add(:nonprofit, 'must have a Stripe account id') if !nonprofit || nonprofit.stripe_account_id.blank?
   end
 
   # Manually cause an instance to become invalid
   def invalidate!
     @not_valid = true
   end
-
 end

app/models/billing_plan.rb

@@ -1,18 +1,21 @@
-# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
+# frozen_string_literal: true
-class BillingPlan < ActiveRecord::Base
-	Names = ['Starter', 'Fundraising', 'Supporter Management']
-	DefaultAmounts = [0, 9900, 29900] # in pennies
 
-	attr_accessible \
+# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
-		:name, #str: readable name
+class BillingPlan < ApplicationRecord
-		:tier, #int: 0-4 (0: Free, 1: Fundraising, 2: Supporter Management)
+  Names = ['Starter', 'Fundraising', 'Supporter Management'].freeze
-		:amount, #int (cents)
+  DefaultAmounts = [0, 9900, 29_900].freeze # in pennies
-		:stripe_plan_id, #str (matches plan ID in Stripe) Not needed if it's not a paying subscription
+
-		:interval, #str ('monthly', 'annual')
+  # TODO
-		:percentage_fee # 0.038
+  # attr_accessible \
+  #   :name, #str: readable name
+  #   :tier, #int: 0-4 (0: Free, 1: Fundraising, 2: Supporter Management)
+  #   :amount, #int (cents)
+  #   :stripe_plan_id, #str (matches plan ID in Stripe) Not needed if it's not a paying subscription
+  #   :interval, #str ('monthly', 'annual')
+  #   :percentage_fee # 0.038
 
   has_many :billing_subscriptions
 
-	validates :name, :presence => true
+  validates :name, presence: true
-	validates :amount, :presence => true
+  validates :amount, presence: true
 end