dato 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9777e0d266657c2dffa3e6651de719c8e24728e311bcb6ed745bc6a7a70d927a
-  data.tar.gz: 4d54c4e69249b7d3a30f9c289afe93f8f242c6026f8a62d7e6ae0e18ca8b8eb2
+  metadata.gz: 2fa3f3032c3681e2bf710b69ffe75eec9b47a27a494e63943909b91500785cb6
+  data.tar.gz: f5ee2896a63dab9a457c94d612fcd285544487df3c915d2dccc14951a4c304d0
 SHA512:
-  metadata.gz: 99432305cdb85e390e2435913840f7d2c6a7bf93e7f9b1bfe9eb2b7c87a99da18ecad696f8f73704fc3776f2799206161fc8b9174b5c2aedb0e74efae34fbe48
-  data.tar.gz: 8539feabd9684b8c3f8824da200ab28527072468914dd8cbfe25117807bd835250043f22348c0259ed3257781bf3ca9149512b963a78637b4f9e36b9b093485c
+  metadata.gz: 6e61ffbd1f842f24bd2d28f0dfdf2b5bfcd835b94ba0081bc01e3338a7768838683e801e02623988ab7f8e7e251b275c6cd7ce29d317bb17d9898e63876ee0d8
+  data.tar.gz: 3914e863434597f8a29fe9379d881e149e970013363890619624eb6201e2b6ae1056d04340429d10472c96735b9ceb7193cb6e2509f1dc0dfcd28e568dfb4fe3

data/.rubocop.yml

@@ -1,6 +1,7 @@
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
+  NewCops: enable
 
   Exclude:
   - "dato.gemspec"
@@ -11,9 +12,27 @@ Style/SafeNavigation:
 Style/Documentation:
   Enabled: false
 
+Style/GuardClause:
+  Enabled: false
+
+Naming/PredicateName:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/EvalWithLocation:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -21,15 +40,15 @@ Metrics/ModuleLength:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Enabled: false
 
 Metrics/AbcSize:
-  Max: 30
+  Enabled: false
 
 Metrics/PerceivedComplexity:
-  Max: 8
+  Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Exclude:
   - "spec/**/*"
   - "lib/dato/site/repo/*"
@@ -40,3 +59,21 @@ Metrics/LineLength:
 Metrics/ParameterLists:
   Exclude:
   - "lib/dato/local/field_type/*"
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes

data/.travis.yml

@@ -7,3 +7,4 @@ before_install:
   - gem install bundler -v 1.13.5
   - echo 'puts "ruby \"#{RUBY_VERSION}\""' | ruby >> Gemfile
   - cat Gemfile
+script: rubocop && rake

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in dato.gemspec
 gemspec

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "-b"

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'dato'
+require "bundler/setup"
+require "dato"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'dato'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start

data/bin/rspec

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
                                            Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path('bundle', __dir__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('rspec-core', 'rspec')
+load Gem.bin_path("rspec-core", "rspec")

data/dato.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubyzip'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rubocop'

data/exe/dato

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-require 'dotenv'
+require "dotenv"
 Dotenv.load
 
-require 'dato'
+require "dato"
 Dato::Cli.start(ARGV)

data/lib/dato.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'dato/version'
+require "dato/version"
 
-require 'dato/site/client'
-require 'dato/account/client'
-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'
+require "dato/site/client"
+require "dato/account/client"
+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/account/client.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'dato/api_client'
+require "dato/api_client"
 
 module Dato
   module Account
     class Client
       include ApiClient
 
-      json_schema 'account-api'
+      json_schema "account-api"
     end
   end
 end

data/lib/dato/api_client.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'faraday'
-require 'faraday_middleware'
-require 'json'
-require 'json_schema'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/inflector'
+require "faraday"
+require "faraday_middleware"
+require "json"
+require "json_schema"
+require "active_support/core_ext/hash/indifferent_access"
+require "active_support/inflector"
 
-require 'dato/version'
-require 'dato/repo'
+require "dato/version"
+require "dato/repo"
 
-require 'dato/api_error'
+require "dato/api_error"
 
-require 'cacert'
+require "cacert"
 
 module Dato
   module ApiClient
@@ -41,11 +41,9 @@ module Dato
 
     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?
+        is_collection = obj.links.select { |x| x.rel == "instances" }.any?
         namespace = is_collection ? type.pluralize : type
-        if method.to_s === namespace
-          return true
-        end
+        return true if method.to_s == namespace
       end
 
       super
@@ -53,18 +51,18 @@ module Dato
 
     def method_missing(method, *args, &block)
       json_schema.definitions.each do |type, obj|
-        is_collection = obj.links.select { |x| x.rel == 'instances' }.any?
+        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)
-          )
+        next unless method.to_s == namespace
 
-          return instance_variable_get("@#{namespace}")
-        end
+        instance_variable_set(
+          "@#{namespace}",
+          instance_variable_get("@#{namespace}") ||
+          Dato::Repo.new(self, type, obj),
+        )
+
+        return instance_variable_get("@#{namespace}")
       end
 
       super
