Update code using rubocop's autocorrect linter

Author: tarebyte

Rakefile

@@ -1,10 +1,11 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path("../config/application", __FILE__)
 
 Rake.application.options.trace = true
 
 Gitscm::Application.load_tasks
-

app/controllers/about_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AboutController < ApplicationController
 
   def index

app/controllers/application_controller.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 PageNotFound = Class.new(Exception)
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :determine_os
 
-  rescue_from PageNotFound, :with => :page_not_found
+  rescue_from PageNotFound, with: :page_not_found
 
   # Mac, Windows, Linux are valid
   def determine_os
-    @os = 'linux'
+    @os = "linux"
   end
 
   def set_title(title)
@@ -18,7 +20,7 @@ def set_title(title)
   private
 
   def page_not_found
-    render :file => not_found_template, :layout => false
+    render file: not_found_template, layout: false
   end
 
   def not_found_template

app/controllers/blog_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class BlogController < ApplicationController
 end

app/controllers/books_controller.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class BooksController < ApplicationController
   before_filter :book_resource, only: [:section, :chapter]
 
   def show
     lang = params[:lang] || "en"
     if edition = params[:edition]
-      @book = Book.where(:code => lang, :edition => edition).first
+      @book = Book.where(code: lang, edition: edition).first
     else
-      @book = Book.where(:code => lang).order("percent_complete DESC, edition DESC").first
+      @book = Book.where(code: lang).order("percent_complete DESC, edition DESC").first
       raise PageNotFound unless @book
       redirect_to "/book/#{lang}/v#{@book.edition}"
     end
@@ -15,18 +17,18 @@ def show
 
   def link
     link = params[:link]
-    @book = Book.where(:code => params[:lang], :edition => params[:edition]).first
+    @book = Book.where(code: params[:lang], edition: params[:edition]).first
     raise PageNotFound unless @book
-    xref = @book.xrefs.where(:name => link).first
+    xref = @book.xrefs.where(name: link).first
     raise PageNotFound unless xref
     return redirect_to "/book/#{@book.code}/v#{@book.edition}/#{ERB::Util.url_encode(xref.section.slug)}##{xref.name}" unless @content
   end
 
   def section
-    @content = @book.sections.where(:slug => params[:slug]).first
+    @content = @book.sections.where(slug: params[:slug]).first
     if !@content
-      @book = Book.where(:code => @book.code, :edition => 1).first
-      if @content = @book.sections.where(:slug => params[:slug]).first
+      @book = Book.where(code: @book.code, edition: 1).first
+      if @content = @book.sections.where(slug: params[:slug]).first
         return redirect_to "/book/#{@book.code}/v#{@book.edition}/#{params[:slug]}"
       else
         return redirect_to "/book/#{@book.code}"
@@ -45,18 +47,18 @@ def chapter
     chapter = params[:chapter].to_i
     section = params[:section].to_i
     lang = params[:lang] || "en"
-    chapter = @book.chapters.where(:number => chapter).first
-    @content = chapter.sections.where(:number => section).first
+    chapter = @book.chapters.where(number: chapter).first
+    @content = chapter.sections.where(number: section).first
     raise PageNotFound unless @content
     return redirect_to "/book/#{lang}/v2/#{@content.slug}"
   end
 
   def book_resource
     if edition = params[:edition]
-      @book ||= Book.where(:code => (params[:lang] || "en"), :edition => edition).first
+      @book ||= Book.where(code: (params[:lang] || "en"), edition: edition).first
     else
       @no_edition = true
-      @book ||= Book.where(:code => (params[:lang] || "en")).order("percent_complete DESC, edition DESC").first
+      @book ||= Book.where(code: (params[:lang] || "en")).order("percent_complete DESC, edition DESC").first
     end
     raise PageNotFound unless @book
     @book

app/controllers/community_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CommunityController < ApplicationController
 
   def index

app/controllers/doc_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DocController < ApplicationController
 
   before_filter :set_caching
@@ -30,7 +32,7 @@ def videos
 
   def watch
     slug = params[:id]
-    @video = Gitscm::VIDEOS.select{|a| a[4] == slug}.first
+    @video = Gitscm::VIDEOS.select { |a| a[4] == slug }.first
     if !@video
       redirect_to :videos
     end
@@ -42,11 +44,11 @@ def ext
   private
 
   def set_caching
-    expires_in 10.minutes, :public => true
+    expires_in 10.minutes, public: true
   end
 
   def set_book
-    @book ||= Book.where(:code => (params[:lang] || "en")).order("percent_complete, edition DESC").first
+    @book ||= Book.where(code: (params[:lang] || "en")).order("percent_complete, edition DESC").first
     raise PageNotFound unless @book
   end
 

app/controllers/downloads_controller.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class DownloadsController < ApplicationController
 
   def index
   end
 
   def latest
     latest = Version.latest_version.name
-    render :text => latest
+    render text: latest
   end
 
   def guis
     guis_info = GuiPresenter.instance.guis_info
 
-    render "downloads/guis/index", :locals => {:guis_info => guis_info}
+    render "downloads/guis/index", locals: {guis_info: guis_info}
   end
 
   def logos
@@ -20,25 +22,25 @@ def logos
 
   def gui
     @platform = params[:platform]
-    @platform = 'windows' if @platform == 'win'
+    @platform = "windows" if @platform == "win"
 
     guis_info = GuiPresenter.instance.guis_info
 
-    render "downloads/guis/index", :locals => {:guis_info => guis_info}
+    render "downloads/guis/index", locals: {guis_info: guis_info}
   end
 
   def download
     @platform = params[:platform]
