shrine-url 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8884463934019ade14512eb3c9c77de112f794f1
-  data.tar.gz: e5168e1c97e08633de01f5fec999a7f30fd37772
+SHA256:
+  metadata.gz: 94d1e6d2134d0236419de6414f7cbf4063108f163647e6876031cfb1768eca1c
+  data.tar.gz: 391de219cafce1d5af7a1e3cfef70eb13e3015f4982ac03e7e9e2a47a75b382d
 SHA512:
-  metadata.gz: 5a2e51d82d4a5bfe0270941ddd7b742328ece218ca87de90c8e0a332a7fec634398bc7ec8b0f0a14be99e20dcdf9b78b798fe35ec8ad029f0ce06df43fa9c48e
-  data.tar.gz: 107dda6adb5afe73affed0f441b26a981bfa4782d9b4e4e7c8d9d011c180d938e9d4a34f59b6327f6887c9dac69d75789d2123e10ff0e7eb1cc8fbd48e0e0506
+  metadata.gz: 03c403f9f2419aaf33177709849c0f6ac5b4e618b0f33d2bd58af7e3576128e7eb0c30f730dd2769f2b812d8dc0cab11b46dca5676a896b1822ed269641ad2a4
+  data.tar.gz: 64f342ced4a84e6dcdbe966051db41ffbbdc1c079f1143a465f8d7eedd22ae567c44a89ad5cf448602f422b627669ab6d9e2c3911bf93bc10322d249554c5aa8

data/README.md

@@ -92,10 +92,10 @@ you'll need to have Docker installed and running.
 
 [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
-[shrine-uploadcare]: https://github.com/janko-m/shrine-uploadcare
+[Shrine]: https://github.com/shrinerb/shrine
+[shrine-transloadit]: https://github.com/shrinerb/shrine-transloadit
+[shrine-tus-demo]: https://github.com/shrinerb/shrine-tus-demo
+[shrine-cloudinary]: https://github.com/shrinerb/shrine-cloudinary
+[shrine-uploadcare]: https://github.com/shrinerb/shrine-uploadcare
 [Down]: https://github.com/janko-m/down
 [kennethreitz/httpbin]: https://github.com/kennethreitz/httpbin

data/lib/shrine/storage/url.rb

@@ -1,13 +1,12 @@
 require "shrine"
-require "net/https"
-require "uri"
+require "http"
 
 class Shrine
   module Storage
     class Url
       attr_reader :downloader
 
-      def initialize(downloader: :net_http)
+      def initialize(downloader: :http)
         if downloader.is_a?(Symbol)
           require "down/#{downloader}"
           const_name = downloader.to_s.split("_").map(&:capitalize).join
@@ -31,7 +30,7 @@ class Shrine
 
       def exists?(id)
         response = request(:head, id)
-        (200..399).cover?(response.code.to_i)
+        response.status.success?
       end
 
       def url(id, **options)
@@ -44,24 +43,11 @@ class Shrine
 
       private
 
-      def request(verb, url, follows_remaining: 2)
-        uri     = URI.parse(url)
-        use_ssl = uri.is_a?(URI::HTTPS)
+      def request(verb, url, follow: {}, headers: {}, **options)
+        options[:follow]  = { max_hops: 2 }.merge(follow)
+        options[:headers] = { user_agent: "shrine-url/1.0.2" }.merge(headers)
 
-        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
+        HTTP.request(verb, url, options)
       end
     end
   end

data/shrine-url.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-url"
-  gem.version       = "1.0.2"
+  gem.version       = "2.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 
   gem.summary      = "Provides a fake storage which allows you to create a Shrine attachment defined only by a custom URL."
-  gem.homepage     = "https://github.com/janko-m/shrine-url"
+  gem.homepage     = "https://github.com/shrinerb/shrine-url"
   gem.authors      = ["Janko Marohnić"]
   gem.email        = ["janko.marohnic@gmail.com"]
   gem.license      = "MIT"
@@ -14,12 +14,11 @@ Gem::Specification.new do |gem|
   gem.require_path = "lib"
 
   gem.add_dependency "shrine", ">= 2.0"
-  gem.add_dependency "down", "~> 4.0"
+  gem.add_dependency "down", "~> 4.4"
+  gem.add_dependency "http", "~> 3.2"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "docker-api"
-  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.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -30,30 +30,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: docker-api
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
+  name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http_parser.rb
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -133,7 +119,7 @@ files:
 - README.md
 - lib/shrine/storage/url.rb
 - shrine-url.gemspec
-homepage: https://github.com/janko-m/shrine-url
+homepage: https://github.com/shrinerb/shrine-url
 licenses:
 - MIT
 metadata: {}
@@ -153,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides a fake storage which allows you to create a Shrine attachment defined