Merge branch 'master' into upgrade-rails-5.2

Author: yhirano55

.circleci/config.yml

@@ -0,0 +1,54 @@
+version: 2
+
+jobs:
+  build:
+    parallelism: 3
+    working_directory: ~/rails_contributors
+    docker:
+      - image: circleci/ruby:2.4-node
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          BUNDLE_PATH: vendor/bundle
+          PGHOST: 127.0.0.1
+          PGUSER: postgres
+          RAILS_ENV: test
+      - image: circleci/postgres:9.5-alpine
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: rails_contributors_test
+          POSTGRES_PASSWORD: ""
+    steps:
+      - run:
+          name: Install dependencies
+          command: sudo apt-get install -y git cmake pkg-config curl
+      - checkout
+      - run:
+          name: Cloning rails.git
+          command: git clone --mirror https://github.com/rails/rails.git
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - restore_cache:
+          keys:
+            - v1-bundle-{{ checksum "Gemfile.lock" }}
+            - v1-bundle-
+      - run:
+          name: Bundle install
+          command: bundle check || bundle install
+      - save_cache:
+          key: v1-bundle-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Coping database.yml
+          command: cp config/database.yml.example config/database.yml
+      - run:
+          name: Wait for DB
+          command: dockerize -wait tcp://localhost:5432 -timeout 1m
+      - run:
+          name: Database setup
+          command: bin/rails db:schema:load --trace
+      - run:
+          name: Run test
+          command: bin/rails test

Capfile

@@ -7,3 +7,4 @@ install_plugin Capistrano::SCM::Git
 require 'capistrano/rvm'
 require 'capistrano/rails'
 require 'capistrano/puma'
+install_plugin Capistrano::Puma

Gemfile

@@ -4,6 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gem 'rails', '~> 5.2.0'
 gem 'pg'
+gem 'puma', '~> 3.7'
 gem 'rugged', '0.27.0'
 gem 'unf'
 gem 'turbolinks', '~> 5'
@@ -20,19 +21,18 @@ end
 group :development do
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
-  gem 'capistrano', '~> 3.10',      require: false
-  gem 'capistrano-rails', '~> 1.1', require: false
-  gem 'capistrano-rvm', '0.1.1',    require: false
-  gem 'capistrano3-puma', '~> 1.0', require: false
-  gem 'rbnacl', '>= 3.2', '< 5.0'
-  gem 'rbnacl-libsodium'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 group :test do
   gem 'rails-controller-testing'
 end
 
-group :production do
-  gem 'puma', '~> 3.7'
+group :deployment do
+  gem 'capistrano', '~> 3.10',      require: false
+  gem 'capistrano-rails', '~> 1.1', require: false
+  gem 'capistrano-rvm', '0.1.1',    require: false
+  gem 'capistrano3-puma', '~> 3.1', require: false
+  gem 'rbnacl', '>= 3.2', '< 5.0'
+  gem 'rbnacl-libsodium'
+  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end

Gemfile.lock

@@ -71,9 +71,10 @@ GEM
     capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano3-puma (1.2.1)
-      capistrano (~> 3.0)
-      puma (>= 2.6)
+    capistrano3-puma (3.1.1)
+      capistrano (~> 3.7)
+      capistrano-bundler
+      puma (~> 3.4)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -208,7 +209,7 @@ DEPENDENCIES
   capistrano (~> 3.10)
   capistrano-rails (~> 1.1)
   capistrano-rvm (= 0.1.1)
-  capistrano3-puma (~> 1.0)
+  capistrano3-puma (~> 3.1)
   coffee-rails (~> 4.2.1)
   listen (>= 3.0.5, < 3.2)
   pg

app/controllers/application_controller.rb

@@ -62,7 +62,10 @@ def set_time_constraints
     ichiro        |
     discobot      |
     bingbot       |
-    yrspider
+    FAST          |
+    MauiBot       |
+    yrspider      |
+    SemrushBot
   }xi
   def trace_user_agent
     if request.user_agent =~ BOTS_REGEXP

app/models/contributor.rb

@@ -1,15 +1,14 @@
 class Contributor < ApplicationRecord
-  has_many :contributions, :dependent => :destroy
-  has_many :commits, :through => :contributions
+  has_many :contributions, dependent: :destroy
+  has_many :commits, through: :contributions
 
-  validates :name,   :presence => true, :uniqueness => true
-  validates :url_id, :presence => true, :uniqueness => true
+  validates :name,   presence: true, uniqueness: true
+  validates :url_id, presence: true, uniqueness: true
 
   nfc :name
 
   scope :with_no_commits, -> {
-    joins('LEFT OUTER JOIN contributions ON contributors.id = contributions.contributor_id').
-    where('contributions.commit_id' => nil)
+    left_joins(:contributions).where(contributions: { commit_id: nil })
   }
 
   def self.all_with_ncommits

app/models/names_manager/canonical_names.rb

@@ -162,7 +162,7 @@ def self.map(canonical_name, *also_as)
     map 'Alexey Zatsepin',            'alexey', 'Alexey'
     map 'Aliaksey Kandratsenka',      'Aleksey Kondratenko'
     map 'Aliaxandr Rahalevich',       'saksmlz', 'saks'
-    map 'Alvaro Pereyra',             'Xenda'
+    map 'Alessandra Pereyra',         'Xenda'
     map 'Amit Kumar Suroliya',        'amitkumarsuroliya'
     map 'Anand Muthukrishnan',        'Anand'
     map 'Anatoli Makarevich',         'Anatoly Makarevich'

config/application.rb

@@ -17,6 +17,8 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+require './lib/bot_killer'
+
 module RailsContributors
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
@@ -26,5 +28,7 @@ class Application < Rails::Application
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
     # the framework and any gems in your application.
+
+    config.middleware.insert 0, BotKiller
   end
 end

config/deploy.rb

@@ -11,3 +11,6 @@
 set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets public/system public/assets rails.git}
 
 set :keep_releases, 5
+
+set :bundle_without, %w{development test deployment}.join(' ')
+set :bundle_gemfile, -> { release_path.join('Gemfile') }

config/deploy/production.rb

@@ -3,7 +3,7 @@
 
 set :puma_bind, 'unix:/tmp/rails-contributors.sock'
 set :puma_preload_app, false
-set :puma_workers, 2
+set :puma_workers, 1
 
 namespace :deploy do
   after :normalize_assets, :gzip_assets do