sober_swag 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c404cf1bad19f06280ce4c8a2002899ed37e9e68e0fc910d270b4e14dc38dab6
-  data.tar.gz: 29333042d89f5f3de762143ef60566bbbb45640a948c8b5720c4563b236a1d64
+  metadata.gz: 58d8be36679e1f9e29622e05aded075a325ab9fef563b4853c4715a1b4250a86
+  data.tar.gz: 7e33fec98c8bf330e7e49af5326a234447154c35f5813d17e3c134e7f41dfa71
 SHA512:
-  metadata.gz: 1b84c508452f4dfd1250e0b6255d11173e2eb8382669adb75d3356f842a9ce7e6155410f5c233c6a8eae00697db0a561b3e466cfa9704996fb8de76c164f9c6b
-  data.tar.gz: 45f28285e80a666f45f6b8ef3b598fb68c321da83022ee3d13b8532bf97cc9b2fe3eaed36ca3d670fe75b44a37263d349ce76dde44f4ed80bdb5583bb4e7f342
+  metadata.gz: 8e9cc9c095545c83b9411bc69cc3c459e017b72b220c8b79dbbfc4a1a303d3bf864d2c984a1290e13b42a999d8d19d03e6a78a66c4992102c31451ea538305de
+  data.tar.gz: 52ecf6c37d3dad5893c9626fd833ba2ae4ff52ddf03895719bb40784aacc63bac0db6c282cd521786902ffad76425c0f5f89d9093412ba166374bbaee796762b

data/.github/workflows/ruby.yml

@@ -17,6 +17,9 @@ jobs:
   test:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
 
     steps:
     - uses: actions/checkout@v2
@@ -30,9 +33,9 @@ jobs:
     - 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
@@ -48,9 +51,9 @@ jobs:
     - 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: |

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sober_swag (0.2.0)
+    sober_swag (0.3.0)
       activesupport
       dry-struct (~> 1.0)
       dry-types (~> 1.2)

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sober_swag (0.2.0)
+    sober_swag (0.3.0)
       activesupport
       dry-struct (~> 1.0)
       dry-types (~> 1.2)

data/lib/sober_swag/compiler/type.rb

@@ -150,14 +150,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
@@ -165,59 +168,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
+      def to_object_schema(object) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         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
           }
-        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::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
+          }
+        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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Anthony Super
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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