down 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404e5e406674a9f3edf5871d3769f865cf352e04
-  data.tar.gz: 10291cb0d07bb70e739118a7474bd18809fb16e9
+  metadata.gz: ae5eb943b2a1423b964812f6eabaab6e2db3ac80
+  data.tar.gz: d94df3114f9784599967e67bd74b2efaa53ff0de
 SHA512:
-  metadata.gz: 5353aac0da3393128585deb6571938e781e1907afc71bcd2555c450a9ed9c690df96d9f3b69ceaa9e91b29b1ca70d674b9058450fa0f03334c14de71aebfa2f9
-  data.tar.gz: 86151e26fa4ab4b8a82e6653022286fe48965fac21aa083712af22d17d6904d545b162038c101e481d7285939333a49fc4463aa86329017eaa3b973a8dbb0d07
+  metadata.gz: 858b972338a5b2252c6674cd55199ce29b491406fba507bac8c86ae8c342c62ca78d9f84bbf7d6f64f3c739e5d15e4328268d0be77e4682da58b1600cb8dda90
+  data.tar.gz: 33399d6ee408a32882b3077fc88478527fc3a5d3ce2fd1bbd53e14e77df9ff5bb3668e6950b0720d636c30b8d029c1af5b775ca22959fe00dc1a6c60505ae227

data/README.md

@@ -8,6 +8,14 @@ Down is a wrapper around `open-uri` for safe downloading of remote files.
 gem 'down'
 ```
 
+## Usage
+
+```rb
+require "down"
+tempfile = Down.download("http://example.com/nature.jpg")
+tempfile #=> #<Tempfile:/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/20150925-55456-z7vxqz.jpg>
+```
+
 ## Features
 
 If you're downloading files from URLs that come from you, then it's probably
@@ -37,7 +45,7 @@ adds `#original_filename` as well, which is extracted from the URL.
 require "down"
 tempfile = Down.download("http://example.com/nature.jpg")
 
-tempfile #=> #<Tempfile:/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/20150925-55456-z7vxqz>
+tempfile #=> #<Tempfile:/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/20150925-55456-z7vxqz.jpg>
 tempfile.content_type #=> "image/jpeg"
 tempfile.original_filename #=> "nature.jpg"
 ```
@@ -91,6 +99,15 @@ You can specify the time after the request will time out:
 Down.download "http://example.com/image.jpg", timeout: 5
 ```
 
+### Additional options
+
+Any additional options will be forwarded to open-uri, so you can for example
+add basic authentication:
+
+```rb
+Down.download "http://example.com/image.jpg", http_basic_authentication: ['john', 'secret']
+```
+
 ### Copying to tempfile
 
 Down has another "hidden" utility method, `#copy_to_tempfile`, which creates

data/down.gemspec

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

data/lib/down.rb

@@ -13,18 +13,22 @@ module Down
   def download(url, options = {})
     url = URI.encode(URI.decode(url))
 
-    downloaded_file = URI(url).open(
+    max_size = options.delete(:max_size)
+    progress = options.delete(:progress)
+    timeout  = options.delete(:timeout)
+
+    downloaded_file = URI(url).open({
       "User-Agent" => "Down/1.0.0",
       content_length_proc: proc { |size|
-        raise Down::TooLarge if size && options[:max_size] && size > options[:max_size]
+        raise Down::TooLarge if size && max_size && size > max_size
       },
       progress_proc: proc { |current_size|
-        raise Down::TooLarge if options[:max_size] && current_size > options[:max_size]
-        options[:progress].call(current_size) if options[:progress]
+        raise Down::TooLarge if max_size && current_size > max_size
+        progress.call(current_size) if progress
       },
-      read_timeout: options[:timeout],
+      read_timeout: timeout,
       redirect: false,
-    )
+    }.merge(options))
 
     # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: down
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake