sober_swag 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb2b4cc3cb2635010c4c3c0950e6ce87272046bf2e4cdbf08cf2e299518444b0
-  data.tar.gz: c407225c2c1c5abfadc3e074e5aba98ffb929dc47dda16f5f32293a73669c444
+  metadata.gz: c404cf1bad19f06280ce4c8a2002899ed37e9e68e0fc910d270b4e14dc38dab6
+  data.tar.gz: 29333042d89f5f3de762143ef60566bbbb45640a948c8b5720c4563b236a1d64
 SHA512:
-  metadata.gz: 3dbeeaec1ac6280e3029d779b31490a1661e436e87f833b4e5dce4c3eef96031e18988148aa48ebd1d849fe85353e93c1308f64a013c25d03424ad5b81041c8e
-  data.tar.gz: 51d0d80744d371cc51a2ba5497a9e8942d26a3e96a97625069476b12b612562fff00a0e371441c7851662e2f181a5ff9e33f0d4dcaecb92c233d6a8c4c07f66f
+  metadata.gz: 1b84c508452f4dfd1250e0b6255d11173e2eb8382669adb75d3356f842a9ce7e6155410f5c233c6a8eae00697db0a561b3e466cfa9704996fb8de76c164f9c6b
+  data.tar.gz: 45f28285e80a666f45f6b8ef3b598fb68c321da83022ee3d13b8532bf97cc9b2fe3eaed36ca3d670fe75b44a37263d349ce76dde44f4ed80bdb5583bb4e7f342

data/.github/workflows/ruby.yml

@@ -38,7 +38,13 @@ jobs:
         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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sober_swag (0.1.0)
+    sober_swag (0.2.0)
       activesupport
       dry-struct (~> 1.0)
       dry-types (~> 1.2)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -18,9 +18,9 @@ GEM
     ast (2.4.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dry-configurable (0.11.3)
+    dry-configurable (0.11.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -47,7 +47,7 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     method_source (0.9.2)
@@ -66,15 +66,15 @@ GEM
       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)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       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)
+    rspec-support (3.9.3)
     rubocop (0.88.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
@@ -97,7 +97,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -3,8 +3,6 @@
 ![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.
 This generates documentation from *types*, which (conveniently) also lets you get supercharged strong-params-on-steroids.
@@ -51,7 +49,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

data/example/Gemfile.lock

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

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))
@@ -129,7 +131,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
 
@@ -239,6 +241,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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Anthony Super
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport