dato 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe0429654722ca0165930dc29c1a0350bb386cd73b6c824d2d43cc0af8bb13f
-  data.tar.gz: fc124f52acef1d95d507dce6a9c45fa7556b9c5a018b9f630fbd688282015eb7
+  metadata.gz: 7779edc00921c84e0f98aee2008bb8fd3f89d893c02107d965db12d1f5bc7882
+  data.tar.gz: 25ba5f84f8a6236c40d2846ef976987501f4977d481c9c445e298b666bc6b1ec
 SHA512:
-  metadata.gz: 7981652ff2a86c8f6081bbb3b7c4fa3d148ba2b159009e5528df476f3ee0517f95c98f7bb8f035c0d09e694f562b06d50a3df44910930a478df3676940508f77
-  data.tar.gz: 396828391163788c25f77da2d01c576d6c4cbad8993dda40d97b7700cb1896c7426897613dc9cc40c99177d7cdc8846a382d8ca9e2f37f0152abf3ff82636efe
+  metadata.gz: 955b67a6fadad2fb96e1342ec2e8907f5084085e0f18737655ebac56a4a8661e5d670ff9e662b3afc21381636139480f86ae48d47f268b571a21fcfa470de8c2
+  data.tar.gz: 479fe2e231a44cdf9518961c98bfddbd67ac06d4cd511e37a7369d668e5f0fa4eeca195d8af09bd981277a5c195f01d5f368f6b134562ebdd8f43df0c47a8c91

data/lib/dato/api_client.rb

@@ -100,10 +100,11 @@ module Dato
         sleep(1)
         request(*args)
       else
+        # puts body.inspect
+        # puts '===='
+        # puts error.message
+        # puts '===='
         error = ApiError.new(e.response)
-        puts '===='
-        puts error.message
-        puts '===='
         raise error
       end
     end

data/lib/dato/json_api_serializer.rb

@@ -23,8 +23,10 @@ module Dato
       data[:type] = type
       data[:attributes] = serialized_attributes(resource)
 
-      if relationships.any?
-        data[:relationships] = serialized_relationships(resource)
+      serialized_relationships = serialized_relationships(resource)
+
+      if serialized_relationships
+        data[:relationships] = serialized_relationships
       end
 
       { data: data }
@@ -82,7 +84,7 @@ module Dato
         end
       end
 
-      result
+      result.empty? ? nil : result
     end
 
     def attributes(resource)
@@ -110,7 +112,11 @@ module Dato
     end
 
     def required_relationships
-      (link_relationships.required || []).map(&:to_sym)
+      if link.schema.properties['data'].required.include?("relationships")
+        (link_relationships.required || []).map(&:to_sym)
+      else
+        []
+      end
     end
 
     def link_attributes

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

@@ -18,6 +18,7 @@ module Dato
                 v[:alt],
                 v[:title],
                 v[:custom_data],
+                v[:focal_point],
                 repo.site.entity.imgix_host
               )
             end
@@ -29,12 +30,14 @@ module Dato
           alt,
           title,
           custom_data,
+          focal_point,
           imgix_host
         )
           @upload = upload
           @alt = alt
           @title = title
           @custom_data = custom_data
+          @focal_point = focal_point
           @imgix_host = imgix_host
         end
 
@@ -100,6 +103,12 @@ module Dato
           @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']
+        end
+
         def tags
           @upload.tags
         end
@@ -216,8 +225,25 @@ module Dato
           ).path(path)
         end
 
-        def url(opts = {})
-          file.to_url(opts)
+        def url(query = {})
+          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.merge!(
+              "crop" => "focalpoint",
+              "fp-x" => focal_point[:x],
+              "fp-y" => focal_point[:y],
+            )
+          end
+
+          file.to_url(query)
         end
 
         def lqip_data_url(opts = {})
@@ -241,6 +267,7 @@ module Dato
             alt: alt,
             title: title,
             custom_data: custom_data,
+            focal_point: focal_point,
             url: url,
             copyright: copyright,
             tags: tags,

data/lib/dato/upload/create_upload_path.rb

@@ -72,7 +72,7 @@ module Dato
         end
         connection.get(url).body
       rescue Faraday::Error => e
-        puts "Error during uploading #{url}"
+        puts "Error during upload of #{url}: #{e.message}"
         raise e
       end
     end

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Stefano Verna
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -464,7 +464,7 @@ homepage: https://github.com/datocms/ruby-datocms-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -479,9 +479,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby client for DatoCMS API
 test_files: []