shrine-url 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f3a92060828b60ded518a3b4b1413c3682851d
-  data.tar.gz: 756dcbadd24b79466452c81a3c226b0212505ed5
+  metadata.gz: 8884463934019ade14512eb3c9c77de112f794f1
+  data.tar.gz: e5168e1c97e08633de01f5fec999a7f30fd37772
 SHA512:
-  metadata.gz: 6b80cf29c41b9072e6aae47d3845edf7910b1b6eba8ad71b1182318520eacc4c94c5007587bf056d7fd09cebe07b29bdf8312072315026420470e5ebbc2e5444
-  data.tar.gz: c06953325cc2c20bd4d4bed5e2641ab1b2d6739d07989fc8a925c0dc9cdbdfc5785ce54488f942a1b6142c6af61333c09f30982e42fc018470fa5f26fe81bb4b
+  metadata.gz: 5a2e51d82d4a5bfe0270941ddd7b742328ece218ca87de90c8e0a332a7fec634398bc7ec8b0f0a14be99e20dcdf9b78b798fe35ec8ad029f0ce06df43fa9c48e
+  data.tar.gz: 107dda6adb5afe73affed0f441b26a981bfa4782d9b4e4e7c8d9d011c180d938e9d4a34f59b6327f6887c9dac69d75789d2123e10ff0e7eb1cc8fbd48e0e0506

data/lib/shrine/storage/url.rb

@@ -1,5 +1,6 @@
 require "shrine"
 require "net/https"
+require "uri"
 
 class Shrine
   module Storage
@@ -30,7 +31,7 @@ class Shrine
 
       def exists?(id)
         response = request(:head, id)
-        (200..299).cover?(response.code.to_i)
+        (200..399).cover?(response.code.to_i)
       end
 
       def url(id, **options)
@@ -43,15 +44,24 @@ class Shrine
 
       private
 
-      def request(method, url)
+      def request(verb, url, follows_remaining: 2)
         uri     = URI.parse(url)
         use_ssl = uri.is_a?(URI::HTTPS)
 
-        Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
-          request = Net::HTTP.const_get(method.to_s.capitalize).new(uri.request_uri)
+        response = Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+          request = Net::HTTP.const_get(verb.capitalize).new(uri.request_uri)
           yield request if block_given?
           http.request(request)
         end
+
+        if response.is_a?(Net::HTTPRedirection) && follows_remaining > 0
+          location = URI.parse(response["Location"])
+          location = uri + location if location.relative?
+
+          response = request(verb, location.to_s, follows_remaining: follows_remaining - 1)
+        end
+
+        response
       end
     end
   end

data/shrine-url.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-url"
-  gem.version       = "1.0.1"
+  gem.version       = "1.0.2"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "docker-api"
-  gem.add_development_dependency "http", "~> 2.2"
+  gem.add_development_dependency "http", "~> 3.0"
   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: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement