sober_swag 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0e0e510ec9344738f12f01098f1d34557ac41c83dc966b4368b1407496b868
-  data.tar.gz: 50f62bed3de241407e3d16caaae632dc8af21781477ac7e212a60af71780c932
+  metadata.gz: 9e65d79013d299407a6fbe6c610bf1ca4c6b24be6b2e944de39faf0bc80204d1
+  data.tar.gz: 69e079b589f72e3ff06d5b08bfff72064341cbc916311166dcfd4b9e8172b5da
 SHA512:
-  metadata.gz: 04ad84a03ee992677593aeea1342ddbb1fb693d7f67ae6c9e3b31b8d5050aeda86d71f65390d906ade4d30e458cdb7717d3ef02d93f3e966a92e4fac63240e8e
-  data.tar.gz: 535711fae0cc27c5122f5873cf64901e571631d9d87ecc04d44420deb99ff173bf83c0b36cdd34ce44aa6a697cec643098a8784be2487c2f9619ea78b52b2754
+  metadata.gz: 342f90b5d974c97149b4449e5ae20b7d2551190a4ded32bfef1e62ea82b5b7e03c75103fefdb48390cf0cfbe9bc58b37f4118bcca3fded7b5f951b8470195ad0
+  data.tar.gz: 3877ec4ef5cd9823e6e43a9c192a7aae89bf51913c9481018fef38206e7bbb36e2907cad3613098907d0c394c52119b7488263bad645a25d9d28452ea55cc75e

data/lib/sober_swag/compiler/type.rb

@@ -126,7 +126,9 @@ module SoberSwag
 
         case type
         when Class
-          { :$ref => self.class.get_ref(type) }
+          # refs have to be standalone
+          # so to not interefere with our other stuff, do this horrible garbage
+          { oneOf: [{ '$ref'.to_sym => self.class.get_ref(type) }] }
         when Dry::Types::Constrained
           self.class.new(type.type).schema_stub
         when Dry::Types::Array::Member
@@ -220,19 +222,20 @@ module SoberSwag
           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
         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])
+          type_def =
+            if self.class.primitive?(value)
+              self.class.primitive_def(value)
+            else
+              metadata.merge!(value.meta)
+              # refs have to be on their own, this is the stupid workaround
+              # so you can add descriptions and stuff
+              { oneOf: [{ '$ref'.to_sym => self.class.get_ref(value) }] }
             end
-          else
-            { '$ref': self.class.get_ref(value) }
+          METADATA_KEYS.select(&metadata.method(:key?)).reduce(type_def) do |definition, key|
+            definition.merge(key => metadata[key])
           end
         else
           raise ArgumentError, "Got confusing node #{object} (#{object.class})"

data/lib/sober_swag/parser.rb

@@ -46,8 +46,9 @@ module SoberSwag
       when Dry::Types::Constrained
         bind(Parser.new(@node.type))
       when Dry::Types::Nominal
+        old_meta = @node.primitive.respond_to?(:meta) ? @node.primitive.meta : {}
         # start off with the moral equivalent of NodeTree[String]
-        Nodes::Primitive.new(@node.primitive, @node.meta)
+        Nodes::Primitive.new(@node.primitive, old_meta.merge(@node.meta))
       else
         # Inside of this case we have a class that is some user-defined type
         # We put it in our array of found types, and consider it a primitive

data/lib/sober_swag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Anthony Super
@@ -183,7 +183,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/setup
 - docs/serializers.md
 - example/.gitignore

data/bin/console

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'sober_swag'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-module Types
-  include Dry.Types()
-end
-
-Bio = SoberSwag.input_object do
-  attribute :name, primitive(:String).meta(description: 'A very basic bio name')
-end
-
-Person = SoberSwag.input_object do
-  attribute :name, primitive(:String).meta(description: 'The full name description')
-  attribute :age, param(:Integer).constrained(gt: 0).optional.meta(description: 'My cool age')
-  attribute? :mood, Types::String
-end
-
-##
-# Demonstration of subclass-style.
-class PersonSearch < SoberSwag::InputObject
-  attribute? :name, Types::String
-  attribute? :age, Types::Integer
-end
-
-##
-# Demonstration of subclass-style *and* recursion in structs.
-class LinkedList < SoberSwag::InputObject
-  attribute :value, Types::String
-  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