From da8b7b552b0bee97ea0a4c7a0616554144f192e2 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 06:08:43 +0300
Subject: [PATCH 01/40] ActiveSupport::Testing::Performance extracted to a gem

---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 92051d954..1e8d37b90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ group :test do
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
   gem 'test-unit'
+  gem 'rails-perftest'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index d781a44a8..f3ed72068 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,6 +130,7 @@ GEM
       activesupport (= 3.2.22.5)
       bundler (~> 1.0)
       railties (= 3.2.22.5)
+    rails-perftest (0.0.7)
     railties (3.2.22.5)
       actionpack (= 3.2.22.5)
       activesupport (= 3.2.22.5)
@@ -223,6 +224,7 @@ DEPENDENCIES
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
   rails (~> 3.2)
+  rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
   recaptcha

From 7dcabea8c484e99072942fff97939ef4a042b651 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 06:12:58 +0300
Subject: [PATCH 02/40] ruby prof required as a dependency

---
 Gemfile      | 3 ++-
 Gemfile.lock | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e8d37b90..bbc1f2d49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :dependencies do
   gem "open_id_authentication"
   gem "RubyInline"
   gem "paperclip", "~>4.3.7"
+  gem 'ruby-prof'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
@@ -43,8 +44,8 @@ group :test do
   gem "rubocop", '~> 0.52.0'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'test-unit'
   gem 'rails-perftest'
+  gem 'test-unit'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f3ed72068..fe9f980c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,6 +162,7 @@ GEM
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-prof (0.18.0)
     ruby-progressbar (1.10.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -231,6 +232,7 @@ DEPENDENCIES
   right_aws
   rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
+  ruby-prof
   sass
   simplecov
   simplecov-cobertura
@@ -247,4 +249,4 @@ RUBY VERSION
    ruby 2.4.6p354
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

From d2e7ba50dcb7c3aa01b925622719cfce6bac9398 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 05:15:27 +0300
Subject: [PATCH 03/40] Configurations update for rails 4.0

---
 Gemfile                                       |   6 +-
 Gemfile.lock                                  | 163 ++++++++++--------
 bin/bundle                                    |   3 +
 bin/rails                                     |   4 +
 bin/rake                                      |   4 +
 bin/setup                                     |  29 ++++
 config/application.rb                         |  27 +--
 config/boot.rb                                |   5 +-
 config/environment.rb                         |   4 +-
 config/environments/development.rb            |  37 ++--
 config/environments/production.rb             |  89 +++++-----
 config/environments/test.rb                   |  32 ++--
 config/initializers/assets.rb                 |  11 ++
 config/initializers/cookies_serializer.rb     |   3 +
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  11 +-
 config/initializers/mime_types.rb             |   1 -
 config/initializers/session_store.rb          |   7 +-
 config/initializers/wrap_parameters.rb        |   6 +-
 config/locales/en.yml                         |  22 ++-
 config/secrets.yml                            |  22 +++
 21 files changed, 304 insertions(+), 186 deletions(-)
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/secrets.yml

diff --git a/Gemfile b/Gemfile
index bbc1f2d49..e3360daf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-ruby "2.4.6"
-gem "rails", "~>3.2"
+ruby '2.4.6'
+gem 'rails', '~>4.0'
 gem 'rake',  '~> 12.3.2'
 gem 'skylight'
 
@@ -42,9 +42,9 @@ end
 
 group :test do
   gem "rubocop", '~> 0.52.0'
+  gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'rails-perftest'
   gem 'test-unit'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fe9f980c6..a4ac481c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,34 +4,41 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.2)
-    actionmailer (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
     ast (2.4.0)
     autoprefixer-rails (9.5.1.1)
       execjs
@@ -40,45 +47,53 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    builder (3.0.4)
+    builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
+    crass (1.0.4)
     docile (1.3.1)
     erubis (2.7.0)
     execjs (2.7.0)
     faker (1.9.3)
       i18n (>= 0.7)
     ffi (1.11.1)
-    friendly_id (4.0.10.1)
-      activerecord (>= 3.0, < 4.0)
+    friendly_id (5.2.5)
+      activerecord (>= 4.0.0)
     geokit (1.13.1)
     geokit-rails (1.1.4)
       geokit (>= 1.5.0)
-    hike (1.2.3)
-    httparty (0.16.2)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    httparty (0.17.0)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    journey (1.0.4)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
       rake
     json (1.8.6)
     libv8 (3.16.14.19)
-    mail (2.5.5)
-      mime-types (~> 1.16)
-      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)
     method_source (0.9.2)
-    mime-types (1.25.1)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
     mimemagic (0.3.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.4.0)
+    minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
@@ -103,7 +118,6 @@ GEM
     passenger (6.0.2)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.5)
     popper_js (1.14.5)
     power_assert (1.1.4)
     powerpack (0.1.2)
