dato 0.7.15 → 0.8.1

data/lib/dato/json_api_serializer.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
-require 'dato/json_schema_relationships'
+
+require "dato/json_schema_relationships"
+require "dato/json_schema_type"
 
 module Dato
   class JsonApiSerializer
     attr_reader :link, :type
 
-    def initialize(type, link)
+    def initialize(type: nil, link: nil)
       @link = link
-      @type = type
+      @type = type || type_from_schema
     end
 
     def serialize(resource, id = nil)
@@ -16,19 +18,22 @@ module Dato
 
       data[:id] = id || resource[:id] if id || resource[:id]
 
-      if resource.has_key?(:meta)
-        resource.delete(:meta)
-      end
+      resource.delete(:meta) if resource.key?(:meta)
 
       data[:type] = type
-      data[:attributes] = serialized_attributes(resource)
 
-      serialized_relationships = serialized_relationships(resource)
+      if link.schema &&
+         link.schema.properties["data"] &&
+         link.schema.properties["data"].properties.keys.include?("attributes")
 
-      if serialized_relationships
-        data[:relationships] = serialized_relationships
+        serialized_resource_attributes = serialized_attributes(resource)
+        data[:attributes] = serialized_resource_attributes
       end
 
+      serialized_relationships = serialized_relationships(resource)
+
+      data[:relationships] = serialized_relationships if serialized_relationships
+
       { data: data }
     end
 
@@ -61,18 +66,18 @@ module Dato
                        value.symbolize_keys
                      end
                    else
-                     type = meta[:types].first
+                     meta_type = meta[:types].first
                      if meta[:collection]
                        value.map do |id|
                          {
-                           type: type,
-                           id: id.to_s
+                           type: meta_type,
+                           id: id.to_s,
                          }
                        end
                      else
                        {
-                         type: type,
-                         id: value.to_s
+                         type: meta_type,
+                         id: value.to_s,
                        }
                      end
                    end
@@ -88,21 +93,23 @@ module Dato
     end
 
     def attributes(resource)
-      if type == 'item'
-        return resource.keys.map(&:to_sym) - %i[
-          item_type
-          id
-          created_at
-          updated_at
-          creator
-        ]
+      if type == "item"
+        return resource.keys.reject do |key|
+          %i[
+            item_type
+            id
+            created_at
+            updated_at
+            creator
+          ].include?(key.to_sym)
+        end
       end
 
-      link_attributes['properties'].keys.map(&:to_sym)
+      link_attributes["properties"].keys.map(&:to_sym)
     end
 
     def required_attributes
-      return [] if type == 'item'
+      return [] if type == "item"
 
       (link_attributes.required || []).map(&:to_sym)
     end
@@ -112,7 +119,7 @@ module Dato
     end
 
     def required_relationships
-      if link.schema.properties['data'].required.include?("relationships")
+      if link.schema.properties["data"].required.include?("relationships")
         (link_relationships.required || []).map(&:to_sym)
       else
         []
@@ -120,11 +127,15 @@ module Dato
     end
 
     def link_attributes
-      link.schema.properties['data'].properties['attributes']
+      link.schema.properties["data"].properties["attributes"]
     end
 
     def link_relationships
-      link.schema.properties['data'].properties['relationships']
+      link.schema.properties["data"].properties["relationships"]
+    end
+
+    def type_from_schema
+      Dato::JsonSchemaType.new(link.schema).call
     end
   end
 end

data/lib/dato/json_schema_relationships.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dato
   class JsonSchemaRelationships
     attr_reader :schema
@@ -7,46 +9,40 @@ module Dato
     end
 
     def relationships
-      if !schema || !schema.properties['data']
-        return {}
-      end
+      return {} if !schema || !schema.properties["data"]
 
-      entity = if schema.properties['data'].type.first == 'array'
-                 schema.properties['data'].items
+      entity = if schema.properties["data"].type.first == "array"
+                 schema.properties["data"].items
                else
-                 schema.properties['data']
+                 schema.properties["data"]
                end
 
