sober_swag 0.7.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a005a30f258a97e03e6a8c69429a3bf3d8f35477ffe0dbe7ba4afb030e36986d
-  data.tar.gz: 0d9aaed05874fec05ebccbe4b987a9c0d46eaeb3fefe9633b34340a28f956c75
+  metadata.gz: fa0e0e510ec9344738f12f01098f1d34557ac41c83dc966b4368b1407496b868
+  data.tar.gz: 50f62bed3de241407e3d16caaae632dc8af21781477ac7e212a60af71780c932
 SHA512:
-  metadata.gz: 10659925df20f3eeab802f8c8648c5f589a509d247d9017076893f67501dc4ba1f97e1c3f21958dcedc1e1aff950d8375e74825f038e1e360c984e01a4656c61
-  data.tar.gz: be74588c605a26165363e88ab95dbfcb4a83cb4d169a224544b74389c69049a769bcde8fb14e6338f7fac92419a317fd9a2332352e7a420be95060c20523e666
+  metadata.gz: 04ad84a03ee992677593aeea1342ddbb1fb693d7f67ae6c9e3b31b8d5050aeda86d71f65390d906ade4d30e458cdb7717d3ef02d93f3e966a92e4fac63240e8e
+  data.tar.gz: 535711fae0cc27c5122f5873cf64901e571631d9d87ecc04d44420deb99ff173bf83c0b36cdd34ce44aa6a697cec643098a8784be2487c2f9619ea78b52b2754

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

@@ -77,7 +77,6 @@ module SoberSwag
         begin
           views.reduce(base_serializer) do |base, view|
             view_serializer = view.serializer
-            view_serializer.identifier("#{identifier}.#{view.name.to_s.classify}") if identifier
             SoberSwag::Serializer::Conditional.new(
               proc do |object, options|
                 if options[:view].to_s == view.name.to_s
@@ -93,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/definition.rb

@@ -18,7 +18,11 @@ module SoberSwag
       end
 
       def view(name, &block)
-        @views << View.define(name, fields, &block)
+        view = View.define(name, fields, &block)
+
+        view.identifier("#{@identifier}.#{name.to_s.classify}") if identifier
+
+        @views << view
       end
 
       def identifier(arg = nil)

data/lib/sober_swag/output_object/view.rb

@@ -3,7 +3,7 @@ module SoberSwag
     ##
     # DSL for defining a view.
     # Used in `view` blocks within {SoberSwag::OutputObject.define}.
-    class View
+    class View < SoberSwag::Serializer::Base
       def self.define(name, base_fields, &block)
         new(name, base_fields).tap do |view|
           view.instance_eval(&block)
@@ -41,12 +41,16 @@ 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.
       def serializer
         @serializer ||=
-          SoberSwag::Serializer::FieldList.new(fields)
+          SoberSwag::Serializer::FieldList.new(fields).tap { |s| s.identifier(identifier) }
       end
     end
   end

data/lib/sober_swag/serializer/mapped.rb

@@ -29,13 +29,6 @@ module SoberSwag
       def type
         @base.type
       end
-
-      ##
-      # I have no freaking clue if ruby optimizes proc composition,
-      # but we at least save some node traversals here
-      def via_map(&block)
-        SoberSwag::Serializer::Mapped.new(@base, @map_f >> block)
-      end
     end
   end
 end

data/lib/sober_swag/serializer/meta.rb

@@ -6,25 +6,35 @@ 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.
+        lazy_type.identifier(@base.lazy_type.identifier)
+        type.identifier(@base.type.identifier)
       end
 
       def lazy_type?

data/lib/sober_swag/version.rb

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

data/sober_swag.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sober_swag
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Anthony Super
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +293,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/SonderMindOrg/sober_swag
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -295,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Generate swagger types from dry-types
 test_files: []