carrierwave-qiniu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681bc93e529a975aee0b4cbf79ca4c36b897303a
-  data.tar.gz: 0f37e352a65ee828771e43e02a1562ff4a6ceb75
+  metadata.gz: 6389bb732e294a7f5bc3c107621c1d65d136440e
+  data.tar.gz: cc2efc74f9d673bc4b30779cd8dae0829e88c46c
 SHA512:
-  metadata.gz: 0ef2ad3e0eb59fc0b9cf5bc6d354a631c495b61a9c67b6ef29a2b60af95c3097f25860010bcd452915ab5d7b86a4407189f12604801638f60e1b3e302dbcd001
-  data.tar.gz: f699c01bb38d639be78d497dc5abdec9502810003178fc76c31c7d868a4a8228a0836a20b5fcf2312e256377e1ae370b7f59384ab63633eda24b832dc29be39b
+  metadata.gz: d9c59dc02dcfad40cdabb9c974a4e1b8acb4be84f593beefec6da7f4b4a78be94eef5ecfb5cad1f6df8b1311b1d6ce4e59abaea33c272eae8ad8aa4c688b6966
+  data.tar.gz: c0c20d6b8129d1aca7cfecef7161499028ecf4ee5be86015e53adae3d2c375666e258d3053fb3203fb5c83e5cb8277f894e5d18c8f818fbf6dab7969c66d33f1

data/Gemfile

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

data/README.md

@@ -29,12 +29,13 @@ You'll need to configure it in config/initializes/carrierwave.rb
   config.qiniu_secret_key    = 'your qiniu secret_key'
   config.qiniu_bucket        = "carrierwave-qiniu-example"
   config.qiniu_bucket_domain = "carrierwave-qiniu-example.aspxboy.com"