-      if !entity || !entity.properties['relationships'] || !entity.properties['relationships']
-        return {}
-      end
+      return {} if !entity || !entity.properties["relationships"] || !entity.properties["relationships"]
 
-      relationships = entity.properties['relationships'].properties
+      relationships = entity.properties["relationships"].properties
 
       relationships.each_with_object({}) do |(relationship, schema), acc|
-        is_collection = schema.properties['data'].type.first == 'array'
+        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
+                  [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
+          types: types,
         }
       end
     end
 
     def type(definition)
-      if definition.properties['type']
-        definition.properties['type'].pattern.source.gsub(/(^\^|\$$)/, '')
-      end
+      definition.properties["type"].pattern.source.gsub(/(^\^|\$$)/, "") if definition.properties["type"]
     end
   end
 end

data/lib/dato/json_schema_type.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Dato
+  class JsonSchemaType
+    attr_reader :schema
+
+    def initialize(schema)
+      @schema = schema
+    end
+
+    def call
+      type_property = find_info_for_type_property
+
+      return nil unless type_property
+
+      type_property.pattern.to_s.gsub(/(^(\(\?-mix:\^)|(\$\))$)/, "")
+    end
+
+    private
+
+    def find_info_for_type_property
+      entity = find_entity_in_data
+
+      return nil unless entity
+
+      entity.properties["type"]
+    end
+
+    def find_entity_in_data
+      return nil if !schema || !schema.properties["data"]
+
+      if schema.properties["data"].type.first == "array"
+        return schema.properties["data"].items if schema.properties["data"].items
+
+        return nil
+      end
+
+      return schema.properties["data"] if schema.properties["data"].type.first == "object"
+
+      if schema.properties["data"].any_of
+        return schema.properties["data"].any_of.reject { |x| x.definitions.type.example == "job" }
+      end
+
+      nil
+    end
+  end
+end

data/lib/dato/local/entities_repo.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/local/json_api_entity'
+require "dato/local/json_api_entity"
 
 module Dato
   module Local
@@ -27,8 +27,8 @@ module Dato
       end
 
       def destroy_item_type(id)
-        entities.fetch('item', {}).delete_if { |_item_id, item| item.item_type.id == id }
-        entities.fetch('item_type', {}).delete(id)
+        entities.fetch("item", {}).delete_if { |_item_id, item| item.item_type.id == id }
+        entities.fetch("item_type", {}).delete(id)
       end
 
       def upsert_entities(*payloads)

data/lib/dato/local/field_type/color.rb

@@ -4,14 +4,14 @@ module Dato
   module Local
     module FieldType
       class Color
-        attr_reader :red, :green, :blue, :alpha
+        attr_reader :red, :green, :blue
 
         def self.parse(value, _repo)
           value && new(
             value[:red],
             value[:green],
             value[:blue],
-            value[:alpha]
+            value[:alpha],
           )
         end
 
@@ -19,17 +19,21 @@ module Dato
           @red = red
           @green = green
           @blue = blue
-          @alpha = alpha / 255.0
+          @alpha = alpha
         end
 
         def rgb
-          if alpha == 1.0
+          if @alpha == 255
             "rgb(#{red}, #{green}, #{blue})"
           else
             "rgba(#{red}, #{green}, #{blue}, #{alpha})"
           end
         end
 
+        def alpha
+          @alpha / 255.0
+        end
+
         def hex
           r = red.to_s(16)
           g = green.to_s(16)
@@ -41,9 +45,9 @@ module Dato
           b = "0#{b}" if b.length == 1
           a = "0#{a}" if a.length == 1
 
-          hex = '#' + r + g + b
+          hex = "##{r}#{g}#{b}"
 
-          hex += a if a != 'ff'
+          hex += a if a != "ff"
 
           hex
         end
@@ -54,7 +58,7 @@ module Dato
             green: green,
             blue: blue,
             rgb: rgb,
-            hex: hex
+            hex: hex,
           }
         end
       end

data/lib/dato/local/field_type/file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'imgix'
+require "imgix"
 
 module Dato
   module Local
@@ -10,7 +10,7 @@ module Dato
           if value
             v = value.with_indifferent_access
 
-            upload = repo.entities_repo.find_entity('upload', v[:upload_id])
+            upload = repo.entities_repo.find_entity("upload", v[:upload_id])
 
             if upload
               new(
@@ -19,7 +19,7 @@ module Dato
                 v[:title],
                 v[:custom_data],
                 v[:focal_point],
-                repo.site.entity.imgix_host
+                repo.site.entity.imgix_host,
               )
             end
           end
@@ -88,25 +88,25 @@ module Dato
         def alt
           default_metadata = @upload.default_field_metadata.deep_stringify_keys
                                     .fetch(I18n.locale.to_s, {})
-          @alt || default_metadata['alt']
+          @alt || default_metadata["alt"]
         end
 
         def title
           default_metadata = @upload.default_field_metadata.deep_stringify_keys
                                     .fetch(I18n.locale.to_s, {})
-          @title || default_metadata['title']
+          @title || default_metadata["title"]
         end
 
         def custom_data
           default_metadata = @upload.default_field_metadata.deep_stringify_keys
                                     .fetch(I18n.locale.to_s, {})
-          @custom_data.merge(default_metadata.fetch('custom_data', {}))
+          @custom_data.merge(default_metadata.fetch("custom_data", {}))
         end
 
         def focal_point
           default_metadata = @upload.default_field_metadata.deep_stringify_keys
                                     .fetch(I18n.locale.to_s, {})
-          @focal_point || default_metadata['focal_point']
+          @focal_point || default_metadata["focal_point"]
         end
 
         def tags
@@ -174,9 +174,7 @@ module Dato
               if options[:exact_res] == :low
                 raw_mp4_url("low")
               elsif options[:exact_res] == :medium
-                if %w[medium high].include?(@upload.mux_mp4_highest_res)
-                  raw_mp4_url("medium")
-                end
+                raw_mp4_url("medium") if %w[medium high].include?(@upload.mux_mp4_highest_res)
               elsif @upload.mux_mp4_highest_res == :high
                 raw_mp4_url("high")
               end
@@ -212,16 +210,14 @@ module Dato
         end
 
         def video
-          if @upload.mux_playback_id
-            VideoAttributes.new(@upload)
-          end
+          VideoAttributes.new(@upload) if @upload.mux_playback_id
         end
 
         def file
           Imgix::Client.new(
             domain: @imgix_host,
             secure: true,
-            include_library_param: false
+            include_library_param: false,
           ).path(path)
         end
 
@@ -229,12 +225,12 @@ module Dato
           query.deep_stringify_keys!
 
           if focal_point &&
-            query["fit"] == "crop" &&
-            (query["h"] || query["height"]) &&
-            (query["w"] || query["width"]) &&
-            [nil, "focalpoint"].include?(query["crop"]) &&
-            query["fp-x"].nil? &&
-            query["fp-y"].nil?
+             query["fit"] == "crop" &&
+             (query["h"] || query["height"]) &&
+             (query["w"] || query["width"]) &&
+             [nil, "focalpoint"].include?(query["crop"]) &&
+             query["fp-x"].nil? &&
+             query["fp-y"].nil?
 
             query.merge!(
               "crop" => "focalpoint",
@@ -252,9 +248,7 @@ module Dato
 
           response = Faraday.get(file.to_url(opts.merge(lqip: "blurhash")))
 
-          if response.status == 200
-            "data:image/jpeg;base64,#{Base64.strict_encode64(response.body)}"
-          end
+          "data:image/jpeg;base64,#{Base64.strict_encode64(response.body)}" if response.status == 200
         end
 
         def to_hash(*_args)
@@ -279,7 +273,7 @@ module Dato
             mime_type: mime_type,
             colors: colors.map(&:to_hash),
             blurhash: blurhash,
-            video: video && video.to_hash
+            video: video && video.to_hash,
           }
         end
       end