Fix rubocop

Author: MaximeRVY

lib/grape-swagger/entity/helper.rb

@@ -1,13 +1,36 @@
 module GrapeSwagger
   module Entity
+    # Helper methods for DRY
     class Helper
-      def self.model_name(entity_model, endpoint)
-        if endpoint.nil?
-          entity_model.to_s.demodulize
-        else
-          endpoint.send(:expose_params_from_model, entity_model)
+      class << self
+        def model_name(entity_model, endpoint)
+          if endpoint.nil?
+            entity_model.to_s.demodulize
+          else
+            endpoint.send(:expose_params_from_model, entity_model)
+          end
+        end
+
+        def discriminator(entity_model)
+          entity_model.superclass.root_exposures.detect do |value|
+            value.documentation.try(:[], :is_discriminator)
+          end
+        end
+
+        def root_exposures_without_parent(entity_model)
+          entity_model.root_exposures.select do |value|
+            entity_model.superclass.root_exposures.find_by(value.attribute).nil?
+          end
+        end
+
+        def root_exposure_with_discriminator(entity_model)
+          if discriminator(entity_model)
+            root_exposures_without_parent(entity_model)
+          else
+            entity_model.root_exposures
+          end
         end
       end
     end
   end
-end
+end

lib/grape-swagger/entity/parser.rb

@@ -26,13 +26,7 @@ def initialize(original, renamed)
       end
 
       def extract_params(exposure)
-        root_exposures =
-          if discriminator(exposure)
-            root_exposures_without_parent(exposure)
-          else
-            exposure.root_exposures
-          end
-        root_exposures.each_with_object({}) do |value, memo|
+        GrapeSwagger::Entity::Helper.root_exposure_with_discriminator(exposure).each_with_object({}) do |value, memo|
           if value.for_merge && (value.respond_to?(:entity_class) || value.respond_to?(:using_class_name))
             entity_class = value.respond_to?(:entity_class) ? value.entity_class : value.using_class_name
 
@@ -45,18 +39,6 @@ def extract_params(exposure)
         end
       end
 
-      def discriminator(exposure)
-        exposure.superclass.root_exposures.detect do |value|
-          value.documentation.try(:[], :is_discriminator)
-        end
-      end
-
-      def root_exposures_without_parent(exposure)
-        exposure.root_exposures.select do |value|
-          exposure.superclass.root_exposures.find_by(value.attribute).nil?
-        end
-      end
-
       def parse_grape_entity_params(params, parent_model = nil)
         return unless params
 
@@ -82,7 +64,7 @@ def parse_grape_entity_params(params, parent_model = nil)
           memo[final_entity_name][:description] = documentation[:desc] if documentation[:desc]
         end
 
-        discriminator = discriminator(model)
+        discriminator = GrapeSwagger::Entity::Helper.discriminator(model)
         if discriminator
           respond_with_all_of(parsed, params, discriminator)
         else
@@ -91,14 +73,8 @@ def parse_grape_entity_params(params, parent_model = nil)
       end
 
       def respond_with_all_of(parsed, params, discriminator)
-        parent_name =
-          GrapeSwagger::Entity::Helper.model_name(model.superclass, endpoint)
+        parent_name = GrapeSwagger::Entity::Helper.model_name(model.superclass, endpoint)
 
-          if endpoint.nil?
-            model.superclass.to_s.demodulize
-          else
-            endpoint.send(:expose_params_from_model, model.superclass)
-          end
         {
           allOf: [
             {
@@ -116,11 +92,9 @@ def add_discriminator(parsed, discriminator)
         model_name = GrapeSwagger::Entity::Helper.model_name(model, endpoint)
 
         parsed.merge(
-          {
-            discriminator.attribute => {
-              type: 'string',
-              enum: [model_name]
-            }
+          discriminator.attribute => {
+            type: 'string',
+            enum: [model_name]
           }
         )
       end