sober_swag 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdf3896754f6acf3bef2df51e947439be3822d3635eb924d6029ab3157b13bd9
-  data.tar.gz: 75846c0b78e4e8dc9fc550af50aeb2bb73f3c1200e8c50af6c07092d2dd8c277
+  metadata.gz: c07baa6165df700b23c0f8a0c9bd1a1dcb841d79b07995479b0c1e19a69928d7
+  data.tar.gz: 523a0eabeb954497f531485962b0f058dc9a32ec398df899162c66e5d985d01e
 SHA512:
-  metadata.gz: ae7076a9dcabcf2a99b642f967782195d1680ff13b6fd251123abdec15ec2eab18435ec1897fe212a060779b1bdffb8061bcb4b2eb89884713230ca0c70ecc27
-  data.tar.gz: 5f3fb9ee3c31feb8ede072171e5f0f2f5108061d7f09c44e4f4d88d929c001519734fce64b4c261ea4d8e63d9aa1862fdf374cdddd00da2b58d9cf75fc367320
+  metadata.gz: 0ccf5c1f96d1647e42e082bfdd05c0a0ba3ff9d6d0bbe9139f9349bd17c917e854057af26a073c84aeeb54ac065c8c9f297d99d8063a0bccf032f77217c900bd
+  data.tar.gz: f01787f76223c896154312b43862ac1276154715c9b8234a761c84dc046a1f5ab7f82e387c821805bf2f3b22ed99452bd834336dfdfc8f15350345efcc575de8

data/bin/console

@@ -34,6 +34,15 @@ class LinkedList < SoberSwag::InputObject
   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

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,21 +6,30 @@ 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
+
+      ##
+      # Delegates to `base`, adds metadata, pumbs identifiers
       def lazy_type
-        @base.lazy_type.meta(**meta)
+        @base.lazy_type.meta(**metadata).tap { |t| t.identifier(@base.identifier) }
       end
 
+      ##
+      # Delegates to `base`, adds metadata, plumbs identifiers
       def type
-        @base.type.meta(**meta)
+        @base.type.meta(**metadata).tap { |t| t.identifier(@base.identifier) }
       end
 
       def finalize_lazy_type!

data/lib/sober_swag/server.rb

@@ -9,8 +9,12 @@ module SoberSwag
       Rails.application.routes.routes.map { |route|
         route.defaults[:controller]
       }.to_set.reject(&:nil?).map { |controller|
-        "#{controller}_controller".classify.constantize
-      }.filter { |controller| controller.ancestors.include?(SoberSwag::Controller) }
+        begin
+          "#{controller}_controller".classify.constantize
+        rescue StandardError
+          nil
+        end
+      }.compact.filter { |controller| controller.ancestors.include?(SoberSwag::Controller) }
     end
 
     ##

data/lib/sober_swag/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SoberSwag
-  VERSION = '0.6.0'
+  VERSION = '0.11.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.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Anthony Super
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-05 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: []