shrine-uploadcare 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 932c8cc50f2f783b0735723437ea598505b1a624
-  data.tar.gz: 51abb3018f380ed7a57df34b5010067660237fed
+SHA256:
+  metadata.gz: b790c469ff1fd523ce6c5306db9f842023e558ee96191f0c89a6e496a4ec69f6
+  data.tar.gz: 3e833ec39a78ecee3d6a866231df0d304dc70202a2cae29571066a5d35c22176
 SHA512:
-  metadata.gz: 8e61afb62b4857dce6fe3996fa378c58ec5753c6305f43c68f137147f7d3f8e5403edf05b9554e1fbe066c66971ed56764bca1c8526c2dc1ca7729bb2e209c67
-  data.tar.gz: 49651d852dfd7f83198182586f321c75fa8af9f9dbb10d6859c3b33e4a1ca500e242f10d70476633a1026bdcba66456a4c9313c31daacd17e5c8220b3bfe7536
+  metadata.gz: 5d7072419a32a8155c6d505b4b4a5e902330718975fafa6cd6fd3dcd82a7b023d9a28ec91e5f0f0c7f89aa1be974e93e5c2408c009be2cf929d19e5f709eeb16
+  data.tar.gz: ca5d8898f474ee736795e0fb9482999f1df00a63b6a0d123e65b8b572f1fd768e0313523a1dc7f0671b1b7d46792f1df218f49aa714eaf05ac332e3d94f09239

data/README.md

@@ -125,7 +125,7 @@ $ rake test
 [MIT](http://opensource.org/licenses/MIT)
 
 [Uploadcare]: https://uploadcare.com/
-[Shrine]: https://github.com/janko-m/shrine
+[Shrine]: https://github.com/shrinerb/shrine
 [HTML widget]: https://uploadcare.com/documentation/widget/
 [demo app]: /demo
 [Secure file uploads]: https://uploadcare.com/documentation/upload/#secure-uploads

data/lib/shrine/storage/uploadcare.rb

@@ -1,6 +1,6 @@
 require "shrine"
 require "uploadcare"
-require "down"
+require "down/http"
 require "uri"
 require "digest"
 
@@ -23,8 +23,8 @@ class Shrine
         update_id!(id, result)
       end
 
-      def open(id)
-        Down.open(url(id))
+      def open(id, **options)
+        Down::Http.open(url(id), **options)
       end
 
       def exists?(id)
@@ -38,15 +38,6 @@ class Shrine
         api_client.delete("/files/#{id}/storage/")
       end
 
-      def multi_delete(ids)
-        ids, rest = ids.take(100), Array(ids[100..-1])
-        response = api_client.delete("/files/storage/") do |request|
-          request.body = ids.to_json
-          request.headers["Content-Type"] = "application/json"
-        end
-        multi_delete(rest) unless rest.empty?
-      end
-
       def url(id, **options)
         operations = options.to_a.map { |operation| operation.flatten.join("/") }
         file(id, operations).cdn_url(true)
@@ -56,7 +47,7 @@ class Shrine
         response = api_client.get("/files/", stored: true, limit: 1000)
         loop do
           uuids = response.body["results"].map { |result| result.fetch("uuid") }
-          multi_delete(uuids) unless uuids.empty?
+          batch_delete(uuids) unless uuids.empty?
           return if (next_url = response.body["next"]).nil?
           response = api_client.get(URI(next_url).request_uri)
         end
@@ -76,7 +67,7 @@ class Shrine
 
         url = upload_client.url_prefix + "base/"
 
-        Struct.new(:url, :fields).new(url, fields)
+        { method: :post, url: url, fields: fields }
       end
 
       protected
@@ -135,6 +126,15 @@ class Shrine
         raise Error, "You must allow \"automatic file storing\" in project settings"
       end
 
+      def batch_delete(ids)
+        ids.each_slice(100) do |ids_slice|
+          api_client.delete("/files/storage/") do |request|
+            request.body = ids_slice.to_json
+            request.headers["Content-Type"] = "application/json"
+          end
+        end
+      end
+
       def api_client
         uploadcare.instance_variable_get("@api_connection")
       end

data/shrine-uploadcare.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-uploadcare"
-  gem.version       = "0.2.0"
+  gem.version       = "0.3.0"
 
   gem.required_ruby_version = ">= 2.1"
 
   gem.summary      = "Provides Uploadcare storage for Shrine."
-  gem.homepage     = "https://github.com/janko-m/shrine-uploadcare"
+  gem.homepage     = "https://github.com/shrinerb/shrine-uploadcare"
   gem.authors      = ["Janko Marohnić"]
   gem.email        = ["janko.marohnic@gmail.com"]
   gem.license      = "MIT"
@@ -13,9 +13,10 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "*.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "shrine", "~> 2.2"
+  gem.add_dependency "shrine", "~> 2.11"
   gem.add_dependency "uploadcare-ruby", "~> 1.0.5"
-  gem.add_dependency "down", ">= 2.3.3"
+  gem.add_dependency "down", "~> 4.4"
+  gem.add_dependency "http", "~> 3.2"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-uploadcare
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: uploadcare-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,30 @@ dependencies:
   name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +119,7 @@ files:
 - README.md
 - lib/shrine/storage/uploadcare.rb
 - shrine-uploadcare.gemspec
-homepage: https://github.com/janko-m/shrine-uploadcare
+homepage: https://github.com/shrinerb/shrine-uploadcare
 licenses:
 - MIT
 metadata: {}
@@ -125,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 Uploadcare storage for Shrine.