swaggard 1.1.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f3251f22ae437dfa4a4030dc6e1929def89936e209bd9fdef0b6d7ed92c554
-  data.tar.gz: 859c0573aee509bf0f6c376e20d451c5f97729c3b6cf03f988f450d90041ae4d
+  metadata.gz: ed70536923570dc261e856336612392dbf360df9e5fbe0854c435eca43be1379
+  data.tar.gz: a838d6c384fe16bc135463d5c356871bc949fa5410f079822b7e79f757817733
 SHA512:
-  metadata.gz: 4d7f32e8aef8e8f5edfd761982e8a9b845364de71a042f1e56ebae621a00ea7193c1d6377991a22c021d5a1316466031aeb25204fc23d388a4ba96cca9c30f2f
-  data.tar.gz: d9b0b90737efd86097f61bbcc06ac9c3b51881a83bfff8ad1f726940c2140f640adff9e549d81dec907b3f221a2fa21737cbeab76fd0c80ca9f450e91315f756
+  metadata.gz: 99b13f5741da156d8d9f442131f4fd7b5d2cb9c69d5218ae64bcb14beb0937a4918bf7ea3da6cd7ea102c4e99a5b3ccf564107046745af55b45f46fa9442b7e4
+  data.tar.gz: 99c290f273f52991dd9f7fbd26bd3d40e170991e5e5eadbc6417e8d3e228a2d27f3fc5d953263539bb7f35e6096b1241e7b8d759bb6a46ce02f32f65d4ca89ab

data/lib/swaggard/api_definition.rb

@@ -7,7 +7,7 @@ module Swaggard
     def initialize
       @paths        = {}
       @tags         = {}
-      @definitions  = []
+      @definitions  = {}
     end
 
     def add_tag(tag)
@@ -19,7 +19,7 @@ module Swaggard
     def add_operation(operation)
       @paths[operation.path] ||= Swagger::Path.new(operation.path)
       @paths[operation.path].add_operation(operation)
-      @definitions.concat(operation.definitions)
+      @definitions.merge!(operation.definitions)
     end
 
     def ignore_put_if_patch!
@@ -51,7 +51,7 @@ module Swaggard
         'produces'    => Swaggard.configuration.api_formats.map { |format| "application/#{format}" },
         'tags'        => @tags.map { |_, tag| tag.to_doc },
         'paths'       => Hash[@paths.values.map { |path| [format_path(path.path), path.to_doc] }],
-        'definitions' => Hash[@definitions.map { |definition| [definition.id, definition.to_doc] }]
+        'definitions' => Hash[@definitions.merge(Swaggard.configuration.definitions).map { |id, definition| [id, definition.to_doc(@definitions)] }]
       }
     end
 

data/lib/swaggard/configuration.rb

@@ -23,8 +23,6 @@ module Swaggard
                 :default_response_status_code, :excluded_paths, :path_parameter_description,
                 :ignore_put_if_patch_exists
 
-    attr_reader :custom_types
-
     def swagger_version
       @swagger_version ||= '2.0'
     end
@@ -149,6 +147,14 @@ module Swaggard
       custom_types[name] = definition
     end
 
+    def definitions
+      @definitions ||= {}
+    end
+
+    def add_definition(definition)
+      definitions[definition.id] = definition
+    end
+
     def path_parameter_description
       @path_parameter_description ||= ->(path_parameter) { "Scope response to #{path_parameter.name}" }
     end

data/lib/swaggard/parsers/models.rb

@@ -1,29 +1,38 @@
 require_relative '../swagger/definition'
-require_relative '../swagger/property'
+require_relative 'property'
 
 module Swaggard
   module Parsers
     class Models
 
       def run(yard_objects)
-        definitions = []
+        definitions = {}
 
         yard_objects.each do |yard_object|
-          next unless yard_object.type == :class
+          definition = parse_yard_object(yard_object)
 
-          definition = Swagger::Definition.new(yard_object.path)
+          definitions[definition.id] = definition if definition
+        end
+
+        definitions
+      end
 
+      def parse_yard_object(yard_object)
+        return unless yard_object.type == :class
+
+        Swagger::Definition.new(yard_object.path, ancestors: yard_object.inheritance_tree.map(&:path)).tap do |definition|
           yard_object.tags.each do |tag|
-            property = Swagger::Property.new(tag)
-            definition.add_property(property)
+            case tag.tag_name
+            when 'attr'
+              property = Swaggard::Parsers::Property.run(tag)
+              definition.add_property(property)
+            when 'ignore_inherited'
+              definition.ignore_inherited = true
+            end
           end
-
-          definitions << definition
         end
-
-        definitions
       end
 
     end
   end
-end
+end

data/lib/swaggard/parsers/property.rb

