dry-swagger 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f02e4e684a8418f7df9ef80cfbbfdbe7169e1e5db8f4bedde227cda11dddf64
-  data.tar.gz: 860a49c5384ca32c9895df6dac3cbec40e2033f6a910c6ae1a00887bf7eeea56
+  metadata.gz: a7ad81fa3e96f19db992cb4beab2707316f08581a18fb4744b98d0ded815474c
+  data.tar.gz: 5b71ef17a426f4cabf5dcce86ed9abb291f5452be9fdee9efc6df2a4d856375d
 SHA512:
-  metadata.gz: 9ab94e41fa7b4e410c1aae8c1b2276ae87455ce85d7ee9b56ee507073cddecd6d32d23e4467d306a717b275e8e19cd794f09adf7dba2e38cd35d8fe74f66fcc1
-  data.tar.gz: 1e70ba36734ba3b2e072b9b840829b30736abe07bdaa8eb57251172681bd53960f1399d6a0f044e514c5d87df3c81c1847b56e27cb6767d22547ff2401ad1e3d
+  metadata.gz: b27a0a040f8b5d59cf8ba72f3636b7161e33e708c64bb4f1658425bb4e17a3eaadc88d9f45e0dcc2b56d5a33b726cdfeb0b2efedc2d25cf08c3002e1ecf6a3ac
+  data.tar.gz: f90605fe210dcb4486a8fad9ee60070ed9237ef5063387f1f8360c8c32b65efc41ed11e053437a514c126084bba42719bbfa674cc8ee87a778e5bdf2fceac432

data/.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '3.2.2'
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run Tests
+        run: bundle exec rspec

data/.gitignore

@@ -10,5 +10,5 @@
 # rspec failure tracking
 .rspec_status
 .idea/
-config/
-rakelib/
+rakelib/
+/config/

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at jane.terziev@webfactory.mk. All
+reported by contacting the project team at janeterziev@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "dry-validation"
-gem "dry-struct"
+gem "dry_struct_parser"
+gem "dry_validation_parser"
 gem 'i18n'

data/Gemfile.lock

@@ -1,51 +1,59 @@
 PATH
   remote: .
   specs:
