Shrine added; Avatar feature added (#576)

* Shrine added; Avatar feature added

Author: Vladimir Bazhanov

.gitignore

@@ -1,14 +1,15 @@
+._*
 .bundle
+.env
+.pryrc
+.sass-cache
+coverage/*
 db/*.sqlite3
+doc/**/*
 log/*.log
-tmp/*
-coverage/*
+public/uploads
 rerun.txt
-doc/**/*
+tmp/*
 vendor/bundle
 vendor/cache
 vendor/ruby
-.sass-cache
-._*
-.env
-.pryrc

.rubocop.yml

@@ -64,6 +64,9 @@ Style/StringMethods:
 Metrics/LineLength:
   Max: 120
 
+Metrics/MethodLength:
+  Max: 16
+
 Metrics/BlockLength:
   Enabled: false
 

Gemfile

@@ -7,9 +7,11 @@ gem "rails", "5.2.4.3"
 
 # assets
 gem "autoprefixer-rails"
+gem "aws-sdk-s3"
 gem "coffee-rails"
 gem "foundation-icons-sass-rails"
 gem "foundation-rails"
+gem "image_processing"
 gem "premailer-rails"
 gem "sass-rails", "~> 5.0.0", ">= 5.0.6"
 gem "uglifier", ">= 2.7.2"
@@ -45,6 +47,7 @@ gem "rack-mini-profiler", require: false, git: "https://github.com/MiniProfiler/
 gem "responders"
 gem "rollbar"
 gem "seedbank"
+gem "shrine"
 gem "stackprof"
 
 group :staging, :production do

Gemfile.lock

@@ -64,6 +64,22 @@ GEM
     autoprefixer-rails (6.7.4)
       execjs
     awesome_print (1.7.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.327.0)
+    aws-sdk-core (3.98.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.33.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.67.1)
+      aws-sdk-core (~> 3, >= 3.96.1)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.4)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -81,13 +97,14 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     byebug (9.0.6)
-    capybara (2.12.1)
+    capybara (3.32.2)
       addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
     choice (0.2.0)
     cliver (0.3.2)
     codeclimate-test-reporter (0.6.0)
@@ -105,6 +122,7 @@ GEM
       execjs
       json
     concurrent-ruby (1.1.6)
+    content_disposition (1.0.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -127,6 +145,8 @@ GEM
     dotenv-rails (2.7.5)
       dotenv (= 2.7.5)
       railties (>= 3.2, < 6.1)
+    down (5.1.1)
+      addressable (~> 2.5)
     draper (4.0.1)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
@@ -149,7 +169,7 @@ GEM
     ffi (1.9.25)
     flamegraph (0.9.5)
     formatador (0.2.5)
-    formulaic (0.4.0)
+    formulaic (0.4.1)
       activesupport
       capybara
       i18n
@@ -184,6 +204,9 @@ GEM
     htmlentities (4.3.4)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    image_processing (1.11.0)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     inky-rb (1.3.7.5)
       foundation_emails (~> 2)
       nokogiri
@@ -195,6 +218,7 @@ GEM
       rake
     jasmine-core (3.5.0)
     jasmine-jquery-rails (2.0.3)
+    jmespath (1.4.0)
     json (2.0.3)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
@@ -232,6 +256,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     msgpack (1.3.3)
@@ -265,7 +291,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (4.0.1)
+    public_suffix (4.0.5)
     puma (4.3.5)
       nio4r (~> 2.0)
     pundit (1.1.0)
@@ -315,6 +341,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
+    regexp_parser (1.7.1)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.0)
@@ -357,6 +384,8 @@ GEM
       rubocop (>= 0.42.0)
     ruby-graphviz (1.2.2)
     ruby-progressbar (1.8.1)
+    ruby-vips (2.0.17)
+      ffi (~> 1.9)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sass (3.4.25)
@@ -374,6 +403,9 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (4.1.2)
       activesupport (>= 4.2.0)
+    shrine (3.2.1)
+      content_disposition (~> 1.0)
+      down (~> 5.1)
     simple_form (5.0.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
@@ -440,8 +472,8 @@ GEM
     websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -450,6 +482,7 @@ DEPENDENCIES
   active_link_to
   autoprefixer-rails
   awesome_print
+  aws-sdk-s3
   bootsnap
   brakeman
   bullet
@@ -475,6 +508,7 @@ DEPENDENCIES
   google-analytics-rails
   guard-rspec
   health_check
+  image_processing
   inky-rb
   interactor
   jasmine (> 2.0)
@@ -506,6 +540,7 @@ DEPENDENCIES
   scss_lint
   seedbank
   shoulda-matchers
+  shrine
   simple_form
   slim
   slim-rails

app/models/user.rb

@@ -1,4 +1,6 @@
 class User < ApplicationRecord
+  include AvatarUploader::Attachment(:avatar)
+
   devise :database_authenticatable, :registerable, :confirmable,
     :recoverable, :rememberable, :trackable, :validatable, :lockable
 

app/sanitizers/user/parameter_sanitizer.rb

@@ -1,16 +1,25 @@
 class User
   class ParameterSanitizer < Devise::ParameterSanitizer
-    USER_PARAMS = %i[
+    SIGN_UP_PARAMS = %i[
       full_name
       email
       password
       password_confirmation
     ].freeze
 
+    ACCOUNT_UPDATE_PARAMS = %i[
+      full_name
+      email
+      avatar
+      remove_avatar
+      password
+      password_confirmation
+    ].freeze
+
     def initialize(*)
       super
-      permit(:sign_up, keys: USER_PARAMS)
-      permit(:account_update, keys: USER_PARAMS)
+      permit(:sign_up, keys: SIGN_UP_PARAMS)
+      permit(:account_update, keys: ACCOUNT_UPDATE_PARAMS)
     end
   end
 end

app/uploaders/avatar_uploader.rb

@@ -0,0 +1,9 @@
+class AvatarUploader < Shrine
+  MAX_AVATAR_FILE_SIZE = 5 * 1024 * 1024
+
+  Attacher.validate do
+    validate_size 1..MAX_AVATAR_FILE_SIZE
+    validate_mime_type %w[image/jpeg image/png]
+    validate_extension %w[jpg jpeg png]
+  end
+end

app/views/users/registrations/edit.html.slim

@@ -2,13 +2,12 @@
   .columns
     h2 = title("Edit #{current_user.full_name}")
 
-.row
-  .medium-5.columns
-    = simple_form_for resource,
-        as: resource_name,
-        url: registration_path(resource_name),
-        html: { method: :put } do |f|
-
+= simple_form_for resource,
+  as: resource_name,
+  url: registration_path(resource_name),
+  html: { method: :put } do |f|
+  .row
+    .medium-5.columns
       .form-inputs
         = f.input :full_name, required: true, autofocus: true
         = f.input :email, required: true
@@ -17,17 +16,25 @@
             required: false
         = f.input :password_confirmation,
             required: false
-
       .form-actions
-        = f.button :submit, "Update"
+          = f.button :submit, "Update"
+
+    .medium-5.columns
+      .form-inputs
+        - if resource.avatar
+          = image_tag resource.avatar_url
+
+          = f.input :remove_avatar, as: :boolean
+
+        = f.hidden_field :avatar, value: resource.cached_avatar_data
+        = f.input :avatar
 
-  .medium-5.medium-offset-1.columns.end
-    h6
-      b Cancel my account
-    p
-      | Unhappy?
-      '
-      = link_to "Cancel my account.",
-          registration_path(resource_name),
-          data: { confirm: "Are you sure?" },
-          method: :delete
+      h6
+        b Cancel my account
+      p
+        | Unhappy?
+        '
+        = link_to "Cancel my account.",
+            registration_path(resource_name),
+            data: { confirm: "Are you sure?" },
+            method: :delete

config/application.rb

@@ -1,6 +1,11 @@
 require_relative "boot"
 
-require "rails/all"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+require "active_job/railtie"
+require "sprockets/railtie"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

config/environments/development.rb

@@ -27,9 +27,6 @@
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
-
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 

config/environments/test.rb

@@ -28,9 +28,6 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Store uploaded files on the local file system in a temporary directory
-  config.active_storage.service = :test
-
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.