carrierwave-qiniu 0.0.1 → 0.0.2

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 uploads/
+

data/Gemfile

@@ -8,7 +8,7 @@ group :test do
   gem 'sqlite3', '1.3.6'
   gem 'carrierwave', '0.6.2'
   gem 'mini_magick', '3.4'
-  gem 'qiniu-rs', '2.3.3'
+  gem 'qiniu-rs', '3.0.3'
   gem 'rspec', '~> 2.11'
   gem 'mocha', '0.10.0'
 end

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-storage [Carrierwave](https://github.com/jnicklas/carrierwave) attachments to http://qiniutek.com
+This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 
 example: https://github.com/huobazi/carrierwave-qiniu-example
 
@@ -32,7 +32,7 @@ You'll need to configure it in config/initializes/carrierwave.rb
 end
 ```
 
-for more information on `qiniu_bucket_domain`, please read http://docs.qiniutek.com/v2/sdk/ruby/#publish
+For more information on `qiniu_bucket_domain`, please read http://docs.qiniutek.com/v2/sdk/ruby/#publish
 
 And then in your uploader, set the storage to `:qiniu`:
 
@@ -52,7 +52,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
   self.qiniu_bucket_domain = "avatars.files.example.com"
 end
 ```
-You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-example or see the spec test on http://xxxxxxxxxxx
+You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-example or see the spec test on https://github.com/huobazi/carrierwave-qiniu/blob/master/spec/upload_spec.rb
 
 ## Contributing
 

data/carrierwave-qiniu.gemspec

@@ -17,7 +17,5 @@ Gem::Specification.new do |gem|
 
 
   gem.add_development_dependency "carrierwave"
-  gem.add_development_dependency "qiniu-rs",["~> 2.3.3"]
-  gem.add_development_dependency "rspec", ["~> 2.11"]
-  gem.add_development_dependency "rake", ["~> 0.9"]
+  gem.add_development_dependency "qiniu-rs",["~> 3.0.3"]
 end

data/lib/carrierwave/storage/qiniu.rb

@@ -11,9 +11,6 @@ rescue LoadError
   raise "You dot't have the 'qiniu-rs' gem installed"
 end
 
-# Qiniu::RS.establish_connection! :access_key => 'fR8TmveK4Eon_9te76mGyLKyC7I0JFwqBr6tVFdp',
-#                                 :secret_key => 'OhEs7BQAGMxoktRHvv1aNrxvosoM4C44cF6pmaMp'
-
 module CarrierWave
   module Storage
     class Qiniu < Abstract
@@ -28,25 +25,40 @@ module CarrierWave
         
         def store(file, key)
           init       
-          remote_upload_url = ::Qiniu::RS.put_auth
-          opts = {
-            :url                => remote_upload_url,
-            :file               => file.path,
-            :key                => key,
-            :bucket             => @qiniu_bucket,
-            :mime_type          => file.content_type,
-            :enable_crc32_check => true
-          }        
-
-          ::Qiniu::RS.upload opts
 
+          # API v2
+          # remote_upload_url = ::Qiniu::RS.put_auth
+          # opts = {
+          #   :url            => remote_upload_url,
+          #   :file               => file.path,
+          #   :key                => key,
+          #   :bucket             => @qiniu_bucket,
+          #   :mime_type          => file.content_type,
+          #   :enable_crc32_check => true
+          # }        
+
+          # ::Qiniu::RS.upload opts
+
+          token_opts = {
+            :scope => @qiniu_bucket, :expires_in => 3600 # https://github.com/qiniu/ruby-sdk/pull/15
+          }
+          uptoken = ::Qiniu::RS.generate_upload_token(token_opts)
+          opts = {
+                      :uptoken            => uptoken,
+                      :file               => file.path,
+                      :key                => key,
+                      :bucket             => @qiniu_bucket,
+                      :mime_type          => file.content_type,
+                      :enable_crc32_check => true
+                    }  
+
+          ::Qiniu::RS.upload_file opts
         end
 
         def delete(key)
           init
           begin            
             Qiniu::RS.delete(@qiniu_bucket, key)
-            true
           rescue Exception => e
             nil
           end

data/lib/carrierwave-qiniu/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Carrierwave
   module Qiniu
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/spec_helper.rb

@@ -26,8 +26,8 @@ ActiveRecord::Migration.verbose = false
 # 测试的时候需要修改这个地方
 ::CarrierWave.configure do |config|
   config.storage             = :qiniu
-  config.qiniu_access_key    = "your qiniu access_key"
-  config.qiniu_secret_key    = 'your qiniu secret_key'
+  config.qiniu_access_key    = "rJ2cC5tKdpA74P-pJPnADWBEZQ39fFSRv3udaGMu"
+  config.qiniu_secret_key    = 'Aeuc1BxLvrOIvp-kBQ4v96rCyDsSC-tYDkxlVBKv'
   config.qiniu_bucket        = "spec-test"
   config.qiniu_bucket_domain = "carrierwave-qiniu-example.aspxboy.com"
 end

data/spec/upload_spec.rb

@@ -37,7 +37,7 @@ describe "Upload" do
     end
 
     protected
-    def secure_token(length=16)
+    def secure_token(length = 16)
       var = :"@#{mounted_as}_secure_token"
       model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
     end
@@ -59,7 +59,8 @@ describe "Upload" do
   context "Upload Image" do
     it "does upload image" do
       f = load_file("ruby-china.png")
-      photo = Photo.create(:image => f)
+      photo = Photo.new(:image => f)
+      photo.save
       photo.errors.count.should == 0
       open(photo.image.url).should_not == nil
       open(photo.image.url).size.should == f.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,39 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 3.0.3
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com