@@ -0,0 +1,21 @@
+require_relative '../swagger/property'
+
+module Swaggard
+  module Parsers
+    module Property
+      def self.run(yard_object)
+        name = yard_object.name.dup
+        options_and_description = yard_object.text&.dup || ''
+
+        options_and_description.gsub!("\n", ' ')
+        options, description = options_and_description.match(/\A(\[.*\])?(.*)\Z/).captures
+        options = options ? options.gsub(/\[?\]?\s?/, '').split(',') : []
+        description = description.strip
+        required = name.gsub!(/^!/, '')
+        type = Parsers::Type.run(yard_object.types.first)
+
+        Swaggard::Swagger::Property.new(name, type, description, required.present?, options)
+      end
+    end
+  end
+end

data/lib/swaggard/parsers/type.rb

@@ -0,0 +1,15 @@
+require_relative '../swagger/type'
+
+module Swaggard
+  module Parsers
+    module Type
+      def self.run(string)
+        parts = string.split(/[<>]/)
+        name = parts.last
+        is_array = parts.grep(/array/i).any?
+
+        Swaggard::Swagger::Type.new(name, is_array)
+      end
+    end
+  end
+end

data/lib/swaggard/swagger/definition.rb

@@ -3,13 +3,15 @@ module Swaggard
     class Definition
 
       attr_reader :id
-      attr_writer :description, :title
+      attr_writer :description, :title, :ignore_inherited
 
-      def initialize(id)
+      def initialize(id, ancestors: [])
         @id = id
         @title = ''
         @properties = []
         @description = ''
+        @ancestors = ancestors
+        @ignore_inherited = false
       end
 
       def add_property(property)
@@ -20,15 +22,35 @@ module Swaggard
         @properties.empty?
       end
 
-      def to_doc
+      def properties(definitions)
+        inherited_properties(definitions)
+          .concat(@properties)
+          .uniq { |property| property.id }
+      end
+
+      def inherited_properties(definitions)
+        return [] if @ignore_inherited
+
+        @ancestors.flat_map do |ancestor|
+          definition = definitions[ancestor]
+
+          next unless definition && definition.id != id
+
+          definition.properties(definitions)
+        end.compact
+      end
+
+      def to_doc(definitions)
         {}.tap do |doc|
           doc['title'] = @title if @title.present?
           doc['type']  = 'object'
 
           doc['description'] = @description if @description.present?
 
-          doc['properties'] =  Hash[@properties.map { |property| [property.id, property.to_doc] }]
-          required_properties = @properties.select(&:required?).map(&:id)
+          all_properties = properties(definitions)
+
+          doc['properties'] =  Hash[all_properties.map { |property| [property.id, property.to_doc] }]
+          required_properties = all_properties.select(&:required?).map(&:id)
           doc['required'] = required_properties if required_properties.any?
         end
 

data/lib/swaggard/swagger/operation.rb

@@ -92,8 +92,12 @@ module Swaggard
       end
 
       def definitions
-        @responses.map(&:definition).compact.tap do |definitions|
-          definitions << @body_parameter.definition if @body_parameter
+        @responses.map(&:definition).compact.inject({}) do |definitions, definition|
+          definitions[definition.id] = definition
+        end.tap do |definitions|
+          next unless @body_parameter
+
+          definitions[@body_parameter.definition.id] = @body_parameter.definition
         end
       end
 

data/lib/swaggard/swagger/parameters/body.rb

@@ -1,11 +1,10 @@
 require_relative 'base'
-require_relative '../type'
+require_relative '../../parsers/type'
 
 module Swaggard
   module Swagger
     module Parameters
       class Body < Base
-
         attr_reader :definition
 
         def initialize(operation_name)
@@ -51,9 +50,7 @@ module Swaggard
 
         private
 
-
         class Property
-
           attr_reader :id
 
           def initialize(string)
@@ -83,13 +80,11 @@ module Swaggard
 
             @id = name
             @description = description if description.present?
-            @type = Type.new([data_type])
+            @type = Parsers::Type.run(data_type)
             @required = required
             @options = options
           end
-
         end
-
       end
     end
   end

data/lib/swaggard/swagger/parameters/query.rb

@@ -1,10 +1,10 @@
 require_relative 'base'
+require_relative '../../parsers/type'
 
 module Swaggard
   module Swagger
     module Parameters
       class Query < Base
-
         def initialize(string)
           @in = 'query'
           parse(string)
@@ -37,12 +37,11 @@ module Swaggard
 
           @name = name
           @description = description
-          @type = Type.new([data_type])
+          @type = Parsers::Type.run(data_type)
           @is_required = required.present?
           @allow_multiple = allow_multiple.present?
           @options = options
         end
-
       end
     end
   end

data/lib/swaggard/swagger/property.rb

@@ -3,23 +3,13 @@ require_relative 'type'
 module Swaggard
   module Swagger
     class Property
-
       attr_reader :id, :type, :description
 
-      def initialize(yard_object)
-        name = yard_object.name.dup
-        options_and_description = yard_object.text&.dup || ''
-
-        options_and_description.gsub!("\n", ' ')
-        options, description = options_and_description.match(/\A(\[.*\])?(.*)\Z/).captures
-        options = options ? options.gsub(/\[?\]?\s?/, '').split(',') : []
-        description = description.strip
-        required = name.gsub!(/^!/, '')
-
+      def initialize(name, type, description = '', required = false, options = [])
         @id = name
