sober_swag 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2b4cc3cb2635010c4c3c0950e6ce87272046bf2e4cdbf08cf2e299518444b0
-  data.tar.gz: c407225c2c1c5abfadc3e074e5aba98ffb929dc47dda16f5f32293a73669c444
+  metadata.gz: a005a30f258a97e03e6a8c69429a3bf3d8f35477ffe0dbe7ba4afb030e36986d
+  data.tar.gz: 0d9aaed05874fec05ebccbe4b987a9c0d46eaeb3fefe9633b34340a28f956c75
 SHA512:
-  metadata.gz: 3dbeeaec1ac6280e3029d779b31490a1661e436e87f833b4e5dce4c3eef96031e18988148aa48ebd1d849fe85353e93c1308f64a013c25d03424ad5b81041c8e
-  data.tar.gz: 51d0d80744d371cc51a2ba5497a9e8942d26a3e96a97625069476b12b612562fff00a0e371441c7851662e2f181a5ff9e33f0d4dcaecb92c233d6a8c4c07f66f
+  metadata.gz: 10659925df20f3eeab802f8c8648c5f589a509d247d9017076893f67501dc4ba1f97e1c3f21958dcedc1e1aff950d8375e74825f038e1e360c984e01a4656c61
+  data.tar.gz: be74588c605a26165363e88ab95dbfcb4a83cb4d169a224544b74389c69049a769bcde8fb14e6338f7fac92419a317fd9a2332352e7a420be95060c20523e666

data/.github/config/rubocop_linter_action.yml

@@ -2,4 +2,3 @@ check_name: 'Rubocop Lint'
 versions:
   rubocop: 'latest'
   rubocop-rspec: 'latest'
-

data/.github/workflows/ruby.yml

@@ -17,6 +17,9 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.7' ]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,25 +29,31 @@ jobs:
     # uses: ruby/setup-ruby@v1
       uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
       with:
-        ruby-version: 2.7
+        ruby-version:  ${{ matrix.ruby }}
     - uses: actions/cache@v2
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gem-deps-${{ hashFiles('**/Gemfile.lock') }}
+        key: ${{ runner.os }}-${{ matrix.ruby }}-gem-deps-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
-          ${{ runner.os }}-gem-deps-
+          ${{ runner.os }}-${{ matrix.ruby }}-gem-deps-
     - name: Install dependencies
       run: |
         bundle config path vendor/bundle
         bundle install
     - name: Run tests
-      run: bundle exec rake
+      run: COVERAGE=1 bundle exec rake
+    - name: Upload Coverage
+      uses: actions/upload-artifact@master
+      if: always()
+      with:
+        name: coverage-report
+        path: coverage
     - uses: actions/cache@v2
       with:
         path: example/vendor/bundle
-        key: ${{ runner.os }}-example-deps-${{ hashFiles('example/**/Gemfile.lock') }}
+        key: ${{ runner.os }}-${{ matrix.ruby }}-example-deps-${{ hashFiles('example/**/Gemfile.lock') }}
         restore-keys: |
-          ${{ runner.os }}-example-deps-
+          ${{ runner.os }}-${{ matrix.ruby }}-example-deps-
     - name: Install example dependencies for example
       working-directory: example
       run: |
@@ -52,4 +61,4 @@ jobs:
         bundle install
     - name: Run specs for example
       working-directory: example
-      run: rake
+      run: bundle exec rake

data/.gitignore

@@ -10,5 +10,6 @@
 # rspec failure tracking
 .rspec_status
 .ruby-version
+Gemfile.lock
 
 *.gem

data/.rubocop.yml

@@ -3,7 +3,7 @@ Style/FrozenStringLiteralComment:
 Style/BlockDelimiters:
   EnforcedStyle: braces_for_chaining
 AllCops:
-  TargetRubyVersion: 2.7.1
+  TargetRubyVersion: 2.6.0
   Exclude:
     - 'bin/bundle'
     - 'example/bin/bundle'
@@ -31,6 +31,8 @@ Metrics/AbcSize:
 Style/Documentation:
   Exclude:
     - 'example/db/migrate/**/*'
