anyfetch 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64448adfab299c1b4c89f9ab347e00412226cd19
-  data.tar.gz: 162903ef49a02492561791aa1a3ab2db3fcfd49e
+  metadata.gz: 29264ad4fdfd44d9a845fdba58e65c5a208b5419
+  data.tar.gz: 5de3fa9d7eb26bc116aae3da86234f2dd2a7ec99
 SHA512:
-  metadata.gz: 440b8dee4e48bf7e74d272870778c1fb6d9747e58c3a61c12353e46777855fb95bafbbcfcc598150c3857a566ff39012734915f669301fd6274542a30b9ca083
-  data.tar.gz: 52b3be162cb4d24ffea775c9dfe7688e5ec6efc3ea4349a9c93ca4b6d538acdeae192a96b8c06ed5aeea57ec1d47e22cbb66457c86877fee077c72a99e0482ee
+  metadata.gz: 25f7793a98e193b1be087c8eabc7f6407cea71dcbe0597c2b694b56ab79de592685bfdc265793ce99fb75cb28ed3dc4c00041a291ff45cd0f58f88f066bae844
+  data.tar.gz: f42a89850d2425adc1c9e797186ec0cc18d0d30e9bae5269e0bc403355182baa89d390ff6ce64cef96aecacae1e5e5fcc254cfab81c61fe76e4d56b53e8001e3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Anyfetch Changelog
 
+## 0.1.3
+
+* Remove automating URI-encoding altogether as it probably should not be responsibility of the library.
+* Always return `Tempfile` from HTTP and FTP handlers.
+
+## 0.1.2
+
+* Prepare URI for parsing by decoding and re-encoding
+
 ## 0.1.1
 
 * Use old hash notation to support ruby 1.8

data/lib/anyfetch.rb

@@ -15,8 +15,7 @@ module Anyfetch extend self
   private
 
   def to_uri(uri)
-    encoded = URI.encode(URI.decode(uri.to_s))
-    URI.parse(encoded)
+    URI.parse(uri.to_s)
   end
 
   def handler(uri, options = {})

data/lib/anyfetch/ftp.rb

@@ -1,19 +1,14 @@
+require "anyfetch/open_uri"
 require "anyfetch/original_filename/content_type"
 
 module Anyfetch
-  class FTP
+  class FTP < OpenURI
     def initialize(uri, options = {})
       @uri = uri
       @options = options
       setup_auth
     end
 
-    def open
-      file = super(@uri)
-      file.extend(OriginalFilename::ContentType)
-      file
-    end
-
     private
 
     def setup_auth

data/lib/anyfetch/http.rb

@@ -1,7 +1,7 @@
-require "anyfetch/original_filename/content_type"
+require "anyfetch/open_uri"
 
 module Anyfetch
-  class HTTP
+  class HTTP < OpenURI
     OPTIONS = {
       "User-Agent" => "Mozilla/5.0 (X11; Linux x86_64; rv:39.0) Gecko/20100101 Firefox/39.0",
       :allow_redirections => :safe,
@@ -13,12 +13,6 @@ module Anyfetch
       setup_basic_auth
     end
 
-    def open
-      file = super(@uri, @options)
-      file.extend(OriginalFilename::ContentType)
-      file
-    end
-
     private
 
     def setup_basic_auth

data/lib/anyfetch/open_uri.rb

@@ -0,0 +1,33 @@
+require "tempfile"
+require "anyfetch/original_filename/content_type"
+
+module Anyfetch
+  class OpenURI
+    def initialize(*args)
+      raise NotImplementedError
+    end
+
+    def open
+      file = super(@uri, @options)
+
+      if file.is_a?(StringIO)
+        file = to_tempfile(file)
+      end
+
+      file.extend(OriginalFilename::ContentType)
+      file
+    end
+
+    private
+
+    # OpenURI returns either Tempfile or StringIO depending of the size of
+    # the response. We want to unify this and always return Tempfile.
+    def to_tempfile(io)
+      tempfile = Tempfile.new('open-uri')
+      tempfile.binmode
+      ::OpenURI::Meta.init(tempfile, io)
+      tempfile << io.string
+      tempfile
+    end
+  end
+end

data/lib/anyfetch/version.rb

@@ -1,3 +1,3 @@
 module Anyfetch
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyfetch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michał Szajbe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -117,6 +117,7 @@ files:
 - lib/anyfetch/file.rb
 - lib/anyfetch/ftp.rb
 - lib/anyfetch/http.rb
+- lib/anyfetch/open_uri.rb
 - lib/anyfetch/original_filename/content_type.rb
 - lib/anyfetch/original_filename/path.rb
 - lib/anyfetch/version.rb