Merge pull request #1815 from dubadub/making-rubocop-happy

Fix code-styling issues from .rubocop_todo.yml

* re: RuboCop: Bulk minor style corrections

* re: RuboCop - hash indention corrections

* re: RuboCop - replace rocket style hashes

* re: RuboCop - get rid of redundant curly braces around a hash parameter

* re: RuboCop - Align the elements of a hash literal if they span more than one line.

* re: RuboCop - Use nested module/class definition instead of compact style.

* re: RuboCop - Suppress of handling LoadError for optional dependencies

* re: RuboCop - use include_ prefix instead of has_

* re: RuboCop - Disable Style/PredicateName rule for public API methods

* re: RuboCop - Remove empty .rubocop_todo.yml

* re: RuboCop - replace rocket style hashes

Author: bf4

.rubocop.yml

@@ -1,7 +1,5 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.1
   Exclude:
     - config/initializers/forbidden_yaml.rb
     - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
@@ -46,7 +44,7 @@ Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
 Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
+  EnforcedStyle: nested
 
 Style/Documentation:
   Enabled: false

.rubocop_todo.yml

@@ -5,7 +5,7 @@ rescue LoadError
 end
 begin
   require 'simplecov'
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
 Bundler::GemHelper.install_tasks
@@ -33,7 +33,7 @@ end
 begin
   require 'rubocop'
   require 'rubocop/rake_task'
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 else
   Rake::Task[:rubocop].clear if Rake::Task.task_defined?(:rubocop)
   require 'rbconfig'
@@ -100,4 +100,4 @@ else
 end
 
 desc 'CI test task'
-task :ci => [:default]
+task ci: [:default]

Rakefile

@@ -23,31 +23,31 @@ Gem::Specification.new do |spec|
 
   rails_versions = ['>= 4.1', '< 6']
   spec.add_runtime_dependency 'activemodel', rails_versions
-    # 'activesupport', rails_versions
-    # 'builder'
+  # 'activesupport', rails_versions
+  # 'builder'
 
   spec.add_runtime_dependency 'actionpack', rails_versions
-    # 'activesupport', rails_versions
-    # 'rack'
-    # 'rack-test', '~> 0.6.2'
+  # 'activesupport', rails_versions
+  # 'rack'
+  # 'rack-test', '~> 0.6.2'
 
   spec.add_runtime_dependency 'railties', rails_versions
-    # 'activesupport', rails_versions
-    # 'actionpack', rails_versions
-    # 'rake', '>= 0.8.7'
+  # 'activesupport', rails_versions
+  # 'actionpack', rails_versions
+  # 'rake', '>= 0.8.7'
 
   # 'activesupport', rails_versions
-    # 'i18n,
-    # 'tzinfo'
-    # 'minitest'
-    # 'thread_safe'
+  # 'i18n,
+  # 'tzinfo'
+  # 'minitest'
+  # 'thread_safe'
 
   spec.add_runtime_dependency 'jsonapi', '~> 0.1.1.beta2'
 
   spec.add_development_dependency 'activerecord', rails_versions
-    # arel
-    # activesupport
-    # activemodel
+  # arel
+  # activesupport
+  # activemodel
 
   # Soft dependency for pagination
   spec.add_development_dependency 'kaminari', ' ~> 0.16.3'

active_model_serializers.gemspec

@@ -19,12 +19,13 @@ def serialization_scope(scope)
     end
 
     def serialization_scope
-      send(_serialization_scope) if _serialization_scope &&
-        respond_to?(_serialization_scope, true)
+      return unless _serialization_scope && respond_to?(_serialization_scope, true)
+
+      send(_serialization_scope)
     end
 
     def get_serializer(resource, options = {})
-      if !use_adapter?
+      unless use_adapter?
         warn 'ActionController::Serialization#use_adapter? has been removed. '\
           "Please pass 'adapter: false' or see ActiveSupport::SerializableResource.new"
         options[:adapter] = false

lib/action_controller/serialization.rb

@@ -125,10 +125,9 @@ def initialize(object, options = {})
       self.root = instance_options[:root]
       self.scope = instance_options[:scope]
 
-      scope_name = instance_options[:scope_name]
-      if scope_name && !respond_to?(scope_name)
-        define_singleton_method scope_name, lambda { scope }
-      end
+      return if !(scope_name = instance_options[:scope_name]) || respond_to?(scope_name)
+
+      define_singleton_method scope_name, -> { scope }
     end
 
     def success?

lib/active_model/serializer.rb

@@ -1,9 +1,12 @@
 require 'active_model/serializer/collection_serializer'
-class ActiveModel::Serializer
-  class ArraySerializer < CollectionSerializer
-    class << self
-      extend ActiveModelSerializers::Deprecate
-      deprecate :new, 'ActiveModel::Serializer::CollectionSerializer.'
+
+module ActiveModel
+  class Serializer
+    class ArraySerializer < CollectionSerializer
+      class << self
+        extend ActiveModelSerializers::Deprecate
+        deprecate :new, 'ActiveModel::Serializer::CollectionSerializer.'
+      end
     end
   end
 end

lib/active_model/serializer/array_serializer.rb

@@ -39,7 +39,7 @@ def inherited(base)
         # @example
         #  has_many :comments, serializer: CommentSummarySerializer
         #
-        def has_many(name, options = {}, &block)
+        def has_many(name, options = {}, &block) # rubocop:disable Style/PredicateName
           associate(HasManyReflection.new(name, options, block))
         end
 
@@ -61,7 +61,7 @@ def belongs_to(name, options = {}, &block)
         # @example
         #  has_one :author, serializer: AuthorSerializer
         #
-        def has_one(name, options = {}, &block)
+        def has_one(name, options = {}, &block) # rubocop:disable Style/PredicateName
           associate(HasOneReflection.new(name, options, block))
         end
 

lib/active_model/serializer/associations.rb

@@ -1,10 +1,14 @@
-class ActiveModel::Serializer::ErrorSerializer < ActiveModel::Serializer
-  # @return [Hash<field_name,Array<error_message>>]
-  def as_json
-    object.errors.messages
-  end
+module ActiveModel
+  class Serializer
+    class ErrorSerializer < ActiveModel::Serializer
+      # @return [Hash<field_name,Array<error_message>>]
+      def as_json
+        object.errors.messages
+      end
 
-  def success?
-    false
+      def success?
+        false
+      end
+    end
   end
 end

lib/active_model/serializer/error_serializer.rb

@@ -1,27 +1,32 @@
 require 'active_model/serializer/error_serializer'
-class ActiveModel::Serializer::ErrorsSerializer
-  include Enumerable
-  delegate :each, to: :@serializers
-  attr_reader :object, :root
 
-  def initialize(resources, options = {})
-    @root = options[:root]
-    @object = resources
-    @serializers = resources.map do |resource|
-      serializer_class = options.fetch(:serializer) { ActiveModel::Serializer::ErrorSerializer }
-      serializer_class.new(resource, options.except(:serializer))
-    end
-  end
+module ActiveModel
+  class Serializer
+    class ErrorsSerializer
+      include Enumerable
+      delegate :each, to: :@serializers
+      attr_reader :object, :root
 
-  def success?
-    false
-  end
+      def initialize(resources, options = {})
+        @root = options[:root]
+        @object = resources
+        @serializers = resources.map do |resource|
+          serializer_class = options.fetch(:serializer) { ActiveModel::Serializer::ErrorSerializer }
+          serializer_class.new(resource, options.except(:serializer))
+        end
+      end
 
-  def json_key
-    nil
-  end
+      def success?
+        false
+      end
 
-  protected
+      def json_key
+        nil
+      end
 
-  attr_reader :serializers
+      protected
+
+      attr_reader :serializers
+    end
+  end
 end