-    @platform = 'windows' if @platform == 'win'
-    if @platform == 'mac'
+    @platform = "windows" if @platform == "win"
+    if @platform == "mac"
       @project_url = "https://sourceforge.net/projects/git-osx-installer/"
       @source_url   = "https://github.com/git/git/"
 
       @download = Download.latest_for(@platform)
       @latest = Version.latest_version
 
       render "downloads/downloading"
-    elsif @platform == 'windows'
+    elsif @platform == "windows"
       @project_url = "https://git-for-windows.github.io/"
       @source_url = "https://github.com/git-for-windows/git"
 
@@ -57,12 +59,12 @@ def download
       end
 
       render "downloads/download_windows"
-    elsif @platform == 'linux'
+    elsif @platform == "linux"
       render "downloads/download_linux"
     else
-      redirect_to '/downloads'
+      redirect_to "/downloads"
     end
   rescue
-    redirect_to '/downloads'
+    redirect_to "/downloads"
   end
 end

app/controllers/site_controller.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 class SiteController < ApplicationController
 
   def index
-    expires_in 10.minutes, :public => true
+    expires_in 10.minutes, public: true
 
     @section    = "home"
     @subsection = ""
   end
 
   def search
-    @term = sname = params['search'].to_s.downcase
+    @term = sname = params["search"].to_s.downcase
     @data = search_term(sname)
-    render :partial => 'shared/search'
+    render partial: "shared/search"
   end
 
   def search_results
-    @term = sname = params['search'].to_s.downcase
+    @term = sname = params["search"].to_s.downcase
     data = search_term(sname, true)
     @top = []
     @rest = []
@@ -29,20 +31,20 @@ def search_results
     end
     @top.sort! { |a, b| b[:score] <=> a[:score] }
     @rest.sort! { |a, b| b[:score] <=> a[:score] }
-    render "results"
+    render "site/results"
   end
 
   def search_term(sname, highlight = false)
     data = {
-      :term => sname,
-      :results => []
+      term: sname,
+      results: []
     }
 
     if results = Doc.search(sname)
       data[:results] << results
     end
 
-    if results = Section.search(sname, :lang => 'en')
+    if results = Section.search(sname, lang: "en")
       data[:results] << results
     end
 
@@ -57,8 +59,8 @@ def redirect_wgibtx
   end
 
   def redirect_book
-    current_uri = request.env['PATH_INFO']
-    if current_uri == '/'
+    current_uri = request.env["PATH_INFO"]
+    if current_uri == "/"
       redirect_to "https://git-scm.com/book"
     else
       redirect_to "https://git-scm.com#{current_uri}"

app/helpers/application_helper.rb

@@ -1,4 +1,6 @@
-require 'iso8601'
+# frozen_string_literal: true
+
+require "iso8601"
 
 module ApplicationHelper
 
@@ -13,7 +15,7 @@ def sidebar_link_options(section)
   end
 
   def random_tagline
-    content_tag(:em, '-' * 2) + Gitscm::TAGLINES.sample
+    content_tag(:em, "-" * 2) + Gitscm::TAGLINES.sample
   end
 
   def latest_version
@@ -26,19 +28,19 @@ def latest_version
   end
 
   def latest_mac_installer
-    @mac_installer ||= Download.latest_for 'mac'
-    @mac_installer ? @mac_installer.version.name : ''
+    @mac_installer ||= Download.latest_for "mac"
+    @mac_installer ? @mac_installer.version.name : ""
   end
 
   def latest_win_installer
-    @win_installer ||= Download.latest_for 'windows32'
-    @win_installer ? @win_installer.version.name : ''
+    @win_installer ||= Download.latest_for "windows32"
+    @win_installer ? @win_installer.version.name : ""
   end
 
   def latest_release_date
     begin
     @version ||= Version.latest_version
-    '(' + @version.committed.strftime("%Y-%m-%d") + ')'
+    "(" + @version.committed.strftime("%Y-%m-%d") + ")"
     rescue
       ""
     end

app/helpers/books_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module BooksHelper
 end

app/helpers/doc_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module DocHelper
 
   def man(name, text = nil)
-    link_to text || name.gsub(/^git-/, ''), doc_file_path(:file => name)
+    link_to text || name.gsub(/^git-/, ""), doc_file_path(file: name)
   end
 
   def linkify(content, section)
     next_page = section.next_slug
     prev_page = section.prev_slug
-    content.gsub('[[nav-next]]', next_page).gsub('[[nav-prev]]', prev_page)
+    content.gsub("[[nav-next]]", next_page).gsub("[[nav-prev]]", prev_page)
   end
 end

app/helpers/site_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SiteHelper
   def highlight_no_html(high)
     strip_tags(high.to_s)
-      .gsub('[highlight]', '<span class="highlight">')
-      .gsub('[xhighlight]', '</span>')
+      .gsub("[highlight]", '<span class="highlight">')
+      .gsub("[xhighlight]", "</span>")
   end
 
   def rchart(title, data, extra = nil)
@@ -36,11 +38,11 @@ def trchart(title, data, extra = nil)
 
 
   def gchart(title, data)
-    labels = data.map {|v| v[0] }
-    vals = data.map {|v| v[1] }
-    
-    v = vals.join(',')
-    l = labels.join('|')
+    labels = data.map { |v| v[0] }
+    vals = data.map { |v| v[1] }
+
+    v = vals.join(",")
+    l = labels.join("|")
 
     scale = vals.max
     c = "<img src=\"https://chart.googleapis.com/chart?"

app/models/book.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # t.string      :code
 # t.timestamps
-class Book < ActiveRecord::Base
+class Book < ApplicationRecord
   has_many :chapters
-  has_many :sections, :through => :chapters
+  has_many :sections, through: :chapters
   has_many :xrefs
 
   def has_edition(number)
-    Book.where(:edition => number, :code => self.code).count > 0
+    Book.where(edition: number, code: self.code).count > 0
   end
 end