added rubocop and some code optimization

Author: pradeep-systango

.gitignore

@@ -29,3 +29,6 @@
 # Ignore master key for decrypting credentials and more.
 /config/master.key
 /config/database.yml
+.scannerwork
+.rubocop.yml
+.vscode

Gemfile

@@ -51,6 +51,8 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem "rename"
   gem "letter_opener"
+  gem 'rubocop'
+  gem 'rubocop-performance'
 end
 
 group :test do
@@ -75,4 +77,4 @@ gem 'jquery-rails'
 gem 'bootstrap', '~> 4.1.0'
 gem 'active_model_serializers'
 gem 'grape-active_model_serializers'
-gem "font-awesome-rails"
+gem "font-awesome-rails"

Gemfile.lock

@@ -52,6 +52,7 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
+    ast (2.4.0)
     autoprefixer-rails (8.3.0)
       execjs
     axiom-types (0.1.1)
@@ -152,6 +153,7 @@ GEM
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     io-like (0.3.0)
+    jaro_winkler (1.5.2)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
@@ -190,6 +192,9 @@ GEM
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
     pg (1.0.0)
     popper_js (1.12.9)
     pry (0.11.3)
@@ -226,6 +231,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
     rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -237,6 +243,16 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-performance (1.1.0)
+      rubocop (>= 0.67.0)
+    ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -282,6 +298,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.10)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.5.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -330,6 +347,8 @@ DEPENDENCIES
   puma (~> 3.11)
   rails (~> 5.2.0)
   rename
+  rubocop
+  rubocop-performance
   sass-rails (~> 5.0)
   selenium-webdriver
   spring
@@ -343,4 +362,4 @@ RUBY VERSION
    ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.2
+   1.16.6

app/controllers/admin/admins_controller.rb

@@ -1,9 +1,7 @@
 class Admin::AdminsController <  Admin::BaseController
-
   before_action :set_admin
 
-  def change_password
-  end
+  def change_password; end
 
   def update_password
     if @admin.update_with_password(admin_params)

app/controllers/admin/dashboard_controller.rb

@@ -1,7 +1,7 @@
 class Admin::DashboardController < Admin::BaseController
   before_action :authenticate_admin!
 
-  def index 
+  def index
     @users = User.all
   end
 end

app/controllers/api/v1/defaults.rb

@@ -9,7 +9,7 @@ module Defaults
         helpers do
           def authenticate!
             begin
-              decoded_token = JWT.decode params[:user][:access_token], Rails.application.credentials.development[:api_hmac_secret], true, { :algorithm => 'HS256' }
+              JWT.decode params[:user][:access_token], Rails.application.credentials.development[:api_hmac_secret], true, { :algorithm => 'HS256' }
               @access_token = AccessToken.where(token: params[:user][:access_token]).first
               if @access_token.present?
                 @current_user = @access_token.user

app/controllers/api/v1/users.rb

@@ -3,6 +3,8 @@ module V1
     class Users < API::V1::Base
       include API::V1::Defaults
 
+      AUTH_DESCRIPTION = "Authorization key".freeze
+
       helpers do
         def generate_access_token_for_user(user_id)
           @access_token = AccessToken.create(user_id: user_id)
@@ -18,7 +20,7 @@ def logout_from_existing_session(user_id)
         desc "Login for user.", {
           headers: {
             "Authorization" => {
-              description: "Authorization key",
+              description: AUTH_DESCRIPTION,
               required: true
             }
           }
@@ -42,7 +44,7 @@ def logout_from_existing_session(user_id)
         desc "Signup user", {
           headers: {
             "Authorization" => {
-              description: "Authorization key",
+              description: AUTH_DESCRIPTION,
               required: true
             }
           }
@@ -64,7 +66,7 @@ def logout_from_existing_session(user_id)
         desc "Logout user", {
           headers: {
             "Authorization" => {
-              description: "Authorization key",
+              description: AUTH_DESCRIPTION,
               required: true
             }
           }

app/controllers/home_controller.rb

@@ -1,4 +1,3 @@
 class HomeController < ApplicationController
-  def index
-  end
+  def index; end
 end

app/controllers/users_controller.rb

@@ -1,7 +1,6 @@
 class UsersController < ApplicationController
   before_action :authenticate_user!
 
-  def show
-  end
+  def show; end
 
 end

config/database.yml

@@ -3,7 +3,7 @@ default: &default
   host: localhost
   encoding: utf8
   username: postgres  # Change it to your username
-  password: 123456    # Change it to your password
+  password: postgres    # Change it to your password
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_04_24_083654) do
+ActiveRecord::Schema.define(version: 2019_02_18_131410) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -23,6 +23,23 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "admins", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.inet "current_sign_in_ip"
+    t.inet "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_admins_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false

public/404.html

@@ -18,37 +18,36 @@
     margin: 4em auto 0;
   }
 
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
   .rails-default-error-page div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #BBB;
     border-top: #B00100 solid 4px;
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
     padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  .rails-default-error-page h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
   }
 
   .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
+  }
+
+  .rails-default-error-page div.dialog > div, .rails-default-error-page div.dialog > p {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>

public/422.html

@@ -18,37 +18,36 @@
     margin: 4em auto 0;
   }
 
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
   .rails-default-error-page div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #BBB;
     border-top: #B00100 solid 4px;
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
     padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  .rails-default-error-page h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
   }
 
   .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
+  }
+
+  .rails-default-error-page div.dialog > div, .rails-default-error-page div.dialog > p {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>

public/500.html

@@ -18,37 +18,36 @@
     margin: 4em auto 0;
   }
 
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
   .rails-default-error-page div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #BBB;
     border-top: #B00100 solid 4px;
     border-top-left-radius: 9px;
     border-top-right-radius: 9px;
     background-color: white;
     padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  .rails-default-error-page h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
   }
 
   .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
     border-bottom-color: #999;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
     border-top-color: #DADADA;
     color: #666;
+  }
+
+  .rails-default-error-page div.dialog > div, .rails-default-error-page div.dialog > p {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
   </style>