activestorage_qiniu 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ad6997e5eb5803649d05adecc94470cb7b043d4
-  data.tar.gz: f4dcd3dd2d251b2935c143a54884bc6697a180d7
+SHA256:
+  metadata.gz: 47f6b2fc9d84e2d9259f30ee944d819d168de2718448b50b9b3f97439f5cb213
+  data.tar.gz: e490f65e548aa46088c1d41d452852b9ebd18edc5c2071950a907a275f7711d0
 SHA512:
-  metadata.gz: dba8d96a7db7e595f5f38701a08b560e346b64fbc63ca3f8d5916540bc09bf75aac8bb57d93f0e9bd036cae9be4a225cd86f9cdc8c86a138e3f0529ef5dc91d9
-  data.tar.gz: 6108b971cd878928d9d3f3aaef1be54e0804c93c703b1ab36d3ec3410bf0417f868d363855e489767a97c0913439d8419f6c98a3941ec79e2fd1096ef329374e
+  metadata.gz: 59f1228423a20a63ce8d103e46486e1cabd94a3e8adf1c3b60f9085f54839c0a6542ad8e5c949c1ddd8b9bf7b4433bda41cb2b3a6b7c8e21b1c484ec7899f1b5
+  data.tar.gz: 4fdbcc72749431be529838e398fc29eb6edae0ad0ea147699dcb792c11bd7ef2c714ead6df865bb5ac6deb61a1cf5b45d36e09f88b5823bb8b65736bbb2d9a50

data/Gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: .
+  specs:
+    activestorage_qiniu (0.1.2)
+      activestorage (~> 0.1)
+      qiniu (~> 6.8.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activestorage (0.1)
+      actionpack (>= 5.1)
+      activejob (>= 5.1)
+      activerecord (>= 5.1)
+      activesupport (>= 5.1)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    erubi (1.7.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    json (1.8.6)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    netrc (0.11.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    qiniu (6.8.1)
+      json (~> 1.8)
+      mime-types (~> 2.4, >= 2.4.0)
+      rest-client (~> 2.0, >= 2.0.0)
+      ruby-hmac (~> 0.4)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (10.5.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    ruby-hmac (0.4.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activestorage_qiniu!
+  bundler (~> 1.16)
+  minitest (~> 5.0)
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.0

data/README.md

@@ -36,7 +36,7 @@ Then, in your application's configuration, you can specify the service to use li
 config.active_storage.service = :qiniu
 ```
 
-### Setup qiniu as image/video analyzer to extract blob metadata
+Finally, config qiniu image and video analyzers.
 
 ```
 config.active_storage.analyzers = [ ActiveStorage::Analyzer::QiniuImageAnalyzer, ActiveStorage::Analyzer::QiniuVideoAnalyzer ]

data/activestorage_qiniu.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_dependency 'rails', ['>= 5.2.0.alpha', '< 6']
-  spec.add_dependency 'qiniu', '~> 6.8.1'
+  spec.add_dependency 'qiniu', '>= 6.9.0'
 end

data/lib/active_storage/service/qiniu_service.rb

@@ -21,13 +21,15 @@ module ActiveStorage
   #
   #
   class Service::QiniuService < Service
-    attr_reader :bucket, :domain, :upload_options
+    attr_reader :bucket, :domain, :upload_options, :protocol
 
     def initialize(access_key:, secret_key:, bucket:, domain:, **options)
       @bucket = bucket
       @domain = domain
+      @protocol = (options.delete(:protocol) || 'https').to_sym
       Qiniu.establish_connection! access_key: access_key,
                                   secret_key: secret_key,
+                                  protocol: protocol,
                                   **options
 
       @upload_options = options
@@ -36,15 +38,18 @@ module ActiveStorage
     def upload(key, io, checksum: nil)
       instrument :upload, key: key, checksum: checksum do
         begin
-          code, result, response_headers = Qiniu::Storage.upload_with_token_2(
+          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
+        rescue => e
+          puts e.backtrace
           raise ActiveStorage::IntegrityError
         end
       end
@@ -70,14 +75,41 @@ module ActiveStorage
       end
     end
 
+    def download(key)
+      if block_given?
+        instrument :streaming_download, key: key do
+          open(url(key, disposition: :attachment)) do |file|
+            while data = file.read(64.kilobytes)
+              yield data
+            end
+          end
+        end
+      else
+        instrument :download, key: key do
+          open(url(key, disposition: :attachment)).read
+        end
+      end
+    end
+
+    def download_chunk(key, range)
+      instrument :download_chunk, key: key, range: range do
+        uri = URI(url(key, disposition: :attachment))
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |client|
+          client.get(uri, 'Range' => "bytes=#{range.begin}-#{range.exclude_end? ? range.end - 1 : range.end}").body
+        end
+      end
+    end
+
     def url(key, **options)
       instrument :url, key: key do |payload|
         fop = if options[:fop].present?        # 内容预处理
                 options[:fop]
-              elsif options[:attname].present? # 下载附件
-                "attname=#{URI.escape(options[:attname])}"
+              elsif options[:disposition].to_s == 'attachment' # 下载附件
+                attname = URI.escape "#{options[:filename] || key}"
+                "attname=#{attname}"
               end
-        url = Qiniu::Auth.authorize_download_url_2(domain, key, fop: fop, expires_in: options[:expires_in])
+        expires_in = options[:expires_in] || url_expires_in
+        url = Qiniu::Auth.authorize_download_url_2(domain, key, fop: fop, expires_in: expires_in, schema: protocol)
         payload[:url] = url
         url
       end
@@ -87,12 +119,12 @@ module ActiveStorage
       instrument :url, key: key do |payload|
         url = Qiniu::Config.up_host(bucket)
         payload[:url] = url
-        { url: url, token: generate_uptoken(key, expires_in) }
+        url
       end
     end
 
     def headers_for_direct_upload(key, content_type:, checksum:, **)
-      { "Content-Type" => content_type, "Content-MD5" => checksum }
+      { "Content-Type" => content_type, "Content-MD5" => checksum, "x-token" => generate_uptoken(key) }
     end
 
     private

data/lib/activestorage_qiniu.rb

@@ -1,7 +1,7 @@
+require 'qiniu'
 require "activestorage_qiniu/version"
 require 'active_storage/service/qiniu_service'
 require 'active_storage/analyzer/qiniu_image_analyzer'
 require 'active_storage/analyzer/qiniu_video_analyzer'
-
 module ActivestorageQiniu
 end

data/lib/activestorage_qiniu/version.rb

@@ -1,3 +1,3 @@
 module ActivestorageQiniu
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Mycolorway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,16 +77,16 @@ dependencies:
   name: qiniu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.8.1
+        version: 6.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.8.1
+        version: 6.9.0
 description: Wraps the Qiniu Storage Service as an Active Storage service. https://www.qiniu.com
 email:
 - sindon@gmail.com
@@ -98,6 +98,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Wraps the Qiniu Storage Service as an Active Storage service