activestorage_qiniu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66dd8ccc4e92df60e083a59af68e0d9c6af449f30905fcd5d0bfbcad646a9376
-  data.tar.gz: 5c1b62fe52270d329f007b17a0fa0821be07995e2faacba6cf78aa400b1ca22b
+  metadata.gz: 3d7979a0cacc3f25e0705c90336bc7deb291a8ae4c0dbda880eb2d9f89c093a9
+  data.tar.gz: 92b947b4ffb4f8be7a20b1a14f5f107d11a07333d33128fb9cee01c67846504a
 SHA512:
-  metadata.gz: f7fabebadd0ba37fe9e8334dd78637df4a030464f0d77433e16a7a2710a45f1cd8cc7ac8553ca0071b6eedabf79dcb577fb8e5ae3b8a1e9ffe12fd23f4438303
-  data.tar.gz: a879fe519784c504edd5c8fe5f358967f79a563951161a3479c56d841a8e86274120853180d1ee9a8548002fc6bc2e7feb262fe07b6af195b121cf081b64c04f
+  metadata.gz: 850ce44e653999bf54bf8f0a7c44f538889f5622fe49cfb451639446e122cf6bb407b284cf743f2fae197f37d31a0e7b59d990630f09feeb2aa3153dcf820088
+  data.tar.gz: 7d517f6d54790257293bab7e660cccd2207a60b086d94a1ec4ae5a9d1aad9defa53ad3a3ed17751e15f59e5344e93eff003f6adff7abf8c359d7c4007ae94ad9

data/Gemfile.lock

@@ -4,65 +4,80 @@ PATH
     activestorage_qiniu (0.2.0)
       qiniu (~> 6.9)
       rails (>= 5.1.6.2)
+      retries (~> 0.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2.1)
-      actionpack (= 5.2.2.1)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2.1)
-      actionview (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2.1)
-      activesupport (= 5.2.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2.1)
-      activesupport (= 5.2.2.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.2.1)
-      activesupport (= 5.2.2.1)
-    activerecord (5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.2.1)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.1, >= 2.1.8)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    domain_name (0.5.20180417)
+    crass (1.0.5)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -70,53 +85,57 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.1009)
     mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     netrc (0.11.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     qiniu (6.9.0)
       mime-types (~> 3.1)
       rest-client (~> 2.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2.1)
-      actioncable (= 5.2.2.1)
-      actionmailer (= 5.2.2.1)
-      actionpack (= 5.2.2.1)
-      actionview (= 5.2.2.1)
-      activejob (= 5.2.2.1)
-      activemodel (= 5.2.2.1)
-      activerecord (= 5.2.2.1)
-      activestorage (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       bundler (>= 1.3.0)
-      railties (= 5.2.2.1)
+      railties (= 6.0.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2.1)
-      actionpack (= 5.2.2.1)
-      activesupport (= 5.2.2.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (10.5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    sprockets (3.7.2)
+    retries (0.0.5)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -129,10 +148,11 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
-    websocket-driver (0.7.0)
+    unf_ext (0.0.7.6)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby

data/activestorage_qiniu.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_runtime_dependency 'rails', '~> 5.1', '>= 5.1.6.2'
+  spec.add_runtime_dependency 'rails', '>= 5.1.6.2'
 
   spec.add_dependency 'qiniu', '~> 6.9'
+  spec.add_dependency 'retries', '~> 0.0.5'
 end

data/lib/active_storage/service/qiniu_service.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+require 'retries'
 
 module ActiveStorage
   # Wraps the Qiniu Storage Service as an Active Storage service.
@@ -24,6 +25,7 @@ module ActiveStorage
   #
   #
   class Service::QiniuService < Service
+    BLOCK_SIZE = 4 * 1024 * 1024
     attr_reader :bucket, :domain, :upload_options, :protocol, :bucket_private
 
     def initialize(access_key:, secret_key:, bucket:, domain:, **options)
@@ -42,21 +44,27 @@ module ActiveStorage
 
     def upload(key, io, checksum: nil, content_type: nil, **)
       instrument :upload, key: key, checksum: checksum do
-        begin
-          upload_method = io.respond_to?(:read) ? :upload_buffer_with_token : :upload_with_token_2
-          code, result, response_headers = Qiniu::Storage.send(upload_method,
-            generate_uptoken(key),
-            io,
-            key,
-            nil,
-            bucket: bucket
-          )
-
-          result
-        rescue => e
-          puts e.backtrace
-          raise ActiveStorage::IntegrityError
+        io = File.open(io) unless io.respond_to?(:read)
+
+        ctx_list = []
+        file_size = 0
+        while (blk = io.read(BLOCK_SIZE))
+          ctx = upload_blk(key, blk)
+          file_size += blk.size
+          ctx_list.push(ctx)
         end
+
+        api_call(
+          key,
+          '/' + [
+            'mkfile',
+            file_size,
+            'key',
+            encode(key),
+            *(content_type ? ['mimeType', encode(content_type)] : [])
+          ].join('/'),
+          ctx_list.join(',')
+        )
       end
     end
 
@@ -119,7 +127,7 @@ module ActiveStorage
                 Qiniu::Auth.authorize_download_url_2(domain, key, schema: protocol, fop: fop, expires_in: expires_in)
               else
                 url_encoded_key = CGI::escape(key)
-                "#{protocol}://#{domain}/#{url_encoded_key}"
+                "#{protocol}://#{domain}/#{url_encoded_key}?#{fop}"
               end
 
         payload[:url] = url
@@ -161,5 +169,31 @@ module ActiveStorage
 
       Qiniu::Auth.generate_uptoken(put_policy)
     end
+
+    def upload_blk(key, blk)
+      result =
+        with_retries(max_retries: 3) do
+          api_call(key, "/mkblk/#{blk.size}", blk)
+        end
+      result.fetch('ctx')
+    end
+
+    def api_call(key, path, body)
+      url = Qiniu::Config.up_host(bucket) + path
+
+      response = RestClient.post(
+        url,
+        body,
+        'Authorization' => "UpToken #{generate_uptoken(key)}"
+      )
+
+      result = JSON.parse(response.body)
+
+      result
+    end
+
+    def encode(value)
+      Base64.encode64(value).strip.gsub(/\+/, '-').gsub(%r{/}, '_')
+    end
   end
-end
+end

data/lib/activestorage_qiniu/version.rb

@@ -1,3 +1,3 @@
 module ActivestorageQiniu
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_qiniu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mycolorway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,9 +57,6 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.6.2
@@ -67,9 +64,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.6.2
@@ -87,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.9'
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: Wraps the Qiniu Storage Service as an Active Storage service. https://www.qiniu.com
 email:
 - sindon@gmail.com
@@ -129,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Wraps the Qiniu Storage Service as an Active Storage service