Merge pull request #189 from kbrock/rubocops

fix rubocops

Author: Fryguy

lib/active_record/virtual_attributes/virtual_arel.rb

@@ -117,4 +117,3 @@ def define_virtual_arel(name, arel) # :nodoc:
     end
   end
 end
-

lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -83,6 +83,7 @@ def define_virtual_delegate(method_name, col, options)
         end
 
         # see activesupport module/delegation.rb
+        # rubocop:disable Style/TernaryParentheses
         def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil) # rubocop:disable Naming/MethodParameterName
           location = caller_locations(2, 1).first
           file, line = location.path, location.lineno
@@ -128,6 +129,7 @@ def #{method_name}(#{definition})
           method_def = method_def.split("\n").map(&:strip).join(';')
           module_eval(method_def, file, line)
         end
+        # rubocop:enable Style/TernaryParentheses
 
         def virtual_delegate_name_prefix(prefix, to) # rubocop:disable Naming/MethodParameterName
           "#{prefix == true ? to : prefix}_" if prefix

lib/active_record/virtual_attributes/virtual_fields.rb

@@ -143,7 +143,7 @@ class Base
 
   module Associations
     class Preloader
-      prepend(Module.new {
+      prepend(Module.new do
         # preloader is called with virtual attributes - need to resolve
         def call
           # Possibly overkill since all records probably have the same class and associations
@@ -165,13 +165,14 @@ def call
             end
           end
         end
-      })
+      end)
 
       class Branch
-        prepend(Module.new {
+        prepend(Module.new do
           # from branched.rb 7.0
           # not going to modify rails code for rubocops
           # rubocop:disable Lint/AmbiguousOperatorPrecedence
+          # rubocop:disable Layout/EmptyLineAfterGuardClause
           def grouped_records
             h = {}
             polymorphic_parent = !root? && parent.polymorphic?
@@ -186,6 +187,7 @@ def grouped_records
             end
             h
           end
+          # rubocop:enable Layout/EmptyLineAfterGuardClause
           # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
@@ -209,13 +211,13 @@ def preloaders_for_reflection(reflection, reflection_records)
               preloader_for(reflection).new(rhs_klass, rs, reflection, scope, reflection_scope, associate_by_default)
             end
           end
-        })
+        end)
       end
     end
   end
 
   class Relation
-    include(Module.new {
+    include(Module.new do
       # From ActiveRecord::QueryMethods (rails 5.2 - 6.1)
       def build_select(arel)
         if select_values.any?
@@ -246,6 +248,6 @@ def construct_join_dependency(associations, join_type) # :nodoc:
         associations = klass.replace_virtual_fields(associations) || {}
         super
       end
-    })
+    end)
   end
 end

lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -5,7 +5,6 @@ module VirtualReflections
       include ActiveRecord::VirtualAttributes::VirtualIncludes
 
       module ClassMethods
-
         #
         # Definition
         #

spec/db/models.rb

@@ -1,12 +1,12 @@
-class VirtualTotalTestBase < ActiveRecord::Base
+class VirtualTotalTestBase < ActiveRecord::Base  # rubocop:disable Rails/ApplicationRecord
   self.abstract_class = true
 
   include VirtualFields
 end
 
 class Author < VirtualTotalTestBase
   # basically a :parent_id relationship
-  belongs_to :teacher, :foreign_key => :teacher_id, :class_name => "Author"
+  belongs_to :teacher, :class_name => "Author"
   has_many :students, :foreign_key => :teacher_id, :class_name => "Author"
   has_many :books
   has_many :ordered_books,   -> { ordered },   :class_name => "Book"

spec/support/database.rb

@@ -6,15 +6,13 @@ class Database
   VALID_ADAPTERS = %w[sqlite3 postgresql mysql2].freeze
 
   def self.adapter
-    # Handle missing and short-form DB values
-    case ENV['DB']
-    when nil, "sqlite" then ENV['DB'] = "sqlite3"
-    when "pg"          then ENV['DB'] = "postgresql"
-    when "mysql"       then ENV['DB'] = "mysql2"
+    case ENV.fetch('DB', "sqlite")
+    when "sqlite", "sqlite3" then ENV['DB'] = "sqlite3"
+    when "pg", "postgresql"  then ENV['DB'] = "postgresql"
+    when "mysql", "mysql2"   then ENV['DB'] = "mysql2"
+    else
+      raise "ENV['DB'] value invalid, must be one of: #{VALID_ADAPTERS.join(", ")}"
     end
-    raise "ENV['DB'] value invalid, must be one of: #{VALID_ADAPTERS.join(", ")}" unless VALID_ADAPTERS.include?(ENV['DB'])
-
-    ENV['DB']
   end
 
   attr_accessor :dirname

spec/virtual_attributes_spec.rb

@@ -871,9 +871,9 @@ def lc
     end
 
     it "distinct orders by has_one with an order clause" do
-      Author.all.order(:id).each_with_index do |author, i|
+      Author.order(:id).each_with_index do |author, i|
         author.photos.create(:description => "photo#{i}") # ignored photo
-        author.photos.create(:description => "photo#{5-i}") # reverse order
+        author.photos.create(:description => "photo#{5 - i}") # reverse order
       end
 
       expect(Author.select(Arel.star, :current_photo_description).distinct.order(:current_photo_description)).to eq(authors.reverse)

spec/virtual_delegates_spec.rb

@@ -34,7 +34,7 @@
     Author.create(:name => "c2", :teacher_id => p.id)
 
     ret = Author.select(:name, :teacher_teacher_name, :teacher_name).order(:id).where(:teacher_id => p.id)
-    expect(ret.map { |c| [c.teacher_teacher_name, c.teacher_name, c.name]}).to eq([["grand", "parent", "c1"],["grand", "parent", "c2"]])
+    expect(ret.map { |c| [c.teacher_teacher_name, c.teacher_name, c.name] }).to eq([["grand", "parent", "c1"], ["grand", "parent", "c2"]])
   end
 
   context "invalid" do
@@ -45,7 +45,7 @@
     end
 
     it "expects a ':type' for delegation" do
-      expect(ActiveRecord::VirtualAttributes.deprecator).to receive(:warn).with(/type/, anything())
+      expect(ActiveRecord::VirtualAttributes.deprecator).to receive(:warn).with(/type/, anything)
       TestClass.virtual_delegate :col1, :to => :ref1
       TestClass.new
     end
@@ -146,7 +146,7 @@
   context "with has_one and order (and many records)" do
     before do
       # OperatingSystem (child)
-      class TestOtherClass < ActiveRecord::Base
+      class TestOtherClass < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
         def self.connection
           TestClassBase.connection
         end
@@ -176,7 +176,7 @@ def self.connection
 
   context "with relation in foreign table" do
     before do
-      class TestOtherClass < ActiveRecord::Base
+      class TestOtherClass < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
         def self.connection
           TestClassBase.connection
         end