dato 0.7.13 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8911d925c9122207b1b12804415839e1a60c6f42212523f8a9d8590a0ac3b609
-  data.tar.gz: fcb4dfbed9102fd7c037c635bb0a436ea8c5671964e51e7dcf1c9b7345f25471
+  metadata.gz: 43d5a65257051385168de064d1b162bbd0bc5d0ef8523a2079d2f9051dc6b509
+  data.tar.gz: 23a9293ed05685fd635de711d3b98084dcb9efc92735d0e379b7640798e8a959
 SHA512:
-  metadata.gz: 127d2b647b57bbf530f3def61fefd302f763ec0ead035dc0f7a3d53cb6d6646948a994a75c5b6f22533e815e35a1a27a1d1f6cb0b85f2eedb86e8985971bbc87
-  data.tar.gz: 9709363be3b119354890d3d1de8a16bd8a020faf3e58692022e50de1ba25dcd4af6c49f1962e03cd8e8b82f35334140efa61cd7ff9f3f9835b39c5901b3e904b
+  metadata.gz: cd30a74fe816ab8d4a3683d62ddfecd1ce350f94c94a4f4bbbcaaabaf88a94677f939c8d7cfaf0c9769040d03adc7da829229d5e8762610491ca7d199244e082
+  data.tar.gz: 47ebdc307a2c8ae71cd28f0b7ce60c4e2f14802951bbed9b90bd93ff359bd41c240dc3dc4c834febafd32ebe81b4f735f05f9d01a2f7ea245ad9df4324938501

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.16
+
+Fixes bug when launching `dato dump --watch` together with the `environment` option.
+
 # 0.7.13
 
 Add option to pass a project's environment:

data/Rakefile

@@ -3,5 +3,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "-b"
+end
+
 task default: :spec

data/dato.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'front_matter_parser'
 
   spec.add_runtime_dependency 'faraday', ['>= 0.9.0']
@@ -37,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', ['>= 4.2.7']
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'imgix', ['>= 0.3.1']
+  spec.add_runtime_dependency 'imgix', ['~> 4']
   spec.add_runtime_dependency 'toml'
   spec.add_runtime_dependency 'cacert'
   spec.add_runtime_dependency 'dotenv'

data/lib/dato/api_client.rb

@@ -33,27 +33,54 @@ module Dato
           @extra_headers = options[:extra_headers] || {}
         end
 
-        # FOR DEV
-        # "http://#{subdomain}.lvh.me:3001/docs/#{subdomain}-hyperschema.json"
+        define_singleton_method(:subdomain) do
+          subdomain
+        end
+      end
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      json_schema.definitions.each do |type, obj|
+        is_collection = obj.links.select { |x| x.rel == 'instances' }.any?
+        namespace = is_collection ? type.pluralize : type
+        if method.to_s === namespace
+          return true
+        end
+      end
+
+      super
+    end
+
+    def method_missing(method, *args, &block)
+      json_schema.definitions.each do |type, obj|
+        is_collection = obj.links.select { |x| x.rel == 'instances' }.any?
+        namespace = is_collection ? type.pluralize : type
+
+        if method.to_s === namespace
+          instance_variable_set(
+            "@#{namespace}",
+            instance_variable_get("@#{namespace}") ||
+            Dato::Repo.new(self, type, obj)
+          )
+
+          return instance_variable_get("@#{namespace}")
+        end
+      end
+
+      super
+    end
+
+    def json_schema
+      @json_schema ||= begin
         response = Faraday.get(
-          "https://#{subdomain}.datocms.com/docs/#{subdomain}-hyperschema.json"
+          # "http://#{subdomain}.lvh.me:3001/docs/#{subdomain}-hyperschema.json"
+          "#{base_url}/docs/#{self.class.subdomain}-hyperschema.json"
         )
 
         schema = JsonSchema.parse!(JSON.parse(response.body))
         schema.expand_references!
 
-        schema.definitions.each do |type, obj|
-          is_collection = obj.links.select { |x| x.rel == 'instances' }.any?
-          namespace = is_collection ? type.pluralize : type
-
-          define_method(namespace) do
-            instance_variable_set(
-              "@#{namespace}",
-              instance_variable_get("@#{namespace}") ||
-              Dato::Repo.new(self, type, obj)
-            )
-          end
-        end
+        schema
       end
     end
 
@@ -100,10 +127,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
@@ -210,14 +219,42 @@ module Dato
 
         def file
           Imgix::Client.new(
-            host: @imgix_host,
+            domain: @imgix_host,
             secure: true,
             include_library_param: false
           ).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 = {})
+          @imgix_host != "www.datocms-assets.com" and
+            raise "#lqip_data_url can only be used with www.datocms-assets.com domain"
+
+          response = Faraday.get(file.to_url(opts.merge(lqip: "blurhash")))
+
+          if response.status == 200
+            "data:image/jpeg;base64,#{Base64.strict_encode64(response.body)}"
+          end
         end
 
         def to_hash(*_args)
@@ -230,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/local/field_type/upload_id.rb

@@ -43,7 +43,7 @@ module Dato
 
         def file
           Imgix::Client.new(
-            host: @imgix_host,
+            domain: @imgix_host,
             secure: true,
             include_library_param: false
           ).path(path)

data/lib/dato/local/loader.rb

@@ -44,7 +44,7 @@ module Dato
         return if pusher && pusher.connected
 
         channel_name = if client.environment
-                         "private-site-#{site_id}-environment-#{environment}"
+                         "private-site-#{site_id}-environment-#{client.environment}"
                        else
                          "private-site-#{site_id}"
                        end

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.13'
+  VERSION = '0.7.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.18
 platform: ruby
 authors:
 - Stefano Verna
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: front_matter_parser
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +252,16 @@ dependencies:
   name: imgix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
@@ -450,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
@@ -465,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: []