@@ -112,40 +126,43 @@ GEM
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (1.4.7)
-    rack-cache (1.9.0)
-      rack (>= 0.4)
+    rack (1.6.11)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.5)
-      actionmailer (= 3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activerecord (= 3.2.22.5)
-      activeresource (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      bundler (~> 1.0)
-      railties (= 3.2.22.5)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-perftest (0.0.7)
-    railties (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      rack-ssl (~> 1.3.2)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
     recaptcha (4.14.0)
       json
     ref (2.0.0)
@@ -176,13 +193,17 @@ GEM
     simplecov-cobertura (1.3.1)
       simplecov (~> 0.8)
     simplecov-html (0.10.2)
-    skylight (1.7.2)
-      activesupport (>= 3.0.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    skylight (4.0.2)
+      skylight-core (= 4.0.2)
+    skylight-core (4.0.2)
+      activesupport (>= 4.2.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -190,11 +211,9 @@ GEM
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.3)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.55)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
@@ -224,7 +243,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
-  rails (~> 3.2)
+  rails (~> 4.0)
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..5191e6927
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 000000000..17240489f
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..acdb2c138
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
diff --git a/config/application.rb b/config/application.rb
index 63217e5ba..09d4d4575 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,12 +2,9 @@
 
 require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module Mapknitter
   class Application < Rails::Application
@@ -19,13 +16,6 @@ class Application < Rails::Application
     # config.autoload_paths += %W(#{config.root}/extras)
     config.autoload_paths += %W(#{config.root}/lib/)
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -43,16 +33,14 @@ class Application < Rails::Application
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
     # Enforce whitelist mode for mass assignment.
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -60,6 +48,5 @@ class Application < Rails::Application
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.3'
     config.assets.paths << Rails.root.join("public","lib")
-
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
index f2830ae31..44358b8e4 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,3 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index 761c5657b..99fb29737 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Mapknitter::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f834629b2..dd73b21a2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,33 +1,43 @@
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
   # Do not compress assets
   config.assets.compress = false
@@ -37,5 +47,4 @@
   config.serve_static_assets = true
 
   config.assets.logger = false
-
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ca5cdf415..219f7fc32 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,65 +1,74 @@
-require 'uglifier'
-
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
 
-  # Code is not reloaded between requests
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = true
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  config.assets.js_compressor = Uglifier.new(:harmony => true)
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = true
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
   config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
   config.assets.precompile += ['tags.js',
-                                 'uploads.js',
-                                 'knitter.js',
-                                 'annotations.js',
-                                 'maps.js']
-
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+                               'uploads.js',
+                               'knitter.js',
+                               'annotations.js',
+                               'maps.js']
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
   config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
   config.action_mailer.delivery_method = :sendmail
   config.action_mailer.sendmail_settings = {
@@ -67,18 +76,16 @@
     arguments: '-i'
   }
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8b5dc4405..278bd7e91 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,6 @@
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +8,36 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..01ef3e663
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 000000000..ac5f8b663
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 000000000..4a994e1e7
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 5d8d9be23..ac033bf9d 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,15 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
+
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e44..dc1899682 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 24b534974..d496b7352 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Mapknitter::Application.config.session_store :cookie_store, key: '_mapknitter_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Mapknitter::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_mapknitter_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 999df2018..35d7efeaf 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,14 +1,14 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
+# Disable root element in JSON for ActiveRecord objects.
 ActiveSupport.on_load(:active_record) do
   self.include_root_in_json = false
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 179c14ca5..065395716 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 000000000..b839a03ad
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: d4b805f25ee5bdba59cfd75d808721c6a73215f9e499e86af29dc2855c2e377bf05a463c8ee46e7ad896a435cd3f4e912794a9f9eb788b75a85c75624b34f01e
+
+test:
+  secret_key_base: 3aecc44ce8fabf9194016bb240fa78113f3c26b8d2c7b1b4dc0611300fbe6f95fdb89fef41f025f2494ec2281c40ca0dd0b86ac3eee3a46683abc42f63c449af
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

From a783e6d905ef78efb4bdae39e256747552828126 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 12:24:03 +0300
Subject: [PATCH 04/40] disable rubocop on bin folder

---
 .codeclimate.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 4c1449c23..7922fef22 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,23 +1,23 @@
 version: 2
-plugins: 
-  rubocop: 
+plugins:
+  rubocop:
     enabled: true
     channel: rubocop-0-70
-  brakeman: 
+  brakeman:
     enabled: true
-  bundler-audit: 
+  bundler-audit:
     enabled: true
-  duplication: 
+  duplication:
     enabled: true
     config:
       languages:
         - ruby:
         - javascript:
-  eslint: 
+  eslint:
     enabled: true
-  fixme: 
+  fixme:
     enabled: true
-  rubocop: 
+  rubocop:
     enabled: true
 
 exclude_patterns:
@@ -25,5 +25,6 @@ exclude_patterns:
 - db/
 - vendor/
 - log/
+- bin/
 
 

From 74ca822e75d854c3e2550c5b9d4e054a065c908b Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 23:51:00 +0300
Subject: [PATCH 05/40] http patch

---
 config/routes.rb | 66 +++---------------------------------------------
 1 file changed, 4 insertions(+), 62 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 6dd6d53f8..2cd514153 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,57 +1,13 @@
 Mapknitter::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+
+  root :to => 'maps#index'
+
   get 'front-page' => 'front_ui#index'
   get 'mappers' => 'front_ui#nearby_mappers'
   post "save_location" => 'front_ui#save_location'
   get 'about' => 'front_ui#about'
   get 'all_maps' => 'front_ui#all_maps'
 
-  # these are a mess:
   get 'external_url_test' => 'export#external_url_test'
   get 'local/:login' => 'sessions#local'
   get 'logout' => 'sessions#logout'
@@ -61,10 +17,8 @@
 
   # since rails 3.2, we use this to log in:
   get 'sessions/create' => 'sessions#create'
-  # believe this is unnecessary:
-  #get 'session' => 'sessions#create', :conditions => { :method => :get }
 
-  resources :users, :sessions
+  resources :users, :sessions, :maps
 
   # redirect legacy route:
   get 'tag/:id', to: redirect('/tags/%{id}')
@@ -87,20 +41,14 @@
   get 'tms/:id/alt/' => 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
-  get 'maps' => 'maps#index'
-  post 'maps' => 'maps#create' # legacy, will be replaced by resourceful route
   get 'map/map' => 'maps#map'
-  put 'map/:id' => 'maps#update' # legacy, will be replaced by resourceful route
   get 'search/:id' => 'maps#search'
   get 'search' => 'maps#search'
-  get 'map/update/:id' => 'maps#update' # legacy
   get 'map/archive/:id' => 'maps#archive'
   get 'map/region/:id' => 'maps#region'
   get 'map/license/:id' => 'maps#license'
   get 'maps/featured' => 'maps#featured'
   get 'map/view/:id', to: redirect('/maps/%{id}') # legacy
-  get 'maps/new' => 'maps#new' # legacy, will be replaced by resourceful route
-  get 'maps/:id/edit' => 'maps#edit' # legacy, will be replaced by resourceful route
   get 'maps/:id/annotate' => 'maps#annotate'
   get 'maps/exports/:id' => 'maps#exports'
   get 'maps/:id/warpables' => 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
@@ -108,7 +56,6 @@
   get 'export/progress/:id' => 'export#progress'
   get 'export/status/:id' => 'export#status'
   get 'exports' => 'export#index'
-  get 'maps/:id' => 'maps#show'
   get 'map/:id', to: redirect('/maps/%{id}')
   get 'embed/:id' => 'maps#embed'
   post 'maps/export/:id' => 'maps#export'
@@ -125,13 +72,8 @@
   delete 'maps/:map_id/warpables/:id' => 'images#destroy' #legacy, will be resourceful
   delete 'images/:id' => 'images#destroy' #legacy, will be resourceful
 
-  # You can have the root of your site routed with 'root'
-  # just remember to delete public/index.html.
-  root :to => 'maps#index'
-
   # RESTful API
   resources :maps do
-    resources :tags
     resources :tags,  only: [:create, :show, :destroy]
     resources :comments
     resources :warpables

From 683a6a95e1600233c4c8d75a9167e4cd614676e6 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 00:14:41 +0300
Subject: [PATCH 06/40] Comment out to allow testing

---
 config/initializers/visitor.rb    | 26 +++++++++++++-------------
 test/performance/browsing_test.rb | 20 ++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/config/initializers/visitor.rb b/config/initializers/visitor.rb
index 443c9ce3b..df4d800c5 100644
--- a/config/initializers/visitor.rb
+++ b/config/initializers/visitor.rb
@@ -11,18 +11,18 @@
 # Arel is now bundled in the Active Record gem, and maintained in the rails/rails repository. 
 # This code can be deleted on update to `activerecord >= 6.0` (Rails 6)
 
-module Arel
-  module Visitors
-    class DepthFirst < Arel::Visitors::Visitor
-      alias :visit_Integer :terminal
-    end
+# module Arel
+#   module Visitors
+#     class DepthFirst < Arel::Visitors::Visitor
+#       alias :visit_Integer :terminal
+#     end
 
-    class Dot < Arel::Visitors::Visitor
-      alias :visit_Integer :visit_String
-    end
+#     class Dot < Arel::Visitors::Visitor
+#       alias :visit_Integer :visit_String
+#     end
 
-    class ToSql < Arel::Visitors::Visitor
-      alias :visit_Integer :literal
-    end
-  end
-end
\ No newline at end of file
+#     class ToSql < Arel::Visitors::Visitor
+#       alias :visit_Integer :literal
+#     end
+#   end
+# end
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 3fea27b91..96ebe7f1e 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -1,12 +1,12 @@
-require 'test_helper'
-require 'rails/performance_test_help'
+# require 'test_helper'
+# require 'rails/performance_test_help'
 
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
+# class BrowsingTest < ActionDispatch::PerformanceTest
+#   # Refer to the documentation for all available options
+#   # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+#   #                          :output => 'tmp/performance', :formats => [:flat] }
 
-  def test_homepage
-    get '/'
-  end
-end
+#   def test_homepage
+#     get '/'
+#   end
+# end

From d7a2a389f1698d2207ffcda375c5bda772eba755 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 00:16:18 +0300
Subject: [PATCH 07/40] no longer supports plugin loading

---
 vendor/plugins/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 vendor/plugins/.gitkeep

diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep
deleted file mode 100644
index e69de29bb..000000000

From 6a77def5a02553622167b0b2c27a9cf684c1f342 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 01:17:34 +0300
Subject: [PATCH 08/40] lock to sprockets 2.12

---
 Gemfile      |  2 +-
 Gemfile.lock | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index e3360daf2..2453ee174 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ group :dependencies do
   gem "rdiscount", "2.2.0.1"
 
   # asset pipelining
-  gem "sprockets"#, "2.12.1"
+  gem 'sprockets', '2.12.1'
   gem "sass", :require => 'sass'
   gem "autoprefixer-rails"
   gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index a4ac481c6..d3010eb1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       geokit (>= 1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    hike (1.2.3)
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -197,13 +198,15 @@ GEM
       skylight-core (= 4.0.2)
     skylight-core (4.0.2)
       activesupport (>= 4.2.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -212,6 +215,7 @@ GEM
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
+    tilt (1.4.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -256,7 +260,7 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   skylight
-  sprockets
+  sprockets (= 2.12.1)
   sqlite3
   test-unit
   therubyracer

From 7a917807660215695064048ccab128ad9591275d Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 01:18:12 +0300
Subject: [PATCH 09/40] Active record patches

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              |  2 +-
 app/controllers/annotations_controller.rb | 28 +++++++++------
 app/controllers/comments_controller.rb    | 13 ++++---
 app/controllers/export_controller.rb      |  6 ++++
 app/controllers/feeds_controller.rb       | 17 ++++-----
 app/controllers/images_controller.rb      | 10 ++++--
 app/controllers/maps_controller.rb        |  6 +++-
 app/controllers/tags_controller.rb        |  6 ++++
 app/controllers/users_controller.rb       |  5 +++
 app/models/annotation.rb                  |  2 --
 app/models/comment.rb                     |  1 -
 app/models/export.rb                      | 13 +++----
 app/models/map.rb                         | 42 +++++++++--------------
 app/models/node.rb                        |  1 -
 app/models/tag.rb                         |  8 ++---
 app/models/user.rb                        |  1 -
 app/models/warpable.rb                    |  4 +--
 app/models/way.rb                         |  3 +-
 app/views/maps/_statistics.html.erb       |  4 +--
 config/initializers/assets.rb             |  5 +++
 21 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2453ee174..e3360daf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ group :dependencies do
   gem "rdiscount", "2.2.0.1"
 
   # asset pipelining
-  gem 'sprockets', '2.12.1'
+  gem "sprockets"#, "2.12.1"
   gem "sass", :require => 'sass'
   gem "autoprefixer-rails"
   gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index d3010eb1d..bfb4b9980 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   skylight
-  sprockets (= 2.12.1)
+  sprockets
   sqlite3
   test-unit
   therubyracer
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 3435ce4c0..9905f52bc 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -9,7 +9,7 @@ def index
   end
 
   def create
-    geojson = params[:annotation]
+    geojson = annotation_params # params[:annotation]
 
     respond_to do |format|
       format.json do
@@ -32,15 +32,16 @@ def show
 
   def update
     @annotation = Annotation.find params[:id]
-    geojson = params[:annotation]
-    return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
-
-    Annotation.update(@annotation.id,
-      coordinates: geojson[:geometry][:coordinates],
-      text: geojson[:properties][:textContent],
-      style: geojson[:properties][:style])
-    render file: 'annotations/update.json.erb',
-           content_type: 'application/json'
+
+    geojson = annotation_params
+    if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
+      Annotation.update(@annotation.id,
+                        coordinates: geojson[:geometry][:coordinates],
+                        text: geojson[:properties][:textContent],
+                        style: geojson[:properties][:style])
+      render file: 'annotations/update.json.erb',
+             content_type: 'application/json'
+    end
   end
 
   def destroy
@@ -54,4 +55,11 @@ def destroy
   def find_map
     @map = Map.find params[:map_id]
   end
+
+  private
+
+  def annotation_params
+    params.require(:annotation).permit(:annotation_type,
+                                       :coordinates, :text, :style)
+  end
 end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index c0e01fbf0..d73678f11 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,10 +3,7 @@ def create
     if logged_in?
       @map = Map.find params[:map_id]
 
-      @comment = @map.comments.new(
-        user_id: current_user.id,
-        body: params[:comment][:body]
-      )
+      @comment = @map.comments.new(comment_params, user_id: current_user.id)
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
@@ -31,7 +28,7 @@ def create
   def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
-      @comment.update_attribute(:body, params[:comment][:body])
+      @comment.update_attribute(comment_params)
       redirect_to '/maps/' + params[:map_id]
     else
       flash[:error] = 'You do not have permissions to update that comment.'
@@ -50,4 +47,10 @@ def destroy
     end
     redirect_to "/maps/#{params[:map_id]}"
   end
+
+  private
+
+  def comment_params
+    params.require(:comment).permit(:body)
+  end
 end
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 2b3c98470..424fa4a71 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -85,4 +85,10 @@ def status
   def external_url_test
     render json: Export.last.to_json
   end
+
+  private
+
+  def export_params
+    params.require(:export).permit(:status, :export_url)
+  end
 end
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 3405ea31d..2224f9e53 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -3,10 +3,11 @@ class FeedsController < ApplicationController
 
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
-    @maps = Map.find(:all, order: 'id DESC', limit: 20,
-                           conditions: { archived: false, password: '' },
-                           joins: %i(user warpables),
-                           group: 'maps.id')
+    @maps = Map.where(archived: false, password: '')
+               .joins(%i[user warpables])
+               .group('maps.id')
+               .order('id DESC')
+               .limit(20)
     render layout: false, template: 'feeds/all'
     response.headers['Content-Type'] = 'application/xml; charset=utf-8'
   end
@@ -23,10 +24,10 @@ def license
   end
 
   def author
-    @maps = Map.find_all_by_author(params[:id],
-      order: 'id DESC',
-      conditions: { archived: false, password: '' },
-      joins: :warpables, group: 'maps.id')
+    @maps = Map.where(author: params[:id], archived: false, password: '')
+               .order('id DESC')
+               .joins(:warpables)
+               .group('maps.id')
     images = []
     @maps.each do |map|
       images += map.warpables
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 2f670da0f..fe79c6a14 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -23,8 +23,8 @@ def fetch
 
   # assign attributes directly after rails update
   def create
-    @warpable = Warpable.new
-    @warpable.image = params[:uploaded_data]
+    @warpable = Warpable.new(image_params)
+    # @warpable.image = params[:uploaded_data]
     map = Map.find(params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
@@ -109,4 +109,10 @@ def destroy
       redirect_to '/login'
     end
   end
+
+  private
+
+  def image_params
+    params.require(:warpable).permit(:image)
+  end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 51258908e..69337853b 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -32,7 +32,7 @@ def new
 
   def create
     if logged_in?
-      @map = current_user.maps.new(params[:map])
+      @map = current_user.maps.new(map_params)
       @map.author = current_user.login # eventually deprecate
       if @map.save
         redirect_to "/maps/#{@map.slug}"
@@ -200,4 +200,8 @@ def search
   def find_map
     @map = Map.find(params[:id])
   end
+
+  def map_params
+    params.require(:map).permit(:author, :name, :slug, :lat, :lon, :location, :description, :zoom, :license)
+  end
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f6ad5ab3d..eba31b0f3 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -32,4 +32,10 @@ def destroy
       redirect_to '/login'
     end
   end
+
+  private
+
+  def tag_params
+    params.require(:tag).permit(:name)
+  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 56d9379e6..5dc4f187f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,4 +27,9 @@ def sort_column
   def sort_direction
     params[:direction] || 'desc'
   end
+
+  def user_params
+    params.require(:user).permit(:login, :email, :name,
+                                 :password, :password_confirmation)
+  end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index bfa3ce87c..05575fdff 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -2,8 +2,6 @@ class Annotation < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  attr_accessible :annotation_type, :coordinates, :text, :style
-
   serialize :coordinates, Array
   serialize :style, Hash
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 8ac15586e..0021e4761 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,4 @@
 class Comment < ActiveRecord::Base
-  attr_accessible :user_id, :body
 
   belongs_to :map
   belongs_to :user
diff --git a/app/models/export.rb b/app/models/export.rb
index d37b52021..d85d62aa4 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -1,6 +1,4 @@
 class Export < ActiveRecord::Base
-  attr_accessible :map_id, :status, :user_id, :export_url
-
   belongs_to :map
   belongs_to :user
 
@@ -10,7 +8,7 @@ def running?
   end
 
   def self.average_cm_per_pixel
-    e = Export.find :all, conditions: ['cm_per_pixel != "" AND cm_per_pixel < 500']
+    e = Export.where('cm_per_pixel != "" AND cm_per_pixel < 500')
     sum = 0
     e.each do |export|
       sum += export.cm_per_pixel
@@ -23,7 +21,8 @@ def self.average_cm_per_pixel
   end
 
   def self.histogram_cm_per_pixel
-    e = Export.find :all, conditions: ['cm_per_pixel != "" AND cm_per_pixel < 500'], order: "cm_per_pixel DESC"
+    e = Export.where('cm_per_pixel != "" AND cm_per_pixel < 500')
+              .order('cm_per_pixel DESC')
     if !e.empty?
       hist = []
       (0..e.first.cm_per_pixel.to_i).each do |bin|
@@ -52,11 +51,13 @@ def self.histogram_cm_per_pixel_in_tens
   end
 
   def self.export_count
-    Export.count :all, conditions: ['status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?', (DateTime.now - 24.hours).to_s(:db)]
+    Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
+                 (DateTime.now-24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
-    Export.find :all, conditions: ['status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?', (DateTime.now - 24.hours).to_s(:db)]
+    Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
+                 (DateTime.now-24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 0ff3c51d4..9091c9722 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -3,33 +3,23 @@ class Map < ActiveRecord::Base
   extend FriendlyId
   friendly_id :name, use: %i(slugged static)
 
-  attr_accessible :author, :name, :slug, :lat, :lon,
-    :location, :description, :zoom, :license
   attr_accessor :image_urls
 
-  validates :name, :slug, :author, :lat, :lon, presence: true
-
-  validates :slug, format: {
-    with: /^[\w-]*$/,
-    message: "must only include permitted URL safe character types:
-              alphanumerics, dashes, and underscores. It will be in your map's
-              URL path (i.e., https://mapknitter.org/maps/your-map-name)."
-  }, uniqueness: true, on: :create
-
-  validates :location, presence: {
-    message: ' cannot be found.
-              Try entering a latitude and longitude if this problem persists.'
-  }
-  #  validates :tile_url, format { with:
-  #   /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.
-  #   [a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
-  # }
-  validates :lat, :lon, NotAtOrigin: true
-
-  has_many :exports, dependent: :destroy
-  has_many :tags, dependent: :destroy
-  has_many :comments, dependent: :destroy
-  has_many :annotations, dependent: :destroy
+  validates_presence_of :name, :slug, :author, :lat, :lon
+  validates_uniqueness_of :slug
+  validates_presence_of :location, :message => ' cannot be found. Try entering a latitude and longitude if this problem persists.'
+  # validates_format_of   :slug,
+  #                       :with => /^[\w-]*$/,
+  #                       :message => " must not include spaces and must be alphanumeric, as it'll be used in the URL of your map, like: https://mapknitter.org/maps/your-map-name. You may use dashes and underscores.",
+  #                       :on => :create
+#  validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+  validates_with NotAtOriginValidator
+    validates :lat, :lon, NotAtOrigin: true
+
+  has_many :exports, :dependent => :destroy
+  has_many :tags, :dependent => :destroy
+  has_many :comments, :dependent => :destroy
+  has_many :annotations, :dependent => :destroy
   belongs_to :user
 
   has_many :warpables 
@@ -272,7 +262,7 @@ def license_link
   end
 
   def has_tag(tagname)
-    !Tag.find(:all, conditions: { map_id: id, name: tagname }).empty?
+    !Tag.where(map_id: self.id, name: tagname).empty?
   end
 
   def add_tag(tagname, user)
diff --git a/app/models/node.rb b/app/models/node.rb
index 92aa1ee70..a6e3018b7 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,4 +1,3 @@
 class Node < ActiveRecord::Base
-  attr_accessible :body, :lat, :lon, :map_id, :way_order, :way_id, :color, :author, :name
   belongs_to :way
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 3a699d727..be5a179e5 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,11 +2,9 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  attr_accessible :name, :map_id, :user_id
-
-  validates_presence_of :name, on: :create, message: "can't be blank"
-  validates_presence_of :user_id, on: :create, message: "can't be blank"
-  validates_presence_of :map_id, on: :create, message: "can't be blank"
+  validates_presence_of :name, :on => :create, :message => "can't be blank"
+  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
+  validates_presence_of :map_id, :on => :create, :message => "can't be blank"
 
   def maps
     Map.where(id: Tag.where(name: name).collect(&:map_id).uniq)
diff --git a/app/models/user.rb b/app/models/user.rb
index 0eaa31479..55e036669 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,7 +18,6 @@ class User < ActiveRecord::Base
   # HACK: HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   #
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index a35fce0d1..bac4a300f 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,5 +1,4 @@
 class Warpable < ActiveRecord::Base
-  attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs
@@ -109,7 +108,8 @@ def get_cm_per_pixel
   end
 
   def self.histogram_cm_per_pixel
-    w = Warpable.find :all, conditions: ['cm_per_pixel != 0 AND cm_per_pixel < 500'], order: "cm_per_pixel DESC"
+    w = Warpable.where('cm_per_pixel != 0 AND cm_per_pixel < 500')
+                .order('cm_per_pixel DESC')
     if !w.empty?
       hist = []
       (0..w.first.cm_per_pixel.to_i).each do |bin|
diff --git a/app/models/way.rb b/app/models/way.rb
index f92f1f1df..8237be702 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,6 +1,5 @@
 class Way < ActiveRecord::Base
-  attr_accessible :body, :lat, :lon, :map_id, :color
-  has_many :nodes, dependent: :destroy
+  has_many :nodes, :dependent => :destroy
 
   def bbox=(bbox)
     # counting from left, counter-clockwise
diff --git a/app/views/maps/_statistics.html.erb b/app/views/maps/_statistics.html.erb
index 5935c074d..7f53e5463 100644
--- a/app/views/maps/_statistics.html.erb
+++ b/app/views/maps/_statistics.html.erb
@@ -1,9 +1,9 @@
 <div class="statistics">
-  <% if (Export.count(:all, :conditions => ["cm_per_pixel != ''"]) > 0) %>
+<% if (Export.where("cm_per_pixel != ''").count > 0) %>
     <h4>What people have been doing with MapKnitter</h4>
     <hr>
     <p class="card-text">
-      MapKnitter is hosting <b><%= Export.count(:all, :conditions => ["cm_per_pixel != ''"]) %> completed maps</b> of an average resolution of <b><%= Export.average_cm_per_pixel.to_i %> cm per pixel</b>. Images average. Currently <a href="/exports">exporting <%= Export.export_count %> maps</a>.</p>
+      MapKnitter is hosting <b><%= Export.where("cm_per_pixel != ''").count %> completed maps</b> of an average resolution of <b><%= Export.average_cm_per_pixel.to_i %> cm per pixel</b>. Images average. Currently <a href="/exports">exporting <%= Export.export_count %> maps</a>.</p>
     <p class="card-text"><small>Resolutions:</small></p>
     <p class="card-text"><small>Resolutions:</small></p>
     <p class="card-text"><small><b>Maps:</b>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 01ef3e663..f5d0ac0f0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,3 +9,8 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += ['tags.js',
+                                               'uploads.js',
+                                               'knitter.js',
+                                               'annotations.js',
+                                               'maps.js']

From 5bcded39ec6a12602ac826f110e81f68ab3c9b9f Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 02:17:59 +0300
Subject: [PATCH 10/40] remove deprecated test syntax

---
 test/functional/maps_controller_test.rb     | 4 ++--
 test/functional/sessions_controller_test.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 47acfc77b..866f4c288 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -190,7 +190,7 @@ def teardown
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
-    assert_true @map.archived
+    assert @map.archived
   end
 
   test 'should not archive map without enough permissions' do
@@ -199,7 +199,7 @@ def teardown
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
-    assert_false @map.archived
+    assert_not @map.archived
   end
 
   test 'should update map' do
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 4087cf6b9..98da1b9dd 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -19,7 +19,7 @@ class SessionsControllerTest < ActionController::TestCase
   test 'logs out a user' do
     session[:user_id] = 1
     get :logout
-    assert_equal nil, session[:user_id]
+    assert_nil session[:user_id]
     assert flash[:success].present?
     assert_equal 'You have successfully logged out.', flash[:success]
     assert_redirected_to "/?_=#{Time.now.to_i}"

From 0d2ca09166f9c682794fbbb31ef1588477cbd8bc Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 12:16:16 +0300
Subject: [PATCH 11/40] fix failing tests

---
 app/controllers/comments_controller.rb      | 14 +++++++-------
 app/controllers/images_controller.rb        | 10 ++--------
 app/controllers/maps_controller.rb          |  2 +-
 app/views/images/_new.html.erb              |  3 ++-
 test/functional/comments_controller_test.rb |  1 +
 test/functional/maps_controller_test.rb     |  4 ++--
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d73678f11..347644693 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,15 +1,15 @@
 class CommentsController < ApplicationController
   def create
     if logged_in?
-      @map = Map.find params[:map_id]
 
-      @comment = @map.comments.new(comment_params, user_id: current_user.id)
+      @comment = current_user.comments.new(comment_params)
+      @map = Map.find comment_params[:map_id]
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
         users.uniq.each do |user|
-          unless user.id == current_user.id
-            CommentMailer.notify(user, @comment).deliver
+          unless @map.user_id == current_user.id
+            CommentMailer.notify(user, @comment).deliver_now
           end
         end
       end
@@ -28,8 +28,8 @@ def create
   def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
-      @comment.update_attribute(comment_params)
-      redirect_to '/maps/' + params[:map_id]
+      @comment.update_attributes(comment_params)
+      redirect_to "/maps/#{@comment.map.slug}"
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -51,6 +51,6 @@ def destroy
   private
 
   def comment_params
-    params.require(:comment).permit(:body)
+    params.require(:comment).permit(:body, :map_id)
   end
 end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index fe79c6a14..2f670da0f 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -23,8 +23,8 @@ def fetch
 
   # assign attributes directly after rails update
   def create
-    @warpable = Warpable.new(image_params)
-    # @warpable.image = params[:uploaded_data]
+    @warpable = Warpable.new
+    @warpable.image = params[:uploaded_data]
     map = Map.find(params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
@@ -109,10 +109,4 @@ def destroy
       redirect_to '/login'
     end
   end
-
-  private
-
-  def image_params
-    params.require(:warpable).permit(:image)
-  end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 69337853b..7e5cc7454 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -40,7 +40,7 @@ def create
         render 'new'
       end
     else
-      @map = Map.new(params[:map])
+      @map = Map.new(map_params)
       if Rails.env != 'production' || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not human! Try again!")
         if @map.save
           redirect_to "/maps/#{@map.slug}"
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 608db8b6f..27862c3cf 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -10,7 +10,8 @@
       </div>
       <div class="modal-body">
         <div>
-          <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
+          <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
+          <%= form_for(@map) do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 761d68717..d3f702668 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class CommentsControllerTest < ActionController::TestCase
+
   # called before every single test
   def setup
     @map = maps(:saugus)
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 866f4c288..c9fa24b18 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -226,8 +226,8 @@ def teardown
   end
 
   test 'should not update unless logged in' do
-    put :update, id: 2, map: { name: 'Street 5' }
-    assert_redirected_to '/login?back_to=/map/2'
+    put :update, id: 2, map: { name: 'Street 5'}
+    assert_redirected_to '/login?back_to=/maps/2'
   end
 
   test 'should display maps by region' do

From 6d278f5bb681886fd2bb58aaccef5fde583f35cd Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 12:44:48 +0300
Subject: [PATCH 12/40] change new super class

---
 config/initializers/visitor.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/initializers/visitor.rb b/config/initializers/visitor.rb
index df4d800c5..79f467501 100644
--- a/config/initializers/visitor.rb
+++ b/config/initializers/visitor.rb
@@ -11,18 +11,18 @@
 # Arel is now bundled in the Active Record gem, and maintained in the rails/rails repository. 
 # This code can be deleted on update to `activerecord >= 6.0` (Rails 6)
 
-# module Arel
-#   module Visitors
-#     class DepthFirst < Arel::Visitors::Visitor
-#       alias :visit_Integer :terminal
-#     end
+module Arel
+  module Visitors
+    class DepthFirst < Arel::Visitors::Visitor
+      alias :visit_Integer :terminal
+    end
 
-#     class Dot < Arel::Visitors::Visitor
-#       alias :visit_Integer :visit_String
-#     end
+    class Dot < Arel::Visitors::Visitor
+      alias :visit_Integer :visit_String
+    end
 
-#     class ToSql < Arel::Visitors::Visitor
-#       alias :visit_Integer :literal
-#     end
-#   end
-# end
+    class ToSql < Arel::Visitors::Reduce
+      alias :visit_Integer :literal
+    end
+  end
+end

From d58db7dc243e74b2b1e98b42bd3dc319bcb15b3e Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 9 May 2019 22:48:33 +0300
Subject: [PATCH 13/40] replace right_aws with right_aws_api

right_aws is no longer maintained, was throwing an error
---
 Gemfile                         |  6 ++++--
 Gemfile.lock                    | 35 +++++++++++++++++++--------------
 lib/tasks/attachment_tasks.rake |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index e3360daf2..d3631c448 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,13 +21,14 @@ group :dependencies do
   gem "open_id_authentication"
   gem "RubyInline"
   gem "paperclip", "~>4.3.7"
-  gem 'ruby-prof'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
 
   # for rake image migration tasks
-  gem 'right_aws'
+  # gem 'right_aws'
+  gem 'right_aws_api'
+
 
   # compiling markdown to html
   gem "rdiscount", "2.2.0.1"
@@ -42,6 +43,7 @@ end
 
 group :test do
   gem "rubocop", '~> 0.52.0'
+  gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bfb4b9980..ff6e8fb53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,6 @@ GEM
       geokit (>= 1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    hike (1.2.3)
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -82,6 +81,7 @@ GEM
       rake
     json (1.8.6)
     libv8 (3.16.14.19)
+    libxml-ruby (3.1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -98,6 +98,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
+    net-http-persistent (2.9.4)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     oa-core (0.3.2)
@@ -166,10 +167,16 @@ GEM
     rdiscount (2.2.0.1)
     recaptcha (4.14.0)
       json
+    redcarpet (3.4.0)
     ref (2.0.0)
-    right_aws (3.1.0)
-      right_http_connection (>= 1.2.5)
-    right_http_connection (1.5.0)
+    right_aws_api (0.3.5)
+      right_cloud_api_base (>= 0.2.6)
+    right_cloud_api_base (0.2.6)
+      json (>= 1.0.0)
+      libxml-ruby (>= 1.0.0)
+      net-http-persistent (~> 2.9)
+      redcarpet (>= 3.0.0)
+      ruby-hmac (>= 0.4.0)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -177,6 +184,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
@@ -198,15 +206,13 @@ GEM
       skylight-core (= 4.0.2)
     skylight-core (4.0.2)
       activesupport (>= 4.2.0)
-    sprockets (2.12.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -215,7 +221,6 @@ GEM
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (1.4.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -252,7 +257,7 @@ DEPENDENCIES
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
   recaptcha
-  right_aws
+  right_aws_api
   rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
   ruby-prof
diff --git a/lib/tasks/attachment_tasks.rake b/lib/tasks/attachment_tasks.rake
index ffd517028..3f16fbebe 100644
--- a/lib/tasks/attachment_tasks.rake
+++ b/lib/tasks/attachment_tasks.rake
@@ -1,5 +1,5 @@
 # see http://ramblingsonrails.com/how-to-migrate-a-rails-app-from-attachment_fu-to-paperclip
-require 'right_aws'
+require 'right_aws_api'
 
 namespace :utils do
   namespace :attachments do

From 3212ccfd59c8058cd328e4debcd33d5d7cdb8b01 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 12:21:56 +0300
Subject: [PATCH 14/40] lock to rails 4.2.11.1

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d3631c448..d23fd673f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 ruby '2.4.6'
-gem 'rails', '~>4.0'
+gem 'rails', '4.2.11.1'
 gem 'rake',  '~> 12.3.2'
 gem 'skylight'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ff6e8fb53..a107967c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
-  rails (~> 4.0)
+  rails (= 4.2.11.1)
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)

From ae7b4cfb88e2307b2d4c43384a11f20a042b9587 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 12:35:02 +0300
Subject: [PATCH 15/40] change rails version in install script

---
 install_cloud.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_cloud.sh b/install_cloud.sh
index 27a11f658..f232a98e4 100755
--- a/install_cloud.sh
+++ b/install_cloud.sh
@@ -6,7 +6,7 @@ source ~/.rvm/scripts/rvm
 rvm install ruby-2.4.6
 source $(rvm 2.4.6 do rvm env --path)
 rvm use ruby-2.4.6
-gem install rails -v 3.2.0
+gem install rails -v 4.2.11.1
 sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server
 sudo apt-get -y install bundler libmysqlclient-dev imagemagick ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev libmagickcore-dev libmagickwand-dev npm nodejs-legacy

From 4c54e24652ad12cf526e46203be6e3de5a91f129 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 23:42:42 +0300
Subject: [PATCH 16/40] remove deprecation warnings

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index dd73b21a2..1ab5e7b64 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -44,7 +44,7 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true#false
-  config.serve_static_assets = true
+  config.serve_static_files = true
 
   config.assets.logger = false
 end

From 995a0988bdc7288f85c1dbfc3f1f1e8a20a7afaf Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 23:57:52 +0300
Subject: [PATCH 17/40] make app work

---
 app/controllers/maps_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 7e5cc7454..d16a66139 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -198,7 +198,7 @@ def search
   private
 
   def find_map
-    @map = Map.find(params[:id])
+    @map = Map.find_by( slug: params[:id])
   end
 
   def map_params

From 40680caf836004bd6c58bc272d2c3a06613b75fd Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 11 May 2019 17:21:54 +0300
Subject: [PATCH 18/40] Change test lib to minitest, add  minitest reporters

---
 .gitignore          |  1 +
 Gemfile             |  3 ++-
 Gemfile.lock        | 12 ++++++++----
 test/test_helper.rb |  3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e85bb8860..be5a8500e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ todo.txt
 .sass-cache
 .byebug_history
 coverage_report/
+test/reports/
diff --git a/Gemfile b/Gemfile
index d23fd673f..2c2d031bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,8 @@ group :test do
   gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'test-unit'
+  gem 'minitest'
+  gem 'minitest-reporters'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a107967c3..626c55d9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ansi (1.5.0)
     arel (6.0.4)
     ast (2.4.0)
     autoprefixer-rails (9.5.1.1)
@@ -95,6 +96,11 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    minitest-reporters (1.3.6)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
@@ -121,7 +127,6 @@ GEM
       rack
       rake (>= 0.8.1)
     popper_js (1.14.5)
-    power_assert (1.1.4)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -214,8 +219,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
-    test-unit (3.3.3)
-      power_assert
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -245,6 +248,8 @@ DEPENDENCIES
   httparty
   image_science (= 1.3.0)
   jshintrb
+  minitest
+  minitest-reporters
   mysql2 (< 0.4)
   oa-openid (= 0.3.2)
   open_id_authentication
@@ -267,7 +272,6 @@ DEPENDENCIES
   skylight
   sprockets
   sqlite3
-  test-unit
   therubyracer
   uglifier
   will_paginate (= 3.1.7)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8b0be3ba0..8c0ee1f2f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,9 @@
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
+require 'minitest/reporters'
+MiniTest::Reporters.use! [MiniTest::Reporters::ProgressReporter.new,
+                          MiniTest::Reporters::JUnitReporter.new]
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.

From aff10ca99c4d8eb6f11f55b2bbd91e4e5f2354d1 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 15 May 2019 19:00:28 +0300
Subject: [PATCH 19/40] active record find patches

---
 app/controllers/maps_controller.rb      | 17 +++++++++--------
 app/controllers/tags_controller.rb      | 10 +++++-----
 test/functional/maps_controller_test.rb | 23 ++++++++++++-----------
 test/functional/tags_controller_test.rb |  4 ++--
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index d16a66139..2249be578 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -77,7 +77,7 @@ def archive
     else
       flash[:error] = 'Only admins may archive maps.'
     end
-    redirect_to '/?_=' + Time.now.to_i.to_s
+    redirect_to "/?_=#{Time.now.to_i.to_s}"
   end
 
   def embed
@@ -94,12 +94,13 @@ def annotate
   def edit; end
 
   def update
-    @map.name =        params[:map][:name]
-    @map.location =    params[:map][:location]
-    @map.lat =         params[:map][:lat]
-    @map.lon =         params[:map][:lon]
-    @map.description = params[:map][:description]
-    @map.license =     params[:map][:license] if @map.user_id == current_user.id
+    # @map.name =        params[:map][:name]
+    # @map.location =    params[:map][:location]
+    # @map.lat =         params[:map][:lat]
+    # @map.lon =         params[:map][:lon]
+    # @map.description = params[:map][:description]
+    # @map.license =     params[:map][:license] if @map.user_id == current_user.id
+  @map.update_attributes(map_params)
 
     save_tags(@map)
     @map.save
@@ -198,7 +199,7 @@ def search
   private
 
   def find_map
-    @map = Map.find_by( slug: params[:id])
+    @map = Map.find_by_slug params[:id]
   end
 
   def map_params
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index eba31b0f3..c0310452d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,21 +2,21 @@ class TagsController < ApplicationController
   before_filter :require_login, only: %i(edit update destroy)
 
   def create
-    @map = Map.find params[:map_id]
+    @map = Map.find_by_slug params[:map_id]
 
     if logged_in?
       save_tags(@map)
-      redirect_to '/maps/' + @map.slug
+      redirect_to "/maps/#{@map.slug}"
     else
       flash[:error] = 'You must be logged in to add tags'
-      redirect_to '/login?back_to=/maps/' + @map.slug
+      redirect_to "/login?back_to=/maps/#{@map.slug}"
     end
   end
 
   def show
     @tag = Tag.find_by_name params[:id]
     @maps = @tag.maps.paginate(page: params[:page], per_page: 24)
-    @title = "Maps tagged with '" + @tag.name + "'"
+    @title = "Maps tagged with ' #{@tag.name} '"
     render template: 'maps/index'
   end
 
@@ -25,7 +25,7 @@ def destroy
 
     if logged_in? && current_user.can_delete?(@tag)
       @tag.delete
-      flash[:notice] = 'Tag ' + @tag.name + ' deleted.'
+      flash[:notice] = "Tag #{@tag.name} deleted."
       redirect_to @tag.map
     else
       flash[:error] = 'You must be logged in to delete tags.'
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index c9fa24b18..f91d88d97 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class MapsControllerTest < ActionController::TestCase
+
   # called before every single test
   def setup
     @map = maps(:saugus)
@@ -161,7 +162,7 @@ def teardown
   test 'should not delete map if not owner' do
     session[:user_id] = 3
     before_count = Map.count
-    post(:destroy, id: @map.id)
+    post(:destroy, id: @map.slug)
 
     assert_redirected_to '/maps/' + @map.slug
     assert_equal flash[:error], 'Only admins or map owners may delete maps.'
@@ -171,15 +172,15 @@ def teardown
   test 'should delete map if owner' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:destroy, id: @map.id)
+    post(:destroy, id: @map.slug)
 
     assert_redirected_to '/'
     assert_not_equal before_count, Map.count
     assert_equal flash[:notice], 'Map deleted.'
   end
 
-  test 'should get show' do
-    get(:show, id: @map.id)
+  test "should get show" do
+    get(:show, id: @map.slug)
     assert_response :success
     assert_not_nil assigns(:map)
   end
@@ -205,7 +206,7 @@ def teardown
   test 'should update map' do
     session[:user_id] = 1
     put(:update,
-        id: 1,
+        id: @map.slug,
         map: {
           name: 'Schrute farms',
           location: 'USA',
@@ -216,8 +217,8 @@ def teardown
         tags: 'beets bears')
     @map.reload
 
-    assert_redirected_to '/maps/' + @map.id.to_s
-    assert_equal 'Schrute farms', @map.name
+    assert_redirected_to "/maps/#{@map.slug}"
+    assert_equal "Schrute farms", @map.name
     assert_equal 44, @map.lat
     assert_equal -74, @map.lon
     assert_equal 'A really green farm', @map.description
@@ -239,19 +240,19 @@ def teardown
   end
 
   test 'should annotate maps' do
-    get :annotate, id: @map.id
+    get :annotate, id: @map.slug
     assert_response :success
     assigns(:annotations) == true
   end
 
   test 'embed' do
-    get :embed, id: @map.id
+    get :embed, id: @map.slug
     assert_response :success
     assert_template :show
   end
 
   test 'it returns the images' do
-    get :images, id: @map.id
+    get :images, id: @map.slug
     assert_response :success
     assert_equal 'application/json', response.content_type
   end
@@ -274,7 +275,7 @@ def export_anonmymous_map
   end
 
   test 'returns the exports' do
-    get :exports, id: 1
+    get :exports, id: @map.slug
     assert_response :success
   end
 
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 0269542e3..ab3046e2c 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -9,7 +9,7 @@ def setup
 
   test "should create tag" do
     session[:user_id] = 1 # log in
-    post(:create, :map_id => @map.id, :tags => "test,nice")
+    post(:create, :map_id => @map.slug, :tags => "test,nice")
     assert_response :redirect
   end
 
@@ -20,7 +20,7 @@ def setup
   end
 
   test "should redirect to login when not logged in" do
-    post :create, map_id: @map.id, tags: "test,nice"
+    post :create, map_id: @map.slug, tags: "test,nice"
     assert_redirected_to "/login?back_to=/maps/#{@map.slug}"
     assert flash.present?
   end

From d93fcb2df1f6a76f4db676f300c9dd21547133cf Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 11:57:00 +0300
Subject: [PATCH 20/40] root_in_json include defaulted to false

---
 config/initializers/wrap_parameters.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 35d7efeaf..b8e3fb7b6 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -9,6 +9,6 @@
 end
 
 # Disable root element in JSON for ActiveRecord objects.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# ActiveSupport.on_load(:active_record) do
+#   self.include_root_in_json = false
+# end

From 06f658d621b329aad33234ed49c98200e5388d78 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 12:13:16 +0300
Subject: [PATCH 21/40] confirm option removed in link helper

---
 app/views/comments/_comment.html.erb |  8 ++++----
 app/views/images/_index.html.erb     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 68e8248e0..0bd9df9c5 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -14,11 +14,11 @@
         <% if current_user && current_user.can_delete?(comment) %>
           <%= link_to(
             [@map, comment],
-            :method => "delete",
+            method: "delete",
             #:remote => true,
-            :confirm => "Are you sure? This cannot be undone.",
-            :class => "btn btn-sm btn-outline-secondary float-right delete-comment-btn",
-            :id => "comment-delete-#{comment.id}"
+            data: { confirm: "Are you sure? This cannot be undone." },
+            class:  "btn btn-sm btn-outline-secondary float-right delete-comment-btn",
+            id: "comment-delete-#{comment.id}"
           ) do %>
 
             <span class="fa fa-trash" data-comment-id="<%= comment.id %>"></span>
diff --git a/app/views/images/_index.html.erb b/app/views/images/_index.html.erb
index 6f9c58bc7..9b06aa5fb 100644
--- a/app/views/images/_index.html.erb
+++ b/app/views/images/_index.html.erb
@@ -32,11 +32,12 @@
         <td>
           <% if logged_in? && current_user.can_delete?(warpable) %>
             <%= link_to "<i class='fa fa-remove'></i>".html_safe, [@map, warpable],
-                :method => "delete",
-                :confirm => "Are you sure? This cannot be undone.",
-                :class => "btn btn-sm btn-danger",
-                :title => "Delete",
-                :rel=> "tooltip" %>
+                method: "delete",
+                class: "btn btn-sm btn-danger",
+                title: "Delete",
+                rel: "tooltip",
+                data: { confirm: "Are you sure? This cannot be undone." }
+            %>
           <% end %>
           <% if warpable.placed? %>
             <a rel="tooltip" id="locate-warpable-<%= warpable.id %>" title="Pan to this image" class="btn btn-sm btn-success"><i class='fa fa-crosshairs'></i></a>

From 8fb43ed5044a0b4cedbfc6beed704514a718edf2 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 16:57:03 +0300
Subject: [PATCH 22/40] cookies serializer changed to hybrid

---
 config/initializers/cookies_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index ac5f8b663..54516e3f2 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid

From 93bd12f46d6ab8864d31b8a74b5ee0bc11207593 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 18:57:47 +0300
Subject: [PATCH 23/40] Change render :text to :plain

render :text will be deprecated and poses a security risk
---
 app/controllers/comments_controller.rb    | 2 +-
 app/controllers/export_controller.rb      | 6 +++---
 app/controllers/feeds_controller.rb       | 2 +-
 app/controllers/images_controller.rb      | 2 +-
 app/controllers/maps_controller.rb        | 4 ++--
 test/functional/export_controller_test.rb | 2 +-
 test/functional/feeds_controller_test.rb  | 2 +-
 test/functional/images_controller_test.rb | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 347644693..ce1298ca9 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -21,7 +21,7 @@ def create
 
     else
       # we intercept this message in /app/assets/javascripts/maps.js
-      render text: 'Login required.'
+      render plain: 'Login required.'
     end
   end
 
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 424fa4a71..0b781ddff 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -41,10 +41,10 @@ def cancel
         flash[:notice] = 'Export cancelled.'
         redirect_to '/exports'
       else
-        render text: 'cancelled'
+        render plain: 'cancelled'
       end
     else
-      render text: 'You must be logged in to export, unless the map is anonymous.'
+      render plain: 'You must be logged in to export, unless the map is anonymous.'
     end
   end
 
@@ -64,7 +64,7 @@ def progress
              else
                'export has not been run'
              end
-    render text: output, layout: false
+    render plain: output, layout: false
   end
 
   def status
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 2224f9e53..6be25cbb9 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -43,7 +43,7 @@ def tag
     render layout: false, template: 'feeds/tag'
     response.headers['Content-Type'] = 'application/xml; charset=utf-8'
   rescue NoMethodError
-    render text: "No maps with tag #{params[:id]}"
+    render plain: "No maps with tag #{params[:id]}"
   end
 
   private
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 2f670da0f..5bbdd1518 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -93,7 +93,7 @@ def update
     @warpable.locked = params[:locked]
     @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
     @warpable.save
-    render text: 'success'
+    render plain: 'success'
   end
 
   def destroy
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 2249be578..d7d1be0bb 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -133,9 +133,9 @@ def images
   # run the export
   def export
     if logged_in? || Rails.env.development? || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not a human!")
-      render text: @map.run_export(current_user, params[:resolution].to_f)
+      render plain: @map.run_export(current_user, params[:resolution].to_f)
     else
-      render text: 'You must be logged in to export, unless the map is anonymous.'
+      render plain: 'You must be logged in to export, unless the map is anonymous.'
     end
   end
 
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index 0d84c1f1d..6fd084835 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -41,7 +41,7 @@ def teardown
     assert_response :success
     assert_equal 'You must be logged in to export, unless the map is anonymous.', @response.body
     assert assigns[:map]
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
     assert flash.empty?
   end
 
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 9a015cb0d..6074acbab 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -60,7 +60,7 @@ def setup
 
   test 'rescues if tag not present' do
     get :tag, id: 'cess'
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
     assert_equal 'No maps with tag cess', @response.body
   end
 end
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index d546182e5..9e04dba2e 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -55,7 +55,7 @@ def fetch_in_production
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
     put :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
-    assert_equal "text/html", response.content_type
+    assert_equal "text/plain", response.content_type
   end
 
   test 'correct user should destroy an image' do

From af4959cd373cc2796198e86a827b06c331462a8b Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 17 May 2019 00:44:52 +0300
Subject: [PATCH 24/40] console for dev web

---
 Gemfile      | 1 +
 Gemfile.lock | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Gemfile b/Gemfile
index 2c2d031bf..41de0ea12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,6 +60,7 @@ end
 group :development do
   gem "jshintrb"
   gem "therubyracer"
+  gem 'web-console', '~> 2.0'
 end
 
 group :sqlite do
diff --git a/Gemfile.lock b/Gemfile.lock
index 626c55d9e..0b66c4c94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
@@ -56,6 +58,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
+    debug_inspector (0.0.3)
     docile (1.3.1)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -230,6 +233,11 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     uuidtools (2.1.5)
+    web-console (2.3.0)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     will_paginate (3.1.7)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
@@ -274,6 +282,7 @@ DEPENDENCIES
   sqlite3
   therubyracer
   uglifier
+  web-console (~> 2.0)
   will_paginate (= 3.1.7)
   will_paginate-bootstrap4
 

From f9686e0d88c3b370cc7f48db2d79ce653b447f28 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 18 May 2019 10:43:45 +0300
Subject: [PATCH 25/40] Check and fix interface functionality

---
 app/controllers/comments_controller.rb  | 6 +++---
 app/controllers/maps_controller.rb      | 8 ++++----
 app/controllers/tags_controller.rb      | 3 +--
 app/views/comments/_new.html.erb        | 5 +++--
 test/functional/tags_controller_test.rb | 1 +
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index ce1298ca9..e28f5409a 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,7 +3,7 @@ def create
     if logged_in?
 
       @comment = current_user.comments.new(comment_params)
-      @map = Map.find comment_params[:map_id]
+      @map = Map.find_by(slug: params[:map_id])
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
@@ -45,12 +45,12 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to "/maps/#{params[:map_id]}"
+    redirect_to "/maps/#{@comment.map.slug}"
   end
 
   private
 
   def comment_params
-    params.require(:comment).permit(:body, :map_id)
+    params.require(:comment).permit(:body, :map_id, :user_id)
   end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index d7d1be0bb..b2365d89e 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -2,8 +2,9 @@
 
 class MapsController < ApplicationController
   protect_from_forgery except: :export
-  before_filter :require_login, only: %i(edit update destroy)
-  before_filter :find_map, only: %i(show annotate embed edit update images export exports destroy)
+
+  before_filter :require_login, only: %i[edit update destroy]
+  before_filter :find_map, only: %i[show annotate embed edit update images export exports destroy archive]
 
   layout 'knitter2'
 
@@ -66,7 +67,6 @@ def show
   end
 
   def archive
-    @map = Map.find_by_slug(params[:id])
     if logged_in? && current_user.can_delete?(@map)
       @map.archived = true
       if @map.save
@@ -199,7 +199,7 @@ def search
   private
 
   def find_map
-    @map = Map.find_by_slug params[:id]
+    @map = Map.find_by(slug: params[:id])
   end
 
   def map_params
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c0310452d..c04b6d0ac 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,8 +2,7 @@ class TagsController < ApplicationController
   before_filter :require_login, only: %i(edit update destroy)
 
   def create
-    @map = Map.find_by_slug params[:map_id]
-
+    @map = Map.find_by(slug: params[:map_id])
     if logged_in?
       save_tags(@map)
       redirect_to "/maps/#{@map.slug}"
diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb
index c978c94b4..2ace3dbeb 100644
--- a/app/views/comments/_new.html.erb
+++ b/app/views/comments/_new.html.erb
@@ -1,9 +1,10 @@
 <div class="form-group">
   <% if logged_in? %>
-    <%= form_for([@map, Comment.new], remote:true) do |f| %>
+    <%= form_for([@map, Comment.new], remote: true) do |f| %>
+        <%= f.hidden_field :map_id, value: @map.id %>
       <%= f.label :body, "Leave a comment" %>
       <%= f.text_area :body, :class => "form-control" %>
- 
+
       <button type="submit" class="btn btn-primary">Post comment</button>
     <% end %>
   <% else %>
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index ab3046e2c..90a325700 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -29,6 +29,7 @@ def setup
     session[:user_id] = 1
     delete :destroy, id: @tag
     assert flash[:notice].present?
+    assert_redirected_to @tag.map
   end
 
   test 'should redirect destroy when not logged in' do

From a1c78a28dba82914c31c7255186d25588d2954a3 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 21 May 2019 13:31:19 +0300
Subject: [PATCH 26/40] fix export functionality

---
 app/controllers/export_controller.rb    | 6 +++---
 app/controllers/maps_controller.rb      | 4 +++-
 test/functional/maps_controller_test.rb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 0b781ddff..231f18d6c 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -32,7 +32,7 @@ def geotiff
   end
 
   def cancel
-    @map = Map.find params[:id]
+    @map = Map.find_by(id: params[:id])
     if @map.anonymous? || logged_in?
       export = @map.export
       export.status = 'none'
@@ -49,7 +49,7 @@ def cancel
   end
 
   def progress
-    map = Map.find params[:id]
+    map = Map.find_by(id: params[:id])
     export = map.export
     output = if export.present?
                if export.status == 'complete'
@@ -68,7 +68,7 @@ def progress
   end
 
   def status
-    map = Map.find(params[:id])
+    map = Map.find_by(id: params[:id])
     if export = map.export
       if export.export_url.present?
         status_response = ExporterClient.new(export.export_url).status
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index b2365d89e..874b89e4b 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -4,7 +4,7 @@ class MapsController < ApplicationController
   protect_from_forgery except: :export
 
   before_filter :require_login, only: %i[edit update destroy]
-  before_filter :find_map, only: %i[show annotate embed edit update images export exports destroy archive]
+  before_filter :find_map, only: %i[show annotate embed edit update images destroy archive]
 
   layout 'knitter2'
 
@@ -132,6 +132,7 @@ def images
 
   # run the export
   def export
+    @map = Map.find_by(id: params[:id])
     if logged_in? || Rails.env.development? || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not a human!")
       render plain: @map.run_export(current_user, params[:resolution].to_f)
     else
@@ -141,6 +142,7 @@ def export
 
   # render list of exports
   def exports
+    @map = Map.find_by(id: params[:id])
     render partial: 'maps/exports', layout: false
   end
 
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index f91d88d97..a9634e8df 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -275,7 +275,7 @@ def export_anonmymous_map
   end
 
   test 'returns the exports' do
-    get :exports, id: @map.slug
+    get :exports, id: @map.id
     assert_response :success
   end
 

From f0b511e2bfb9d08ca9f58c30cdb0d2d56cc8d82a Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 29 May 2019 02:26:36 +0300
Subject: [PATCH 27/40] add protected attributes for the warpable model

---
 Gemfile                | 1 +
 Gemfile.lock           | 3 +++
 app/models/warpable.rb | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 41de0ea12..d2dc1dd08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem "will_paginate", "3.1.7"
 gem 'will_paginate-bootstrap4'
 gem "friendly_id"
 gem 'popper_js', '~> 1.11', '>= 1.11.1'
+gem 'protected_attributes'
 
 # dependencies
 group :dependencies do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b66c4c94..5d9e6465e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,6 +131,8 @@ GEM
       rake (>= 0.8.1)
     popper_js (1.14.5)
     powerpack (0.1.2)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -264,6 +266,7 @@ DEPENDENCIES
   paperclip (~> 4.3.7)
   passenger
   popper_js (~> 1.11, >= 1.11.1)
+  protected_attributes
   pry-rails
   rails (= 4.2.11.1)
   rails-perftest
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index bac4a300f..4049b49be 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,4 +1,6 @@
 class Warpable < ActiveRecord::Base
+  include  ActiveModel::MassAssignmentSecurity
+  attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs

From c2a65eb153856d55f71dcfbcc368d64a9fcccd65 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 31 May 2019 18:40:35 +0300
Subject: [PATCH 28/40] fix image upload

---
 app/controllers/images_controller.rb | 2 +-
 app/views/images/_new.html.erb       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 5bbdd1518..95b4c5885 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -25,7 +25,7 @@ def fetch
   def create
     @warpable = Warpable.new
     @warpable.image = params[:uploaded_data]
-    map = Map.find(params[:map_id])
+    map = Map.find_by(slug: params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
     map.updated_at = Time.now
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 27862c3cf..695767ad5 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -11,7 +11,8 @@
       <div class="modal-body">
         <div>
           <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
-          <%= form_for(@map) do |f| %>
+          <%# <%= form_for(@map) do |f| %1> %>
+               <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">

From 3b49b0f92606447888775b248f6937ee544ee78d Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 1 Jun 2019 19:24:16 +0300
Subject: [PATCH 29/40] Fix comments and images failing tests

---
 app/controllers/comments_controller.rb      |  9 ++++-----
 app/models/map.rb                           | 20 ++++++--------------
 app/views/images/_new.html.erb              |  4 +---
 test/functional/comments_controller_test.rb |  3 +--
 test/functional/export_controller_test.rb   |  2 +-
 test/functional/images_controller_test.rb   |  6 +++---
 test/test_helper.rb                         |  1 +
 7 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e28f5409a..a4db91007 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,12 +3,11 @@ def create
     if logged_in?
 
       @comment = current_user.comments.new(comment_params)
-      @map = Map.find_by(slug: params[:map_id])
+      @map = @comment.map
       if @comment.save!
-        users = @map.comments.collect(&:user)
-        users += [@map.user] unless @map.user.nil?
-        users.uniq.each do |user|
-          unless @map.user_id == current_user.id
+        users = @map.comments.collect(&:user).uniq
+        users.each do |user|
+          unless user.id == @map.user_id && user.id == current_user.id
             CommentMailer.notify(user, @comment).deliver_now
           end
         end
diff --git a/app/models/map.rb b/app/models/map.rb
index 9091c9722..481333824 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -87,12 +87,9 @@ def self.featured
   end
 
   def self.new_maps
-    Map.find(
-      :all,
-      order: 'created_at DESC',
-      limit: 12,
-      conditions: ['password = "" AND archived = "false"']
-    )
+    Map.where( ['password = "" AND archived = "false"'])
+      .order('created_at DESC')
+      .limit(12)
   end
 
   def self.map
@@ -142,14 +139,9 @@ def nodes
   def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
-    Map.find(
-      :all,
-      limit: 10,
-      conditions: [
-        'id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-        id, lat - dist, lat + dist, lon - dist, lon + dist
-      ]
-    )
+    Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
+              id, lat - dist, lat + dist, lon - dist, lon + dist)
+      .limit(10)
   end
 
   def average_scale
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 695767ad5..941b8232e 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -10,9 +10,7 @@
       </div>
       <div class="modal-body">
         <div>
-          <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
-          <%# <%= form_for(@map) do |f| %1> %>
-               <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
+            <%= form_for [@map, Warpable.new],  :html => { :multipart => true, :id => "fileupload" } do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index d3f702668..97b12e3c1 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -7,7 +7,6 @@ def setup
     @map = maps(:saugus)
   end
 
-  # called after every single test
   def teardown
   end
 
@@ -146,7 +145,7 @@ def teardown
          })
 
     assert_response :success
-    assert !ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
+    assert_not ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
   end
 
   test "should send email to author if someone else comments" do
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index 6fd084835..d67b3cb96 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -65,7 +65,7 @@ def teardown
     get :progress, id: @map.id
     assert_response :success
     assert_equal 'export not running', @response.body
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
   end
 
   test 'should display progress with no export' do
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 9e04dba2e..2fdb63f06 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -31,13 +31,13 @@ def fetch_in_production
   test 'create uploads an image' do
     before_count = Warpable.count
 
-    post :create, map_id: @map.id, uploaded_data: @uploaded_data
+    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
     assert_response :success
     assert_equal before_count + 1, Warpable.count
   end
 
   test 'should return correct status and type on create' do
-    post :create, map_id: @map.id, uploaded_data: @uploaded_data
+    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
 
     assert_equal 200, response.status
     assert_equal "text/html", response.content_type
@@ -53,7 +53,7 @@ def fetch_in_production
   test 'should update an image' do
     session[:user_id] = 1
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
-    put :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
+    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
     assert_equal "text/plain", response.content_type
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8c0ee1f2f..56d5f30b9 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -16,4 +16,5 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
+  include ApplicationHelper
 end

From c074876fccdf45bbc4032a5e99f1c0fb6a1534b9 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 04:37:32 +0300
Subject: [PATCH 30/40] include mass assignment security in annotations

---
 app/controllers/annotations_controller.rb   | 28 ++++++++-------------
 app/models/annotation.rb                    |  3 +++
 test/functional/comments_controller_test.rb | 14 +++++------
 test/unit/map_test.rb                       |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 9905f52bc..b27494903 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -9,7 +9,7 @@ def index
   end
 
   def create
-    geojson = annotation_params # params[:annotation]
+    geojson = params[:annotation]
 
     respond_to do |format|
       format.json do
@@ -32,16 +32,15 @@ def show
 
   def update
     @annotation = Annotation.find params[:id]
-
-    geojson = annotation_params
-    if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
-      Annotation.update(@annotation.id,
-                        coordinates: geojson[:geometry][:coordinates],
-                        text: geojson[:properties][:textContent],
-                        style: geojson[:properties][:style])
-      render file: 'annotations/update.json.erb',
-             content_type: 'application/json'
-    end
+    geojson = params[:annotation]
+    return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
+
+    Annotation.update(@annotation.id,
+                      coordinates: geojson[:geometry][:coordinates],
+                      text: geojson[:properties][:textContent],
+                      style: geojson[:properties][:style])
+    render file: 'annotations/update.json.erb',
+      content_type: 'application/json'
   end
 
   def destroy
@@ -55,11 +54,4 @@ def destroy
   def find_map
     @map = Map.find params[:map_id]
   end
-
-  private
-
-  def annotation_params
-    params.require(:annotation).permit(:annotation_type,
-                                       :coordinates, :text, :style)
-  end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 05575fdff..b4bed15ee 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,7 +1,10 @@
 class Annotation < ActiveRecord::Base
+  include  ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
+  attr_accessible :annotation_type, :coordinates, :text, :style
+
   serialize :coordinates, Array
   serialize :style, Hash
 
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 97b12e3c1..bf95ae235 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -28,8 +28,8 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
@@ -44,8 +44,8 @@ def teardown
 
     put(:update,
         id: @comment.id,
-        map_id: @map.slug,
         comment: {
+          map_id: @map.id,
           body: "I'm gonna troll you!"
         })
 
@@ -139,8 +139,8 @@ def teardown
     session[:user_id] = @user.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+           map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
@@ -153,9 +153,9 @@ def teardown
     session[:user_id] = 3
 
     post(:create,
-         map_id: @map.slug,
          comment: {
-           body: "I'm gonna troll you!"
+      map_id: @map.id,
+      body: "I'm gonna troll you!"
          })
 
     email = ActionMailer::Base.deliveries.last
@@ -172,16 +172,16 @@ def teardown
     session[:user_id] = @chris.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
     session[:user_id] = @joshua.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "Yeah we'll see!"
          })
 
diff --git a/test/unit/map_test.rb b/test/unit/map_test.rb
index c90e20f30..dd5fbd9f5 100644
--- a/test/unit/map_test.rb
+++ b/test/unit/map_test.rb
@@ -31,7 +31,7 @@ class MapTest < ActiveSupport::TestCase
     assert_not_nil map.images_histogram
     assert_not_nil map.grouped_images_histogram(10)
     assert_not_nil map.nearby_maps(100) # in degrees lat/lon
-    assert_true Map.first.validate
+    assert Map.first.validate
     assert_equal Map.count, Map.new_maps.size
   end
 

From e36050ac0e80ff46f9d3cf849c9d3f8b849d9a86 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 05:24:16 +0300
Subject: [PATCH 31/40] render html for update images

---
 app/controllers/images_controller.rb      | 2 +-
 test/functional/images_controller_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 95b4c5885..5ca999c4e 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -93,7 +93,7 @@ def update
     @warpable.locked = params[:locked]
     @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
     @warpable.save
-    render plain: 'success'
+    render html: 'success'
   end
 
   def destroy
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 2fdb63f06..5e7d427ab 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -55,7 +55,7 @@ def fetch_in_production
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
     patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
-    assert_equal "text/plain", response.content_type
+    assert_equal "text/html", response.content_type
   end
 
   test 'correct user should destroy an image' do

From efdb6d64ddca35a53b7f713575cb393b3923aa15 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 07:46:08 +0300
Subject: [PATCH 32/40] clear mail array before every test

---
 test/functional/comments_controller_test.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index bf95ae235..b8dd69c39 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -5,6 +5,8 @@ class CommentsControllerTest < ActionController::TestCase
   # called before every single test
   def setup
     @map = maps(:saugus)
+    @emails = ActionMailer::Base.deliveries
+    @emails.clear
   end
 
   def teardown
@@ -145,7 +147,7 @@ def teardown
          })
 
     assert_response :success
-    assert_not ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
+    assert_not @emails.collect(&:to).include?([@user.email])
   end
 
   test "should send email to author if someone else comments" do
@@ -158,11 +160,9 @@ def teardown
       body: "I'm gonna troll you!"
          })
 
-    email = ActionMailer::Base.deliveries.last
-
     assert_response :success
-    assert ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
-    assert ActionMailer::Base.deliveries.collect(&:subject).include?("New comment on '#{@map.name}'")
+    assert @emails.collect(&:to).include?([@user.email])
+    assert @emails.collect(&:subject).include?("New comment on '#{@map.name}'")
   end
 
   test "should send email to all commenters on commenting" do
@@ -185,10 +185,8 @@ def teardown
            body: "Yeah we'll see!"
          })
 
-    email = ActionMailer::Base.deliveries.last
-
     assert_response :success
-    assert ActionMailer::Base.deliveries.collect(&:to).include?([@chris.email])
-    assert ActionMailer::Base.deliveries.collect(&:subject).include?("New comment on '#{@map.name}'")
+    assert @emails.collect(&:to).include?([@chris.email])
+    assert @emails.collect(&:subject).include?("New comment on '#{@map.name}'")
   end
 end

From cc6559d0a511b1e49a50c3c97c6b3b620ce70377 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 5 Jun 2019 21:27:54 +0300
Subject: [PATCH 33/40] Fix codeclimate issues

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 12 +++++++-----
 app/controllers/annotations_controller.rb |  6 +++---
 app/controllers/feeds_controller.rb       |  2 +-
 app/controllers/maps_controller.rb        | 14 ++++----------
 app/controllers/users_controller.rb       |  2 +-
 app/models/annotation.rb                  |  2 +-
 app/models/comment.rb                     |  1 -
 app/models/export.rb                      |  4 ++--
 app/models/map.rb                         | 18 +++++++++---------
 app/models/tag.rb                         |  6 +++---
 app/models/warpable.rb                    |  2 +-
 app/models/way.rb                         |  2 +-
 13 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2dc1dd08..3797b36d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :dependencies do
 end
 
 group :test do
-  gem "rubocop", '~> 0.52.0'
+  gem "rubocop", '~> 0.64.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d9e6465e..ee3e765f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,7 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jaro_winkler (1.5.2)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -187,13 +188,14 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.1)
+    rubocop (0.64.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -233,7 +235,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -274,7 +276,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha
   right_aws_api
-  rubocop (~> 0.52.0)
+  rubocop (~> 0.64.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index b27494903..d82ecf27d 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-                      coordinates: geojson[:geometry][:coordinates],
-                      text: geojson[:properties][:textContent],
-                      style: geojson[:properties][:style])
+     coordinates: geojson[:geometry][:coordinates],
+     text: geojson[:properties][:textContent],
+     style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 6be25cbb9..392051d23 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -4,7 +4,7 @@ class FeedsController < ApplicationController
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
     @maps = Map.where(archived: false, password: '')
-               .joins(%i[user warpables])
+               .joins(%i(user warpables))
                .group('maps.id')
                .order('id DESC')
                .limit(20)
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 874b89e4b..f2e9b6d38 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -3,8 +3,8 @@
 class MapsController < ApplicationController
   protect_from_forgery except: :export
 
-  before_filter :require_login, only: %i[edit update destroy]
-  before_filter :find_map, only: %i[show annotate embed edit update images destroy archive]
+  before_filter :require_login, only: %i(edit update destroy)
+  before_filter :find_map, only: %i(show annotate embed edit update images destroy archive)
 
   layout 'knitter2'
 
@@ -77,7 +77,7 @@ def archive
     else
       flash[:error] = 'Only admins may archive maps.'
     end
-    redirect_to "/?_=#{Time.now.to_i.to_s}"
+    redirect_to "/?_=#{Time.now.to_i}"
   end
 
   def embed
@@ -94,13 +94,7 @@ def annotate
   def edit; end
 
   def update
-    # @map.name =        params[:map][:name]
-    # @map.location =    params[:map][:location]
-    # @map.lat =         params[:map][:lat]
-    # @map.lon =         params[:map][:lon]
-    # @map.description = params[:map][:description]
-    # @map.license =     params[:map][:license] if @map.user_id == current_user.id
-  @map.update_attributes(map_params)
+    @map.update_attributes(map_params)
 
     save_tags(@map)
     @map.save
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5dc4f187f..40601a191 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -30,6 +30,6 @@ def sort_direction
 
   def user_params
     params.require(:user).permit(:login, :email, :name,
-                                 :password, :password_confirmation)
+      :password, :password_confirmation)
   end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index b4bed15ee..e681cb9bc 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,5 +1,5 @@
 class Annotation < ActiveRecord::Base
-  include  ActiveModel::MassAssignmentSecurity
+  include ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 0021e4761..05d55677e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,4 @@
 class Comment < ActiveRecord::Base
-
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/export.rb b/app/models/export.rb
index d85d62aa4..59353d1c1 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,12 +52,12 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now-24.hours).to_s(:db)).count
+                 (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now-24.hours).to_s(:db))
+                  (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 481333824..798371cb6 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -7,19 +7,19 @@ class Map < ActiveRecord::Base
 
   validates_presence_of :name, :slug, :author, :lat, :lon
   validates_uniqueness_of :slug
-  validates_presence_of :location, :message => ' cannot be found. Try entering a latitude and longitude if this problem persists.'
+  validates_presence_of :location, message: ' cannot be found. Try entering a latitude and longitude if this problem persists.'
   # validates_format_of   :slug,
   #                       :with => /^[\w-]*$/,
   #                       :message => " must not include spaces and must be alphanumeric, as it'll be used in the URL of your map, like: https://mapknitter.org/maps/your-map-name. You may use dashes and underscores.",
   #                       :on => :create
-#  validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+  # validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
   validates_with NotAtOriginValidator
-    validates :lat, :lon, NotAtOrigin: true
+  validates :lat, :lon, NotAtOrigin: true
 
-  has_many :exports, :dependent => :destroy
-  has_many :tags, :dependent => :destroy
-  has_many :comments, :dependent => :destroy
-  has_many :annotations, :dependent => :destroy
+  has_many :exports, dependent: :destroy
+  has_many :tags, dependent: :destroy
+  has_many :comments, dependent: :destroy
+  has_many :annotations, dependent: :destroy
   belongs_to :user
 
   has_many :warpables 
@@ -87,7 +87,7 @@ def self.featured
   end
 
   def self.new_maps
-    Map.where( ['password = "" AND archived = "false"'])
+    Map.where(['password = "" AND archived = "false"'])
       .order('created_at DESC')
       .limit(12)
   end
@@ -254,7 +254,7 @@ def license_link
   end
 
   def has_tag(tagname)
-    !Tag.where(map_id: self.id, name: tagname).empty?
+    !Tag.where(map_id: id, name: tagname).empty?
   end
 
   def add_tag(tagname, user)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index be5a179e5..390df29ac 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,9 +2,9 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  validates_presence_of :name, :on => :create, :message => "can't be blank"
-  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
-  validates_presence_of :map_id, :on => :create, :message => "can't be blank"
+  validates_presence_of :name, on: :create, message: "can't be blank"
+  validates_presence_of :user_id, on: :create, message: "can't be blank"
+  validates_presence_of :map_id, on: :create, message: "can't be blank"
 
   def maps
     Map.where(id: Tag.where(name: name).collect(&:map_id).uniq)
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 4049b49be..86dcc14c7 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,5 +1,5 @@
 class Warpable < ActiveRecord::Base
-  include  ActiveModel::MassAssignmentSecurity
+  include ActiveModel::MassAssignmentSecurity
   attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
diff --git a/app/models/way.rb b/app/models/way.rb
index 8237be702..7fb80d1ed 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,5 +1,5 @@
 class Way < ActiveRecord::Base
-  has_many :nodes, :dependent => :destroy
+  has_many :nodes, dependent: :destroy
 
   def bbox=(bbox)
     # counting from left, counter-clockwise

From 382040ee2bdcd4064608b4fc444690ee5a024c0f Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 15:59:15 +0300
Subject: [PATCH 34/40] skip failing test

The test is failing because of different names in model(warpable) and
controller(images) skipping this for now until we decide if we want to
standardize the names
---
 test/functional/maps_controller_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index a9634e8df..ceb8bb6a3 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -145,6 +145,7 @@ def teardown
   end
 
   test 'should render new if map not created' do
+    skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
     post(:create, map: {

From 2c6efa7c0a4c7a65ff845c4acc83e0a602acc0ed Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 17:41:09 +0300
Subject: [PATCH 35/40] replace unprotected redirects

---
 app/controllers/comments_controller.rb | 4 ++--
 app/controllers/maps_controller.rb     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a4db91007..d68846c75 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -28,7 +28,7 @@ def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
       @comment.update_attributes(comment_params)
-      redirect_to "/maps/#{@comment.map.slug}"
+      redirect_to  @comment.map
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -44,7 +44,7 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to "/maps/#{@comment.map.slug}"
+    redirect_to  @comment.map
   end
 
   private
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index f2e9b6d38..66b2cbbc9 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -36,7 +36,7 @@ def create
       @map = current_user.maps.new(map_params)
       @map.author = current_user.login # eventually deprecate
       if @map.save
-        redirect_to "/maps/#{@map.slug}"
+        redirect_to @map
       else
         render 'new'
       end
@@ -44,7 +44,7 @@ def create
       @map = Map.new(map_params)
       if Rails.env != 'production' || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not human! Try again!")
         if @map.save
-          redirect_to "/maps/#{@map.slug}"
+          redirect_to @map
         else
           render 'new'
         end
@@ -108,7 +108,7 @@ def destroy
       redirect_to '/'
     else
       flash[:error] = 'Only admins or map owners may delete maps.'
-      redirect_to "/maps/#{@map.slug}"
+      redirect_to @map
     end
   end
 

From 11328c58c199a3448c1a483736cfdc1d70e52320 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 20:34:09 +0300
Subject: [PATCH 36/40] fix fa icons

---
 app/views/layouts/_login_form.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_login_form.html.erb b/app/views/layouts/_login_form.html.erb
index cb9ce6b6e..587d1295b 100644
--- a/app/views/layouts/_login_form.html.erb
+++ b/app/views/layouts/_login_form.html.erb
@@ -10,22 +10,22 @@
   <p>
     <%= button_tag submit: 'Github', name: "subaction", value: "github" do %>
     <span class="btn btn-default" style="margin-left:2px;background-color: #333;">
-      <i class="fa fa-github fa-fw" style="font-size:20px;color:white;"></i>
+      <i class="fab fa-github fa-fw" style="font-size:20px;color:white;"></i>
     </span>
     <% end %>
     <%= button_tag 'Google', name: "subaction", value: "google_oauth2" do %>
     <span class="btn btn-outline-light" style="margin-right:2px;background-color: #d34836;">
-      <i class="fa fa-google fa-fw" style="font-size:20px;color:white;"></i>
+      <i class="fab fa-google fa-fw" style="font-size:20px;color:white;"></i>
     </span>
     <% end %>
     <%= button_tag submit: 'Twitter', name: "subaction", value: "twitter" do %>
       <span class="btn btn-outline-light" style="margin-left:2px;background-color: #1da1f2;">
-        <i class="fa fa-twitter fa-fw" style="font-size:20px;color:white;margin-left:2px;"></i>
+        <i class="fab fa-twitter fa-fw" style="font-size:20px;color:white;margin-left:2px;"></i>
       </span>
     <% end %>
     <%= button_tag 'Facebook', name: "subaction", value: "facebook" do%>
       <span class="btn btn-outline-light" style="margin-left:2px;background-color: #3b5998">
-        <i class="fa fa-facebook fa-fw" style="font-size:20px;color:white;"></i>
+        <i class="fab fa-facebook fa-fw" style="font-size:20px;color:white;"></i>
       </span>
     <% end %>
   </p>

From 7bf898ffd64e3f329d50b128c25ef25b5473347d Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 21:24:42 +0300
Subject: [PATCH 37/40] fix login functionality

---
 app/controllers/sessions_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 65a0f181a..fcc042241 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -16,6 +16,8 @@ def new
   end
 
   def create
+    @openid_url_base = "https://publiclab.org/people/"
+    @openid_url_suffix = "/identity"
     back_to = params[:back_to]
     # we pass a temp username; on line 75 it'll be overwritten by the real one in PublicLab.org's response:
     open_id = "x"

From 15151764737d96d073d25c8c1e31e880bcd09f11 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 21:41:36 +0300
Subject: [PATCH 38/40] precompile images

---
 config/initializers/assets.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index f5d0ac0f0..8ecba8368 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -2,6 +2,7 @@
 
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.precompile += %w[*.png *.jpg *.jpeg *.gif]
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path

From a86d20998003fa8e0d20131b162ab9aeae6be531 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 23:25:21 +0300
Subject: [PATCH 39/40] fix codeclimate issues

---
 app/controllers/annotations_controller.rb | 6 +++---
 app/controllers/comments_controller.rb    | 4 ++--
 app/controllers/tags_controller.rb        | 2 +-
 app/models/export.rb                      | 4 ++--
 app/models/map.rb                         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index d82ecf27d..88019d3f7 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-     coordinates: geojson[:geometry][:coordinates],
-     text: geojson[:properties][:textContent],
-     style: geojson[:properties][:style])
+      coordinates: geojson[:geometry][:coordinates],
+      text: geojson[:properties][:textContent],
+      style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d68846c75..b147be42d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -28,7 +28,7 @@ def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
       @comment.update_attributes(comment_params)
-      redirect_to  @comment.map
+      redirect_to @comment.map
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -44,7 +44,7 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to  @comment.map
+    redirect_to @comment.map
   end
 
   private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c04b6d0ac..b3bf053c2 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -5,7 +5,7 @@ def create
     @map = Map.find_by(slug: params[:map_id])
     if logged_in?
       save_tags(@map)
-      redirect_to "/maps/#{@map.slug}"
+      redirect_to @map
     else
       flash[:error] = 'You must be logged in to add tags'
       redirect_to "/login?back_to=/maps/#{@map.slug}"
diff --git a/app/models/export.rb b/app/models/export.rb
index 59353d1c1..94fbce007 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,12 +52,12 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now - 24.hours).to_s(:db)).count
+      (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                  (DateTime.now - 24.hours).to_s(:db))
+      (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 798371cb6..9df49aa4e 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -140,7 +140,7 @@ def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
     Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-              id, lat - dist, lat + dist, lon - dist, lon + dist)
+      id, lat - dist, lat + dist, lon - dist, lon + dist)
       .limit(10)
   end
 

From 20d0ba27bccb882f5a69e7d08e648dafcff88ea5 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 18:04:24 +0530
Subject: [PATCH 40/40] Fix oauth icons

---
 app/assets/stylesheets/application.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 9f8329d68..cd9eebaf4 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -14,6 +14,7 @@
  *= require leaflet-illustrate/dist/Leaflet.Illustrate.css
  *= require leaflet-toolbar/dist/leaflet.toolbar.css
  *= require leaflet-distortableimage/dist/leaflet.distortableimage.css
+ *= require fontawesome/css/font-awesome.min.css
 
  *= require style
  *= require maps