-    dry-swagger (1.0.0)
+    dry-swagger (2.0.0)
+      dry_struct_parser
+      dry_validation_parser
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.9)
+    bigdecimal (3.1.5)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.7.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.1)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.7.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.6.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.5, >= 1.5.2)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
+    dry_struct_parser (0.1.0)
+      dry-struct (~> 1)
+    dry_validation_parser (0.1.7)
+      dry-types (~> 1)
+      dry-validation (~> 1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -63,17 +71,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dry-struct
   dry-swagger!
-  dry-validation
+  dry_struct_parser
+  dry_validation_parser
   i18n
   rake (~> 12.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.4
+   2.5.4

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 wf-janeterziev
+Copyright (c) 2021 Jane-Terziev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -3,6 +3,25 @@
 Generate a valid and up to date swagger documentation out of your dry-structs and dry-validations
 
 The gem is still work in progress and is not yet fully tested.
+## IMPORTANT:
+
+If you are upgrading from version 1 to version 2, you will need to replace: 
+    
+    Dry::Swagger::StructParser.new.call(struct)
+with 
+
+    Dry::Swagger::DocumentationGenerator.new.from_struct(struct) 
+and replace 
+    
+    Dry::Swagger::ContractParser.new.call(contract)
+with 
+    
+    Dry::Swagger::DocumentationGenerator.new.from_validation(contract).
+
+For the configuration file in project/config/initializers/dry-swagger.rb, you will need to replace:
+
+    Dry::Swagger::Config::ContractConfiguration -> Dry::Swagger::Config::SwaggerConfiguration
+you do not need both ContractConfiguration and StructConfiguration.
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -24,8 +43,6 @@ This will generate configuration files in your project under `project/config`. S
 ## Usage
 
 #### With Dry::Validation::Contract
-Lets say we have the following Dry::Validation::Contract definition:
-    
     class TestContract < Dry::Validation::Contract
         params do
             required(:some_field).value(:str?, min_size?: 5, max_size?: 10)
@@ -39,128 +56,63 @@ Lets say we have the following Dry::Validation::Contract definition:
         end
     end
     
-    parser = Dry::Swagger::ContractParser.new
-
-`parser.call(TestContract)` will set the `keys` of the `parser` object to:
-    
-    {
-        :some_field => {
-            :required => true,
-            :type => "string",
-            :description => "Minimum size: 5, Maximum size: 10"
-        },
-         :some_array_of_objects => { 
-            :required => true,
-            :array => true,
-            :type => "array",
-            :keys => {
-                :some_nested_attribute => {
-                    :required=>true, :type=>"string"
-                }
-            }
-         },
-         :some_array_of_integers => {
-            :required=>true, 
-            :array=>true, 
-            :type=>"integer"
-         },
-         :dto => {
-            :required => true,
-            :type => "hash",
-            :keys => {
-                :some_nested_attribute => {
-                    :required => false, 
-                    :"x-nullable"=>true, 
-                    :type=>"string"
-                }
-            }
-         }
-    }
-
-As we can see, the `ContractParser` goes through all the params defined in the
-schema and generates a hash. The hash is saved in the `keys` attribute of the parser,
-so that we can call `to_swagger` later.
-
-The required key in our result will be set to `true` if the field is defined as
-`required(:field_name)`, and `false` if defined as `optional(:field_name)`.
-
-The "x-nullable" key depends on whether we have defined the field as value, maybe or filled.
-
-For nested objects like array of objects or hash, we add a keys field with a definition
-for each field inside the nested hash.
-
-If the field is an array of primitive type, the type field will equal to the primitive type, and a
-array flag will be set on the field.
-
-Calling `parser.to_swagger` will give the following result:
-    
-    {
-      "type": "object",
-      "properties": {
-        "some_field": {
-          "type": "string",
-          "description": "Minimum size: 5, Maximum size: 10",
-          "x-nullable": false
-        },
-        "some_array_of_objects": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "some_nested_attribute": {
-                "type": "string",
-                "x-nullable": false
-              }
-            },
-            "required": [
-              "some_nested_attribute"
-            ],
-            "x-nullable": false
-          },
-          "x-nullable": false
-        },
-        "some_array_of_integers": {
-          "type": "array",
-          "items": {
-            "type": "integer",
-            "x-nullable": false
-          },
-          "x-nullable": false
-        },
-        "dto": {
+    Dry::Swagger::DocumentationGenerator.new.from_validation(TestContract)
+    => {
           "type": "object",
           "properties": {
-            "some_nested_attribute": {
+            "some_field": {
               "type": "string",
-              "x-nullable": true
+              "description": "Minimum size: 5, Maximum size: 10",
+              "x-nullable": false
+            },
+            "some_array_of_objects": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "some_nested_attribute": {
+                    "type": "string",
+                    "x-nullable": false
+                  }
+                },
+                "required": [
+                  "some_nested_attribute"
+                ],
+                "x-nullable": false
+              },
+              "x-nullable": false
+            },
+            "some_array_of_integers": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "x-nullable": false
+              },
+              "x-nullable": false
+            },
+            "dto": {
+              "type": "object",
+              "properties": {
+                "some_nested_attribute": {
+                  "type": "string",
+                  "x-nullable": true
+                }
+              },
+              "required": [
+        
+              ],
+              "x-nullable": false
             }
           },
           "required": [
-    
-          ],
-          "x-nullable": false
+            "some_field",
+            "some_array_of_objects",
+            "some_array_of_integers",
+            "dto"
+          ]
         }
-      },
-      "required": [
-        "some_field",
-        "some_array_of_objects",
-        "some_array_of_integers",
-        "dto"
-      ]
-    }
 
 #### With Dry::Struct
-The `Dry::Swagger::StructParser` works the same as the contract parser.
-
-The required key depends on whether we define the field as attribute or attribute?
-
-The "x-nullable" key depends on whether we define the type as Type or Type.optional.
-
-For more complex types, for example DTO1 | DTO2 or Types::Array.of(DTO1 | DTO2), 
-the parser converts the field value to an array of both schemas.
-
-Example:
-    
     class DTO1 < Dry::Struct
         attribute :dto1_field, Types::String
     end
@@ -172,145 +124,79 @@ Example:
     class DTO < Dry::Struct
         attribute :dynamic_dto, DTO1 | DTO2
     end
