typed_params 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 014c42e82286c1ffc175d08aca51e631da96a5b2aee8e9bbf575fc0bea7e1d57
-  data.tar.gz: 3a0ea8bac6b1021143b768767763899a6f5328f16bb6011a87b2f1ed694b6325
+  metadata.gz: f82d6c1b5e74e9768d4e039ffdb562d4f4358a3cacdcaa6bbd7c88fa2f052b98
+  data.tar.gz: a2635ee1541b834a73cefed0768f15e9d47d435af3b3d27cb497d0d4e98bb18a
 SHA512:
-  metadata.gz: c563758456e6359e37c75926124925141c59f535fc77070be23d46d3f86e0772f2cf2c52d2e57f165e2ba11f93717c6a0b15f90e61fcbe00baa19b3c1985f2a8
-  data.tar.gz: a277c1c13a5d0ac14ef293fbc9611bec82eba5df00686f9afaf8e324e89148aef7c49fa672bf025570a9482ec277e330edc1049a1e59051e41a559a31a4b6584
+  metadata.gz: 6dfb4c39029e273c58a08459b2c7fc2b5263947816d15bcb4a3e8d3e8b9bd2b7ca56b487f40b8d84a4bd391b6cf7913717be2c62e7d38548e8f8cea4c93e4ec8
+  data.tar.gz: 444e92938c7426fec891eda9f7dd226861296f6159c1e8905d6776d2fee75c95f20ce762358161c36970bf84ceadbc352d0bfdfb6c7f56f9c1d350934ba86649

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.1
+
+- Update JSONAPI formatter to simplify logic for polymorphic relationships.
+
 ## 1.2.0
 
 - Add `aliases:` keyword to `#param` to allow the schema to be accessible by different names.

data/README.md

@@ -689,8 +689,10 @@ param :invalid, type: :string, validate: -> v {
 
 #### Polymorphic parameter
 
-***Currently, this option is only utilized by the JSONAPI formatter. Define
-a polymorphic parameter, used when formatting JSONAPI relationships.***
+_Note: currently, this option is only utilized by the JSONAPI formatter._
+
+Define a polymorphic parameter. Actual behavior will vary based on the
+formatter being used.
 
 ```ruby
 format :jsonapi
@@ -711,8 +713,8 @@ typed_params # => { owner_type: 'User', owner_id: 1 }
 
 In this example, a polymorphic `:owner` relationship is defined. When run
 through the JSONAPI formatter, instead of formatting the relationship
-into the `:owner_id` key, it also includes the `:owner_type` key
-for a polymorphic association.
+into solely the `:owner_id` key, it also includes the `:owner_type`
+key for a polymorphic association.
 
 ### Shared options
 

data/lib/typed_params/formatters/jsonapi.rb

@@ -77,7 +77,8 @@ module TypedParams
         # relationship data only contains :type and :id, otherwise it
         # will use the x_attributes key.
         rels&.each do |key, rel|
-          child = schema.children.dig(:relationships, key)
+          child = schema.children.fetch(:relationships)
+                        .children.fetch(key)
 
           case rel
           # FIXME(ezekg) We need https://bugs.ruby-lang.org/issues/18961 to
@@ -86,8 +87,7 @@ module TypedParams
             res[:"#{key.to_s.singularize}_ids"] = linkage.map { _1[:id] }
           in data: []
             res[:"#{key.to_s.singularize}_ids"] = []
-          # FIXME(ezekg) Not sure how to make this cleaner, but this handles polymorphic relationships.
-          in data: { type:, id:, **nil } if key.to_s.underscore.classify != type.underscore.classify && child.polymorphic?
+          in data: { type:, id:, **nil } if child.polymorphic?
             res[:"#{key}_type"], res[:"#{key}_id"] = type.underscore.classify, id
           in data: { type:, id:, **nil }
             res[:"#{key}_id"] = id

data/lib/typed_params/schema.rb

@@ -272,7 +272,7 @@ module TypedParams
     def allow_nil?         = !!@allow_nil
     def allow_non_scalars? = !!@allow_non_scalars
     def nilify_blanks?     = !!@nilify_blanks
-    def endless?         = !!@endless
+    def endless?           = !!@endless
     def indexed?           = !endless?
     def if?                = !@if.nil?
     def unless?            = !@unless.nil?
@@ -285,9 +285,6 @@ module TypedParams
       "#<#{self.class.name} key=#{key.inspect} type=#{type.inspect} children=#{children.inspect}>"
     end
 
-    # @private
-    def dig(*keys) = children.dig(*keys)
-
     private
 
     attr_reader :controller,

data/lib/typed_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TypedParams
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_params
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Zeke Gabrielse