From 71aa05bb0e58cce4126f04ad2ca882550678ca17 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Tue, 27 Jun 2017 14:58:49 +0200
Subject: [PATCH] refactor

---
 Dockerfile.production             |  2 +-
 Gemfile                           |  6 +++---
 Gemfile.lock                      | 18 +++++++-----------
 app/models/tag.rb                 |  2 +-
 config/environments/production.rb |  7 +------
 config/secrets.yml                |  4 ++--
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Dockerfile.production b/Dockerfile.production
index 5b82281e2..f6fc6a76f 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -1,4 +1,4 @@
-FROM ruby:2.3.3
+FROM ruby:2.4.1
 MAINTAINER BioSistemika <info@biosistemika.com>
 
 # additional dependecies
diff --git a/Gemfile b/Gemfile
index f7b15775b..7577cb5f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,9 +61,9 @@ gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
 gem 'delayed_paperclip'
 gem 'rubyzip'
 
-gem 'paperclip', '~> 4.3' # File attachment, image attachment library
-gem 'aws-sdk', '~> 2.2.8'
-gem 'aws-sdk-v1'
+gem 'paperclip', '~> 5.1' # File attachment, image attachment library
+gem 'aws-sdk', '~> 2'
+
 gem 'delayed_job_active_record'
 gem 'devise-async'
 gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
diff --git a/Gemfile.lock b/Gemfile.lock
index 99c347f92..418ded2c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,9 +71,6 @@ GEM
       jmespath (~> 1.0)
     aws-sdk-resources (2.2.37)
       aws-sdk-core (= 2.2.37)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -193,7 +190,7 @@ GEM
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
     mini_portile2 (2.2.0)
     minitest (5.10.2)
     minitest-reporters (1.1.14)
@@ -216,12 +213,12 @@ GEM
       nokogiri
     oj (2.18.5)
     orm_adapter (0.5.0)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
     parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
@@ -372,8 +369,7 @@ DEPENDENCIES
   auto_strip_attributes (~> 2.1)
   autosize-rails
   awesome_print
-  aws-sdk (~> 2.2.8)
-  aws-sdk-v1
+  aws-sdk (~> 2)
   base62
   bcrypt (~> 3.1.10)
   better_errors
@@ -409,7 +405,7 @@ DEPENDENCIES
   nested_form_fields
   newrelic_rpm
   nokogiri
-  paperclip (~> 4.3)
+  paperclip (~> 5.1)
   pg
   puma
   rails (= 5.1.1)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index b937696c4..2e86e2d9d 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,4 +1,4 @@
-class Tag <ApplicationRecord
+class Tag < ApplicationRecord
   include SearchableModel
 
   auto_strip_attributes :name, :color, nullify: false
diff --git a/config/environments/production.rb b/config/environments/production.rb
index a6485ce69..5ee6a1484 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -46,10 +46,6 @@ Rails.application.configure do
   # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = 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?
-
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
@@ -124,7 +120,7 @@ Rails.application.configure do
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
+  if ENV['RAILS_LOG_TO_STDOUT'].present?
     logger           = ActiveSupport::Logger.new(STDOUT)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
@@ -156,7 +152,6 @@ Rails.application.configure do
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-
   # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
   # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
   # `config/secrets.yml.key`.
diff --git a/config/secrets.yml b/config/secrets.yml
index 95be2004e..9705af649 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -57,11 +57,11 @@ common: &common
 # ======================================================================
 
 development:
-  secret_key_base: 22f2adf8f5cb73351da28f2292daa840cc2a414ae00ae605b175a8d5c73932f7e5b8ff8ef8f1554a7f1064f9869b15347f7709f0daa6ccb24c50f3cace304f64
+  secret_key_base: <%= ENV["DEVELOPMENT_KEY_BASE"] %>
   <<: *common
 
 test:
-  secret_key_base: f3719934e04fa8871cf5d33d5c60f05e1b8995e0315265aef9f8b878da49bd2d386eb25ce35545b469a94ccf22f91e0052b93a15194b4f57b0c8d6ce8b150e1e
+  secret_key_base: <%= ENV["TEST_KEY_BASE"] %>
   <<: *common
 
 production: