blueprinter_schema 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4bead8620839a075c510b0f243d4e8c3d8ee38a3f5025e493bf0c3f59d01519
-  data.tar.gz: 6ee11ed05b4b0337af6e4276e02cee4ce546eb47f7de4d36ff024c6af229b356
+  metadata.gz: 10b97bd206d6715355d0156e5f4974fdde88e4bde379a55c4216ad86043256af
+  data.tar.gz: 553afa8720b17b25d338eeda16b2959654a942765efbe509bb1ee51ae37f949c
 SHA512:
-  metadata.gz: 807bc1360008eb60eaf2df3c55f1287dc90d11fc2d6bc71f4abe68153ab678fd267b14382b581adfbbd5e728f262183a6434901c50d4086de8f4b815248a558b
-  data.tar.gz: e18240976adffd74caff957b4be334c72acd88e0286f03fd20ff60f118b5e1e0e6a94be6dedc689216fa761f1a588e33c359eaa1ff3fd680a305aacf65fc0e35
+  metadata.gz: 19c19495d8b3a3e0803ee43ff817b261b0d06af1ea872c8ae2229c306235896a3ec957769fde57191fd4fc7594a637be7263d83f4a7c5ed54f31c198cacca1c7
+  data.tar.gz: 067fea318a9903c9af725b00cb27cc71012cffcaabdc31fe19df179798021e7a2fd18f52b9144dfa0cd35ead7e8031ba68c2723915601ce3575f6cd4eec0d931

data/README.md

@@ -195,22 +195,46 @@ class RestrictionsSerializer < Blueprinter::Base
   field :max_units
 end
 
-BlueprinterSchema.generate(serializer: RestrictionsSerializer, model: Restrictions)
+class Product
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :reference, :string
+  attribute :restrictions
+end
+
+class ProductSerializer < Blueprinter::Base
+  field :reference
+  association :restrictions, blueprint: RestrictionsSerializer, model: Restrictions
+end
+
+BlueprinterSchema.generate(serializer: ProductSerializer, model: Product)
 ```
 
 ```rb
 {
   "type" => "object",
-  "title" => "Restrictions",
+  "title" => "Product",
   "properties" => {
-    "min_units" => {
-      "type" => "integer"
+    "reference" => {
+      "type" => ["string", "null"]
     },
-    "max_units" => {
-      "type" => ["integer", "null"]
+    "restrictions" => {
+      "type" => "object",
+      "title" => "Restrictions",
+      "properties" => {
+        "min_units" => {
+          "type" => "integer"
+        },
+        "max_units" => {
+          "type" => ["integer", "null"]
+        }
+      },
+      "required" => ["max_units", "min_units"],
+      "additionalProperties" => false
     }
   },
-  "required" => ["max_units", "min_units"],
+  "required" => ["reference", "restrictions"],
   "additionalProperties" => false
 }
 ```

data/lib/blueprinter_schema/generator.rb

@@ -150,13 +150,24 @@ module BlueprinterSchema
       return { 'type' => 'object' } unless blueprint_class
 
       ar_association = @model.try(:reflect_on_association, association.name)
-      is_collection = ar_association ? ar_association.collection? : association.options[:collection]
-
       view = association.options[:view] || :default
       type = association.options[:optional] ? %w[object null] : 'object'
-      associated_schema = recursive_generate(blueprint_class, ar_association&.klass, view, type:)
+      model = association_model(association, ar_association)
+      associated_schema = recursive_generate(blueprint_class, model, view, type:)
+
+      wrap_collection(associated_schema, association_collection?(association, ar_association))
+    end
+
+    def association_model(association, ar_association)
+      ar_association&.klass || association.options[:model]
+    end
+
+    def association_collection?(association, ar_association)
+      ar_association ? ar_association.collection? : association.options[:collection]
+    end
 
-      is_collection ? { 'type' => 'array', 'items' => associated_schema } : associated_schema
+    def wrap_collection(schema, is_collection)
+      is_collection ? { 'type' => 'array', 'items' => schema } : schema
     end
 
     def recursive_generate(serializer, model, view, type:)

data/lib/blueprinter_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlueprinterSchema
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueprinter_schema
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - thisismydesign