-    parser = Dry::Swagger::StructParser.new
-    
-    parser.call(DTO)
-    => {
-         "dynamic_dto": [ # ARRAY
-           {
-             "type": "hash",
-             "required": true,
-             "x-nullable": false,
-             "keys": {
-               "dto1_field": {
-                 "type": "string",
-                 "required": true,
-                 "x-nullable": false
-               }
-             }
-           },
-           {
-             "type": "hash",
-             "required": true,
-             "x-nullable": false,
-             "keys": {
-               "dto2_field": {
-                 "type": "string",
-                 "required": true,
-                 "x-nullable": false
-               }
-             }
-           }
-         ]
-       }
 
-Calling `parser.to_swagger` will give the following result:
-    
-    {
-      "type": "object",
-      "properties": {
-        "dynamic_dto": {
+    Dry::Swagger::DocumentationGenerator.new.from_struct(DTO)
+    => {
           "type": "object",
           "properties": {
-            "definition_1": {
+            "dynamic_dto": {
               "type": "object",
               "properties": {
-                "dto1_field": {
-                  "type": "string",
+                "definition_1": {
+                  "type": "object",
+                  "properties": {
+                    "dto1_field": {
+                      "type": "string",
+                      "x-nullable": false
+                    }
+                  },
+                  "required": [
+                    "dto1_field"
+                  ],
                   "x-nullable": false
-                }
-              },
-              "required": [
-                "dto1_field"
-              ],
-              "x-nullable": false
-            },
-            "definition_2": {
-              "type": "object",
-              "properties": {
-                "dto2_field": {
-                  "type": "string",
+                },
+                "definition_2": {
+                  "type": "object",
+                  "properties": {
+                    "dto2_field": {
+                      "type": "string",
+                      "x-nullable": false
+                    }
+                  },
+                  "required": [
+                    "dto2_field"
+                  ],
                   "x-nullable": false
                 }
               },
-              "required": [
-                "dto2_field"
-              ],
-              "x-nullable": false
-            }
-          },
-          "example": "Dynamic Field. See Model Definitions",
-          "oneOf": [
-            {
-              "type": "object",
-              "properties": {
-                "dto1_field": {
-                  "type": "string",
+              "example": "Dynamic Field. See Model Definitions",
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "dto1_field": {
+                      "type": "string",
+                      "x-nullable": false
+                    }
+                  },
+                  "required": [
+                    "dto1_field"
+                  ],
                   "x-nullable": false
-                }
-              },
-              "required": [
-                "dto1_field"
-              ],
-              "x-nullable": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "dto2_field": {
-                  "type": "string",
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "dto2_field": {
+                      "type": "string",
+                      "x-nullable": false
+                    }
+                  },
+                  "required": [
+                    "dto2_field"
+                  ],
                   "x-nullable": false
                 }
-              },
-              "required": [
-                "dto2_field"
-              ],
-              "x-nullable": false
+              ]
             }
+          },
+          "required": [
+            "dynamic_dto"
           ]
         }
-      },
-      "required": [
-        "dynamic_dto"
-      ]
-    }
 
 ## Overriding fields
-You can also modify the fields by passing a block after the .call() method.
-
-    Dry::Swagger::StructParser.new.call(DTO) do |it|
-      # types = string/integer/hash/array
-      
-      # Remove a field
-      its.keys = it.keys.except(:field_name) 
-      
-      # Add new field on root level
-      it.keys[:new_field_name] = { type: type, required: true/false, :it.config.nullable_type=>true/false } 
-      
-      # Add a new field in nested hash/array
-      it.keys[:nested_field][:keys][:new_field_name] = { 
-        type: type, required: true/false, :it.config.nullable_type=>true/false
-      }
-      
-      # Remove a field in nested hash/array
-      it.keys = it.keys[:nested_field][:keys].except(:field_name)
-      
-      # Add an array or hash
-      it.keys[:nested_field] = { 
-        type: "array/hash", required: true/false, :it.config.nullable_type=> true/false, keys: {
-          # List all nested fields
-          new_field: { type: :type, required: true/false, :it.config.nullable_type=>true/false }
-        }
-      }
-      
-      # Add an Array of primitive types, type field needs to be the element type(string, integer, float), 
-      and add an array: true flag
-      
-      it.keys[:array_field_name] = { 
-        type: type, array: true, required: true/false, :it.config.nullable_type=> true/false 
-      }
-      
-    end.to_swagger()
+The documentation generator returns the result as a hash, so you can easily modify it based on your needs.
     
 ## Custom Configuration For Your Project
 You can override default configurations by changing the values in the `config/initializers/dry-swagger.rb` file generated from the rake command in the Installation section.

