dato 0.7.18 → 0.8.2

data/lib/dato/local/loader.rb

@@ -1,32 +1,31 @@
 # frozen_string_literal: true
 
-require 'pusher-client'
+require "pusher-client"
 
-require 'dato/local/entities_repo'
-require 'dato/local/items_repo'
+require "dato/local/entities_repo"
+require "dato/local/items_repo"
 
 module Dato
   module Local
     class Loader
-      attr_reader :client
-      attr_reader :entities_repo
-      attr_reader :items_repo
-      attr_reader :preview_mode
+      attr_reader :client, :entities_repo, :items_repo, :preview_mode
 
-      PUSHER_API_KEY = '75e6ef0fe5d39f481626'
+      PUSHER_API_KEY = "75e6ef0fe5d39f481626"
 
+      # rubocop:disable Style/OptionalBooleanParameter
       def initialize(client, preview_mode = false)
         @client = client
         @preview_mode = preview_mode
         @entities_repo = EntitiesRepo.new
         @items_repo = ItemsRepo.new(@entities_repo)
       end
+      # rubocop:enable Style/OptionalBooleanParameter
 
       def load
         threads = [
           Thread.new { Thread.current[:output] = site },
           Thread.new { Thread.current[:output] = all_items },
-          Thread.new { Thread.current[:output] = all_uploads }
+          Thread.new { Thread.current[:output] = all_uploads },
         ]
 
         results = threads.map do |t|
@@ -39,7 +38,7 @@ module Dato
       end
 
       def watch(&block)
-        site_id = client.get('/site')['data']['id']
+        site_id = client.get("/site")["data"]["id"]
 
         return if pusher && pusher.connected
 
@@ -69,11 +68,11 @@ module Dato
       private
 
       def bind_on_site_upsert(&block)
-        bind_on("site:upsert", block) do |data|
+        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_uploads }
+            Thread.new { Thread.current[:output] = all_uploads },
           ]
 
           results = threads.map do |t|
@@ -86,16 +85,16 @@ module Dato
       end
 
       def bind_on_item_upsert(&block)
-        event_type = preview_mode ? 'preview_mode' : 'published_mode'
+        event_type = preview_mode ? "preview_mode" : "published_mode"
 
         bind_on("item:#{event_type}:upsert", block) do |data|
           payload = client.items.all(
             {
-              'filter[ids]' => data[:ids].join(','),
-              version: item_version
+              "filter[ids]" => data[:ids].join(","),
+              version: item_version,
             },
             deserialize_response: false,
-            all_pages: true
+            all_pages: true,
           )
 
           @entities_repo.upsert_entities(payload)
@@ -103,10 +102,10 @@ module Dato
       end
 
       def bind_on_item_destroy(&block)
-        event_type = preview_mode ? 'preview_mode' : 'published_mode'
+        event_type = preview_mode ? "preview_mode" : "published_mode"
 
         bind_on("item:#{event_type}:destroy", block) do |data|
-          @entities_repo.destroy_entities('item', data[:ids])
+          @entities_repo.destroy_entities("item", data[:ids])
         end
       end
 
@@ -114,10 +113,10 @@ module Dato
         bind_on("upload:upsert", block) do |data|
           payload = client.uploads.all(
             {
-              'filter[ids]' => data[:ids].join(',')
+              "filter[ids]" => data[:ids].join(","),
             },
             deserialize_response: false,
-            all_pages: true
+            all_pages: true,
           )
 
           @entities_repo.upsert_entities(payload)
@@ -125,21 +124,21 @@ module Dato
       end
 
       def bind_on_upload_destroy(&block)
-        bind_on('upload:destroy', block) do |data|
-          @entities_repo.destroy_entities('upload', data[:ids])
+        bind_on("upload:destroy", block) do |data|
+          @entities_repo.destroy_entities("upload", data[:ids])
         end
       end
 
       def bind_on_item_type_upsert(&block)
-        bind_on('item_type:upsert', block) do |data|
+        bind_on("item_type:upsert", block) do |data|
           data[:ids].each do |id|
             payload = client.item_types.find(id, {}, deserialize_response: false)
             @entities_repo.upsert_entities(payload)
 
             payload = client.items.all(
-              { 'filter[type]' => id },
+              { "filter[type]" => id },
               deserialize_response: false,
-              all_pages: true
+              all_pages: true,
             )
 
             @entities_repo.upsert_entities(payload)
@@ -148,7 +147,7 @@ module Dato
       end
 
       def bind_on_item_type_destroy(&block)