-        @type = Type.new(yard_object.types)
+        @type = type
         @description = description
-        @required = required.present?
+        @required = required
         @options = options
       end
 
@@ -33,7 +23,6 @@ module Swaggard
         result['enum'] = @options if @options.present?
         result
       end
-
     end
   end
 end

data/lib/swaggard/swagger/type.rb

@@ -12,14 +12,16 @@ module Swaggard
         'boolean'   => { 'type' => 'boolean' },
         'date'      => { 'type' => 'string',  'format' => 'date' },
         'date-time' => { 'type' => 'string',  'format' => 'date-time' },
+        'datetime'  => { 'type' => 'string',  'format' => 'date-time' },
         'password'  => { 'type' => 'string',  'format' => 'password' },
         'hash'      => { 'type' => 'object' }
       }
 
       attr_reader :name
 
-      def initialize(types)
-        parse(types)
+      def initialize(name, is_array = false)
+        @name = name.to_s
+        @is_array = is_array
       end
 
       def to_doc
@@ -32,14 +34,6 @@ module Swaggard
 
       private
 
-      def parse(types)
-        parts = types.first.split(/[<>]/)
-
-        @name = parts.last
-        @is_array = parts.grep(/array/i).any?
-      end
-
-
       def basic_type?
         BASIC_TYPES.has_key?(@name.downcase)
       end

data/lib/swaggard/version.rb

@@ -1,3 +1,3 @@
 module Swaggard
-  VERSION = '1.1.1'
+  VERSION = '1.4.0'
 end

data/lib/swaggard.rb

@@ -38,6 +38,7 @@ module Swaggard
       ::YARD::Tags::Library.define_tag('Response description', :response_description)
       ::YARD::Tags::Library.define_tag('Response example', :response_example)
       ::YARD::Tags::Library.define_tag('Response header', :response_header)
+      ::YARD::Tags::Library.define_tag('Ignore inherited attributes', :ignore_inherited)
     end
 
     def get_doc(host = nil)
@@ -119,7 +120,6 @@ module Swaggard
 
         tags.each do |tag|
           @tags << [tag, operations]
-          # [tag.controller_class.controller_path] ||= { tag: tag, operations: operations }
         end
       end
 
@@ -136,12 +136,12 @@ module Swaggard
     def parse_models
       parser = Parsers::Models.new
 
-      definitions =[]
+      definitions = {}
       configuration.models_paths.each do |path|
         Dir[path].each do |file|
           yard_objects = get_yard_objects(file)
 
-          definitions.concat(parser.run(yard_objects))
+          definitions.merge!(parser.run(yard_objects))
         end
 
         @api.definitions = definitions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swaggard
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Adrian Gomez
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,9 @@ files:
 - lib/swaggard/engine.rb
 - lib/swaggard/parsers/controller.rb
 - lib/swaggard/parsers/models.rb
+- lib/swaggard/parsers/property.rb
 - lib/swaggard/parsers/routes.rb
+- lib/swaggard/parsers/type.rb
 - lib/swaggard/swagger/definition.rb
 - lib/swaggard/swagger/operation.rb
 - lib/swaggard/swagger/parameters/base.rb
@@ -192,7 +194,6 @@ files:
 - spec/fixtures/dummy/config/application.rb
 - spec/fixtures/dummy/config/environments/development.rb
 - spec/fixtures/dummy/config/routes.rb
-- spec/fixtures/dummy/log/development.log
 - spec/fixtures/swagger_schema.json
 - spec/integration/swaggard_spec.rb
 - spec/spec_helper.rb
@@ -200,7 +201,7 @@ homepage: https://github.com/adrian-gomez/swaggard
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,19 +216,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: 'Swaggard: Swagger Rails REST API doc using yard YARD'
 test_files:
-- spec/spec_helper.rb
-- spec/integration/swaggard_spec.rb
-- spec/fixtures/swagger_schema.json
-- spec/fixtures/dummy/app/controllers/pets_controller.rb
-- spec/fixtures/dummy/app/controllers/application_controller.rb
+- spec/fixtures/api.json
 - spec/fixtures/dummy/app/controllers/admin/pets_controller.rb
-- spec/fixtures/dummy/config/routes.rb
-- spec/fixtures/dummy/config/environments/development.rb
+- spec/fixtures/dummy/app/controllers/application_controller.rb
+- spec/fixtures/dummy/app/controllers/pets_controller.rb
 - spec/fixtures/dummy/config/application.rb
-- spec/fixtures/dummy/log/development.log
-- spec/fixtures/api.json
+- spec/fixtures/dummy/config/environments/development.rb
+- spec/fixtures/dummy/config/routes.rb
+- spec/fixtures/swagger_schema.json
+- spec/integration/swaggard_spec.rb
+- spec/spec_helper.rb