data/dry-swagger.gemspec

@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_dependency "dry_struct_parser"
+  spec.add_dependency "dry_validation_parser"
 end

data/lib/dry/swagger/config/{struct_configuration.rb → swagger_configuration.rb}

@@ -1,7 +1,7 @@
 module Dry
   module Swagger
     module Config
-      module StructConfiguration
+      module SwaggerConfiguration
         extend Configuration
 
         define_setting :enable_required_validation, true

data/lib/dry/swagger/documentation_generator.rb

@@ -11,8 +11,16 @@ module Dry
           "time" => { type: :string, format: :time },
       }.freeze
 
-      def initialize(config)
-        @config = config
+      def initialize
+        @config = ::Dry::Swagger::Config::SwaggerConfiguration
+      end
+
+      def from_struct(struct)
+        generate_documentation(::DryStructParser::StructSchemaParser.new.call(struct).keys)
+      end
+
+      def from_validation(validation)
+        generate_documentation(::DryValidationParser::ValidationSchemaParser.new.call(validation).keys)
       end
 
       def generate_documentation(fields)
@@ -45,7 +53,7 @@ module Dry
           documentation = generate_for_primitive_type(definition)
         end
         @config.enable_nullable_validation ?
-            documentation.merge(@config.nullable_type => definition.fetch(@config.nullable_type, false)) :
+            documentation.merge(@config.nullable_type => definition.fetch(:nullable, false)) :
             documentation.merge(@config.nullable_type => true)
 
       rescue KeyError
@@ -80,7 +88,7 @@ module Dry
                     SWAGGER_FIELD_TYPE_DEFINITIONS.fetch(definition.fetch(:type)) :
                     generate_documentation(definition.fetch(:keys))
         items =  @config.enable_nullable_validation ?
-                     items.merge(@config.nullable_type => definition.fetch(@config.nullable_type, false)) :
+                     items.merge(@config.nullable_type => definition.fetch(:nullable, false)) :
                      items.merge(@config.nullable_type => true)
         { type: :array, items: items }
       end

data/lib/dry/swagger/tasks/configuration_generator.rake

@@ -1,26 +1,19 @@
 require 'fileutils'
 
 namespace 'dry-swagger' do
-  desc 'Create a configuration file for Struct and Contract'
+  desc 'Create a configuration file for Dry Swagger Documentation Generator'
   task :create_configuration_file do
     FileUtils.mkdir_p "#{ Dir.pwd }/config/initializers/"
     puts "Created #{ Dir.pwd }/config/initializers/dry-swagger.rb"
     File.open("#{ Dir.pwd }/config/initializers/dry-swagger.rb", "w") { |file|
-file.puts 'Dry::Swagger::Config::StructConfiguration.configuration do |config|
+file.puts 'Dry::Swagger::Config::SwaggerConfiguration.configuration do |config|
   config.enable_required_validation = true
   config.enable_nullable_validation = true
   config.enable_enums = true
   config.enable_descriptions = true
   config.nullable_type = :"x-nullable" # or :nullable
 end
-
-Dry::Swagger::Config::ContractConfiguration.configuration do |config|
-  config.enable_required_validation = true
-  config.enable_nullable_validation = true
-  config.enable_enums = true
-  config.enable_descriptions = true
-  config.nullable_type = :"x-nullable" # or :nullable
-end'
+'
     }
   end
 

data/lib/dry/swagger/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Swagger
-    VERSION = "1.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/dry/swagger.rb

@@ -1,12 +1,9 @@
 require "dry/swagger/version"
-require "dry/swagger/contract_parser"
-require "dry/swagger/struct_parser"
 require 'dry/swagger/documentation_generator'
 require 'dry/swagger/errors/missing_hash_schema_error'
 require 'dry/swagger/errors/missing_type_error'
 require 'dry/swagger/config/configuration'
-require 'dry/swagger/config/contract_configuration'
-require 'dry/swagger/config/struct_configuration'
+require 'dry/swagger/config/swagger_configuration'
 require 'i18n'
 require 'dry/swagger/railtie' if defined?(Rails)
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dry-swagger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jane-Terziev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
-dependencies: []
+date: 2024-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry_struct_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry_validation_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A parser which converts dry-validation or dry-struct into valid swagger
   documentation
 email:
@@ -18,10 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rakeTasks"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -33,14 +61,11 @@ files:
 - dry-swagger.gemspec
 - lib/dry/swagger.rb
 - lib/dry/swagger/config/configuration.rb
