carrierwave-qiniu 0.0.6 → 0.0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7466c24b8bbad340cb158313bce99c1649c0ccb4
-  data.tar.gz: 6d5152971794c5b28e3306ccfa01c4db5e56a46e
+  metadata.gz: 30a5d49adf6184ef9c7f0cc52ddc05ed74e04384
+  data.tar.gz: 904e00be456b48cb111fa57d4f283d7c10ec3fcc
 SHA512:
-  metadata.gz: 88bd1de7f76d7c9bf7126a0918ed63deb2211b71498841da479584877274bb202183fe73668dc93bf013e713d2b943644067bc30fad56717abae10cbb9e667ec
-  data.tar.gz: e9120ad9050bb2dd1bbfc163c1ff2e22838307b0e7ec9e575828a3b77463653df4e0377ea8bcf04399a23f190974944c371be8c2a4d313d20944d715755e10c2
+  metadata.gz: 4b6a5af9aa7f85b05a149363c8b1718c709b077b41b4278ba4ed19d75c36e9f10992ecdec8d651f3a89b4df71e4c0de44fb867c7b9d9f0fdaff05e43c9647471
+  data.tar.gz: 6668159f0f110a0b4e07b15f953025c5443b0a73f790a06d8a00543bca0ebdd7d234d8298395ea20a66a4a543be7c9cb3040f3d92e1c3877cba96c532a292d34

data/Gemfile

@@ -1,4 +1,5 @@
-source 'https://rubygems.org'
+#source 'https://rubygems.org'
+source 'http://ruby.taobao.org'
 
 # Specify your gem's dependencies in carrierwave-qiniu.gemspec
 gemspec

data/README.md

@@ -52,6 +52,18 @@ class AvatarUploader < CarrierWave::Uploader::Base
 
   self.qiniu_bucket = "avatars"
   self.qiniu_bucket_domain = "avatars.files.example.com"
