diff --git a/.rubocop.yml b/.rubocop.yml index 7d174e5..087e03e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,3 @@ -Metrics/LineLength: - Max: 120 - Documentation: Enabled: false diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 261b08d..199840c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,6 +13,6 @@ class ApplicationController < ActionController::Base end def render_404 - render 'errors/not_found', status: :not_found + render "errors/not_found", status: :not_found end end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index ec46137..e565129 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -2,11 +2,11 @@ class CategoriesController < ApplicationController # GET /categories # GET /categories.xml def index - @categories = Category.order('sort ASC').page(params[:page]).per(4) + @categories = Category.order("sort ASC").page(params[:page]).per(4) - @photos = Photo.featured.limit(2).order('RANDOM()') + @photos = Photo.featured.limit(2).order("RANDOM()") - @page_title = 'Portfolio' + @page_title = "Portfolio" @num_blank = 4 - @categories.length diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb index d352acf..ff7a060 100644 --- a/app/controllers/contacts_controller.rb +++ b/app/controllers/contacts_controller.rb @@ -1,16 +1,16 @@ class ContactsController < ApplicationController def new @contact = Contact.new(id: 1) - @page_title = 'Contact' + @page_title = "Contact" end def create @contact = Contact.new(params[:contact]) if @contact.valid? Notifier.contact_notification(@contact).deliver - redirect_to(:new_contact, notice: t('contact.thanks')) + redirect_to(:new_contact, notice: t("contact.thanks")) else - flash[:alert] = t('contact.invalid') + flash[:alert] = t("contact.invalid") render :new end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 07e608b..401ddac 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,5 +1,5 @@ class HomeController < ApplicationController def index - @photos = Photo.featured.order('RANDOM()').limit(1) + @photos = Photo.featured.order("RANDOM()").limit(1) end end diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index ee002c2..104106f 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -25,6 +25,6 @@ class PhotosController < ApplicationController def all @photos = Photo.enabled.order(taken_at: :desc) .page(params[:page]) - @page_title = 'All Photos' + @page_title = "All Photos" end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 1ed7758..7f27d79 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,5 +1,5 @@ class SessionsController < ApplicationController - layout 'admin/login' + layout "admin/login" skip_before_action :require_login, only: [:new, :create], raise: false diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb index 008c2ec..06af44d 100644 --- a/app/validators/email_validator.rb +++ b/app/validators/email_validator.rb @@ -2,6 +2,6 @@ class EmailValidator < ActiveModel::EachValidator def validate_each(object, attribute, value) return if value =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i - object.errors[attribute] << (options[:message] || 'is not valid') + object.errors[attribute] << (options[:message] || "is not valid") end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9b3768c..fc279de 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,10 +7,10 @@ - <%= stylesheet_link_tag 'application' %> - <%= javascript_include_tag 'application' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> <%= render "shared/fonts" %> - <%= favicon_link_tag 'favicon.ico' %> + <%= favicon_link_tag "favicon.ico" %> <%= csrf_meta_tags %> @@ -23,7 +23,7 @@