activestorage-aliyun 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280e83ae1965f9a922c30d70f38be9ed550abaa4
-  data.tar.gz: b6c1f47cf9f9445309f7efe09578047396fdde37
+  metadata.gz: 8561c1bab22046a3249849fa1198ecbdc6929b1f
+  data.tar.gz: 78758224fd12173075a2b3d79a5896d0361d43d1
 SHA512:
-  metadata.gz: 7e6c52b08d031f69fb05fa444edf7906ea76a18267874e0043caceb6c53127454a357c98cf759cfc16b1215e453893331ffb1970972412f6b6c8b2767fe7a51d
-  data.tar.gz: 55fc172b6b021a02f8aa3f7096a2f2de9324008c0c3e12080ca22f02bbe53a85fcb65ba245fe8572b94ee85224f64c9b1e6d5d47c49c83ad44cf2424136115b1
+  metadata.gz: 0a137d16f6ddf427e374e92d951bd074dc1647e74c226a06d82ce8a4870e68b98653ea2d07b1ebd6a54586aca98d8d1ebdb684341368e8f9c3448adf5901e2f2
+  data.tar.gz: 8db2b3039051f23371d88c7f556f7ae39d12b75a39a7bd419b37630616d370a296daefb776fdbc59d73521158e2da1936e343079fd43a7286d25f47110d4006d

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 0.1.1
+
+- Fix streaming upload.
+- Fix delete by prefixed.
+- Add full test.
+
+## 0.1.0
+
+- First release.

data/README.md

@@ -1,10 +1,13 @@
-# ActivestorageAliyun
-Short description and motivation.
+# ActiveStorage Aliyun Service
+
+Wraps the Aliyun OSS as an Active Storage service.
+
+
+[![Gem Version](https://badge.fury.io/rb/activestorage-aliyun.svg)](https://badge.fury.io/rb/activestorage-aliyun) [![Build Status](https://travis-ci.org/huacnlee/activestorage-aliyun.svg)](https://travis-ci.org/huacnlee/activestorage-aliyun) [![Code Climate](https://codeclimate.com/github/huacnlee/activestorage-aliyun/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/activestorage-aliyun) [![codecov.io](https://codecov.io/github/huacnlee/activestorage-aliyun/coverage.svg?branch=master)](https://codecov.io/github/huacnlee/activestorage-aliyun?branch=master)
 
-## Usage
-How to use my plugin.
 
 ## Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -12,17 +15,37 @@ gem 'activestorage-aliyun'
 ```
 
 And then execute:
+
 ```bash
 $ bundle
 ```
 
-Or install it yourself as:
-```bash
-$ gem install activestorage-aliyun
+## Usage
+
+config/storage.yml
+
+```rb
+production:
+  service: Aliyun
+  access_key_id: "your-oss-access-key-id"
+  access_key_secret: "your-oss-access-key-secret"
+  bucket: "bucket-name"
+  endpoint: "https://oss-cn-beijing.aliyuncs.com"
+  # path prefix, default: /
+  path: "my-app-files"
+```
+
+Use image:
+
+```erb
+- Orignial File URL: <%= image_tag @photo.image.service_url %>
+- Thumb with OSS image service: <%= image_tag @photo.image.service_url(filename: 'x-oss-process=image/resize,h_100,w_100') %>
 ```
 
 ## Contributing
+
 Contribution directions go here.
 
 ## License
+
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/active_storage/service/aliyun_service.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "aliyun/oss"
+
 module ActiveStorage
   class Service::AliyunService < Service
     def initialize(**config)
@@ -8,15 +9,24 @@ module ActiveStorage
     end
 
     def upload(key, io, checksum: nil)
-      headers = {}
       instrument :upload, key: key, checksum: checksum do
-        bucket.put_object(path_for(key), file: io)
+        bucket.put_object(path_for(key)) do |stream|
+          stream << io.read
+        end
       end
     end
 
     def download(key)
       instrument :download, key: key do
-        bucket.get_object(path_for(key))
+        chunk_buff = []
+        bucket.get_object(path_for(key)) do |chunk|
+          if block_given?
+            yield chunk
+          else
+            chunk_buff << chunk
+          end
+        end
+        chunk_buff.join("")
       end
     end
 
@@ -28,7 +38,9 @@ module ActiveStorage
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
-        bucket.delete_object(path_for(prefix))
+        files = bucket.list_objects(prefix: path_for(prefix))
+        keys = files.map(&:key)
+        bucket.batch_delete_objects(keys, quiet: true)
       end
     end
 
@@ -42,7 +54,7 @@ module ActiveStorage
       instrument :url, key: key do |payload|
         generated_url = bucket.object_url(path_for(key), false, expires_in)
         generated_url.gsub('http://', 'https://')
-        if filename.present?
+        if filename.present? && filename.include?("x-oss-process")
           generated_url = [generated_url, filename].join("?")
         end
 
@@ -82,7 +94,7 @@ module ActiveStorage
       end
 
       def client
-        @client ||= client = Aliyun::OSS::Client.new(
+        @client ||= Aliyun::OSS::Client.new(
           endpoint: endpoint,
           access_key_id: config.fetch(:access_key_id),
           access_key_secret: config.fetch(:access_key_secret),

data/lib/active_storage_aliyun/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageAliyun
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/activestorage-aliyun.rb

@@ -1,4 +1,4 @@
-require "active_storage_aliyun/railtie"
+# require "active_storage_aliyun/railtie"
 
 module ActiveStorageAliyun
   # Your code goes here...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jason Lee
@@ -44,6 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - README.md
 - Rakefile
 - lib/active_storage/service/aliyun_service.rb