@@ -74,7 +72,7 @@ module Dato
       @json_schema ||= begin
         response = Faraday.get(
           # "http://#{subdomain}.lvh.me:3001/docs/#{subdomain}-hyperschema.json"
-          "#{base_url}/docs/#{self.class.subdomain}-hyperschema.json"
+          "#{base_url}/docs/#{self.class.subdomain}-hyperschema.json",
         )
 
         schema = JsonSchema.parse!(JSON.parse(response.body))
@@ -109,7 +107,7 @@ module Dato
 
       response.body.with_indifferent_access if response.body.is_a?(Hash)
     rescue Faraday::SSLError => e
-      raise e if ENV['SSL_CERT_FILE'] == Cacert.pem
+      raise e if ENV["SSL_CERT_FILE"] == Cacert.pem
 
       Cacert.set_in_env
       request(*args)
@@ -118,12 +116,12 @@ module Dato
       raise e
     rescue Faraday::ClientError => e
       if e.response[:status] == 429
-        to_wait = e.response[:headers]['x-ratelimit-reset'].to_i
+        to_wait = e.response[:headers]["x-ratelimit-reset"].to_i
         puts "Rate limit exceeded, waiting #{to_wait} seconds..."
         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
@@ -140,16 +138,16 @@ module Dato
 
     def batch_data_validation?(response)
       body = begin
-               JSON.parse(response[:body])
-             rescue JSON::ParserError => e
-               nil
-             end
+        JSON.parse(response[:body])
+      rescue JSON::ParserError
+        nil
+      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 StandardError
       false
@@ -157,20 +155,18 @@ module Dato
 
     def connection
       default_headers = {
-        'Accept' => 'application/json',
-        'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}",
-        'User-Agent' => "ruby-client v#{Dato::VERSION}",
-        'X-Api-Version' => '3'
+        "Accept" => "application/json",
+        "Content-Type" => "application/json",
+        "Authorization" => "Bearer #{@token}",
+        "User-Agent" => "ruby-client v#{Dato::VERSION}",
+        "X-Api-Version" => "3",
       }
 
-      if environment
-        default_headers.merge!('X-Environment' => environment)
-      end
+      default_headers.merge!("X-Environment" => environment) if environment
 
       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/api_error.rb

@@ -2,25 +2,22 @@
 
 module Dato
   class ApiError < StandardError
-    attr_reader :response
+    attr_reader :response, :body
 
     def initialize(response)
-      @response = response
-    end
+      body = JSON.parse(response[:body]) if response[:body]
 
-    def message
-      [
-        'DatoCMS API Error',
+      message = [
+        "DatoCMS API Error",
         "Status: #{response[:status]}",
-        'Response:',
-        JSON.pretty_generate(body)
+        "Response:",
+        JSON.pretty_generate(body),
       ].join("\n")
-    end
 
-    def body
-      if response[:body]
-        JSON.parse(response[:body])
-      end
+      super(message)
+
+      @response = response
+      @body = body
     end
   end
 end

data/lib/dato/cli.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'thor'
-require 'dato/dump/runner'
-require 'dato/dump/ssg_detector'
-require 'listen'
+require "thor"
+require "dato/dump/runner"
+require "dato/dump/ssg_detector"
+require "listen"
 module Dato
   class Cli < Thor
-    package_name 'DatoCMS'
+    package_name "DatoCMS"
 
-    desc 'dump', 'dumps DatoCMS content into local files'
-    option :config, default: 'dato.config.rb'
-    option :token, default: ENV['DATO_API_TOKEN'], required: true
+    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
@@ -24,12 +24,12 @@ module Dato
         options[:token],
         environment: options[:environment],
         extra_headers: {
-          'X-Reason' => 'dump',
-          'X-SSG' => Dump::SsgDetector.new(Dir.pwd).detect
-        }
+          "X-Reason" => "dump",
+          "X-SSG" => Dump::SsgDetector.new(Dir.pwd).detect,
+        },
       )
       loader = Dato::Local::Loader.new(client, preview_mode)
-      print 'Fetching content from DatoCMS... '
+      print "Fetching content from DatoCMS... "
       loader.load
 
       if watch_mode
@@ -51,23 +51,23 @@ module Dato
       end
     end
 
-    desc 'check', 'checks the presence of a DatoCMS token'
+    desc "check", "checks the presence of a DatoCMS token"
     def check
-      exit 0 if ENV['DATO_API_TOKEN']
+      exit 0 if ENV["DATO_API_TOKEN"]
 
-      say 'Site token is not specified!'
+      say "Site token is not specified!"
       token = ask "Please paste your DatoCMS site read-only API token:\n>"
 
       if !token || token.empty?
-        puts 'Missing token'
+        puts "Missing token"
         exit 1
       end
 
-      File.open('.env', 'a') do |file|
+      File.open(".env", "a") do |file|
         file.puts "DATO_API_TOKEN=#{token}"
       end
 
-      say 'Token added to .env file.'
+      say "Token added to .env file."
 
       exit 0
     end