+Metrics/PerceivedComplexity:
+  Enabled: false
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true
 Layout/SpaceAroundMethodCallOperator:

data/README.md

@@ -3,16 +3,12 @@
 ![Ruby Test Status](https://github.com/SonderMindOrg/sober_swag/workflows/Ruby/badge.svg?branch=master)
 ![Linters Status](https://github.com/SonderMindOrg/sober_swag/workflows/Linters/badge.svg?branch=master)
 
-***NOTE: THIS GEM IS HIGHLY EXPERIMENTAL AND PROBABLY SHOULD NOT YET BE USED IN PRODUCTION***.
-
 SoberSwag is a combination of [Dry-Types](https://dry-rb.org/gems/dry-types/1.2/) and [Swagger](https://swagger.io/) that makes your Rails APIs more awesome.
-Other tools generate documenation from a DSL.
+Other tools generate documentation from a DSL.
 This generates documentation from *types*, which (conveniently) also lets you get supercharged strong-params-on-steroids.
 
 An introductory presentation is available [here](https://www.icloud.com/keynote/0bxP3Dn8ETNO0lpsSQSVfEL6Q#SoberSwagPresentation).
 
-This gem uses pattern matching, and is thus only compatible with Ruby 2.7 or later.
-
 ## Types for a fully-automated API
 
 SoberSwag lets you type your API using describe blocks.
@@ -20,22 +16,22 @@ In any controller that includes `SoberSwag::Controller`, you get access to the s
 This lets you type your API endpoint:
 
 ```ruby
-  class PeopleController < ApplicationController
-    include SoberSwag::Controller
-    define :patch, :update, '/people/{id}' do
-      query_params do
-        attribute? :include_extra_info, Types::Params::Bool
-      end
-      request_body do
-        attribute? :name, Types::Params::String
-        attribute? :age, Types::Params::Integer
-      end
-      path_params { attribute :id, Types::Params::Integer }
+class PeopleController < ApplicationController
+  include SoberSwag::Controller
+  define :patch, :update, '/people/{id}' do
+    query_params do
+      attribute? :include_extra_info, Types::Params::Bool
     end
+    request_body do
+      attribute? :name, Types::Params::String
+      attribute? :age, Types::Params::Integer
+    end
+    path_params { attribute :id, Types::Params::Integer }
   end
+end
 ```
 
-We can now us this information to generate swagger documentation, available at the `swagger` action on this controller.
+We can now use this information to generate swagger documentation, available at the `swagger` action on this controller.
 More than that, we can use this information *inside* our controller methods:
 
 ```ruby
@@ -51,7 +47,7 @@ You define the type of parameters you accept, and we reject anything that doesn'
 ### Typed Responses
 
 Want to go further and type your responses too?
-Use SoberSwag blueprints, a serializer library heavily inspired by [OutputObjecter](https://github.com/procore/blueprinter)
+Use SoberSwag output objects, a serializer library heavily inspired by [Blueprinter](https://github.com/procore/blueprinter)
 
 ```ruby
 PersonOutputObject = SoberSwag::OutputObject.define do
@@ -89,27 +85,75 @@ end
 
 Support for easily typing "render the activerecord errors for me please" is (unfortunately) under development.
 
-### SoberSwag Structs
+### SoberSwag Input Objects
 
 Input parameters (including path, query, and request body) are typed using [dry-struct](https://dry-rb.org/gems/dry-struct/1.0/).
-You don't have to do them inline: you can define them in another file, like so:
+You don't have to do them inline. You can define them in another file, like so:
 
 ```ruby
-User = SoberSwag.struct do
+User = SoberSwag.input_object do
   attribute :name, SoberSwag::Types::String
   # use ? if attributes are not required
   attribute? :favorite_movie, SoberSwag::Types::String
   # use .optional if attributes may be null
-  attribute :age, SoberSwag::Types::Params::::Integer.optional
+  attribute :age, SoberSwag::Types::Params::Integer.optional
+end
+```
+
+Then, in your controller, just do:
+
+```ruby
+class PeopleController < ApplicationController
+  include SoberSwag::Controller
+
+  define :path, :update, '/people/{id}' do
+    request_body(User)
+    path_params { attribute :id, Types::Params::Integer }
+    response(:ok, 'the updated person', PersonOutputObject)
+  end
+  def update
+    # same as above!
+  end
 end
 ```
 
 Under the hood, this literally just generates a subclass of `Dry::Struct`.
 We use the DSL-like method just to make working with Rails' reloading less annoying.
 
+#### Adding additional documentation
+
+You can use the `.meta` attribute on a type to add additional documentation.
+Some keys are considered "well-known" and will be present on the swagger output.
+For example:
+
+
+```ruby
+User = SoberSwag.input_object do
+  attribute? :name, SoberSwag::Types::String.meta(description: <<~MARKDOWN, deprecated: true)
+    The given name of the students, with strings encoded as escaped-ASCII.
+    This is used by an internal Cobol microservice from 1968.
+    Please use unicode_name instead unless you are that microservice.
+  MARKDOWN
+  attribute? :unicode_name, SoberSwag::Types::String
+end
+```
+
+This will output the swagger you expect, with a description and a deprecated flag.
+
+#### Adding Default Values
+
+Sometimes it makes sense to specify a default value.
+Don't worry, we've got you covered:
+
+```ruby
+QueryInput = SoberSwag.input_object do
+  attribute :allow_first, SoberSwag::Types::Params::Bool.default(false) # smartly alters type-definition to establish that passing this is not required.
+end
+```
+
 ## Special Thanks
 
-This gem is a mismatch of ideas from various sources.
+This gem is a mishmash of ideas from various sources.
 The biggest thanks is owed to the [dry-rb](https://github.com/dry-rb) project, upon which the typing of SoberSwag is based.
 On an API design level, much is owed to [blueprinter](https://github.com/procore/blueprinter) for the serializers.
 The idea of a strongly-typed API came from the Haskell framework [servant](https://www.servant.dev/).

data/bin/console

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -W:no-experimental
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require 'bundler/setup'
@@ -34,6 +34,15 @@ class LinkedList < SoberSwag::InputObject
   attribute? :next, LinkedList
 end
 
+Foo = SoberSwag::OutputObject.define do
+  field :name, primitive(:String)
+  field :age, primitive(:String)
+
+  view :foo do
+    field :bar, primitive(:String).optional
+  end
+end
+
 # (If you use this, don't forget to add pry to your Gemfile!)
 require 'pry'
 Pry.start

data/docs/serializers.md

@@ -4,11 +4,11 @@ Serializers are a way to transform from one type to another.
 For example, you might want to change an ActiveRecord object to a JSON struct.
 You might also want to change an internal date-interval into a two-element array of dates, or some custom text format.
 You can do all of these things with SoberSwag serializers.
-Furthermore, Serializers document the *type* that they serialize, so you can use it to degenerate documentation.
+Furthermore, Serializers document the *type* that they serialize, so you can use it to generate documentation.
 
 ## The Basics
 
-All serializers are inherted from [`SoberSwag::Serializer::Base`](../lib/sober_swag/serializer/base.rb).
+All serializers are inherited from [`SoberSwag::Serializer::Base`](../lib/sober_swag/serializer/base.rb).
 This is an abstract class that implements several methods, most of which will be documented later.
 The two that are most interesting, however, are `#type` and `#serialize`.
 
@@ -55,12 +55,12 @@ In the future, we might add some "debug mode" sorta thing that will do type-chec
 
 ### Mapped
 
-Sometimes, you can create a serilaizer via a *proc*.
+Sometimes, you can create a serializer via a *proc*.
 For example, let's say that I want a serializer that takes a `Date` and returns a string.
 I can do this:
 
 ```ruby
-date_string = SoberSwag::Serializer.Primitive(:String).via_map { |d| d.to_s }
+date_string = SoberSwag::Serializer.primitive(:String).via_map { |d| d.to_s }
 ```
 
 This is implemented via [`SoberSwag::Serializer::Mapped`](../lib/sober_swag/serializer/mapped.rb).
@@ -87,7 +87,7 @@ my_serializer.optional.serialize(nil) # => nil
 # ^ nils become nil
 ```
 
-This properly changes the `type` to be a nillable type, as well.
+This properly changes the `type` to be a nilable type, as well.
 
 ### Array
 
@@ -121,9 +121,9 @@ Let's define an output object:
 
 ```ruby
 StudentOutputObject = SoberSwag::OutputObject.define do
-  field :first_name, Primitive(:String)
-  field :last_name, Primitive(:String)
-  field :recent_grades, Primitive(:Integer).array do |student|
+  field :first_name, primitive(:String)
+  field :last_name, primitive(:String)
+  field :recent_grades, primitive(:Integer).array do |student|
     student.graded_assignments.limit(100).pluck(:grade)
   end
 end
@@ -143,10 +143,10 @@ Let's take a look at their use:
 
 ```ruby
 StudentOutputObject = SoberSwag::OutputObject.define do
-  field :first_name, Primitive(:String)
-  field :last_name, Primitive(:String)
+  field :first_name, primitive(:String)
+  field :last_name, primitive(:String)
   view :detail do
-    field :recent_grades, Primitive(:Integer).array do |student|
+    field :recent_grades, primitive(:Integer).array do |student|
       student.graded_assignments.limit(100).pluck(:grade)
     end
   end
@@ -189,7 +189,7 @@ StudentOutputObject = SoberSwag::OutputObject.define do
 end
 ```
 
-This can cause a circular dependecy.
+This can cause a circular dependency.
 To break this, you can use a lambda:
 
 ```ruby
@@ -200,4 +200,4 @@ StudentOutputObject = SoberSwag::OutputObject.define do
 end
 ```
 
-For clarity (and to prevent infinitely-looping serializers on accident, we reccomend you *always* use an explicit view for dependent output objects.
+For clarity (and to prevent infinitely-looping serializers on accident, we recommend you *always* use an explicit view for dependent output objects.

data/example/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.1'
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
 

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sober_swag (0.1.0)
+    sober_swag (0.5.0)
       activesupport
       dry-struct (~> 1.0)
       dry-types (~> 1.2)
@@ -225,8 +225,5 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
   tzinfo-data
 
-RUBY VERSION
-   ruby 2.7.1p83
-
 BUNDLED WITH
    2.1.4

data/example/app/controllers/people_controller.rb

@@ -61,16 +61,18 @@ class PeopleController < ApplicationController
 
   define :get, :index, '/people/' do
     query_params do
-      attribute? :first_name, Types::String
-      attribute? :last_name, Types::String
-      attribute? :view, Types::String.enum('base', 'detail')
+      attribute? :filters do
+        attribute? :first_name, Types::String
+        attribute? :last_name, Types::String
+      end
+      attribute :view, Types::String.default('base'.freeze).enum('base', 'detail')
     end
     response(:ok, 'all the people', PersonOutputObject.array)
   end
   def index
     @people = Person.all
-    @people = @people.where('UPPER(first_name) LIKE UPPER(?)', "%#{parsed_query.first_name}%") if parsed_query.first_name
-    @people = @people.where('UPPER(last_name) LIKE UPPER(?)', "%#{parsed_query.last_name}%") if parsed_query.last_name
+    @people = @people.where('UPPER(first_name) LIKE UPPER(?)', "%#{parsed_query.filters.first_name}%") if parsed_query.filters&.first_name
+    @people = @people.where('UPPER(last_name) LIKE UPPER(?)', "%#{parsed_query.filters.last_name}%") if parsed_query.filters&.last_name
     respond!(:ok, @people.includes(:posts), serializer_opts: { view: parsed_query.view })
   end
 

data/example/app/controllers/posts_controller.rb

@@ -39,12 +39,20 @@ class PostsController < ApplicationController
   define :get, :index, '/posts/' do
     query_params do
       attribute? :view, ViewTypes
+      attribute :include_first, SoberSwag::Types::Params::Bool.default(false).meta(description: <<~MARKDOWN)
+        For historical reasons the first-ever post is the entire text of *Finnegan's Wake.*
+        Unfortunately, our contractors wound up depending on this quirk to complete dark arcane ceremonies,
+        so we can't remove it. Thus, by default, we don't include the first post unless you explicitly ask us to
+        (maybe you feel like some classic literature?).
+      MARKDOWN
     end
     response(:ok, 'all the posts', PostOutputObject.array)
   end
   def index
     @posts = Post.all
 
+    @posts = @posts.where('id > 1') unless parsed_query.include_first
+
     respond!(:ok, @posts.includes(:person), serializer_opts: { view: parsed_query.view })
   end
 

data/example/spec/requests/people/index_spec.rb

@@ -35,13 +35,13 @@ RSpec.describe 'Index action for people' do
     end
 
     context 'with a good first-name search' do
-      let(:request) { get '/people', params: { first_name: 'A' } }
+      let(:request) { get '/people', params: { filters: { first_name: 'A' } } }
 
       it_behaves_like 'a request with the person'
     end
 
     context 'with a good last-name search' do
-      let(:request) { get '/people', params: { last_name: 'G' } }
+      let(:request) { get '/people', params: { filters: { last_name: 'G' } } }
 
       it_behaves_like 'a request with the person'
     end

data/lib/sober_swag/compiler/type.rb

@@ -22,6 +22,8 @@ module SoberSwag
         end
 
         def primitive_def(value)
+          value = value.primitive if value.is_a?(Dry::Types::Nominal)
+
           return nil unless value.is_a?(Class)
 
           if (name = primitive_name(value))
@@ -71,13 +73,16 @@ module SoberSwag
       end
 
       def path_schema
-        path_schema_stub.map { |e| e.merge(in: :path) }
+        path_schema_stub.map do |e|
+          ensure_uncomplicated(e[:name], e[:schema])
+          e.merge(in: :path)
+        end
       rescue TooComplicatedError => e
         raise TooComplicatedForPathError, e.message
       end
 
       def query_schema
-        path_schema_stub.map { |e| e.merge(in: :query) }
+        path_schema_stub.map { |e| e.merge(in: :query, style: :deepObject, explode: true) }
       rescue TooComplicatedError => e
         raise TooComplicatedForQueryError, e.message
       end
@@ -129,7 +134,7 @@ module SoberSwag
         when Dry::Types::Sum
           { oneOf: normalize(parsed_type).elements.map { |t| self.class.new(t.value).schema_stub } }
         else
-          raise ArgumentError, "Cannot generate a schema stub for #{type} (#{type.class})"
+          raise SoberSwag::Compiler::Error, "Cannot generate a schema stub for #{type} (#{type.class})"
         end
       end
 
@@ -148,14 +153,17 @@ module SoberSwag
 
       def rewrite_sums(object) # rubocop:disable Metrics/MethodLength
         case object
-        in Nodes::Sum[Nodes::OneOf[*lhs], Nodes::OneOf[*rhs]]
-        Nodes::OneOf.new(lhs + rhs)
-        in Nodes::Sum[Nodes::OneOf[*args], rhs]
-        Nodes::OneOf.new(args + [rhs])
-        in Nodes::Sum[lhs, Nodes::OneOf[*args]]
-        Nodes::OneOf.new([lhs] + args)
-        in Nodes::Sum[lhs, rhs]
-        Nodes::OneOf.new([lhs, rhs])
+        when Nodes::Sum
+          lhs, rhs = object.deconstruct
+          if lhs.is_a?(Nodes::OneOf) && rhs.is_a?(Nodes::OneOf)
+            Nodes::OneOf.new(lhs.deconstruct + rhs.deconstruct)
+          elsif lhs.is_a?(Nodes::OneOf)
+            Nodes::OneOf.new([*lhs.deconstruct, rhs])
+          elsif rhs.is_a?(Nodes::OneOf)
+            Nodes::OneOf.new([lhs, *rhs.deconstruct])
+          else
+            Nodes::OneOf.new([lhs, rhs])
+          end
         else
           object
         end
@@ -163,59 +171,69 @@ module SoberSwag
 
       def flatten_one_ofs(object)
         case object
-          in Nodes::OneOf[*args]
-          Nodes::OneOf.new(args.uniq)
-          else
+        when Nodes::OneOf
+          Nodes::OneOf.new(object.deconstruct.uniq)
+        else
           object
         end
       end
 
       def to_object_schema(object) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         case object
-        in Nodes::List[element]
+        when Nodes::List
           {
             type: :array,
-            items: element
+            items: object.deconstruct.first
           }
-        in Nodes::Enum[values]
+        when Nodes::Enum
           {
             type: :string,
-            enum: values
+            enum: object.deconstruct.first
+          }
+        when Nodes::OneOf
+          if object.deconstruct.include?({ type: 'null' })
+            rejected = object.deconstruct.reject { |e| e[:type] == 'null' }
+            if rejected.length == 1
+              rejected.first.merge(nullable: true)
+            else
+              { oneOf: rejected, nullable: true }
+            end
+          else
+            { oneOf: object.deconstruct }
+          end
+        when Nodes::Object
+          # openAPI requires that you give a list of required attributes
+          # (which IMO is the *totally* wrong thing to do but whatever)
+          # so we must do this garbage
+          required = object.deconstruct.filter { |(_, b)| b[:required] }.map(&:first)
+          {
+            type: :object,
+            properties: object.deconstruct.map { |(a, b)|
+              [a, b.reject { |k, _| k == :required }]
+            }.to_h,
+            required: required
           }
-        in Nodes::OneOf[{ type: 'null' }, b]
-        b.merge(nullable: true)
-        in Nodes::OneOf[a, { type: 'null' }]
-        a.merge(nullable: true)
-        in Nodes::OneOf[*attrs] if attrs.include?(type: 'null')
-        { oneOf: attrs.reject { |e| e[:type] == 'null' }, nullable: true }
-        in Nodes::OneOf[*cases]
-        { oneOf: cases }
-        in Nodes::Object[*attrs]
-        # openAPI requires that you give a list of required attributes
-        # (which IMO is the *totally* wrong thing to do but whatever)
-        # so we must do this garbage
-        required = attrs.filter { |(_, b)| b[:required] }.map(&:first)
-        {
-          type: :object,
-          properties: attrs.map { |(a, b)|
-            [a, b.reject { |k, _| k == :required }]
-          }.to_h,
-          required: required
-        }
-        in Nodes::Attribute[name, true, value]
-        [name, value.merge(required: true)]
-        in Nodes::Attribute[name, false, value]
-        [name, value]
+        when Nodes::Attribute
+          name, req, value = object.deconstruct
+          if req
+            [name, value.merge(required: true)]
+          else
+            [name, value]
+          end
         # can't match on value directly as ruby uses `===` to match,
         # and classes use `===` to mean `is an instance of`, as
         # opposed to direct equality lmao
-        in Nodes::Primitive[value:, metadata:] if self.class.primitive?(value)
-        md = self.class.primitive_def(value)
-        METADATA_KEYS.select(&metadata.method(:key?)).reduce(md) do |definition, key|
-          definition.merge(key => metadata[key])
-        end
-        in Nodes::Primitive[value:]
-        { '$ref': self.class.get_ref(value) }
+        when Nodes::Primitive
+          value = object.value
+          metadata = object.metadata
+          if self.class.primitive?(value)
+            md = self.class.primitive_def(value)
+            METADATA_KEYS.select(&metadata.method(:key?)).reduce(md) do |definition, key|
+              definition.merge(key => metadata[key])
+            end
+          else
+            { '$ref': self.class.get_ref(value) }
+          end
         else
           raise ArgumentError, "Got confusing node #{object} (#{object.class})"
         end
@@ -224,13 +242,10 @@ module SoberSwag
       def path_schema_stub
         @path_schema_stub ||=
           object_schema[:properties].map do |k, v|
-            ensure_uncomplicated(k, v)
+            # ensure_uncomplicated(k, v)
             {
               name: k,
               schema: v.reject { |key, _| %i[required nullable].include?(key) },
-              # rubocop:disable Style/DoubleNegation
-              allowEmptyValue: !object_schema[:required].include?(k) || !!v[:nullable], # if it's required, no empties, but if *nullabe*, empties are okay
-              # rubocop:enable Style/DoubleNegation
               required: object_schema[:required].include?(k) || false
             }
           end
@@ -239,6 +254,8 @@ module SoberSwag
       def ensure_uncomplicated(key, value)
         return if value[:type]
 
+        return value[:oneOf].each { |member| ensure_uncomplicated(key, member) } if value[:oneOf]
+
         raise TooComplicatedError, <<~ERROR
           Property #{key} has object-schema #{value}, but this type of param should be simple (IE a primitive of some kind)
         ERROR

data/lib/sober_swag/nodes/base.rb

@@ -44,6 +44,10 @@ module SoberSwag
       def map
         raise ArgumentError, 'Base is abstract'
       end
+
+      def flatten_one_ofs
+        raise ArgumentError, 'Base is abstract'
+      end
     end
   end
 end

data/lib/sober_swag/output_object/field_syntax.rb

@@ -10,7 +10,7 @@ module SoberSwag
       ##
       # Given a symbol to this, we will use a primitive name
       def primitive(name)
-        SoberSwag::Serializer.Primitive(SoberSwag::Types.const_get(name))
+        SoberSwag::Serializer.primitive(SoberSwag::Types.const_get(name))
       end
     end
   end

data/lib/sober_swag/parser.rb

@@ -10,6 +10,9 @@ module SoberSwag
 
     def to_syntax # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
       case @node
+      when Dry::Types::Default
+        # we handle this elsewhere, so
+        bind(Parser.new(@node.type))
       when Dry::Types::Array::Member
         Nodes::List.new(bind(Parser.new(@node.member)))
       when Dry::Types::Enum
@@ -21,7 +24,7 @@ module SoberSwag
       when Dry::Types::Schema::Key
         Nodes::Attribute.new(
           @node.name,
-          @node.required?,
+          @node.required? && !@node.type.default?,
           bind(Parser.new(@node.type))
         )
       when Dry::Types::Sum

data/lib/sober_swag/serializer.rb

@@ -18,7 +18,7 @@ module SoberSwag
       # in values raw.
       #
       # @param contained {Class} Dry::Type to use
-      def Primitive(contained) # rubocop:disable Naming/MethodName
+      def primitive(contained)
         SoberSwag::Serializer::Primitive.new(contained)
       end
     end

data/lib/sober_swag/serializer/conditional.rb

@@ -47,7 +47,11 @@ module SoberSwag
       end
 
       def lazy_type
-        left.lazy_type | right.lazy_type
+        if left.lazy_type == right.lazy_type
+          left.lazy_type
+        else
+          left.lazy_type | right.lazy_type
+        end
       end
 
       def lazy_type?

data/lib/sober_swag/serializer/mapped.rb

@@ -8,7 +8,9 @@ module SoberSwag
         @map_f = map_f
       end
 
-      def serialize(object, options)
+      attr_reader :base, :map_f
+
+      def serialize(object, options = {})
         @base.serialize(@map_f.call(object), options)
       end
 

data/lib/sober_swag/server.rb

@@ -9,8 +9,12 @@ module SoberSwag
       Rails.application.routes.routes.map { |route|
         route.defaults[:controller]
       }.to_set.reject(&:nil?).map { |controller|
-        "#{controller}_controller".classify.constantize
-      }.filter { |controller| controller.ancestors.include?(SoberSwag::Controller) }
+        begin
+          "#{controller}_controller".classify.constantize
+        rescue StandardError
+          nil
+        end
+      }.compact.filter { |controller| controller.ancestors.include?(SoberSwag::Controller) }
     end
 
     ##

data/lib/sober_swag/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SoberSwag
-  VERSION = '0.2.0'
+  VERSION = '0.7.0'
 end

data/sober_swag.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
 
+  spec.required_ruby_version = '>= 2.6.0'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Anthony Super
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,7 +166,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -288,14 +287,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate swagger types from dry-types

data/Gemfile.lock

@@ -1,116 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sober_swag (0.1.0)
-      activesupport
-      dry-struct (~> 1.0)
-      dry-types (~> 1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    dry-configurable (0.11.3)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.0.6)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-struct (1.3.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-types (~> 1.3)
-      ice_nine (~> 0.11)
-    dry-types (1.4.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    method_source (0.9.2)
-    minitest (5.14.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.88.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    rubocop-rspec (1.42.0)
-      rubocop (>= 0.87.0)
-    ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  pry
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop
-  rubocop-rspec
-  simplecov
-  sober_swag!
-
-BUNDLED WITH
-   2.1.4