dato 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118ea91dc3caa834412e342a2350b594c94880bbbafba6f37d2b6041b5570acc
-  data.tar.gz: 64e1a53c6292a41ad4e361e4b01bdff416d09e3acebbd133afc123c2f80fe74b
+  metadata.gz: 93c35eede758af97a20a62da18105ecf526b0727efde0e6da8e9785da0b3fb06
+  data.tar.gz: 8884b702f26c094d226fcb33e6a14bb6316a06a6a434fb74f06cac9c03f495f0
 SHA512:
-  metadata.gz: a93f7dccda38b47237a585a7274754b2a3c370918c476e5556bc42ec13a2326a53e594f25b48fdc240a456f707d71dedfe9d9587a978ff38a177c398d5627ffa
-  data.tar.gz: b74c22160ba51d703705213b12c60d795eb499855fc6179a8b2c576ff8e32d1cd7bb94747a7e3a6a5bd957ff527e34964ca01eb47dbfdc078f16519272dfb6a4
+  metadata.gz: dfd86b0dd620ea5585a05d7aea34dcf6ca399436e9a532b8c9de096e16b8f43153544df8e6753b1f9da3e55275e004fd55c75b6991d7abd987dbe8acdc11d9db
+  data.tar.gz: 799596a6912acc9fb99bab989fb1a57deefc7d04d9a1059808eb06e431c42954ba132cdce8146b97286513d20a353aa501b258ebf534cc551af53442340f15b8

data/lib/dato/site/client.rb

@@ -2,7 +2,7 @@
 
 require 'dato/api_client'
 require 'dato/upload/file'
-require 'dato/upload/image'
+require 'dato/upload/create_upload_path'
 
 module Dato
   module Site
@@ -11,13 +11,18 @@ module Dato
 
       json_schema 'site-api'
 
-      def upload_file(path_or_url)
-        file = Upload::File.new(self, path_or_url)
+      def create_upload_path(path_or_url)
+        file = Upload::CreateUploadPath.new(self, path_or_url)
+        file.upload_path
+      end
+
+      def upload_file(path_or_url, upload_attributes = {}, field_attributes = {})
+        file = Upload::File.new(self, path_or_url, upload_attributes, field_attributes)
         file.upload
       end
 
-      def upload_image(path_or_url)
-        file = Upload::Image.new(self, path_or_url)
+      def upload_image(path_or_url, upload_attributes = {}, field_attributes = {})
+        file = Upload::File.new(self, path_or_url, upload_attributes, field_attributes)
         file.upload
       end
 

data/lib/dato/upload/create_upload_path.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'mime/types'
+require 'tempfile'
+require 'addressable'
+require 'net/http'
+
+module Dato
+  module Upload
+    class CreateUploadPath
+      attr_reader :client, :source
+
+      def initialize(client, source)
+        @client = client
+        @source = source
+      end
+
+      def file
+        @file ||= if http_source?
+                    uri = Addressable::URI.parse(source)
+                    ext = ::File.extname(uri.path).downcase
+                    tempfile = Tempfile.new(['file', ext])
+                    tempfile.binmode
+                    tempfile.write(download_file(source))
+                    tempfile.rewind
+                    tempfile
+                  else
+                    ::File.new(::File.expand_path(source))
+                  end
+      end
+
+      def http_source?
+        uri = Addressable::URI.parse(source)
+        uri.scheme == 'http' || uri.scheme == 'https'
+      rescue Addressable::URI::InvalidURIError
+        false
+      end
+
+      def filename
+        if http_source?
+          ::File.basename(source)
+        else
+          ::File.basename(file.path)
+        end
+      end
+
+      def upload_path
+        upload_request = client.upload_request.create(filename: filename)
+        uri = URI.parse(upload_request[:url])
+
+        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.body = file.read
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        http.request(request)
+
+        upload_request[:id]
+      end
+
+      def download_file(url)
+        connection = Faraday.new do |c|
+          c.response :raise_error
+          c.use FaradayMiddleware::FollowRedirects
+          c.adapter :net_http
+        end
+        connection.get(url).body
+      rescue Faraday::Error => e
+        puts "Error during uploading #{url}"
+        raise e
+      end
+    end
+  end
+end
+

data/lib/dato/upload/file.rb

@@ -1,88 +1,31 @@
 # frozen_string_literal: true
 
-require 'mime/types'
-require 'tempfile'
-require 'addressable'
-require 'net/http'
+require 'dato/upload/create_upload_path'
 
 module Dato
   module Upload
     class File
-      IMAGE_FORMATS = %w[png jpg jpeg gif].freeze
+      attr_reader :client, :source, :upload_attributes, :field_attributes
 
-      attr_reader :client, :source
-
-      def initialize(client, source)
+      def initialize(client, source, upload_attributes = {}, field_attributes = {})
         @client = client
         @source = source
-      end
-
-      def file
-        @file ||= if http_source?
-                    uri = Addressable::URI.parse(source)
-                    ext = ::File.extname(uri.path).downcase
-                    tempfile = Tempfile.new(['file', ext])
-                    tempfile.binmode
-                    tempfile.write(download_file(source))
-                    tempfile.rewind
-                    tempfile
-                  else
-                    ::File.new(::File.expand_path(source))
-                  end
-      end
-
-      def http_source?
-        uri = Addressable::URI.parse(source)
-        uri.scheme == 'http' || uri.scheme == 'https'
-      rescue Addressable::URI::InvalidURIError
-        false
-      end
-
-      def filename
-        if http_source?
-          ::File.basename(source)
-        else
-          ::File.basename(file.path)
-        end
+        @upload_attributes = upload_attributes
+        @field_attributes = field_attributes
       end
 
       def upload
-        upload_request = client.upload_request.create(filename: filename)
-        uri = URI.parse(upload_request[:url])
+        upload_path = CreateUploadPath.new(client, source).upload_path
 
-        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.body = file.read
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-
-        http.request(request)
-
-        upload = client.uploads.create(path: upload_request[:id])
+        upload = client.uploads.create(
+          upload_attributes.merge(path: upload_path)
+        )
 
         {
-          upload_id: upload['id'],
           alt: nil,
           title: nil,
           custom_data: {},
-        }
-      end
-
-      def download_file(url)
-        connection = Faraday.new do |c|
-          c.response :raise_error
-          c.use FaradayMiddleware::FollowRedirects
-          c.adapter :net_http
-        end
-        connection.get(url).body
-      rescue Faraday::Error => e
-        puts "Error during uploading #{url}"
-        raise e
+        }.merge(field_attributes).merge(upload_id: upload['id'])
       end
     end
   end

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -425,6 +425,7 @@ files:
 - lib/dato/paginator.rb
 - lib/dato/repo.rb
 - lib/dato/site/client.rb
+- lib/dato/upload/create_upload_path.rb
 - lib/dato/upload/file.rb
 - lib/dato/upload/image.rb
 - lib/dato/utils/favicon_tags_builder.rb