dato 0.7.10 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0c8876b3874673682917304166e526920fde1a607306d8a75335f6e92dbcdc
-  data.tar.gz: 25ff226def0f2c3633bce0b17053bc0734516639991d7530e32a482e78aa17a0
+  metadata.gz: fe8a9078fb6f9d6b37f6d9e371dbfcd417b2be9d2108395ad742a37b1f361262
+  data.tar.gz: 3466ff70f311f4c7208ff37ce20c2b2753cfd9eac05ac912cc42412748be3244
 SHA512:
-  metadata.gz: d07b5291010a9703bb29449425836fde87132d3776f5b7f7ed5479340f2935cfbde6e98ac0868ecfca68f767cf969844dba118ea66beb6acb8c785dfc6cd9e77
-  data.tar.gz: 57ee98d19caf26eefaee762afb46fd44448400d600858386526fafc56f163df330249efb16d6362a6a6b393b76b7c6d4b84e6f5e724ab9e09521819332b678df
+  metadata.gz: 23adcec27891f974552ee201cddc28b982579f849ffbaaaf88c4fad678460ce10effec7a52a65a4cd548253f79bfbe22c98b6f78caf8c95fb6dba3005b4eab3d
+  data.tar.gz: 32aea1391ce6f54ab64af0de2ec95619b7a3ece9644dfa98ed0b6bcefa819de797ea3b6b87741235b561a73aab952643cb9ecf47e7fae97cc9d323700f60360e

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+# 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:
+
+```ruby
+require "dato"
+client = Dato::Site::Client.new("YOUR-API-KEY", environment: 'sandbox-foobar')
+```
+
+# 0.7.12
+
+Introduces `Dato::Utils::BuildModularBlock` class to help creating modular blocks.
+
+An example usage can be:
+
+```ruby
+description = [
+  Dato::Utils::BuildModularBlock.build(
+    item_type: "1235",
+    name: "Best dog in the world",
+    year: "2020",
+    picture: picture
+  )
+]
+
+record = client.items.create(
+  item_type: "1234", # model ID
+  name: "Gigio",
+  description: description
+)
+```
+
+Find more info [on the documentation](https://www.datocms.com/docs/content-management-api/resources/item/create).
+
+# 0.7.11 (not released)
+
+* Updated specs cassettes after `appeareance -> appearance` typo fix
+* Some style changes
+
 # 0.7.10
 
 * Fixed SEO title retrieval. Now it fallbacks to default SEO title is item title is blank

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.rb

@@ -8,6 +8,7 @@ require 'dato/local/site'
 require 'dato/cli'
 require 'dato/utils/seo_tags_builder'
 require 'dato/utils/favicon_tags_builder'
+require 'dato/utils/build_modular_block'
 
 module Dato
 end

data/lib/dato/api_client.rb

@@ -20,7 +20,7 @@ module Dato
       base.extend ClassMethods
 
       base.class_eval do
-        attr_reader :token, :base_url, :schema, :extra_headers
+        attr_reader :token, :environment, :base_url, :schema, :extra_headers
       end
     end
 
@@ -29,27 +29,28 @@ module Dato
         define_method(:initialize) do |token, options = {}|
           @token = token
           @base_url = options[:base_url] || "https://#{subdomain}.datocms.com"
+          @environment = options[:environment]
           @extra_headers = options[:extra_headers] || {}
         end
 
+        # FOR DEV
+        # "http://#{subdomain}.lvh.me:3001/docs/#{subdomain}-hyperschema.json"
         response = Faraday.get(
-          # FOR DEV
-          # "http://#{subdomain}.lvh.me:3001/docs/#{subdomain}-hyperschema.json"
           "https://#{subdomain}.datocms.com/docs/#{subdomain}-hyperschema.json"
         )
 
         schema = JsonSchema.parse!(JSON.parse(response.body))
         schema.expand_references!
 
-        schema.definitions.each do |type, schema|
-          is_collection = schema.links.select { |x| x.rel === 'instances' }.any?
+        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, schema)
+              Dato::Repo.new(self, type, obj)
             )
           end
         end
@@ -76,16 +77,10 @@ module Dato
       method, absolute_path, body, params = args
 
       response = connection.send(method, absolute_path, body) do |c|
-        if params
-          c.params = params
-        end
+        c.params = params if params
       end
 
-      if response.body.is_a?(Hash)
-        response.body.with_indifferent_access
-      else
-        nil
-      end
+      response.body.with_indifferent_access if response.body.is_a?(Hash)
     rescue Faraday::SSLError => e
       raise e if ENV['SSL_CERT_FILE'] == Cacert.pem
 
@@ -101,14 +96,15 @@ module Dato
         sleep(to_wait + 1)
         request(*args)
       elsif e.response[:status] == 422 && batch_data_validation?(e.response)
-        puts "Validating items, waiting 1 second and retrying..."
+        puts 'Validating items, waiting 1 second and retrying...'
         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
@@ -123,12 +119,12 @@ module Dato
              end
 
       return false unless body
-      return false unless body["data"]
+      return false unless body['data']
 
-      body["data"].any? do |e|
-        e["attributes"]["code"] == "BATCH_DATA_VALIDATION_IN_PROGRESS"
+      body['data'].any? do |e|
+        e['attributes']['code'] == 'BATCH_DATA_VALIDATION_IN_PROGRESS'
       end
-    rescue
+    rescue StandardError
       false
     end
 
@@ -141,9 +137,13 @@ module Dato
         'X-Api-Version' => '3'
       }
 
+      if environment
+        default_headers.merge!('X-Environment' => environment)
+      end
+
       options = {
         url: base_url,
-        headers: default_headers.merge(extra_headers),
+        headers: default_headers.merge(extra_headers)
       }
 
       @connection ||= Faraday.new(options) do |c|

data/lib/dato/cli.rb

@@ -11,8 +11,10 @@ module Dato
     desc 'dump', 'dumps DatoCMS content into local files'
     option :config, default: 'dato.config.rb'
     option :token, default: ENV['DATO_API_TOKEN'], required: true
+    option :environment, type: :string, required: false
     option :preview, default: false, type: :boolean
     option :watch, default: false, type: :boolean
+
     def dump
       config_file = File.expand_path(options[:config])
       watch_mode = options[:watch]
@@ -20,6 +22,7 @@ module Dato
 
       client = Dato::Site::Client.new(
         options[:token],
+        environment: options[:environment],
         extra_headers: {
           'X-Reason' => 'dump',
           'X-SSG' => Dump::SsgDetector.new(Dir.pwd).detect

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

@@ -43,7 +43,13 @@ module Dato
 
         return if pusher && pusher.connected
 
-        pusher.subscribe("private-site-#{site_id}")
+        channel_name = if client.environment
+                         "private-site-#{site_id}-environment-#{client.environment}"
+                       else
+                         "private-site-#{site_id}"
+                       end
+
+        pusher.subscribe(channel_name)
 
         bind_on_site_upsert(&block)
         bind_on_item_destroy(&block)
@@ -66,7 +72,8 @@ module Dato
         bind_on("site:upsert", block) do |data|
           threads = [
             Thread.new { Thread.current[:output] = site },
-            Thread.new { Thread.current[:output] = all_items }
+            Thread.new { Thread.current[:output] = all_items },
+            Thread.new { Thread.current[:output] = all_uploads }
           ]
 
           results = threads.map do |t|

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/utils/build_modular_block.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'dato/json_api_serializer'
+
+module Dato
+  module Utils
+    module BuildModularBlock
+      def self.build(unserialized_body)
+        json_api_serializer = JsonApiSerializer.new('item', nil)
+        attributes = json_api_serializer.serialized_attributes(unserialized_body)
+
+        payload = {
+          type: 'item',
+          attributes: attributes,
+          relationships: {
+            item_type: {
+              data: {
+                id: unserialized_body[:item_type],
+                type: 'item_type',
+              },
+            },
+          },
+        }
+
+        payload[:id] = unserialized_body[:id] if unserialized_body[:id]
+
+        payload
+      end
+    end
+  end
+end

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.17
 platform: ruby
 authors:
 - Stefano Verna
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-10-07 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
@@ -429,6 +443,7 @@ files:
 - lib/dato/upload/create_upload_path.rb
 - lib/dato/upload/file.rb
 - lib/dato/upload/image.rb
+- lib/dato/utils/build_modular_block.rb
 - lib/dato/utils/favicon_tags_builder.rb
 - lib/dato/utils/locale_value.rb
 - lib/dato/utils/meta_tags/article_modified_time.rb
@@ -449,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
@@ -464,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: []