shrine-url 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b34a1d4fbd4f6cbf9ae2e831e743f523eb0930
-  data.tar.gz: 8305097455d28e605daddf904c3e9467c7966dfa
+  metadata.gz: 279d319f5a6e2538dfca270f1b5d897f3f7c476c
+  data.tar.gz: c7457ca67917a378acc4c3312b0096d2c6a379aa
 SHA512:
-  metadata.gz: a04868b1733d793007eb4b014c0b0027e5ee7b2a3939731b0bc0cbaadd5b40bca218668dd9db941b5bfdb083ad282d8d5e6cb6e8bc065540cc9cf202e0b26b2e
-  data.tar.gz: da8901cb7ae05bb35e498d4cf56f94f02392ad469c42129a47e4e9aeae67595419d6cef6b3bc521501bc6bd2dc5133769dea2e9e1c342655d28040799e117881
+  metadata.gz: 02c67d530326bd9525741d4c0366b59c3ce6071e9c53803730a599faed2a2bdb7bf3846d3479c08af47401de7f0ca1d2b8d3cdd6765d5ae53185e7b0d7fbdfac
+  data.tar.gz: 5b784b1d8c35665d573fcb2b68454e5aa94360359b66d54240fa009876c8c5431d031f3b25ee912ca707e7c32961c2af34aeb8c2b9e46323af061380e7352bbb

data/README.md

@@ -1,6 +1,6 @@
 # Shrine::Storage::Url
 
-Provides a "storage" which allows you to attach uploaded files defined by a
+Provides a "storage" for [Shrine] for attaching uploaded files defined by a
 custom URL.
 
 ## Installation
@@ -43,27 +43,25 @@ photo.image.exists?       # Sends a HEAD request and returns true if it's 2xx
 photo.image.delete        # Sends a DELETE request
 ```
 
-No HTTP requests are made at this point. When the cached file is uploaded to
-permanent storage, `shrine-url` will by default use [Down] to download the file
-from the given URL, before uploading it to permanent storage.
-
-Note that Down doesn't yet support resuming the download in case of network
-failures, so if you're expecting large files to be attached, you might want to
-tell `Shrine::Storage::Url` to use `wget` instead of Down.
+No HTTP requests are made at this point. When this "cached file" is about to be
+uploaded to a permanent storage, `shrine-url` will download the file from the
+given URL using [Down]. By default the `Down::NetHttp` backend will be used for
+downloading, but you can tell `shrine-url` to use another Down backend:
 
 ```rb
 Shrine::Storage::Url.new(downloader: :wget)
+# or
+require "down/http"
+Shrine::Storage::Url.new(downloader: Down::Http)
+# or
+require "down/net_http"
+Shrine::Storage::Url.new(downloader: Down::NetHttp.new("User-Agent" => "MyApp/1.0.0"))
 ```
 
-Just note that using `wget` won't work well with the `restore_cached_data`
-Shrine plugin from the performance standpoint, because `wget` doesn't support
-partial downloads, so the file would first be fully downloaded before
-extracting metadata.
-
-If you're using permanent storage that supports uploading from remote URL (like
-[shrine-cloudinary] or [shrine-uploadcare]), downloading will be completely
-skipped and the permanent storage will use only the custom URL for uploading
-the file.
+Note that if you're using permanent storage that supports uploading from a
+remote URL (like [shrine-cloudinary] or [shrine-uploadcare]), downloading will
+be completely skipped as the permanent storage will use only the URL for
+uploading the file.
 
 ## Advantages and Use Cases
 
@@ -87,10 +85,14 @@ promoted to permanent storage.
 $ rake test
 ```
 
+The test suite pulls and runs [kennethreitz/httpbin] as a Docker container, so
+you'll need to have Docker installed and running.
+
 ## License
 
 [MIT](/LICENSE.txt)
 
+[Shrine]: https://github.com/janko-m/shrine
 [shrine-transloadit]: https://github.com/janko-m/shrine-transloadit
 [shrine-tus-demo]: https://github.com/janko-m/shrine-tus-demo
 [shrine-cloudinary]: https://github.com/janko-m/shrine-cloudinary

data/lib/shrine/storage/url.rb

@@ -4,8 +4,16 @@ require "net/http"
 class Shrine
   module Storage
     class Url
-      def initialize(downloader: :down)
-        @downloader = Downloader.new(downloader)
+      attr_reader :downloader
+
+      def initialize(downloader: :net_http)
+        if downloader.is_a?(Symbol)
+          require "down/#{downloader}"
+          const_name = downloader.to_s.split("_").map(&:capitalize).join
+          @downloader = Down.const_get(const_name)
+        else
+          @downloader = downloader
+        end
       end
 
       def upload(io, id, **)
@@ -47,64 +55,6 @@ class Shrine
 
         response
       end
-
-      class Downloader
-        SUPPORTED_TOOLS = [:down, :wget]
-
-        def initialize(tool)
-          raise ArgumentError, "unsupported downloading tool: #{tool}" unless SUPPORTED_TOOLS.include?(tool)
-
-          @tool = tool
-        end
-
-        def download(url)
-          send(:"download_with_#{@tool}", url)
-        end
-
-        def open(url)
-          send(:"open_with_#{@tool}", url)
-        end
-
-        private
-
-        def download_with_down(url)
-          require "down"
-          Down.download(url)
-        end
-
-        def open_with_down(url)
-          require "down"
-          Down.open(url)
-        end
-
-        def download_with_wget(url)
-          require "tempfile"
-          require "open3"
-
-          tempfile = Tempfile.new("shrine-url", binmode: true)
-          cmd = %W[wget --no-verbose #{url} -O #{tempfile.path}]
-
-          begin
-            stdout, stderr, status = Open3.capture3(*cmd)
-
-            if !status.success?
-              tempfile.close!
-              raise Error, "downloading from #{url} failed: #{stderr}"
-            end
-          rescue Errno::ENOENT
-            raise Error, "wget is not installed"
-          end
-
-          tempfile.open # refresh file descriptor
-          tempfile
-        end
-
-        def open_with_wget(url)
-          tempfile = download_with_wget(url)
-          tempfile.instance_eval { def close(unlink_now=true) super end } # delete tempfile when it's closed
-          tempfile
-        end
-      end
     end
   end
 end

data/shrine-url.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-url"
-  gem.version       = "0.3.1"
+  gem.version       = "1.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -14,9 +14,12 @@ Gem::Specification.new do |gem|
   gem.require_path = "lib"
 
   gem.add_dependency "shrine", ">= 2.0"
-  gem.add_dependency "down", ">= 2.3.7"
+  gem.add_dependency "down", "~> 4.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
-  gem.add_development_dependency "webmock"
+  gem.add_development_dependency "docker-api"
+  gem.add_development_dependency "http", "~> 2.2"
+  gem.add_development_dependency "posix-spawn" unless RUBY_ENGINE == "jruby"
+  gem.add_development_dependency "http_parser.rb"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-url
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -28,16 +28,16 @@ dependencies:
   name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides a fake storage which allows you to create a Shrine attachment defined