dato 0.7.14 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe0429654722ca0165930dc29c1a0350bb386cd73b6c824d2d43cc0af8bb13f
-  data.tar.gz: fc124f52acef1d95d507dce6a9c45fa7556b9c5a018b9f630fbd688282015eb7
+  metadata.gz: 9777e0d266657c2dffa3e6651de719c8e24728e311bcb6ed745bc6a7a70d927a
+  data.tar.gz: 4d54c4e69249b7d3a30f9c289afe93f8f242c6026f8a62d7e6ae0e18ca8b8eb2
 SHA512:
-  metadata.gz: 7981652ff2a86c8f6081bbb3b7c4fa3d148ba2b159009e5528df476f3ee0517f95c98f7bb8f035c0d09e694f562b06d50a3df44910930a478df3676940508f77
-  data.tar.gz: 396828391163788c25f77da2d01c576d6c4cbad8993dda40d97b7700cb1896c7426897613dc9cc40c99177d7cdc8846a382d8ca9e2f37f0152abf3ff82636efe
+  metadata.gz: 99432305cdb85e390e2435913840f7d2c6a7bf93e7f9b1bfe9eb2b7c87a99da18ecad696f8f73704fc3776f2799206161fc8b9174b5c2aedb0e74efae34fbe48
+  data.tar.gz: 8539feabd9684b8c3f8824da200ab28527072468914dd8cbfe25117807bd835250043f22348c0259ed3257781bf3ca9149512b963a78637b4f9e36b9b093485c

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/TODO.md

@@ -0,0 +1,28 @@
+```ruby
+StructuredTextRenderer.new(
+  foo.content,
+  adapter: Adapter.new(
+    render_text: lambda do |text|
+      text.gsub(/this/, "that")
+    end,
+    render_fragment: lambda do |children|
+      children.join("")
+    end,
+    render_node: lambda do |tagname, attrs, children|
+      # we could ActionView::Helpers::TagHelper
+      content_tag(tagname, children, attrs)
+    end,
+  )
+  custom_rules: {
+    heading: lambda do |node, children, adapter|
+      adapter.render_node("h#{node[:level] + 1}", {}, children)
+    end
+  },
+  render_link_to_record: lambda do |record, children, adapter|
+  end,
+  render_inline_record: lambda do |record, adapter|
+  end,
+  render_block: lambda do |record, adapter|
+  end
+)
+```

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,18 +84,20 @@ module Dato
         end
       end
 
-      result
+      result.empty? ? nil : result
     end
 
     def attributes(resource)
       if type == 'item'
-        return resource.keys.map(&:to_sym) - %i[
-          item_type
-          id
-          created_at
-          updated_at
-          creator
-        ]
+        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)
@@ -110,7 +114,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/local/field_type/structured_text.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Dato
+  module Local
+    module FieldType
+      class StructuredText
+        def self.parse(value, repo)
+          new(value, repo)
+        end
+
+        def initialize(value, repo)
+          @value = value
+          @repo = repo
+        end
+
+        def value
+          @value
+        end
+
+        def blocks
+          find_all_nodes("block").map do |node|
+            @repo.find(node["item"])
+          end.uniq
+        end
+
+        def links
+          find_all_nodes(["inlineItem", "itemLink"]).map do |node|
+            @repo.find(node["item"])
+          end.uniq
+        end
+
+        def find_all_nodes(types)
+          if value.nil?
+            return []
+          end
+
+          types = Array(types)
+          result = []
+
+          visit(value["document"]) do |node|
+            if node.is_a?(Hash) && types.include?(node["type"])
+              result << node
+            end
+          end
+
+          result
+        end
+
+        def visit(node, &block)
+          if node.is_a?(Hash) && node["children"].is_a?(Array)
+            node["children"].each do |child|
+              visit(child, &block)
+            end
+          end
+
+          block.call(node)
+        end
+
+        def to_hash(max_depth = 3, current_depth = 0)
+          {
+            value: value,
+            links: links.map { |item| item.to_hash(max_depth, current_depth) },
+            blocks: blocks.map { |item| item.to_hash(max_depth, current_depth) },
+          }
+        end
+      end
+    end
+  end
+end

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.14'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefano Verna
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -380,6 +380,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/console
 - bin/rspec
 - bin/setup
@@ -427,6 +428,7 @@ files:
 - lib/dato/local/field_type/seo.rb
 - lib/dato/local/field_type/slug.rb
 - lib/dato/local/field_type/string.rb
+- lib/dato/local/field_type/structured_text.rb
 - lib/dato/local/field_type/text.rb
 - lib/dato/local/field_type/theme.rb
 - lib/dato/local/field_type/upload_id.rb
@@ -464,7 +466,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 +481,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: []