dato 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72cf7ee954d8a8d7cd830e96740e32cb6aa2bf3de95d6d665dcc9d59956313f4
-  data.tar.gz: df97ce29199800559fcfef471a70e76cb75bc50d84175d55c9db35f8d53e685e
+  metadata.gz: 22be7e5b5bd13a7df1d3ebf63c52ce769b0333d0c8a90e0d8f5d3da7dda8712a
+  data.tar.gz: 4fda2a299ace4004514ed7727d789271a5a4d23361c02eaad3f59d7b9132e7c2
 SHA512:
-  metadata.gz: 8605bfa3d4c080d249c13958e48fce6b39ecdf632269d8786b8c10767dc6f1ef53434b82bac04b2ef922a9fe6ddebda56848bb75387c7fb825c7fbf300d91a8a
-  data.tar.gz: 2f0db7c66bfd1c84f0a93a6fdecdaaf5289401b92cef4644a2ee722e863866c40a3fe45337298e4adb1af342e2551173b1e3fd08535d178c74d8efde500d4ac2
+  metadata.gz: 5f6b5c6e85c74e541ea03b77da23c0284e6447386af8adc4e0918b699028666b0888c1df2f27d701013efec3c75ea8fbec9e8d7b97e0ab54b87945373086ce45
+  data.tar.gz: 285b84bdbcd3e1932fbf65ab72cb9a5519a59eaacde9b7b7150572849efb68dec1f7f0e1fd64ca7f09010e238deefe8d3073e23e3177293d5da980994791442b

data/dato.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday_middleware', ['>= 0.9.0']
   spec.add_runtime_dependency 'activesupport', ['>= 4.2.7']
   spec.add_runtime_dependency 'fastimage'
-  spec.add_runtime_dependency 'downloadr'
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'imgix', ['>= 0.3.1']

data/lib/dato/upload/file.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'downloadr'
+require 'fastimage'
 require 'tempfile'
 require 'addressable'
 require 'net/http'
-require 'fastimage'
 
 module Dato
   module Upload
@@ -21,10 +20,12 @@ module Dato
       def file
         @file ||= if http_source?
                     uri = Addressable::URI.parse(source)
-                    ext = ::File.extname(uri.path)
-                    Tempfile.new(['file', ext]).tap do |file|
-                      Downloadr::HTTP.new(source, file).download
-                    end
+                    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
@@ -67,26 +68,39 @@ module Dato
         uploads['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
+
       def format_resource(upload_request)
-        extension = ::File.extname(::File.basename(file.path)).delete('.')
+        extension = FastImage.type(file.path).to_s
+        if extension.empty?
+          extension = ::File.extname(::File.basename(file.path)).delete('.').downcase
+        end
+
+        raise FastImage::UnknownImageType if extension.empty?
 
         base_format = {
           path: upload_request[:id],
           size: ::File.size(file.path),
           format: extension
         }
-
         if IMAGE_FORMATS.include?(extension)
           width, height = FastImage.size(file.path)
-
-          base_format.merge(
+          base_format = base_format.merge(
             width: width,
-            height: height,
-            format: FastImage.type(file.path).to_s
+            height: height
           )
-        else
-          base_format
         end
+        base_format
       end
     end
   end

data/lib/dato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: downloadr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement