dato 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b83ae27c74e6a173bdde5b26ce31b9d71a70969f7630d0ffee199ed5a7f45ff
-  data.tar.gz: eadb0a8bf60f1364345e57cfc1c8ffc314f84310482157129b37e2c73fe67ddf
+  metadata.gz: 118ea91dc3caa834412e342a2350b594c94880bbbafba6f37d2b6041b5570acc
+  data.tar.gz: 64e1a53c6292a41ad4e361e4b01bdff416d09e3acebbd133afc123c2f80fe74b
 SHA512:
-  metadata.gz: 57ae67081408c41489e5f9d44cc4548f89decb247db797223f2e6582f615fed19acab7ced73e62006f1d5e50df2a6c47f61717f3ee866f9e184b51952c247f92
-  data.tar.gz: 65996e97224be9504d239166b40a0f363e758236f31347a9b2f6acc39556935725ec73d1b1b2edad1fee1a109d0299ab040ffca6ff53b618a87c09c586e83800
+  metadata.gz: a93f7dccda38b47237a585a7274754b2a3c370918c476e5556bc42ec13a2326a53e594f25b48fdc240a456f707d71dedfe9d9587a978ff38a177c398d5627ffa
+  data.tar.gz: b74c22160ba51d703705213b12c60d795eb499855fc6179a8b2c576ff8e32d1cd7bb94747a7e3a6a5bd957ff527e34964ca01eb47dbfdc078f16519272dfb6a4

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.3.0
   - 2.4.0
+  - 2.5.0
+  - 2.6.0
 before_install:
   - gem install bundler -v 1.13.5
   - echo 'puts "ruby \"#{RUBY_VERSION}\""' | ruby >> Gemfile

data/dato.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubyzip'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'vcr'
@@ -43,6 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dotenv'
   spec.add_runtime_dependency 'pusher-client'
   spec.add_runtime_dependency 'listen'
-  spec.add_runtime_dependency 'json_schema'
+  spec.add_runtime_dependency 'dato_json_schema'
   spec.add_runtime_dependency 'mime-types'
 end

data/lib/dato/api_client.rb

@@ -56,8 +56,31 @@ module Dato
       end
     end
 
+    def put(absolute_path, body = {}, params = {})
+      request(:put, absolute_path, body, params)
+    end
+
+    def post(absolute_path, body = {}, params = {})
+      request(:post, absolute_path, body, params)
+    end
+
+    def get(absolute_path, params = {})
+      request(:get, absolute_path, nil, params)
+    end
+
+    def delete(absolute_path, params = {})
+      request(:delete, absolute_path, nil, params)
+    end
+
     def request(*args)
-      response = connection.send(*args)
+      method, absolute_path, body, params = args
+
+      response = connection.send(method, absolute_path, body) do |c|
+        if params
+          c.params = params
+        end
+      end
+
       if response.body.is_a?(Hash)
         response.body.with_indifferent_access
       else
@@ -82,7 +105,7 @@ module Dato
         sleep(1)
         request(*args)
       else
-        error = ApiError.new(e)
+        error = ApiError.new(e.response)
         puts "===="
         puts error.message
         puts "===="
@@ -115,12 +138,12 @@ module Dato
         'Content-Type' => 'application/json',
         'Authorization' => "Bearer #{@token}",
         'User-Agent' => "ruby-client v#{Dato::VERSION}",
-        'X-Api-Version' => '2'
+        'X-Api-Version' => '3'
       }
 
       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,23 +2,25 @@
 
 module Dato
   class ApiError < StandardError
-    attr_reader :faraday_error
+    attr_reader :response
 
-    def initialize(faraday_error)
-      @faraday_error = faraday_error
+    def initialize(response)
+      @response = response
     end
 
     def message
       [
         'DatoCMS API Error',
-        "Status: #{faraday_error.response[:status]}",
+        "Status: #{response[:status]}",
         'Response:',
         JSON.pretty_generate(body)
       ].join("\n")
     end
 
     def body
-      JSON.parse(faraday_error.response[:body])
+      if response[:body]
+        JSON.parse(response[:body])
+      end
     end
   end
 end

data/lib/dato/json_api_deserializer.rb

@@ -3,10 +3,10 @@ require 'dato/json_schema_relationships'
 
 module Dato
   class JsonApiDeserializer
-    attr_reader :link
+    attr_reader :schema
 
-    def initialize(link)
-      @link = link
+    def initialize(schema)
+      @schema = schema
     end
 
     def deserialize(data)
@@ -23,7 +23,6 @@ module Dato
 
     def deserialize_resource(data)
       result = { id: data[:id] }
-
       result[:meta] = data[:meta] if data[:meta]
       result.merge!(data[:attributes]) if data[:attributes]
 
@@ -51,7 +50,7 @@ module Dato
     end
 
     def relationships
-      @relationships ||= JsonSchemaRelationships.new(link.target_schema).relationships
+      @relationships ||= JsonSchemaRelationships.new(schema).relationships
     end
   end
 end

data/lib/dato/local/field_type/file.rb

@@ -6,21 +6,18 @@ module Dato
   module Local
     module FieldType
       class File
-        attr_reader :path, :format, :size, :width, :height, :title, :alt
+        def self.parse(value, repo)
+          if value
+            v = value.with_indifferent_access
 
-        def self.parse(upload_id, repo)
-          if upload_id
-            upload = repo.entities_repo.find_entity('upload', upload_id)
+            upload = repo.entities_repo.find_entity('upload', v[:upload_id])
 
             if upload
               new(
-                upload.path,
-                upload.format,
-                upload.size,
-                upload.width,
-                upload.height,
-                upload.alt,
-                upload.title,
+                upload,
+                v[:alt],
+                v[:title],
+                v[:custom_data],
                 repo.site.entity.imgix_host
               )
             end
@@ -28,23 +25,64 @@ module Dato
         end
 
         def initialize(
-          path,
-          format,
-          size,
-          width,
-          height,
+          upload,
           alt,
           title,
+          custom_data,
           imgix_host
         )
-          @path = path
-          @format = format
-          @size = size
-          @imgix_host = imgix_host
-          @width = width
-          @height = height
+          @upload = upload
           @alt = alt
           @title = title
+          @custom_data = custom_data
+          @imgix_host = imgix_host
+        end
+
+        def path
+          @upload.path
+        end
+
+        def format
+          @upload.format
+        end
+
+        def size
+          @upload.size
+        end
+
+        def width
+          @upload.width
+        end
+
+        def height
+          @upload.height
+        end
+
+        def author
+          @upload.author
+        end
+
+        def notes
+          @upload.notes
+        end
+
+        def copyright
+          @upload.copyright
+        end
+
+        def alt
+          default_metadata = @upload.default_field_metadata.deep_stringify_keys.fetch(I18n.locale.to_s, {})
+          @alt || default_metadata["alt"]
+        end
+
+        def title
+          default_metadata = @upload.default_field_metadata.deep_stringify_keys.fetch(I18n.locale.to_s, {})
+          @title || default_metadata["title"]
+        end
+
+        def custom_data
+          default_metadata = @upload.default_field_metadata.deep_stringify_keys.fetch(I18n.locale.to_s, {})
+          @custom_data.merge(default_metadata.fetch("custom_data", {}))
         end
 
         def file
@@ -67,6 +105,7 @@ module Dato
             height: height,
             alt: alt,
             title: title,
+            custom_data: custom_data,
             url: url
           }
         end

data/lib/dato/local/field_type/seo.rb

@@ -19,7 +19,7 @@ module Dato
         end
 
         def image
-          @image && File.parse(@image, @repo)
+          @image && UploadId.parse(@image, @repo)
         end
 
         def to_hash(*args)

data/lib/dato/local/field_type/theme.rb

@@ -27,7 +27,7 @@ module Dato
         end
 
         def logo
-          @logo && File.parse(@logo, @repo)
+          @logo && UploadId.parse(@logo, @repo)
         end
 
         def to_hash(*args)

data/lib/dato/local/field_type/upload_id.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'imgix'
+
+module Dato
+  module Local
+    module FieldType
+      class UploadId
+        attr_reader :path, :format, :size, :width, :height
+
+        def self.parse(upload_id, repo)
+          if upload_id
+            upload = repo.entities_repo.find_entity('upload', upload_id)
+
+            if upload
+              new(
+                upload.path,
+                upload.format,
+                upload.size,
+                upload.width,
+                upload.height,
+                repo.site.entity.imgix_host
+              )
+            end
+          end
+        end
+
+        def initialize(
+          path,
+          format,
+          size,
+          width,
+          height,
+          imgix_host
+        )
+          @path = path
+          @format = format
+          @size = size
+          @imgix_host = imgix_host
+          @width = width
+          @height = height
+        end
+
+        def file
+          Imgix::Client.new(
+            host: @imgix_host,
+            secure: true,
+            include_library_param: false
+          ).path(path)
+        end
+
+        def url(opts = {})
+          file.to_url(opts)
+        end
+
+        def to_hash(*_args)
+          {
+            format: format,
+            size: size,
+            width: width,
+            height: height,
+            url: url
+          }
+        end
+      end
+    end
+  end
+end

data/lib/dato/local/field_type/video.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/compact'
-
 module Dato
   module Local
     module FieldType

data/lib/dato/local/loader.rb

@@ -39,7 +39,7 @@ module Dato
       end
 
       def watch(&block)
-        site_id = client.request(:get, '/site')['data']['id']
+        site_id = client.get('/site')['data']['id']
 
         return if pusher && pusher.connected
 
@@ -172,8 +172,7 @@ module Dato
       end
 
       def site
-        include = ['item_types', 'item_types.fields']
-        client.request(:get, '/site', include: include)
+        client.get('/site', include: ['item_types', 'item_types.fields'])
       end
 
       def all_items