-- lib/dry/swagger/config/contract_configuration.rb
-- lib/dry/swagger/config/struct_configuration.rb
-- lib/dry/swagger/contract_parser.rb
+- lib/dry/swagger/config/swagger_configuration.rb
 - lib/dry/swagger/documentation_generator.rb
 - lib/dry/swagger/errors/missing_hash_schema_error.rb
 - lib/dry/swagger/errors/missing_type_error.rb
 - lib/dry/swagger/railtie.rb
-- lib/dry/swagger/struct_parser.rb
 - lib/dry/swagger/tasks/configuration_generator.rake
 - lib/dry/swagger/types.rb
 - lib/dry/swagger/version.rb
@@ -67,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Generate dry-validation and dry-struct into valid swagger documentation

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4

data/lib/dry/swagger/config/contract_configuration.rb

@@ -1,15 +0,0 @@
-module Dry
-  module Swagger
-    module Config
-      module ContractConfiguration
-        extend Configuration
-
-        define_setting :enable_required_validation, true
-        define_setting :enable_nullable_validation, true
-        define_setting :enable_enums, true
-        define_setting :enable_descriptions, true
-        define_setting :nullable_type, :"x-nullable"
-      end
-    end
-  end
-end

data/lib/dry/swagger/contract_parser.rb

@@ -1,128 +0,0 @@
-module Dry
-  module Swagger
-    class ContractParser
-      PREDICATE_TO_TYPE = {
-          array?: 'array',
-          bool?: 'boolean',
-          date?: 'date',
-          date_time?: 'datetime',
-          decimal?: 'float',
-          float?: 'float',
-          hash?: 'hash',
-          int?: 'integer',
-          nil?: 'nil',
-          str?: 'string',
-          time?: 'time'
-      }.freeze
-
-      # @api private
-      attr_reader :keys
-
-      # @api private
-      def initialize
-        @keys = {}
-        @config = Config::ContractConfiguration
-      end
-
-      # @api private
-      def to_h
-        { keys: keys }
-      end
-
-      # @api private
-      def call(contract, &block)
-        @keys = {}
-        visit(contract.schema.to_ast)
-        instance_eval(&block) if block_given?
-        self
-      end
-
-      # @api private
-      def visit(node, opts = {})
-        meth, rest = node
-        public_send(:"visit_#{meth}", rest, opts)
-      end
-
-      # @api private
-      def visit_set(node, opts = {})
-        target = (key = opts[:key]) ? self.class.new : self
-
-        node.map { |child| target.visit(child, opts) }
-
-        return unless key
-
-        target_info = opts[:member] ? target.to_h : target.to_h
-        type = keys[key][:array] ? 'array' : 'hash'
-
-        keys.update(key => { **keys[key], type: type, **target_info })
-      end
-
-      # @api private
-      def visit_and(node, opts = {})
-        left, right = node
-
-        visit(left, opts)
-        visit(right, opts)
-      end
-
-      def visit_not(_node, opts = {})
-        keys[opts[:key]][@config.nullable_type] = true
-      end
-
-      # @api private
-      def visit_implication(node, opts = {})
-        node.each do |el|
-          opts = opts.merge(required: false)
-          visit(el, opts)
-        end
-      end
-
-      # @api private
-      def visit_each(node, opts = {})
-        visit(node, opts.merge(member: true))
-      end
-
-      # @api private
-      def visit_key(node, opts = {})
-        name, rest = node
-        opts = opts.merge(key: name)
-        opts = opts.merge(required: true)
-        visit(rest, opts)
-      end
-
-      # @api private
-      def visit_predicate(node, opts = {})
-        name, rest = node
-
-        key = opts[:key]
-
-        if name.equal?(:key?)
-          keys[rest[0][1]] = { required: opts.fetch(:required, true) }
-        elsif name.equal?(:array?)
-          keys[key][:array] = true
-        elsif name.equal?(:included_in?)
-          enums = rest[0][1]
-          enums += [nil] if opts.fetch(@config.nullable_type, false)
-          keys[key][:enum] = enums
-        elsif PREDICATE_TO_TYPE[name]
-          keys[key][:type] = PREDICATE_TO_TYPE[name]
-        else
-          description = predicate_description(name.to_s, rest[0][1].to_s)
-          if keys[key][:description].to_s.empty?
-            keys[key][:description] = description unless description.to_s.empty?
-          else
-            keys[key][:description] += ", #{description}" unless description.to_s.empty?
-          end
-        end
-      end
-
-      def predicate_description(name, value)
-        ::I18n.t("contract.descriptions.#{name}", value: value, default: '')
-      end
-
-      def to_swagger
-        DocumentationGenerator.new(@config).generate_documentation(keys)
-      end
-    end
-  end
-end

