dato 0.6.12 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0888e8962c3b18b01b3040c781dcb73288d94f4ae68b6b8e031569b26bdc979a'
-  data.tar.gz: e3dfd7de8de4b2829ef561c7accaadb27230792626152f4a605d02e015c868e4
+  metadata.gz: 95b2f3c8bcf22fedf8b578ae80e935c7992a325587592e32e6d8de0eb42d2723
+  data.tar.gz: f0d31b23cf1a1c78a1d229601f88905e6a3e3d1097954d722d7454a402d2e645
 SHA512:
-  metadata.gz: be30d00c30de4a9e5f2855c19944c2bdc990024eea1a1e669973bbd332a27f47afca4d96198501501be9fd9ca1afdfa54f04cc2c8971c2fc75b174bbbb4efdfc
-  data.tar.gz: 7d2e9f18cc0b9f9e2a064d3234adee067a304654ab842e5e0dc4c39bd47545b16db7b1285eb952380cf6db9982c0c75307ff99599536147aab3123c90f451db0
+  metadata.gz: 5e08e8c062c574e18fb638ed415ab63752230c41a30472ad9c69b82d1d8d8f5eebf905a8a511e0996531ce97c58d39228b9a574e267ff357d2cb8cf64e3f0c17
+  data.tar.gz: 58b5b1c0dc0c0638b6b83e86238eb4b465db65950e4fb6866959b4c16786513a370edb62aa7f2c9f23f26ae2da897aa9743379d475d6b180adff11cb98f26bd5

data/lib/dato/json_api_deserializer.rb

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
+require 'dato/json_schema_relationships'
 
 module Dato
   class JsonApiDeserializer
+    attr_reader :link
+
+    def initialize(link)
+      @link = link
+    end
+
     def deserialize(data)
       return nil unless data
 
@@ -20,21 +27,37 @@ module Dato
       result[:meta] = data[:meta] if data[:meta]
       result.merge!(data[:attributes]) if data[:attributes]
 
-      relationships = data.delete(:relationships)
-
-      if relationships
-        relationships.each do |key, handle|
-          handle_data = handle['data']
-          value = if handle_data.is_a? Array
-                    handle_data.map { |ref| ref['id'] }
-                  elsif handle_data.is_a? Hash
-                    handle_data[:id]
-                  end
-          result[key] = value
+      if data[:relationships]
+        relationships.each do |relationship, meta|
+          if data[:relationships][relationship]
+            rel_data = data[:relationships][relationship][:data]
+
+            result[relationship] = if meta[:types].length > 1
+                                     rel_data
+                                   else
+                                     if !rel_data
+                                       nil
+                                     elsif meta[:collection]
+                                       rel_data.map { |ref| ref[:id] }
+                                     else
+                                       rel_data[:id]
+                                     end
+                                   end
+          end
         end
       end
 
       result.with_indifferent_access
     end
+
+    def relationships
+      @relationships ||= JsonSchemaRelationships.new(link_relationships).relationships
+    end
+
+    def link_relationships
+      if link.target_schema
+        link.target_schema.properties['data'].properties['relationships']
+      end
+    end
   end
 end

data/lib/dato/json_api_serializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'dato/json_schema_relationships'
 
 module Dato
   class JsonApiSerializer
@@ -51,16 +52,31 @@ module Dato
           value = resource[relationship]
 
           data = if value
-                   if meta[:collection]
-                     value.map do |id|
-                       { type: meta[:type], id: id.to_s }
+                   if meta[:types].length > 1
+                     if meta[:collection]
+                       value.map(&:symbolize_keys)
+                     else
+                       value.symbolize_keys
                      end
                    else
-                     { type: meta[:type], id: value.to_s }
+                     type = meta[:types].first
+                     if meta[:collection]
+                       value.map do |id|
+                         {
+                           type: type,
+                           id: id.to_s
+                         }
+                       end
+                     else
+                       {
+                         type: type,
+                         id: value.to_s
+                       }
+                     end
                    end
                  end
-          result[relationship] = { data: data }
 
+          result[relationship] = { data: data }
         elsif required_relationships.include?(relationship)
           throw "Required attribute: #{relationship}"
         end
@@ -76,6 +92,7 @@ module Dato
           id
           created_at
           updated_at
+          creator
         ]
       end
 
@@ -89,42 +106,10 @@ module Dato
     end
 
     def relationships
-      if type == 'item'
-        if link.rel == :create
-          return { item_type: { collection: false, type: 'item_type' } }
-        else
-          {}
-        end
-      end
-
-      return {} unless link_relationships
-
-      link_relationships.properties.each_with_object({}) do |(relationship, schema), acc|
-        is_collection = schema.properties['data'].type.first == 'array'
-
-        definition = if is_collection
-                       schema.properties['data'].items
-                     elsif schema.properties['data'].type.first == 'object'
-                       schema.properties['data']
-                     else
-                       schema.properties['data'].any_of.find do |option|
-                         option.type.first == 'object'
-                       end
-                     end
-
-        type = definition.properties['type']
-                         .pattern.source.gsub(/(^\^|\$$)/, '')
-
-        acc[relationship.to_sym] = {
-          collection: is_collection,
-          type: type
-        }
-      end
+      @relationships ||= JsonSchemaRelationships.new(link_relationships).relationships
     end
 
     def required_relationships
-      return %i[item_type] if type == 'item'
-
       (link_relationships.required || []).map(&:to_sym)
     end
 

data/lib/dato/json_schema_relationships.rb

@@ -0,0 +1,38 @@
+module Dato
+  class JsonSchemaRelationships
+    attr_reader :link
+
+    def initialize(link)
+      @link = link
+    end
+
+    def relationships
+      return {} unless link
+
+      link.properties.each_with_object({}) do |(relationship, schema), acc|
+        is_collection = schema.properties['data'].type.first == 'array'
+
+        types = if is_collection
+                       [type(schema.properties['data'].items)]
+                     elsif schema.properties['data'].type.first == 'object'
+                       [type(schema.properties['data'])]
+                     else
+                       schema.properties['data'].any_of.map do |option|
+                         type(option)
+                       end.compact
+                     end
+
+        acc[relationship.to_sym] = {
+          collection: is_collection,
+          types: types
+        }
+      end
+    end
+
+    def type(definition)
+      if definition.properties['type']
+        definition.properties['type'].pattern.source.gsub(/(^\^|\$$)/, '')
+      end
+    end
+  end
+end

data/lib/dato/repo.rb

@@ -95,7 +95,7 @@ module Dato
                 end
 
       if options.fetch(:deserialize_response, true)
-        JsonApiDeserializer.new.deserialize(response)
+        JsonApiDeserializer.new(link).deserialize(response)
       else
         response
       end

data/lib/dato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dato
-  VERSION = '0.6.12'
+  VERSION = '0.6.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.14
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -407,6 +407,7 @@ files:
 - lib/dato/dump/ssg_detector.rb
 - lib/dato/json_api_deserializer.rb
 - lib/dato/json_api_serializer.rb
+- lib/dato/json_schema_relationships.rb
 - lib/dato/local/entities_repo.rb
 - lib/dato/local/field_type/boolean.rb
 - lib/dato/local/field_type/color.rb