Required tuple

Author: kzaitsev

.rubocop.yml

@@ -1,5 +1,34 @@
 AllCops:
   Exclude:
     - vendor/**/*
+  TargetRubyVersion: 2.4
 
 inherit_from: .rubocop_todo.yml
+
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
+Metrics/ClassLength:
+  Max: 300
+
+Metrics/LineLength:
+  Max: 120
+  Exclude:
+    - spec/**/*
+
+Metrics/MethodLength:
+  Exclude:
+    - spec/**/*
+
+Naming:
+  Enabled: false
+
+Style/RegexpLiteral:
+  Enabled: false

.rubocop_todo.yml

@@ -1,34 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-11-19 22:40:01 +0200 using RuboCop version 0.51.0.
+# on 2018-08-21 15:46:20 +0300 using RuboCop version 0.58.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 3
 Metrics/AbcSize:
-  Max: 34
-
-# Offense count: 8
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 132
+  Max: 39
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 19
 
-# Offense count: 67
+# Offense count: 2
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 160
+  Max: 130
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 36
+  Max: 35
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
@@ -37,14 +32,7 @@ Metrics/ParameterLists:
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
-  Max: 18
-
-# Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'lib/grape-swagger-representable.rb'
+  Max: 21
 
 # Offense count: 2
 Style/Documentation:

Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape-swagger-representable.gemspec
 gemspec
 
-gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
+gem 'grape-swagger', path: '../grape-swagger'

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

bin/pry

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'grape-swagger/representable'

grape-swagger-representable.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'grape-swagger/representable/version'
 

lib/grape-swagger-representable.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'grape-swagger/representable'

lib/grape-swagger/representable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape-swagger'
 require 'representable'
 

lib/grape-swagger/representable/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrapeSwagger
   module Representable
     class Parser
@@ -75,33 +77,60 @@ def representer_mapping(representer, documentation, property, is_a_collection =
             }
           end
         else
-          attributes = parse_representer(representer)
-          attributes = attributes.deep_merge!(parse_representer(nested)) if nested
+          attributes, required = combine(representer, nested)
 
           if is_a_collection
             {
               type: :array,
-              items: {
+              items: with_required({
                 type: :object,
                 properties: attributes
-              },
+              }, required),
               description: documentation[:desc] || property[:desc] || ''
             }
           else
-            {
+            with_required({
               type: :object,
               properties: attributes,
               description: documentation[:desc] || property[:desc] || ''
-            }
+            }, required)
           end
         end
       end
 
       def parse_representer(representer)
-        representer.map.each_with_object({}) do |value, property|
+        properties = representer.map.each_with_object({}) do |value, property|
           property_name = value[:as].try(:call) || value.name
           property[property_name] = parse_representer_property(value)
         end
+
+        required = representer.map
+                              .select { |value| value[:documentation] && value[:documentation][:required] }
+                              .map { |value| value[:as] || value.name }
+
+        [properties, required]
+      end
+
+      def combine(representer, nested)
+        attributes, required = parse_representer(representer)
+        return [attributes, required] unless nested
+
+        nested_attributes, nested_required = parse_representer(nested) if nested
+        final_attributes = attributes.deep_merge!(nested_attributes)
+
+        overrided = (attributes.keys & nested_attributes.keys)
+
+        final_required = (required + nested_required)
+                         .uniq
+                         .select { |k| (overrided.include?(k) && nested_required.include?(k)) || !overrided.include?(k) }
+
+        [final_attributes, final_required]
+      end
+
+      def with_required(hash, required)
+        return hash if required.empty?
+        hash[:required] = required
+        hash
       end
     end
   end

lib/grape-swagger/representable/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module GrapeSwagger
   module Representable
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.1.6'
   end
 end