data/lib/dato/local/site.rb

@@ -28,7 +28,7 @@ module Dato
       end
 
       def favicon
-        read_attribute(:favicon, FieldType::File, false)
+        read_attribute(:favicon, FieldType::UploadId, false)
       end
 
       def to_s

data/lib/dato/paginator.rb

@@ -11,8 +11,8 @@ module Dato
     def response
       items_per_page = 100
 
-      base_response = @client.request(
-        :get, @base_endpoint, @filters.dup.merge('page[limit]' => items_per_page)
+      base_response = @client.get(
+        @base_endpoint, @filters.dup.merge('page[limit]' => items_per_page)
       )
 
       extra_pages = (
@@ -20,8 +20,7 @@ module Dato
       ).ceil - 1
 
       extra_pages.times do |page|
-        base_response[:data] += @client.request(
-          :get,
+        base_response[:data] += @client.get(
           @base_endpoint,
           @filters.dup.merge(
             'page[offset]' => items_per_page * (page + 1),

data/lib/dato/repo.rb

@@ -54,47 +54,79 @@ module Dato
         placeholder
       end
 
-      response = if %i[post put].include?(link.method)
-                   body = if link.schema
-                            unserialized_body = args.shift
+      body = nil
+      query_string = nil
 
-                            JsonApiSerializer.new(type, link).serialize(
-                              unserialized_body,
-                              link.method == :post ? nil : placeholders.last
-                            )
-                          else
-                            {}
-                          end
+      if %i[post put].include?(link.method)
+        body = link.schema ? args.shift : {}
+        query_string = args.shift || {}
 
-                   client.request(link.method, url, body)
+      elsif link.method == :delete
+        query_string = args.shift || {}
 
-                 elsif link.method == :delete
-                   client.request(:delete, url)
+      elsif link.method == :get
+        query_string = args.shift || {}
+      end
 
-                 elsif link.method == :get
-                   query_string = args.shift
+      options = args.any? ? args.shift.symbolize_keys : {}
 
-                   all_pages = (args[0] || {})
-                     .symbolize_keys
-                     .fetch(:all_pages, false)
+      if link.schema && %i[post put].include?(link.method) && options.fetch(:serialize_response, true)
+        body = JsonApiSerializer.new(type, link).serialize(
+          body,
+          link.method == :post ? nil : placeholders.last
+        )
+      end
 
-                   if all_pages
+      response = if %i[post put].include?(link.method)
+                   client.send(link.method, url, body, query_string)
+                 elsif link.method == :delete
+                   client.delete(url, query_string)
+                 elsif link.method == :get
+                   if options.fetch(:all_pages, false)
                      Paginator.new(client, url, query_string).response
                    else
-                     client.request(:get, url, query_string)
+                     client.get(url, query_string)
                    end
                  end
 
-      options = if args.any?
-                  args.shift.symbolize_keys
-                else
-                  {}
-                end
-
-      if options.fetch(:deserialize_response, true)
-        JsonApiDeserializer.new(link).deserialize(response)
+      if response && response[:data] && response[:data].is_a?(Hash) && response[:data][:type] == "job"
+        job_result = nil
+
+        while !job_result do
+          begin
+            sleep(1)
+            job_result = client.job_result.find(response[:data][:id])
+          rescue ApiError => error
+            if error.response[:status] != 404
+              raise error
+            end
+          end
+        end
+
+        if job_result[:status] < 200 || job_result[:status] >= 300
+          error = ApiError.new(
+            status: job_result[:status],
+            body: JSON.dump(job_result[:payload])
+          )
+
+          puts "===="
+          puts error.message
+          puts "===="
+
+          raise error
+        end
+
+        if options.fetch(:deserialize_response, true)
+          JsonApiDeserializer.new(link.job_schema).deserialize(job_result[:payload])
+        else
+          job_result.payload
+        end
       else
-        response
+        if options.fetch(:deserialize_response, true)
+          JsonApiDeserializer.new(link.target_schema).deserialize(response)
+        else
+          response
+        end
       end
     end
   end

data/lib/dato/upload/file.rb

@@ -63,9 +63,14 @@ module Dato
 
         http.request(request)
 
-        uploads = client.uploads.create(path: upload_request[:id])
+        upload = client.uploads.create(path: upload_request[:id])
 
-        uploads['id']
+        {
+          upload_id: upload['id'],
+          alt: nil,
+          title: nil,
+          custom_data: {},
+        }
       end
 
       def download_file(url)

data/lib/dato/version.rb

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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -319,7 +319,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_schema
+  name: dato_json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -414,6 +414,7 @@ files:
 - lib/dato/local/field_type/string.rb
 - lib/dato/local/field_type/text.rb
 - lib/dato/local/field_type/theme.rb
+- lib/dato/local/field_type/upload_id.rb
 - lib/dato/local/field_type/video.rb
 - lib/dato/local/item.rb
 - lib/dato/local/items_repo.rb