typed_params 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82d6c1b5e74e9768d4e039ffdb562d4f4358a3cacdcaa6bbd7c88fa2f052b98
-  data.tar.gz: a2635ee1541b834a73cefed0768f15e9d47d435af3b3d27cb497d0d4e98bb18a
+  metadata.gz: 160a6e63cc497232a6c33d2cdc06050682c44e71624bee8d70f72e25b3ef3374
+  data.tar.gz: f0e1c30200d4ac4fc555cd5418546ed3ceba69dc54b09a98a02e4b349dcfd014
 SHA512:
-  metadata.gz: 6dfb4c39029e273c58a08459b2c7fc2b5263947816d15bcb4a3e8d3e8b9bd2b7ca56b487f40b8d84a4bd391b6cf7913717be2c62e7d38548e8f8cea4c93e4ec8
-  data.tar.gz: 444e92938c7426fec891eda9f7dd226861296f6159c1e8905d6776d2fee75c95f20ce762358161c36970bf84ceadbc352d0bfdfb6c7f56f9c1d350934ba86649
+  metadata.gz: 773babee3c280766879e615a654206f1665a3811ac98fe673dcab655ef6e42471335f9cc2605e999eed2aa06a3aa5e6a85ed74fcd4e138b39f97467fc28adef0
+  data.tar.gz: 0ab8544aa6011e99256af88dafe207b27509f78b7db906cc41f47192967fc5b24f7fe8d8b352729908083026804ec39f5aec314b27747c2ea222443e092e4276

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.2
+
+- Fix issue where `as:` keyword was not handled in JSONAPI relationship formatter.
+
 ## 1.2.1
 
 - Update JSONAPI formatter to simplify logic for polymorphic relationships.

data/lib/typed_params/formatters/jsonapi.rb

@@ -58,9 +58,10 @@ module TypedParams
       end
 
       def self.format_hash_data(data, schema:)
-        rels  = data[:relationships]
-        attrs = data[:attributes]
-        res   = data.except(
+        relationships  = data[:relationships]
+        attributes     = data[:attributes]
+
+        res = data.except(
           :attributes,
           :links,
           :meta,
@@ -69,18 +70,21 @@ module TypedParams
         )
 
         # Move attributes over to top-level params
-        attrs&.each do |key, attr|
-          res[key] = attr
+        attributes&.each do |key, attribute|
+          res[key] = attribute
         end
 
         # Move relationships over. This will use x_id and x_ids when the
         # relationship data only contains :type and :id, otherwise it
         # will use the x_attributes key.
-        rels&.each do |key, rel|
-          child = schema.children.fetch(:relationships)
-                        .children.fetch(key)
-
-          case rel
+        relationships&.each do |key, relationship|
+          child = schema.children.fetch(:relationships).then do |rels|
+                    rels.children.fetch(key) {
+                      rels.children.values.find { _1.as == key || _1.alias == key }
+                    }
+                  end
+
+          case relationship
           # FIXME(ezekg) We need https://bugs.ruby-lang.org/issues/18961 to
           #              clean this up (i.e. remove the if guard).
           in data: [{ type:, id:, **nil }, *] => linkage if linkage.all? { _1 in type:, id:, **nil }
@@ -96,7 +100,7 @@ module TypedParams
           else
             # NOTE(ezekg) Embedded relationships are non-standard as per the
             #             JSONAPI spec, but I don't really care. :)
-            res[:"#{key}_attributes"] = call(rel, schema: child)
+            res[:"#{key}_attributes"] = call(relationship, schema: child)
           end
         end
 

data/lib/typed_params/schema.rb

@@ -10,6 +10,7 @@ module TypedParams
                 :source,
                 :type,
                 :key,
+                :as,
                 :alias,
                 :if,
                 :unless
@@ -80,6 +81,7 @@ module TypedParams
       @strict            = strict
       @parent            = parent
       @key               = key
+      @as                = as
       @alias             = binding.local_variable_get(:alias)
       @optional          = optional
       @coerce            = coerce && @type.coercable?

data/lib/typed_params/version.rb

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

metadata

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