+
+    # See also:
+    # http://docs.qiniu.com/api/put.html#uploadToken
+    # http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps
+    def qiniu_async_ops
+      commands = []
+      %W(small little middle large).each do |style|
+        commands << "http://#{self.qiniu_bucket_domain}/#{self.store_dir}/#{self.filename}/#{style}"
+      end
+      commands
+    end
+
 end
 ```
 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
@@ -64,9 +76,7 @@ You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-e
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Contributors
 
-## CHANGELOG
-
-### 0.0.1 (2012-08-17)
+See the [Contributors List](https://github.com/huobazi/carrierwave-qiniu/graphs/contributors).
 
-* it works.

data/lib/carrierwave/storage/qiniu.rb

@@ -18,11 +18,12 @@ module CarrierWave
       class Connection
         def initialize(options={})
           @qiniu_bucket_domain = options[:qiniu_bucket_domain]
-          @qiniu_bucket = options[:qiniu_bucket]
-          @qiniu_access_key = options[:qiniu_access_key]
-          @qiniu_secret_key = options[:qiniu_secret_key]
-          @qiniu_block_size = options[:qiniu_block_size] || 1024*1024*4
-          @qiniu_protocal = options[:qiniu_protocal] || "http"
+          @qiniu_bucket        = options[:qiniu_bucket]
+          @qiniu_access_key    = options[:qiniu_access_key]
+          @qiniu_secret_key    = options[:qiniu_secret_key]
+          @qiniu_block_size    = options[:qiniu_block_size] || 1024*1024*4
+          @qiniu_protocal      = options[:qiniu_protocal] || "http"
+          @qiniu_async_ops     = options[:qiniu_async_ops] || ''
           init
         end
 
@@ -30,21 +31,25 @@ module CarrierWave
           token_opts = {
             :scope => @qiniu_bucket, :expires_in => 3600 # https://github.com/qiniu/ruby-sdk/pull/15
           }
+          token_opts.merge!(:async_options => @qiniu_async_ops) if @qiniu_async_ops.size > 0
+
           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
-                    }  
+            :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)
-          begin            
+          begin
             ::Qiniu::RS.delete(@qiniu_bucket, key)
           rescue Exception => e
             nil
@@ -73,8 +78,8 @@ module CarrierWave
         def init_qiniu_rs_connection
           return if @qiniu_rs_connection_inited
           ::Qiniu::RS.establish_connection! :access_key => @qiniu_access_key,
-                                            :secret_key => @qiniu_secret_key,
-                                            :block_size => @qiniu_block_size
+            :secret_key => @qiniu_secret_key,
+            :block_size => @qiniu_block_size
 
           @qiniu_rs_connection_inited = true
         end
@@ -118,13 +123,22 @@ module CarrierWave
             @qiniu_connection
           else
             config = {
-                :qiniu_access_key    => @uploader.qiniu_access_key,
-                :qiniu_secret_key    => @uploader.qiniu_secret_key,
-                :qiniu_bucket        => @uploader.qiniu_bucket,
-                :qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
-                :qiniu_block_size    => @uploader.qiniu_block_size,
-                :qiniu_protocal      => @uploader.qiniu_protocal
+              :qiniu_access_key    => @uploader.qiniu_access_key,
+              :qiniu_secret_key    => @uploader.qiniu_secret_key,
+              :qiniu_bucket        => @uploader.qiniu_bucket,
+              :qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
+              :qiniu_block_size    => @uploader.qiniu_block_size,
+              :qiniu_protocal      => @uploader.qiniu_protocal
             }
+
+            if @uploader.respond_to?(:qiniu_async_ops) and !@uploader.qiniu_async_ops.nil? and @uploader.qiniu_async_ops.size > 0
+              if @uploader.qiniu_async_ops.is_a?(Array)
+                config.merge!(:qiniu_async_ops => @uploader.qiniu_async_ops.join(';'))
+              else
+                config.merge!(:qiniu_async_ops => @uploader.qiniu_async_ops)
+              end
+            end
+
             @qiniu_connection ||= Connection.new config
           end
         end

data/lib/carrierwave-qiniu/version.rb

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

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require "rails"
 require "active_record"
 require "carrierwave"
 require "carrierwave/orm/activerecord"
-require "carrierwave/processing/mini_magick"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","lib"))
@@ -26,12 +25,14 @@ ActiveRecord::Migration.verbose = false
 # 测试的时候需要修改这个地方
 ::CarrierWave.configure do |config|
   config.storage             = :qiniu
-  config.qiniu_access_key    = "rJ2cC5tKdpA74P-pJPnADWBEZQ39fFSRv3udaGMu"
-  config.qiniu_secret_key    = 'Aeuc1BxLvrOIvp-kBQ4v96rCyDsSC-tYDkxlVBKv'
+  config.qiniu_access_key    = 'CsYEw1QBZAIPqp4q6wxb3s5Y6AIIuMIgGLW1MEIH'
+  config.qiniu_secret_key    = 'avkqArZO-O3O736X_hf9-eL5CE2o-nlznwLq4Bzc'
   config.qiniu_bucket        = "spec-test"
-  config.qiniu_bucket_domain = "carrierwave-qiniu-example.aspxboy.com"
+  config.qiniu_bucket_domain = "spec-test.qiniudn.com"
+  config.qiniu_block_size    = 4*1024*1024
+  config.qiniu_protocal      = "http"
 end
 
 def load_file(fname)
   File.open([Rails.root,fname].join("/"))
-end
+end

data/spec/upload_spec.rb

@@ -6,7 +6,7 @@ require "open-uri"
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
-describe "Upload" do
+describe "CarrierWave Qiniu" do
   def setup_db
     ActiveRecord::Schema.define(:version => 1) do
       create_table :photos do |t|
@@ -14,28 +14,35 @@ describe "Upload" do
       end
     end
   end
-  
+
   def drop_db
     ActiveRecord::Base.connection.tables.each do |table|
       ActiveRecord::Base.connection.drop_table(table)
     end
   end
-  
+
   class PhotoUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MiniMagick
 
-    version :small do
-      process :resize_to_fill => [100, 100]
-    end
-    
     def store_dir
-      "photos"
+      "carrierwave-qiniu-spec"
     end
 
     def filename
       "images/#{secure_token(10)}.#{file.extension}" if original_filename.present?
     end
 
+    # See
+    # http://docs.qiniu.com/api/put.html#uploadToken
+    # http://docs.qiniutek.com/v3/api/io/#uploadToken-asyncOps
+    def qiniu_async_ops
+      commands = []
+      %W(small little middle large).each do |style|
+        commands << "http://#{self.qiniu_bucket_domain}/#{self.store_dir}/#{self.filename}/#{style}"
+      end
+      commands
+    end
+
+
     protected
     def secure_token(length = 16)
       var = :"@#{mounted_as}_secure_token"
@@ -44,32 +51,43 @@ describe "Upload" do
   end
 
   class Photo < ActiveRecord::Base
+
+    %W(small little middle large).each do |style|
+      define_method("#{style}_image_url".to_sym){ self.image.url.to_s + "/#{style}" }
+    end
+
     mount_uploader :image, PhotoUploader
   end
-  
-  
+
+
   before :all do
     setup_db
   end
-  
+
   after :all do
     drop_db
   end
-  
+
   context "Upload Image" do
     it "does upload image" do
-      f = load_file("ruby-china.png")
+      f = load_file("mm.jpg")
       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
-      open(photo.image.small.url).should_not == nil
+
+      open(photo.small_image_url).should_not == nil
+      open(photo.little_image_url).should_not == nil
+      open(photo.middle_image_url).should_not == nil
+      open(photo.large_image_url).should_not == nil
+
       puts ""
       puts 'The image was uploaded to:'
       puts ""
-      puts photo.image.url
-      puts photo.image.small.url
+      puts photo.small_image_url
+      puts photo.little_image_url
+      puts photo.middle_image_url
+      puts photo.large_image_url
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7.1
 platform: ruby
 authors:
 - huobazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -55,7 +55,7 @@ files:
 - lib/carrierwave-qiniu/version.rb
 - lib/carrierwave/qiniu/configuration.rb
 - lib/carrierwave/storage/qiniu.rb
-- spec/ruby-china.png
+- spec/mm.jpg
 - spec/spec_helper.rb
 - spec/upload_spec.rb
 homepage: https://github.com/huobazi/carrierwave-qiniu
@@ -77,11 +77,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Qiniu Storage support for CarrierWave
 test_files:
-- spec/ruby-china.png
+- spec/mm.jpg
 - spec/spec_helper.rb
 - spec/upload_spec.rb