swagger-dsl 1.5.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb702f7ccc67a100818688d3485e5412f9d332af2bfa1b58b8f58c741504694
-  data.tar.gz: 6ace6ed015f84d78cacbc7718045153e3d26f7fd578fa477177ee6a6f54b3474
+  metadata.gz: 2fdb0f1e88082ae965e4b6075a7dd8ef91efb750208b7f11fa5522a6be1f7144
+  data.tar.gz: 3bf9c27d7202419ce13b5fce8296edf1fbbdcbc7c391a15bc7aecd580a358a61
 SHA512:
-  metadata.gz: 75a3957270bbe0bdc800f376438112f1dd3056ffee525c34672beb12b63a0441eee10badbaddb924e15358c0907ea96006ea23be278bff9a758c5c7d2f035dc8
-  data.tar.gz: face316a38563b9b8f6e8f06cbe5c2ef0f7ef6bb59a5bc3c5d4802aedade9817284369ee992ed60149cee16aea8cf7f384201e508e0a8c5e8bba64c22883f46b
+  metadata.gz: 84423580c60508efe85948381313f60b075b892869c730b6e1e86bf4418914edcdf08314910c25634ee86117262c106293c7613a0059a2e6b1d8ff29801cc6c8
+  data.tar.gz: 413775b11c9556ce0366b0d61acd21aa63a445fbd6fc80e00cf6723527a93762ab80a45259734d84e5119a1f91e24337f4678ca021b9e6ab479b7bea06f5f6d4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.0.1
+
+- fix(brake): nested class naming
+
+## 2.0.0
+
+- fix(brake): adjust to OAS3 spec
+
 ## 1.4.0
 
 - add: lazy_define_paths for Rails eager_load

data/lib/swagger/dsl/components.rb

@@ -18,7 +18,7 @@ module Swagger
       private
 
       def serializer_name(name)
-        name.to_s.sub(/(?:Serializer)?$/, "Serializer")
+        name.to_s.gsub(/-/, '::').sub(/(?:Serializer)?$/, "Serializer")
       end
     end
   end

data/lib/swagger/dsl/config.rb

@@ -13,7 +13,7 @@ module Swagger
       )
         @inject_key = inject_key
         @default_dsl = default_dsl
-        @dsl_options ||= { reference_name: ->(name) { name.sub(/Serializer$/, "") } }
+        @dsl_options ||= { reference_name: ->(name) { name.sub(/Serializer$/, "").gsub(/::/, '-') } }
         @eager = eager
         @default_required = default_required
         @lazy_define_paths = lazy_define_paths

data/lib/swagger/dsl/json_schema/jimmy_patch.rb

@@ -5,7 +5,7 @@ module Jimmy
   class SchemaCreation
     module Referencing
       def component(id)
-        name = "#/components/#{id}"
+        name = "#/components/schemas/#{id}"
         reference_name = Swagger::DSL.current.config.dsl_options[:reference_name]
         reference_name ? reference_name.call(name) : name
       end

data/lib/swagger/dsl/operation.rb

@@ -16,7 +16,6 @@ module Swagger
 
       def initialize(operation_id, format: :json, &block)
         self["operationId"] = operation_id
-        self["requestBody"] = { "content" => {}, "required" => true }
         self["responses"] = {}
         self["parameters"] = []
         self["tags"] = []
@@ -42,20 +41,24 @@ module Swagger
 
       def body(format: @format, dsl: nil, &block)
         formats(format).each do |f|
+          self["requestBody"] ||= { "required" => true }
+          self["requestBody"]["content"] ||= {}
           self["requestBody"]["content"][f] = { "schema" => Swagger::DSL::JsonSchema.by(dsl).dsl(&block) }
         end
       end
 
       def body_description(body_description = nil)
+        self["requestBody"] ||= { "required" => true }
         self["requestBody"]["description"] = body_description
       end
 
       def body_optional(optional = true)
+        self["requestBody"] ||= {}
         self["requestBody"]["required"] = optional
       end
 
       def render(code = 200, format: @format, dsl: nil, &block)
-        self["responses"][code] ||= { "content" => {} }
+        self["responses"][code] ||= { "content" => {}, "description" => "#{code}" }
         formats(format).each do |f|
           self["responses"][code]["content"][f] = { "schema" => Swagger::DSL::JsonSchema.by(dsl).dsl(&block) }
         end

data/lib/swagger/dsl/serializer.rb

@@ -5,8 +5,8 @@ module Swagger
   class DSL < Hash
     module Serializer
       def swagger(dsl: nil, &block)
-        name = self.name.sub(/Serializer$/, "")
-        Swagger::DSL.current["components"][name] =
+        name = self.name.sub(/Serializer$/, "").gsub(/::/, '-')
+        Swagger::DSL.current["components"]["schemas"][name] =
           Swagger::DSL::JsonSchema.by(dsl).dsl(&block).merge(Swagger::DSL.current.config.inject_key => name)
       end
 

data/lib/swagger/dsl/version.rb

@@ -1,5 +1,5 @@
 module Swagger
   class DSL < Hash
-    VERSION = "1.5.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

data/lib/swagger/dsl.rb

@@ -20,9 +20,10 @@ module Swagger
     def initialize(schema = nil, config: Config.new)
       merge!(schema || {})
       self["openapi"] ||= "3.0.0"
-      self["info"] ||= {}
+      self["info"] ||= { "title" => "OpenAPI schema", "version" => "0.0.0" }
       self["paths"] ||= {}
-      self["components"] = Components[self["components"] || {}]
+      self["components"] ||= {}
+      self["components"]["schemas"] = Components[self["components"]["schemas"] || {}]
       @config = config
       @define_paths_procs = []
     end

data/swagger-dsl.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "jimmy", "~> 0.5"
-  spec.add_dependency "json-schema-subset-dsl", "~> 1.2"
+  spec.add_dependency "json-schema-subset-dsl", "~> 2.0"
   spec.add_dependency "hana", "~> 1.3"
   spec.add_dependency "json_refs", "~> 0.1"
-  spec.add_dependency "activesupport", "~> 6.0"
+  spec.add_dependency "activesupport", ">= 4.0.2"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
@@ -42,4 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-config-prettier", "~> 0.1"
   spec.add_development_dependency "yard", "~> 0.9"
   spec.add_development_dependency "pry-byebug", "~> 3.7"
+  spec.add_development_dependency "json_spec", "~> 1"
+  spec.add_development_dependency "openapi3_parser", "~> 0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger-dsl
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Narazaka
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jimmy
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-description: 
+- !ruby/object:Gem::Dependency
+  name: json_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: openapi3_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+description:
 email:
 - info@narazaka.net
 executables: []
@@ -264,8 +292,8 @@ metadata:
   homepage_uri: https://github.com/Narazaka/swagger-dsl
   source_code_uri: https://github.com/Narazaka/swagger-dsl.git
   changelog_uri: https://github.com/Narazaka/swagger-dsl/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/swagger-dsl/1.5.0
-post_install_message: 
+  documentation_uri: https://www.rubydoc.info/gems/swagger-dsl/2.0.1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -280,8 +308,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Swagger (OpenAPI 3) DSL
 test_files: []