data/lib/dry/swagger/struct_parser.rb

@@ -1,150 +0,0 @@
-module Dry
-  module Swagger
-    class StructParser
-      PREDICATE_TYPES = {
-          String: 'string',
-          Integer: 'integer',
-          TrueClass: 'boolean',
-          FalseClass: 'boolean',
-          Float: 'float',
-          Date: 'date',
-          DateTime: 'datetime',
-          Time: 'time'
-      }.freeze
-
-      attr_reader :keys
-
-      def initialize
-        @keys = {}
-        @config = Dry::Swagger::Config::StructConfiguration
-      end
-
-      def to_h
-        { keys: keys }
-      end
-
-      def call(dto, &block)
-        @keys = {}
-        visit(dto.schema.to_ast)
-        instance_eval(&block) if block_given?
-        self
-      end
-
-      def visit(node, opts = {})
-        meth, rest = node
-        public_send(:"visit_#{meth}", rest, opts)
-      end
-
-      def visit_constructor(node, opts = {})
-        visit(node[0], opts)
-      end
-
-      def visit_schema(node, opts = {})
-        target = (key = opts[:key]) ? self.class.new : self
-
-        required = opts.fetch(:required, true)
-        nullable = opts.fetch(:nullable, false)
-
-        node[0].each do |child|
-          target.visit(child)
-        end
-
-        return unless key
-
-        target_info =  target.to_h if opts[:member]
-
-        type = opts[:array]? 'array' : 'hash'
-
-        definition = {
-            type: type,
-            required: required,
-            @config.nullable_type => nullable,
-            **target_info
-        }
-
-        if opts[:oneOf]
-          keys[key] = keys[key] ? keys[key] << definition : [definition]
-        else
-          keys[key] = definition
-        end
-      end
-
-      def visit_key(node, opts = {})
-        name, required, rest = node
-        opts[:key] = name
-        opts[:required] = required
-        visit(rest, opts)
-      end
-
-      def visit_constrained(node, opts = {})
-        node.each {|it| visit(it, opts) }
-      end
-
-      def visit_nominal(_node, _opts); end
-
-      def visit_predicate(node, opts = {})
-        name, rest = node
-        type = rest[0][1]
-
-        if name.equal?(:type?)
-          type = type.to_s.to_sym
-          return unless PREDICATE_TYPES[type]
-
-          # print node
-          # puts
-          # print opts
-          # puts
-
-          type_definition = {
-              type: PREDICATE_TYPES[type],
-              required: opts.fetch(:required),
-              @config.nullable_type => opts.fetch(:nullable, false)
-          }
-
-          type_definition[:array] = opts[:array] if opts[:array]
-
-          keys[opts[:key]] = type_definition
-        elsif name.equal?(:included_in?)
-          type += [nil] if opts.fetch(:nullable, false)
-          keys[opts[:key]][:enum] = type
-        end
-      end
-
-      def visit_and(node, opts = {})
-        left, right = node
-
-        visit(left, opts)
-        visit(right, opts)
-      end
-
-      def visit_enum(node, opts = {})
-        visit(node[0], opts)
-      end
-
-      def visit_sum(node, opts = {})
-        if node[0][0].equal?(:constrained)
-          opts[:nullable] = true if node[0][1][0][1][0].equal?(NilClass)
-          visit(node[1], opts) # ignore NilClass constrained
-        elsif node[0][0].equal?(:struct) || node[0][0].equal?(:sum)
-          opts[:oneOf] = true
-          node.each { |child| visit(child, opts) unless child.is_a?(Hash) }
-        end
-      end
-
-      def visit_struct(node, opts = {})
-        opts[:member] = true
-
-        visit(node[1], opts)
-      end
-
-      def visit_array(node, opts = {})
-        opts[:array] = true
-        visit(node[0], opts)
-      end
-
-      def to_swagger
-        DocumentationGenerator.new(@config).generate_documentation(keys)
-      end
-    end
-  end
-end