+  config.qiniu_bucket_private= true #default is false
   config.qiniu_block_size    = 4*1024*1024
   config.qiniu_protocol      = "http"
 end
 ```
 
-For more information on `qiniu_bucket_domain`, please read http://docs.qiniutek.com/v2/sdk/ruby/#publish
+For more information on qiniu, please read http://developer.qiniu.com/docs/v6/
 
 And then in your uploader, set the storage to `:qiniu`:
 
@@ -54,6 +55,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
   self.qiniu_bucket_domain = "avatars.files.example.com"
   self.qiniu_protocal = 'http'
   self.qiniu_can_overwrite = true
+  self.qiniu_bucket_private= true #default is false
 
     # See also:
     # https://github.com/qiniu/ruby-sdk/issues/48
@@ -82,4 +84,3 @@ You can see a example project on: https://github.com/huobazi/carrierwave-qiniu-e
 ## Contributors
 
 See the [Contributors List](https://github.com/huobazi/carrierwave-qiniu/graphs/contributors).
-

data/carrierwave-qiniu.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "carrierwave"
-  gem.add_dependency "qiniu-rs",["~> 3.4.2"]
+  gem.add_dependency "qiniu",["~> 6.2.4"]
 end

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave/qiniu/configuration.rb

@@ -7,6 +7,7 @@ module CarrierWave
       included do
         add_config :qiniu_bucket_domain
         add_config :qiniu_bucket
+        add_config :qiniu_bucket_private
         add_config :qiniu_access_key
         add_config :qiniu_secret_key
         add_config :qiniu_block_size

data/lib/carrierwave/storage/qiniu.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'carrierwave'
-require 'qiniu-rs'
+require 'qiniu'
 
 module CarrierWave
   module Storage
@@ -10,10 +10,11 @@ module CarrierWave
         def initialize(options={})
           @qiniu_bucket_domain = options[:qiniu_bucket_domain]
           @qiniu_bucket        = options[:qiniu_bucket]
+          @qiniu_bucket_private= options[:qiniu_bucket_private] || false
           @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_protocol      = options[:qiniu_protocol] || options[:qiniu_protocal] || "http"
+          @qiniu_protocol      = options[:qiniu_protocol] || "http"
           @qiniu_async_ops     = options[:qiniu_async_ops] || ''
           @qiniu_can_overwrite = options[:qiniu_can_overwrite] || false
           init
@@ -22,66 +23,51 @@ module CarrierWave
         def store(file, key)
           qiniu_upload_scope = @qiniu_bucket
           qiniu_upload_scope = @qiniu_bucket + ':' + key if @qiniu_can_overwrite
-          token_opts = {
-            :scope => qiniu_upload_scope, :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)
+          put_policy = ::Qiniu::Auth::PutPolicy.new(
+            @qiniu_bucket,
+            key,
+            3600
+          )
 
-          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
+          code, result, response_headers = ::Qiniu::Storage.upload_with_put_policy(
+            put_policy,
+            file.path,
+            key
+          )
 
         end
 
         def delete(key)
           begin
-            ::Qiniu::RS.delete(@qiniu_bucket, key)
+            ::Qiniu::Storage.delete(@qiniu_bucket, key)
           rescue Exception => e
             nil
           end
         end
 
-        def get_public_url(key)
-          if @qiniu_bucket_domain and @qiniu_bucket_domain.size > 0
-            "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{key}"
-          else
-            res = ::Qiniu::RS.get(@qiniu_bucket, key)
-            if res
-              res["url"]
-            else
-              nil
-            end
-          end
+        def download_url(path)
+          encode_path = URI.escape(path, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) #fix chinese file name, same as encodeURIComponent in js
+          primitive_url = "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{encode_path}"
+          @qiniu_bucket_private ? ::Qiniu::Auth.authorize_download_url(primitive_url) : primitive_url
         end
 
         private
+
         def init
           init_qiniu_rs_connection
-          #setup_publish_bucket_and_domain
         end
 
         def init_qiniu_rs_connection
           return if @qiniu_rs_connection_inited
-          ::Qiniu::RS.establish_connection! :access_key => @qiniu_access_key,
+
+          ::Qiniu.establish_connection! :access_key => @qiniu_access_key,
             :secret_key => @qiniu_secret_key,
             :block_size => @qiniu_block_size
 
           @qiniu_rs_connection_inited = true
         end
 
-        def setup_publish_bucket_and_domain
-          ::Qiniu::RS.publish(@qiniu_bucket_domain, @qiniu_bucket)
-        end
-
       end
 
       class File
@@ -95,11 +81,7 @@ module CarrierWave
         end
 
         def url
-          if @uploader.qiniu_bucket_domain and @uploader.qiniu_bucket_domain.size > 0
-            "#{@uploader.qiniu_protocol || 'http'}://#{@uploader.qiniu_bucket_domain}/#{@path}"
-          else
-            qiniu_connection.get_public_url(@path)
-          end
+          qiniu_connection.download_url(@path)
         end
 
         def store(file)
@@ -121,6 +103,7 @@ module CarrierWave
               :qiniu_secret_key    => @uploader.qiniu_secret_key,
               :qiniu_bucket        => @uploader.qiniu_bucket,
               :qiniu_bucket_domain => @uploader.qiniu_bucket_domain,
+              :qiniu_bucket_private=> @uploader.qiniu_bucket_private,
               :qiniu_block_size    => @uploader.qiniu_block_size,
               :qiniu_protocol      => @uploader.qiniu_protocol
             }

data/spec/spec_helper.rb

@@ -25,10 +25,12 @@ ActiveRecord::Migration.verbose = false
 # 测试的时候需要修改这个地方
 ::CarrierWave.configure do |config|
   config.storage             = :qiniu
-  config.qiniu_access_key    = 'your key'
-  config.qiniu_secret_key    = 'your key'
-  config.qiniu_bucket        = "spec-test"
-  config.qiniu_bucket_domain = "spec-test.qiniudn.com"
+  config.qiniu_access_key    = "xxx"
+  config.qiniu_secret_key    = "xxx"
+
+  config.qiniu_bucket        = "xxx"
+  config.qiniu_bucket_domain = "xxx"
+
   config.qiniu_block_size    = 4*1024*1024
   config.qiniu_protocol      = "http"
 end

data/spec/upload_spec.rb

@@ -53,10 +53,6 @@ describe "CarrierWave Qiniu" do
 
   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
 
@@ -77,18 +73,13 @@ describe "CarrierWave Qiniu" do
 
       photo.errors.count.should == 0
 
-      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.small_image_url
-      puts photo.little_image_url
-      puts photo.middle_image_url
-      puts photo.large_image_url
+
+      open(photo.image.url).should_not be_nil
+
+      puts photo.image.url
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: qiniu-rs
+  name: qiniu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 6.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 6.2.4
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com