dato 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3f7902f2a827a7ef8fcf30fa3e5cd94dfb40b8b
-  data.tar.gz: d4dafeb0c1a06a93e142ea001e86cc754ccdef2a
+SHA256:
+  metadata.gz: 8d26b49c17a15d3cf199eb8f61d41ff39ca047171c948fe3e9a8c399b333be9f
+  data.tar.gz: c106df7971a5a76deb4757f12dec298292d0d4210fa133dde8996fc2bc018f35
 SHA512:
-  metadata.gz: fb49453ce559cbed239411696a244d51c3daf99800f94840d4dd7bb13f4656fb955b9d301a48506e739aeff3d918290c23b50be204bc75f91740a6a1aececec9
-  data.tar.gz: 24f811323e62e5f32e73dc79abbf39263f5dbb9a81bbd1c28ad724f5ff46dbde945c0ac5e8d19c4ebabb72f7f051890ee8e17790b97c1a552f4a20667720e9d1
+  metadata.gz: b79aa89dfa3390ed806c67dd1c22b8294b80087c482b68e0b041bf4e0d560dd515e72f87875bb81a9193a039d7420819f1a87eae29565d10d73c4da17d186f92
+  data.tar.gz: af030722407d485affdf563b368dd3963cad1c2e34a58f9f04574e32d12989db47122ad61d34e50ec19581ddc4d7e0346a7af0617a01b63eda5c37ed926a7ebd

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.0

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

@@ -5,22 +5,42 @@ module Dato
   module Local
     module FieldType
       class File
-        attr_reader :path, :format, :size
+        attr_reader :path, :format, :size, :width, :height, :title, :alt
 
-        def self.parse(value, repo)
-          value && new(
-            value[:path],
-            value[:format],
-            value[:size],
-            repo.site.entity.imgix_host
-          )
+        def self.parse(upload_id, repo)
+          if upload_id
+            upload = repo.entities_repo.find_entity("upload", upload_id)
+            new(
+              upload.path,
+              upload.format,
+              upload.size,
+              upload.width,
+              upload.height,
+              upload.alt,
+              upload.title,
+              repo.site.entity.imgix_host
+            )
+          end
         end
 
-        def initialize(path, format, size, imgix_host)
+        def initialize(
+          path,
+          format,
+          size,
+          width,
+          height,
+          alt,
+          title,
+          imgix_host
+        )
           @path = path
           @format = format
           @size = size
           @imgix_host = imgix_host
+          @width = width
+          @height = height
+          @alt = alt
+          @title = title
         end
 
         def file
@@ -39,6 +59,10 @@ module Dato
           {
             format: format,
             size: size,
+            width: width,
+            height: height,
+            alt: alt,
+            title: title,
             url: url
           }
         end

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

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

data/lib/dato/local/loader.rb

@@ -18,7 +18,7 @@ module Dato
       end
 
       def load
-        @entities_repo = EntitiesRepo.new(site, all_items)
+        @entities_repo = EntitiesRepo.new(site, all_items, all_uploads)
         @items_repo = ItemsRepo.new(@entities_repo)
       end
 
@@ -36,6 +36,14 @@ module Dato
           all_pages: true
         )
       end
+
+      def all_uploads
+        client.uploads.all(
+          {},
+          deserialize_response: false,
+          all_pages: true
+        )
+      end
     end
   end
 end

data/lib/dato/local/site.rb

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

data/lib/dato/site/client.rb

@@ -94,7 +94,8 @@ module Dato
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',
             'Authorization' => "Bearer #{@token}",
-            'User-Agent' => "ruby-client v#{Dato::VERSION}"
+            'User-Agent' => "ruby-client v#{Dato::VERSION}",
+            'X-Api-Version' => "2"
           )
         }
 

data/lib/dato/upload/file.rb

@@ -3,10 +3,13 @@ require 'downloadr'
 require 'tempfile'
 require 'addressable'
 require 'net/http'
+require 'fastimage'
 
 module Dato
   module Upload
     class File
+      IMAGE_FORMATS = %w(png jpg jpeg gif)
+
       attr_reader :client, :source
 
       def initialize(client, source)
@@ -56,15 +59,33 @@ module Dato
 
         http.request(request)
 
-        format_resource(upload_request)
+        uploads = client.uploads.create(
+          format_resource(upload_request)
+        )
+
+        uploads["id"]
       end
 
       def format_resource(upload_request)
-        {
+        extension = ::File.extname(::File.basename(file.path)).delete('.')
+
+        base_format = {
           path: upload_request[:id],
           size: ::File.size(file.path),
-          format: ::File.extname(::File.basename(file.path)).delete('.')
+          format: extension
         }
+
+        if IMAGE_FORMATS.include?(extension)
+          width, height = FastImage.size(file.path)
+
+          base_format.merge(
+            width: width,
+            height: height,
+            format: FastImage.type(file.path).to_s
+          )
+        else
+          base_format
+        end
       end
     end
   end

data/lib/dato/upload/image.rb

@@ -1,19 +1,8 @@
 # frozen_string_literal: true
 require 'dato/upload/file'
-require 'fastimage'
 
 module Dato
   module Upload
-    class Image < Dato::Upload::File
-      def format_resource(upload_request)
-        width, height = FastImage.size(file.path)
-
-        super(upload_request).merge(
-          width: width,
-          height: height,
-          format: FastImage.type(file.path).to_s
-        )
-      end
-    end
+    Image = Dato::Upload::File
   end
 end

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

@@ -20,10 +20,11 @@ module Dato
 
         def item_image
           item && item.fields
-                      .select { |field| field.field_type == 'image' }
+                      .select { |field| field.field_type == 'file' }
                       .map { |field| item.send(field.api_key) }
                       .compact
                       .find do |image|
+
                         image.width && image.height &&
                           image.width >= 200 && image.height >= 200
                       end

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -403,7 +403,6 @@ files:
 - lib/dato/local/field_type/float.rb
 - lib/dato/local/field_type/gallery.rb
 - lib/dato/local/field_type/global_seo.rb
-- lib/dato/local/field_type/image.rb
 - lib/dato/local/field_type/integer.rb
 - lib/dato/local/field_type/json.rb
 - lib/dato/local/field_type/lat_lon.rb
@@ -474,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for DatoCMS API

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

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-require 'dato/local/field_type/file'
-
-module Dato
-  module Local
-    module FieldType
-      class Image < Dato::Local::FieldType::File
-        attr_reader :width, :height, :title, :alt
-
-        def self.parse(value, repo)
-          value && new(
-            value[:path],
-            value[:format],
-            value[:size],
-            value[:width],
-            value[:height],
-            value[:alt],
-            value[:title],
-            repo.site.entity.imgix_host
-          )
-        end
-
-        def initialize(
-          path,
-          format,
-          size,
-          width,
-          height,
-          alt,
-          title,
-          imgix_host
-        )
-          super(path, format, size, imgix_host)
-          @width = width
-          @height = height
-          @alt = alt
-          @title = title
-        end
-
-        def to_hash(*args)
-          super.merge(
-            width: width,
-            height: height,
-            alt: alt,
-            title: title
-          )
-        end
-      end
-    end
-  end
-end