sober_swag 0.9.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb0df290ab4fa245edd30b31ac7ba60ab590ad0586ad343183fa9ba1d8ef7a7
-  data.tar.gz: 836911a79386af53ccccaf7bbe09d108d7804ad6eb482ad8cca3dfb57b8b69fb
+  metadata.gz: 234da6bca56fd440edae30e4fc9c34c50a37a6ab26b41739276e57ab43c73408
+  data.tar.gz: 103e61429365ceb04d6d0225822ddaa4012f95a043a5bb97c6b8a2fd26671ce5
 SHA512:
-  metadata.gz: afd6d4975c6328e6496ed551d8e6421cc7d93d39e49445e5253fa9f82124a3b2eeb38ef3c4e8fec8522242a2eb98f2fe3d2a37b7950778e4648b64f3ebd59afb
-  data.tar.gz: 8ca0acee27f790c58c8d5ac236f2346dc1286ff338673678c9602f2f109b4273e568e1c7143187c1b10e3fa740c7cfa3a9bf3d1ff22d29a35f2107bcb5fe235a
+  metadata.gz: 58f27a7deebfcb50ec6279084e0a0e872fd0c2a447fca922549d7d3d9822a7e13e010372376c1a079472ba807845d267327275fe453efb99662f685321041e28
+  data.tar.gz: 97ecdb6352db7545004fba2103bb505b3730973a22689f05dedd5b6a305115a63f302f0f248edd3f70e6377ebe470c9ef4f734b2e38af031bf762d229c71bcc0

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

@@ -13,9 +13,16 @@ module SoberSwag
       # The name to use for this type in external documentation.
       def identifier(arg = nil)
         @identifier = arg if arg
+
         @identifier || name.to_s.gsub('::', '.')
       end
 
+      def meta(*args)
+        super(*args).tap do |result|
+          result.identifier(identifier) if result.is_a?(Class) # pass on identifier
+        end
+      end
+
       def primitive(sym)
         SoberSwag::Types.const_get(sym)
       end

data/lib/sober_swag/output_object.rb

@@ -92,6 +92,10 @@ module SoberSwag
         end
     end
 
+    def to_s
+      "<SoberSwag::OutputObject(#{identifier})>"
+    end
+
     def base_serializer
       @base_serializer ||= SoberSwag::Serializer::FieldList.new(fields).tap do |s|
         s.identifier(identifier)

data/lib/sober_swag/output_object/view.rb

@@ -41,6 +41,10 @@ module SoberSwag
         @fields << field
       end
 
+      def to_s
+        "<SoberSwag::OutputObject::View(#{identifier})>"
+      end
+
       ##
       # Get the serializer defined by this view.
       # WARNING: Don't add more fields after you call this.

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/serializer/meta.rb

@@ -6,25 +6,36 @@ module SoberSwag
     class Meta < Base
       def initialize(base, meta)
         @base = base
-        @meta = meta
+        @metadata = meta
+        @identifier = @base.identifier
       end
 
-      attr_reader :base, :meta
+      attr_reader :base, :metadata
 
       def serialize(args, opts = {})
         base.serialize(args, opts)
       end
 
+      def meta(hash)
+        self.class.new(base, metadata.merge(hash))
+      end
+
       def lazy_type
-        @base.lazy_type.meta(**meta)
+        @lazy_type ||= @base.lazy_type.meta(**metadata)
       end
 
       def type
-        @base.type.meta(**meta)
+        @type ||= @base.type.meta(**metadata)
       end
 
       def finalize_lazy_type!
         @base.finalize_lazy_type!
+        # Using .meta on dry-struct returns a *new type* that wraps the old one.
+        # As such, we need to be a bit clever about when we tack on the identifier
+        # for this type.
+        %i[lazy_type type].each do |sym|
+          public_send(sym).identifier(@base.public_send(sym).identifier) if @base.public_send(sym).respond_to?(:identifier)
+        end
       end
 
       def lazy_type?

data/lib/sober_swag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.14.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