-        bind_on('item_type:destroy', block) do |data|
+        bind_on("item_type:destroy", block) do |data|
           data[:ids].each do |id|
             @entities_repo.destroy_item_type(id)
           end
@@ -174,19 +173,19 @@ module Dato
         @pusher ||= PusherClient::Socket.new(
           PUSHER_API_KEY,
           secure: true,
-          auth_method: method(:pusher_auth_method)
+          auth_method: method(:pusher_auth_method),
         )
       end
 
       def site
-        client.get('/site', include: ['item_types', 'item_types.fields'])
+        client.get("/site", include: ["item_types", "item_types.fields"])
       end
 
       def all_items
         client.items.all(
           { version: item_version },
           deserialize_response: false,
-          all_pages: true
+          all_pages: true,
         )
       end
 
@@ -198,9 +197,9 @@ module Dato
 
       def item_version
         if preview_mode
-          'latest'
+          "latest"
         else
-          'published'
+          "published"
         end
       end
 

data/lib/dato/local/site.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-require 'active_support/inflector/transliterate'
-require 'active_support/hash_with_indifferent_access'
-require 'dato/utils/locale_value'
+require "forwardable"
+require "dato/utils/locale_value"
 
 module Dato
   module Local
@@ -11,6 +9,7 @@ module Dato
       extend Forwardable
 
       attr_reader :entity
+
       def_delegators :entity, :id, :name, :locales, :domain,
                      :internal_domain, :no_index, :frontend_url
 

data/lib/dato/paginator.rb

@@ -12,7 +12,7 @@ module Dato
       items_per_page = 100
 
       base_response = @client.get(
-        @base_endpoint, @filters.dup.merge('page[limit]' => items_per_page)
+        @base_endpoint, @filters.dup.merge("page[limit]" => items_per_page)
       )
 
       extra_pages = (
@@ -23,9 +23,9 @@ module Dato
         base_response[:data] += @client.get(
           @base_endpoint,
           @filters.dup.merge(
-            'page[offset]' => items_per_page * (page + 1),
-            'page[limit]' => items_per_page
-          )
+            "page[offset]" => items_per_page * (page + 1),
+            "page[limit]" => items_per_page,
+          ),
         )[:data]
       end
 

data/lib/dato/repo.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'dato/json_api_serializer'
-require 'dato/json_api_deserializer'
-require 'dato/paginator'
+require "dato/json_api_serializer"
+require "dato/json_api_deserializer"
+require "dato/paginator"
 
 module Dato
   class Repo
     attr_reader :client, :type, :schema
 
-    IDENTITY_REGEXP = /\{\(.*?definitions%2F(.*?)%2Fdefinitions%2Fidentity\)}/
+    IDENTITY_REGEXP = /\{\(.*?definitions%2F(.*?)%2Fdefinitions%2Fidentity\)}/.freeze
 
     METHOD_NAMES = {
-      'instances' => :all,
-      'self' => :find
+      "instances" => :all,
+      "self" => :find,
     }.freeze
 
     def initialize(client, type, schema)
@@ -32,23 +32,23 @@ module Dato
     private
 
     def method_missing(method, *args, &block)
-      link = schema.links.find do |link|
-        METHOD_NAMES.fetch(link.rel, link.rel).to_sym == method.to_sym
+      link = schema.links.find do |ilink|
+        METHOD_NAMES.fetch(ilink.rel, ilink.rel).to_sym == method.to_sym
       end
 
-      return super if !link
+      return super unless link
 
       min_arguments_count = [
         link.href.scan(IDENTITY_REGEXP).size,
-        link.schema && link.method != :get ? 1 : 0
+        link.schema && link.method != :get ? 1 : 0,
       ].reduce(0, :+)
 
-      (args.size >= min_arguments_count) or
-        raise ArgumentError, "wrong number of arguments (given #{args.size}, expected #{min_arguments_count})"
+      (args.size >= min_arguments_count) ||
+        raise(ArgumentError, "wrong number of arguments (given #{args.size}, expected #{min_arguments_count})")
 
       placeholders = []
 
-      url = link['href'].gsub(IDENTITY_REGEXP) do |_stuff|
+      url = link["href"].gsub(IDENTITY_REGEXP) do |_stuff|
         placeholder = args.shift.to_s
         placeholders << placeholder
         placeholder
@@ -61,19 +61,16 @@ module Dato
         body = link.schema ? args.shift : {}
         query_string = args.shift || {}
 
-      elsif link.method == :delete
-        query_string = args.shift || {}
-
-      elsif link.method == :get
+      elsif %i[get delete].include?(link.method)
         query_string = args.shift || {}
       end
 
       options = args.any? ? args.shift.symbolize_keys : {}
 
       if link.schema && %i[post put].include?(link.method) && options.fetch(:serialize_response, true)
-        body = JsonApiSerializer.new(type, link).serialize(
+        body = JsonApiSerializer.new(link: link).serialize(
           body,
-          link.method == :post ? nil : placeholders.last
+          link.method == :post ? nil : placeholders.last,
         )
       end
 
@@ -92,21 +89,19 @@ module Dato
       if response && response[:data] && response[:data].is_a?(Hash) && response[:data][:type] == "job"
         job_result = nil
 
-        while !job_result do
+        until job_result
           begin
             sleep(1)
             job_result = client.job_result.find(response[:data][:id])
-          rescue ApiError => error
-            if error.response[:status] != 404
-              raise error
-            end
+          rescue ApiError => e
+            raise e if e.response[:status] != 404
           end
         end
 
         if job_result[:status] < 200 || job_result[:status] >= 300
           error = ApiError.new(
             status: job_result[:status],
-            body: JSON.dump(job_result[:payload])
+            body: JSON.dump(job_result[:payload]),
           )
 
           puts "===="
@@ -121,12 +116,10 @@ module Dato
         else
           job_result.payload
         end
+      elsif options.fetch(:deserialize_response, true)
+        JsonApiDeserializer.new(link.target_schema).deserialize(response)
       else
-        if options.fetch(:deserialize_response, true)
-          JsonApiDeserializer.new(link.target_schema).deserialize(response)
-        else
-          response
-        end
+        response
       end
     end
   end

data/lib/dato/site/client.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'dato/api_client'
-require 'dato/upload/file'
-require 'dato/upload/create_upload_path'
+require "dato/api_client"
+require "dato/upload/file"
+require "dato/upload/create_upload_path"
 
 module Dato
   module Site
     class Client
       include ApiClient
 
-      json_schema 'site-api'
+      json_schema "site-api"
 
       def create_upload_path(path_or_url)
         file = Upload::CreateUploadPath.new(self, path_or_url)
@@ -30,7 +30,7 @@ module Dato
         request(
           :post,
           "/pusher/authenticate",
-          { socket_id: socket_id, channel_name: channel}
+          { socket_id: socket_id, channel_name: channel },
         )
       end
     end

data/lib/dato/upload/create_upload_path.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'mime/types'
-require 'tempfile'
-require 'addressable'
-require 'net/http'
+require "mime/types"
+require "tempfile"
+require "addressable"
+require "net/http"
 
 module Dato
   module Upload
@@ -19,7 +19,7 @@ module Dato
         @file ||= if http_source?
                     uri = Addressable::URI.parse(source)
                     ext = ::File.extname(uri.path).downcase
-                    tempfile = Tempfile.new(['file', ext])
+                    tempfile = Tempfile.new(["file", ext])
                     tempfile.binmode
                     tempfile.write(download_file(source))
                     tempfile.rewind
@@ -31,7 +31,7 @@ module Dato
 
       def http_source?
         uri = Addressable::URI.parse(source)
-        uri.scheme == 'http' || uri.scheme == 'https'
+        uri.scheme == "http" || uri.scheme == "https"
       rescue Addressable::URI::InvalidURIError
         false
       end
@@ -51,9 +51,7 @@ module Dato
         mime_type = MIME::Types.of(filename).first
 
         request = Net::HTTP::Put.new(uri)
-        if mime_type
-          request.add_field("Content-Type", mime_type.to_s)
-        end
+        request.add_field("Content-Type", mime_type.to_s) if mime_type
         request.body = file.read
 
         http = Net::HTTP.new(uri.host, uri.port)
@@ -78,4 +76,3 @@ module Dato
     end
   end
 end
-

data/lib/dato/upload/file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/upload/create_upload_path'
+require "dato/upload/create_upload_path"
 
 module Dato
   module Upload
@@ -18,14 +18,14 @@ module Dato
         upload_path = CreateUploadPath.new(client, source).upload_path
 
         upload = client.uploads.create(
-          upload_attributes.merge(path: upload_path)
+          upload_attributes.merge(path: upload_path),
         )
 
         {
           alt: nil,
           title: nil,
           custom_data: {},
-        }.merge(field_attributes).merge(upload_id: upload['id'])
+        }.merge(field_attributes).merge(upload_id: upload["id"])
       end
     end
   end

data/lib/dato/upload/image.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/upload/file'
+require "dato/upload/file"
 
 module Dato
   module Upload

