down 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c086180eb4e40493ef9c6dc92f4d4a79466e3e
-  data.tar.gz: 60b796696b95541ac518dd3a915d4cac8aca0435
+  metadata.gz: b92313f399fb288e1c324b1355cd26b3eb02ca00
+  data.tar.gz: bec353dfe70af7fb445b0203ecdd0f20cacc1a29
 SHA512:
-  metadata.gz: 5d828860d9a2c813aac16c1e4839f726bbee83d82b18abf426109403ae3341dc8548a04bd1546a8f57e42847133bf5c1d37c3282c771e3ed6742eecd964797ef
-  data.tar.gz: b60dea3f69f5b08d1e135962530677f0d8d44dd0b04e5907065065b7d8beab688b009d08ab6479d30c9b4cf5cd81182dcdfe52c527968f6b10c27e7a7a25a01c
+  metadata.gz: 64b80aa1853dcc253828360b4d8c903c22f4cf0ef4ee4f340b458bc37160852caf6544613476d24fb354b2c103df0bfdaf25b55cdcf5a51a09982ca32b99e949
+  data.tar.gz: a3d520d6b413114981037d589884f9c113bd0bbef0e5f384c0a5acabee15f73ccec76ca17490ecb5b0b1cf272f337562ed06338449d9c943e3a149c2d983d623

data/README.md

@@ -23,6 +23,11 @@ returns a `StringIO`. In my application I needed that the file is always
 downloaded to disk. This was obviously a wrong design decision from the MRI
 team, so Down patches this behaviour and always returns a `Tempfile`.
 
+### File extension
+
+When using `open-uri` directly, the extension of the remote file is not
+preserved. Down patches that behaviour and preserves the file extension.
+
 ### Metadata
 
 `open-uri` adds some metadata to the returned file, like `#content_type`. Down
@@ -86,6 +91,17 @@ You can specify the time after the request will time out:
 Down.download "http://example.com/image.jpg", timeout: 5
 ```
 
+### Copying to tempfile
+
+Down has another "hidden" utility method, `#copy_to_tempfile`, which creates
+a Tempfile out of the given file. The `#download` method uses it internally,
+but it's also publicly available for direct use:
+
+```rb
+tempfile = Down.copy_to_tempfile "path/to/file.jpg"
+tempfile.path #=> "/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/down20151116-77262-jgcx65.jpg"
+```
+
 ## Supported Ruby versions
 
 * MRI 1.9.3

data/down.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "down"
-  spec.version       = "1.0.2"
+  spec.version       = "1.0.3"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

data/lib/down.rb

@@ -25,13 +25,14 @@ module Down
       redirect: false,
     )
 
-    # open-uri will return a StringIO instead of a Tempfile if the filesize
-    # is less than 10 KB, so if it happens we convert it back to Tempfile.
-    if downloaded_file.is_a?(StringIO)
-      stringio = downloaded_file
-      downloaded_file = copy_to_tempfile("open-uri", stringio)
-      OpenURI::Meta.init downloaded_file, stringio
-    end
+    # open-uri will return a StringIO instead of a Tempfile if the filesize is
+    # less than 10 KB, so if it happens we convert it back to Tempfile. We want
+    # to do this with a Tempfile as well, because open-uri doesn't preserve the
+    # file extension, so we want to run it against #copy_to_tempfile which
+    # does.
+    open_uri_file = downloaded_file
+    downloaded_file = copy_to_tempfile(URI(url).path, open_uri_file)
+    OpenURI::Meta.init downloaded_file, open_uri_file
 
     downloaded_file.extend DownloadedFile
     downloaded_file
@@ -42,7 +43,7 @@ module Down
   end
 
   def copy_to_tempfile(basename, io)
-    tempfile = Tempfile.new(basename, binmode: true)
+    tempfile = Tempfile.new(["down", File.extname(basename)], binmode: true)
     IO.copy_stream(io, tempfile.path)
     io.rewind
     tempfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: down
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake