dato 0.8.0 → 0.8.1

data/lib/dato/dump/dsl/add_to_data_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/dump/operation/add_to_data_file'
+require "dato/dump/operation/add_to_data_file"
 
 module Dato
   module Dump

data/lib/dato/dump/dsl/create_data_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/dump/operation/create_data_file'
+require "dato/dump/operation/create_data_file"
 
 module Dato
   module Dump

data/lib/dato/dump/dsl/create_post.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/dump/operation/create_post'
+require "dato/dump/operation/create_post"
 
 module Dato
   module Dump

data/lib/dato/dump/dsl/directory.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dato/dump/dsl/create_post'
-require 'dato/dump/dsl/create_data_file'
-require 'dato/dump/dsl/add_to_data_file'
+require "dato/dump/dsl/create_post"
+require "dato/dump/dsl/create_data_file"
+require "dato/dump/dsl/add_to_data_file"
 
 module Dato
   module Dump
@@ -17,7 +17,7 @@ module Dato
         def initialize(dato, operations, &block)
           @dato = dato
           @operations = operations
-          @self_before_instance_eval = eval 'self', block.binding
+          @self_before_instance_eval = eval "self", block.binding
 
           instance_eval(&block)
         end

data/lib/dato/dump/dsl/root.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'dato/dump/dsl/directory'
-require 'dato/dump/dsl/create_post'
-require 'dato/dump/dsl/create_data_file'
-require 'dato/dump/dsl/add_to_data_file'
+require "dato/dump/dsl/directory"
+require "dato/dump/dsl/create_post"
+require "dato/dump/dsl/create_data_file"
+require "dato/dump/dsl/add_to_data_file"
 
-require 'dato/dump/operation/directory'
+require "dato/dump/operation/directory"
 
 module Dato
   module Dump
@@ -21,9 +21,9 @@ module Dato
           @dato = dato
           @operations = operations
 
-          # rubocop:disable Lint/Eval
+          # rubocop:disable Security/Eval
           eval(config_code)
-          # rubocop:enable Lint/Eval
+          # rubocop:enable Security/Eval
         end
 
         def directory(path, &block)

data/lib/dato/dump/format.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dato/dump/format/toml'
-require 'dato/dump/format/yaml'
-require 'dato/dump/format/json'
+require "dato/dump/format/toml"
+require "dato/dump/format/yaml"
+require "dato/dump/format/json"
 
 module Dato
   module Dump

data/lib/dato/dump/format/json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Dato
   module Dump

data/lib/dato/dump/format/toml.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/keys'
-require 'toml'
+require "active_support/core_ext/hash/keys"
+require "toml"
 
 class Time
-  def to_toml(_path = '')
-    utc.strftime('%Y-%m-%dT%H:%M:%SZ')
+  def to_toml(_path = "")
+    utc.strftime("%Y-%m-%dT%H:%M:%SZ")
   end
 end
 
 class Date
-  def to_toml(_path = '')
-    strftime('%Y-%m-%d')
+  def to_toml(_path = "")
+    strftime("%Y-%m-%d")
   end
 end
 

data/lib/dato/dump/format/yaml.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/keys'
-require 'yaml'
+require "active_support/core_ext/hash/keys"
+require "yaml"
 
 class Array
   def deep_stringify_keys
@@ -22,7 +22,7 @@ module Dato
     module Format
       module Yaml
         def self.dump(value)
-          YAML.dump(value.deep_stringify_keys).chomp.gsub(/^\-+\n/, '')
+          YAML.dump(value.deep_stringify_keys).chomp.gsub(/^-+\n/, "")
         end
 
         def self.frontmatter_dump(value)

data/lib/dato/dump/operation/add_to_data_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/dump/format'
+require "dato/dump/format"
 
 module Dato
   module Dump
@@ -24,15 +24,15 @@ module Dato
           old_content = if File.exist? complete_path
                           ::File.read(complete_path)
                         else
-                          ''
+                          ""
                         end
 
           new_content = old_content.sub(
             /\n*(#\s*datocms:start.*#\s*datocms:end|\Z)/m,
-            "\n\n# datocms:start\n#{content_to_add}\n# datocms:end"
+            "\n\n# datocms:start\n#{content_to_add}\n# datocms:end",
           )
 
-          File.open(complete_path, 'w') do |f|
+          File.open(complete_path, "w") do |f|
             f.write new_content
           end
         end

data/lib/dato/dump/operation/create_data_file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'fileutils'
-require 'dato/dump/format'
+require "fileutils"
+require "dato/dump/format"
 
 module Dato
   module Dump
@@ -19,7 +19,7 @@ module Dato
         def perform
           FileUtils.mkdir_p(File.dirname(path))
 
-          File.open(File.join(context.path, path), 'w') do |file|
+          File.open(File.join(context.path, path), "w") do |file|
             file.write Format.dump(format, value)
           end
         end

data/lib/dato/dump/operation/create_post.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'fileutils'
-require 'dato/dump/format'
+require "fileutils"
+require "dato/dump/format"
 
 module Dato
   module Dump
@@ -9,8 +9,7 @@ module Dato
       class CreatePost
         attr_reader :context, :path
 
-        attr_accessor :frontmatter_format, :frontmatter_value
-        attr_accessor :content
+        attr_accessor :frontmatter_format, :frontmatter_value, :content
 
         def initialize(context, path)
           @context = context
@@ -20,10 +19,10 @@ module Dato
         def perform
           FileUtils.mkdir_p(File.dirname(path))
 
-          File.open(File.join(context.path, path), 'w') do |file|
+          File.open(File.join(context.path, path), "w") do |file|
             file.write Format.frontmatter_dump(
               frontmatter_format,
-              frontmatter_value
+              frontmatter_value,
             )
             file.write "\n\n"
             file.write content

data/lib/dato/dump/operation/directory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'fileutils'
+require "fileutils"
 
 module Dato
   module Dump

data/lib/dato/dump/runner.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dato/dump/dsl/root'
-require 'dato/dump/operation/root'
-require 'dato/dump/ssg_detector'
-require 'dato/local/loader'
+require "dato/dump/dsl/root"
+require "dato/dump/operation/root"
+require "dato/dump/ssg_detector"
+require "dato/local/loader"
 
 module Dato
   module Dump
@@ -25,7 +25,7 @@ module Dato
         Dsl::Root.new(
           File.read(config_path),
           loader.items_repo,
-          operation
+          operation,
         )
 
         operation.perform

data/lib/dato/dump/ssg_detector.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'toml'
-require 'json'
-require 'yaml'
+require "toml"
+require "json"
+require "yaml"
 
 module Dato
   module Dump
@@ -18,17 +18,17 @@ module Dato
 
       HUGO = [
         {
-          file: 'config.toml',
-          loader: ->(content) { TOML::Parser.new(content).parsed }
+          file: "config.toml",
+          loader: ->(content) { TOML::Parser.new(content).parsed },
         },
         {
-          file: 'config.yaml',
-          loader: ->(content) { YAML.safe_load(content) }
+          file: "config.yaml",
+          loader: ->(content) { YAML.safe_load(content) },
         },
         {
-          file: 'config.json',
-          loader: ->(content) { JSON.parse(content) }
-        }
+          file: "config.json",
+          loader: ->(content) { JSON.parse(content) },
+        },
       ].freeze
 
       def initialize(path)
@@ -40,13 +40,13 @@ module Dato
           node_generator ||
           python_generator ||
           hugo ||
-          'unknown'
+          "unknown"
       end
 
       private
 
       def ruby_generator
-        gemfile_path = File.join(path, 'Gemfile')
+        gemfile_path = File.join(path, "Gemfile")
         return unless File.exist?(gemfile_path)
 
         gemfile = File.read(gemfile_path)
@@ -57,13 +57,13 @@ module Dato
       end
 
       def node_generator
-        package_path = File.join(path, 'package.json')
+        package_path = File.join(path, "package.json")
         return unless File.exist?(package_path)
 
         package = JSON.parse(File.read(package_path))
 
-        deps = package.fetch('dependencies', {})
-        dev_deps = package.fetch('devDependencies', {})
+        deps = package.fetch("dependencies", {})
+        dev_deps = package.fetch("devDependencies", {})
         all_deps = deps.merge(dev_deps)
 
         NODE.find do |generator|
@@ -74,7 +74,7 @@ module Dato
       end
 
       def python_generator
-        requirements_path = File.join(path, 'requirements.txt')
+        requirements_path = File.join(path, "requirements.txt")
         return unless File.exist?(requirements_path)
 
         requirements = File.read(requirements_path)
@@ -89,13 +89,11 @@ module Dato
           config_path = File.join(path, option[:file])
           if File.exist?(config_path)
             config = option[:loader].call(File.read(config_path))
-            config.key? 'baseurl'
+            config.key? "baseurl"
           end
-        end && 'hugo'
+        end && "hugo"
       rescue JSON::ParserError
         nil
-      rescue Psych::SyntaxError
-        nil
       end
     end
   end

data/lib/dato/json_api_deserializer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'dato/json_schema_relationships'
+
+require "dato/json_schema_relationships"
 
 module Dato
   class JsonApiDeserializer
@@ -28,21 +29,19 @@ module Dato
 
       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
+          next unless data[:relationships][relationship]
+
+          rel_data = data[:relationships][relationship][:data]
+
+          result[relationship] = if meta[:types].length > 1
+                                   rel_data
+                                 elsif !rel_data
+                                   nil
+                                 elsif meta[:collection]
+                                   rel_data.map { |ref| ref[:id] }
+                                 else
+                                   rel_data[:id]
+                                 end
         end
       end
 

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,7 +93,7 @@ module Dato
     end
 
     def attributes(resource)
-      if type == 'item'
+      if type == "item"
         return resource.keys.reject do |key|
           %i[
             item_type
@@ -100,11 +105,11 @@ module Dato
         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
@@ -114,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
         []
@@ -122,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