blueprinter_schema 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392b3344dd71f597ca8c1bfc35e1e3e47c7d01417ba38cd5bf170d6f7e63f1cc
-  data.tar.gz: 7aadb18ef24453084f6f23fcb3b0e681c13b7d82b5e12c2d56572e3365f13e3f
+  metadata.gz: b4bead8620839a075c510b0f243d4e8c3d8ee38a3f5025e493bf0c3f59d01519
+  data.tar.gz: 6ee11ed05b4b0337af6e4276e02cee4ce546eb47f7de4d36ff024c6af229b356
 SHA512:
-  metadata.gz: 96b8ebe6804c446804b240e1962f223e9130990144421217139e019c1db8e12a891100b1cdb37423e67bc27afd38eb85e1106103a02439032a527511f701d2f0
-  data.tar.gz: 0e244fdb17fac6bb6d1ac367f77d97511d5736625850f2a55189dd3da58cceb114dd485b8d7a8f25eab79fd4c79b85339e0128334681cc1100fb07124febe3c7
+  metadata.gz: 807bc1360008eb60eaf2df3c55f1287dc90d11fc2d6bc71f4abe68153ab678fd267b14382b581adfbbd5e728f262183a6434901c50d4086de8f4b815248a558b
+  data.tar.gz: e18240976adffd74caff957b4be334c72acd88e0286f03fd20ff60f118b5e1e0e6a94be6dedc689216fa761f1a588e33c359eaa1ff3fd680a305aacf65fc0e35

data/README.md

@@ -186,13 +186,13 @@ class Restrictions
 
   attribute :min_units, :integer
   attribute :max_units, :integer
-  attribute :label, :string
+
+  validates :min_units, presence: true
 end
 
 class RestrictionsSerializer < Blueprinter::Base
   field :min_units
   field :max_units
-  field :label, type: [:string, :null]
 end
 
 BlueprinterSchema.generate(serializer: RestrictionsSerializer, model: Restrictions)
@@ -207,19 +207,14 @@ BlueprinterSchema.generate(serializer: RestrictionsSerializer, model: Restrictio
       "type" => "integer"
     },
     "max_units" => {
-      "type" => "integer"
-    },
-    "label" => {
-      "type" => ["string", "null"]
+      "type" => ["integer", "null"]
     }
   },
-  "required" => ["max_units", "min_units", "label"],
+  "required" => ["max_units", "min_units"],
   "additionalProperties" => false
 }
 ```
 
-Note: Attributes are assumed to be non-null. If an attribute is nullable, specify it explicitly in the serializer.
-
 ## Development
 
 Devcontainer / Codespaces / Native

data/lib/blueprinter_schema/generator.rb

@@ -88,14 +88,11 @@ module BlueprinterSchema
     end
 
     def model_attribute_to_json_schema(name)
-      if @model.respond_to?(:columns_hash)
-        column = @model.columns_hash[name]
-        type_to_json_schema(column&.type, column&.null)
-      elsif @model.respond_to?(:type_for_attribute)
-        type_to_json_schema(@model.type_for_attribute(name)&.type, false)
-      else
-        @fallback_definition.dup
-      end
+      type_to_json_schema(model_attributes.type(name), model_attributes.nullable?(name))
+    end
+
+    def model_attributes
+      @model_attributes ||= ModelAttributes.new(@model)
     end
 
     def merge_field_options(type_definition, options)
@@ -147,12 +144,12 @@ module BlueprinterSchema
       type
     end
 
-    def association_to_json_schema(association) # rubocop:disable Metrics/CyclomaticComplexity
+    def association_to_json_schema(association)
       blueprint_class = association.options[:blueprint]
 
       return { 'type' => 'object' } unless blueprint_class
 
-      ar_association = @model&.reflect_on_association(association.name)
+      ar_association = @model.try(:reflect_on_association, association.name)
       is_collection = ar_association ? ar_association.collection? : association.options[:collection]
 
       view = association.options[:view] || :default

data/lib/blueprinter_schema/model_attributes.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module BlueprinterSchema
+  # Resolves an attribute's type and nullability from a model.
+  #
+  # ActiveRecord models (responding to +columns_hash+) infer both the type and
+  # nullability from the column. ActiveModel objects (responding to
+  # +type_for_attribute+) infer the type from the attribute; nullability is
+  # inferred from presence validations when available, otherwise assumed nullable.
+  class ModelAttributes
+    def initialize(model)
+      @model = model
+    end
+
+    def type(name)
+      if active_record?
+        @model.columns_hash[name]&.type
+      elsif active_model?
+        @model.type_for_attribute(name)&.type
+      end
+    end
+
+    def nullable?(name)
+      if active_record?
+        column = @model.columns_hash[name]
+        column ? column.null : false
+      elsif active_model?
+        active_model_nullable?(name)
+      else
+        false
+      end
+    end
+
+    private
+
+    def active_record?
+      @model.respond_to?(:columns_hash)
+    end
+
+    def active_model?
+      @model.respond_to?(:type_for_attribute)
+    end
+
+    def active_model_nullable?(name)
+      return true unless @model.respond_to?(:validators_on)
+
+      !presence_validated?(name)
+    end
+
+    def presence_validated?(name)
+      @model.validators_on(name).any? { |validator| validator.kind == :presence }
+    end
+  end
+end

data/lib/blueprinter_schema/version.rb

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

data/lib/blueprinter_schema.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'blueprinter_schema/version'
+require_relative 'blueprinter_schema/model_attributes'
 require_relative 'blueprinter_schema/generator'
 
 module BlueprinterSchema

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueprinter_schema
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - thisismydesign
@@ -27,6 +27,7 @@ files:
 - compose.yml
 - lib/blueprinter_schema.rb
 - lib/blueprinter_schema/generator.rb
+- lib/blueprinter_schema/model_attributes.rb
 - lib/blueprinter_schema/version.rb
 - sig/blueprinter_schema.rbs
 homepage: https://github.com/thisismydesign/blueprinter_schema