paperclip-qiniu 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    paperclip-qiniu (0.0.2)
+    paperclip-qiniu (0.0.3)
       paperclip
-      qiniu-rs
+      qiniu-rs (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.6)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.0)
-    cocaine (0.2.1)
+    cocaine (0.3.0)
     diff-lcs (1.1.3)
-    i18n (0.6.0)
-    json (1.7.3)
+    i18n (0.6.1)
+    json (1.7.5)
     mime-types (1.19)
     multi_json (1.3.6)
-    paperclip (3.1.3)
+    paperclip (3.1.4)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (>= 0.0.2)
       mime-types
-    qiniu-rs (2.1.2)
-      json (~> 1.7.3)
+    qiniu-rs (3.0.5)
+      json (~> 1.7.5)
       mime-types (~> 1.19)
       rest-client (~> 1.6.7)
       ruby-hmac (~> 0.4.0)
@@ -44,10 +44,10 @@ GEM
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.0)
-    rspec-expectations (2.11.1)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     ruby-hmac (0.4.0)
     tzinfo (0.3.33)
 

data/README.md

@@ -58,6 +58,10 @@ end
 
 ## CHANGELOG
 
+### 0.0.3 (2012-09-06)
+
+* support qiniu api v3.
+
 ### 0.0.2 (2012-07-17)
 
 * support public host.

data/lib/paperclip-qiniu/exceptions.rb

@@ -0,0 +1,6 @@
+module Paperclip
+  module Qiniu
+    class Error < StandardError; end
+    class UploadFailed < Error; end
+  end
+end

data/lib/paperclip-qiniu/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Qiniu
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/paperclip/storage/qiniu.rb

@@ -1,3 +1,5 @@
+require 'paperclip-qiniu/exceptions'
+
 module Paperclip
   module Storage
     module Qiniu
@@ -74,14 +76,16 @@ module Paperclip
       end
 
       def upload(file, path)
-        remote_upload_url = ::Qiniu::RS.put_auth
-        opts = {:url                => remote_upload_url,
+        upload_token = ::Qiniu::RS.generate_upload_token :scope => bucket
+        opts = {:uptoken            => upload_token,
                  :file               => file.path,
                  :key                => path,
                  :bucket             => bucket,
                  :mime_type          => file.content_type,
                  :enable_crc32_check => true}
-        ::Qiniu::RS.upload opts
+        unless ::Qiniu::RS.upload_file(opts)
+          raise Paperclip::Qiniu::UploadFailed
+        end
       end
 
       def bucket

data/paperclip-qiniu.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Paperclip::Qiniu::VERSION
   gem.add_dependency 'paperclip'
-  gem.add_dependency 'qiniu-rs'
+  gem.add_dependency 'qiniu-rs', '~> 3.0'
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ files:
 - README.md
 - Rakefile
 - lib/paperclip-qiniu.rb
+- lib/paperclip-qiniu/exceptions.rb
 - lib/paperclip-qiniu/version.rb
 - lib/paperclip/storage/qiniu.rb
 - paperclip-qiniu.gemspec