data/lib/dato/utils/build_modular_block.rb

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

data/lib/dato/utils/favicon_tags_builder.rb

@@ -20,7 +20,7 @@ module Dato
           build_apple_icon_tags,
           build_windows_tags,
           build_color_tags,
-          build_app_name_tag
+          build_app_name_tag,
         ].flatten.compact
       end
 
@@ -29,9 +29,9 @@ module Dato
 
         APPLE_TOUCH_ICON_SIZES.map do |size|
           link_tag(
-            'apple-touch-icon',
+            "apple-touch-icon",
             url(size),
-            sizes: "#{size}x#{size}"
+            sizes: "#{size}x#{size}",
           )
         end
       end
@@ -41,10 +41,10 @@ module Dato
 
         ICON_SIZES.map do |size|
           link_tag(
-            'icon',
+            "icon",
             url(size),
             sizes: "#{size}x#{size}",
-            type: "image/#{site.favicon.format}"
+            type: "image/#{site.favicon.format}",
           )
         end
       end
@@ -58,15 +58,15 @@ module Dato
       end
 
       def build_app_name_tag
-        meta_tag('application-name', site.name)
+        meta_tag("application-name", site.name)
       end
 
       def build_color_tags
         return unless theme_color
 
         [
-          meta_tag('theme-color', theme_color),
-          meta_tag('msapplication-TileColor', theme_color)
+          meta_tag("theme-color", theme_color),
+          meta_tag("msapplication-TileColor", theme_color),
         ]
       end
 
@@ -75,11 +75,11 @@ module Dato
       end
 
       def meta_tag(name, value)
-        { tag_name: 'meta', attributes: { name: name, content: value } }
+        { tag_name: "meta", attributes: { name: name, content: value } }
       end
 
       def link_tag(rel, href, attrs = {})
-        { tag_name: 'link', attributes: attrs.merge(rel: rel, href: href) }
+        { tag_name: "link", attributes: attrs.merge(rel: rel, href: href) }
       end
     end
   end

data/lib/dato/utils/locale_value.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'i18n/backend/fallbacks'
+require "i18n/backend/fallbacks"
 
 module Dato
   module Utils

data/lib/dato/utils/meta_tags/article_modified_time.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'dato/utils/meta_tags/base'
-require 'time'
+require "dato/utils/meta_tags/base"
+require "time"
 
 module Dato
   module Utils
     module MetaTags
       class ArticleModifiedTime < Base
         def build
-          og_tag('article:modified_time', item.updated_at.iso8601) if item
+          og_tag("article:modified_time", item.updated_at.iso8601) if item
         end
       end
     end

data/lib/dato/utils/meta_tags/article_publisher.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'dato/utils/meta_tags/base'
+require "dato/utils/meta_tags/base"
 
 module Dato
   module Utils
     module MetaTags
       class ArticlePublisher < Base
         def build
-          og_tag('article:publisher', facebook_page_url) if facebook_page_url
+          og_tag("article:publisher", facebook_page_url) if facebook_page_url
         end
 
         def facebook_page_url

data/lib/dato/utils/meta_tags/base.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-require 'dato/local/field_type/seo'
-require 'active_support/core_ext/object/blank'
+require "forwardable"
+require "dato/local/field_type/seo"
 
 module Dato
   module Utils
@@ -19,7 +18,7 @@ module Dato
           fallback_seo = site.global_seo && site.global_seo.fallback_seo
 
           seo_field = item &&
-                      item.fields.detect { |f| f.field_type == 'seo' }
+                      item.fields.detect { |f| f.field_type == "seo" }
 
           item_seo_value = seo_field &&
                            item[seo_field.api_key] &&
@@ -36,11 +35,11 @@ module Dato
         end
 
         def meta_tag(name, content)
-          tag('meta', name: name, content: content)
+          tag("meta", name: name, content: content)
         end
 
         def og_tag(property, content)
-          tag('meta', property: property, content: content)
+          tag("meta", property: property, content: content)
         end
 
         def card_tag(name, content)

data/lib/dato/utils/meta_tags/description.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dato/utils/meta_tags/base'
+require "dato/utils/meta_tags/base"
 
 module Dato
   module Utils
@@ -10,9 +10,9 @@ module Dato
           return unless description.present?
 
           [
-            meta_tag('description', description),
-            og_tag('og:description', description),
-            card_tag('twitter:description', description)
+            meta_tag("description", description),
+            og_tag("og:description", description),
+            card_tag("twitter:description", description),
           ]
         end