Remove child_class completely

Author: aadityataparia

lib/rspec_api_documentation.rb

@@ -58,18 +58,14 @@ module OpenApi
     autoload :Info
     autoload :Contact
     autoload :License
-    autoload :Paths
     autoload :Path
     autoload :Tag
     autoload :Operation
     autoload :Parameter
-    autoload :Responses
     autoload :Response
     autoload :Example
-    autoload :Headers
     autoload :Header
     autoload :Schema
-    autoload :SecurityDefinitions
     autoload :SecuritySchema
   end
 

lib/rspec_api_documentation/open_api/node.rb

@@ -1,12 +1,6 @@
 module RspecApiDocumentation
   module OpenApi
     class Node
-      # this is used to define class of incoming option attribute
-      # If +false+ then do not create new setting
-      # If +true+ then create new setting with raw passed value
-      # If RspecApiDocumentation::OpenApi::Node then create new setting and wrap it in this class
-      CHILD_CLASS = false
-
       # This attribute allow us to hide some of children through configuration file
       attr_accessor :hide
 
@@ -49,8 +43,6 @@ def initialize(opts = {})
                 value
               end
             assign_setting(name, converted)
-          elsif self.class::CHILD_CLASS
-            add_setting name, :value => self.class::CHILD_CLASS === true ? value : self.class::CHILD_CLASS.new(value)
           else
             public_send("#{name}=", value) if respond_to?("#{name}=")
           end
@@ -98,7 +90,7 @@ def as_json
             tmp = value.select { |v| !v.hide }.map { |v| v.as_json }
             hash[name] = tmp unless tmp.empty?
           when value.is_a?(Hash) && value.values[0].is_a?(Node)
-            hash[name] = Hash[value.map { |k, v| [k, v.as_json] }]
+            hash[name] = Hash[value.select { |k, v| !v.hide }.map { |k, v| [k, v.as_json] }]
           else
             hash[name] = value
           end unless value.nil?

lib/rspec_api_documentation/open_api/operation.rb

@@ -3,13 +3,13 @@ module OpenApi
     class Operation < Node
       add_setting :tags, :default => []
       add_setting :summary
-      add_setting :description, :default => ''
+      add_setting :description
       add_setting :externalDocs
       add_setting :operationId
       add_setting :consumes
       add_setting :produces
       add_setting :parameters, :default => [], :schema => [Parameter]
-      add_setting :responses, :required => true, :schema => Responses
+      add_setting :responses, :required => true, :schema => { String => Response }
       add_setting :schemes
       add_setting :deprecated, :default => false
       add_setting :security

lib/rspec_api_documentation/open_api/response.rb

@@ -3,7 +3,7 @@ module OpenApi
     class Response < Node
       add_setting :description, :required => true, :default => 'Successful operation'
       add_setting :schema, :schema => Schema
-      add_setting :headers, :schema => { "" => Header }
+      add_setting :headers, :schema => { String => Header }
       add_setting :examples
     end
   end

lib/rspec_api_documentation/open_api/responses.rb

@@ -8,11 +8,11 @@ class Root < Node
       add_setting :schemes, :default => %w(http https)
       add_setting :consumes, :default => %w(application/json application/xml)
       add_setting :produces, :default => %w(application/json application/xml)
-      add_setting :paths, :default => {}, :required => true, :schema => { "" => Path }
+      add_setting :paths, :default => {}, :required => true, :schema => { String => Path }
       add_setting :definitions
       add_setting :parameters
       add_setting :responses
-      add_setting :securityDefinitions, :schema => SecurityDefinitions
+      add_setting :securityDefinitions, :schema => { String => SecuritySchema }
       add_setting :security
       add_setting :tags, :default => [], :schema => [Tag]
       add_setting :externalDocs

lib/rspec_api_documentation/open_api/root.rb

@@ -48,7 +48,7 @@ def examples
       end
 
       def add_security_definitions!
-        security_definitions = OpenApi::SecurityDefinitions.new
+        security_definitions = {}
 
         arr = examples.map do |example|
           example.respond_to?(:authentications) ? example.authentications : nil
@@ -62,7 +62,7 @@ def add_security_definitions!
               type: opts[:type],
               in: opts[:in]
             )
-            security_definitions.add_setting security, :value => schema
+            security_definitions[security.to_s] = schema
           end
         end
         specs.securityDefinitions = security_definitions unless arr.empty?
@@ -83,14 +83,14 @@ def add_paths!
         specs.safe_assign_setting(:paths, {})
         examples.each do |example|
           route = example.route.to_s
-          specs.paths[route] = OpenApi::Path.new
+          specs.paths[route] ||= OpenApi::Path.new
 
           operation = specs.paths[route].setting(example.http_method) || OpenApi::Operation.new
 
           operation.safe_assign_setting(:tags, [example.resource_name])
           operation.safe_assign_setting(:summary, example.respond_to?(:route_summary) ? example.route_summary : '')
           operation.safe_assign_setting(:description, example.respond_to?(:route_description) ? example.route_description : '')
-          operation.safe_assign_setting(:responses, OpenApi::Responses.new)
+          operation.safe_assign_setting(:responses, {})
           operation.safe_assign_setting(:parameters, extract_parameters(example))
           operation.safe_assign_setting(:consumes, example.requests.map { |request| request[:request_content_type] }.compact.map { |q| q[/[^;]+/] })
           operation.safe_assign_setting(:produces, example.requests.map { |request| request[:response_content_type] }.compact.map { |q| q[/[^;]+/] })
@@ -120,9 +120,9 @@ def process_responses(responses, example)
           if /\A(?<response_content_type>[^;]+)/ =~ request[:response_content_type]
             response.safe_assign_setting(:examples, {})
             response_body = JSON.parse(request[:response_body]) rescue nil
-            response.examples[response_content_type.to_s] = response_body
+            response.examples[response_content_type.to_s] = response_body if response_body
           end
-          responses.add_setting "#{request[:response_status]}", :value => response
+          responses[request[:response_status].to_s] = response
         end
       end
 

lib/rspec_api_documentation/open_api/security_definitions.rb

@@ -8,7 +8,6 @@
 
   describe "default settings" do
     class RspecApiDocumentation::OpenApi::Info; end
-    class RspecApiDocumentation::OpenApi::Paths; end
 
     its(:swagger) { should == '2.0' }
     its(:info) { should be_a(RspecApiDocumentation::OpenApi::Info) }
@@ -17,7 +16,6 @@ class RspecApiDocumentation::OpenApi::Paths; end
     its(:schemes) { should == %w(http https) }
     its(:consumes) { should == %w(application/json application/xml) }
     its(:produces) { should == %w(application/json application/xml) }
-    its(:paths) { should be_a(RspecApiDocumentation::OpenApi::Paths) }
     its(:definitions) { should be_nil }
     its(:parameters) { should be_nil }
     its(:responses) { should be_nil }