carrierwave-qiniu 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04640c52f6176337abf13494a126a5c1aee37a08
-  data.tar.gz: 53058125653be7c0cdef610f133cbeccb5b43fb5
+  metadata.gz: b044a1ac28aea84db7adb5190619a2de43ee8cc0
+  data.tar.gz: 6b4edd18e16dc3f09123bf534c6f30378c6b7160
 SHA512:
-  metadata.gz: 7c711e6520f752659341b048433fb63c1c59c6d96cad26d62416e09351a20e6f8c408b1d582bfadc3fcf566790b8b6bb57c930da5010352eb4924262de6afb9b
-  data.tar.gz: fa0fcef504448c964e769c39d4ce531650caa12b6e76cd0fc0a027c0bee1a0e13be8db53b25e77049b595e4e7ebc49dfe8070304bc5d6faa4c8711d05561d4b5
+  metadata.gz: 52fcfbbdfd26eb4faf7f6f0be932503d1c61c59b208be441e7b96b4e0032ffb379816f170d01ec474a53c64da09fc91b10da2c2fc7c93f141be62051cfa1aa2a
+  data.tar.gz: 2171171a2c871055ba0276d706f90473d5c071230c93a98dd3f757f8844837123f3e5c070bd4e9b75f1228780f73747cc9895f567dd42270a2643fa88592ad6d

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.0.3'
+  gem 'qiniu-rs', '~>3.4.2'
   gem 'rspec', '~> 2.11'
   gem 'mocha', '>=0.10.0'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 huobazi
+Copyright (c) 2012 Marble Wu
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -30,7 +30,7 @@ You'll need to configure it in config/initializes/carrierwave.rb
   config.qiniu_bucket        = "carrierwave-qiniu-example"
   config.qiniu_bucket_domain = "carrierwave-qiniu-example.aspxboy.com"
   config.qiniu_block_size    = 4*1024*1024
-  config.qiniu_protocal      = "http"
+  config.qiniu_protocol      = "http"
 end
 ```
 
@@ -52,6 +52,8 @@ class AvatarUploader < CarrierWave::Uploader::Base
 
   self.qiniu_bucket = "avatars"
   self.qiniu_bucket_domain = "avatars.files.example.com"
+  self.qiniu_protocal = 'http'
+  self.qiniu_can_overwrite = true
 
     # See also:
     # https://github.com/qiniu/ruby-sdk/issues/48

data/carrierwave-qiniu.gemspec

@@ -2,11 +2,12 @@
 require File.expand_path('../lib/carrierwave-qiniu/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["huobazi"]
+  gem.authors       = ["Marble Wu"]
   gem.email         = ["huobazi@gmail.com"]
   gem.description   = %q{Qiniu Storage support for CarrierWave}
   gem.summary       = %q{Qiniu Storage support for CarrierWave}
   gem.homepage      = "https://github.com/huobazi/carrierwave-qiniu"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/carrierwave/qiniu/configuration.rb

@@ -10,31 +10,30 @@ module CarrierWave
         add_config :qiniu_access_key
         add_config :qiniu_secret_key
         add_config :qiniu_block_size
-        add_config :qiniu_protocal
+        add_config :qiniu_protocol
+        add_config :qiniu_async_ops
+        add_config :qiniu_can_overwrite
+
+        alias_config :qiniu_protocal, :qiniu_protocol
       end
-    end
 
-    module ClassMethods
-      def add_config(name)
+      module ClassMethods
+        def alias_config(new_name, old_name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def self.#{name}(value=nil)
-              @#{name} = value if value
-              return @#{name} if self.object_id == #{self.object_id} || defined?(@#{name})
-              name = superclass.#{name}
-              return nil if name.nil? && !instance_variable_defined?("@#{name}")
-              @#{name} = name && !name.is_a?(Module) && !name.is_a?(Symbol) && !name.is_a?(Numeric) && !name.is_a?(TrueClass) && !name.is_a?(FalseClass) ? name.dup : name
-            end
+          def self.#{new_name}(value=nil)
+            self.#{old_name}(value)
+          end
 
-            def self.#{name}=(value)
-              @#{name} = value
-            end
+          def self.#{new_name}=(value)
+            self.#{old_name}=(value)
+          end
 
-            def #{name}
-              value = self.class.#{name}
-              value.instance_of?(Proc) ? value.call : value
-            end
+          def #{new_name}
+          #{old_name}
+          end
           RUBY
         end
+      end
     end
   end
 end

data/lib/carrierwave/storage/qiniu.rb

@@ -13,14 +13,17 @@ module CarrierWave
           @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_protocol      = options[:qiniu_protocol] || options[:qiniu_protocal] || "http"
           @qiniu_async_ops     = options[:qiniu_async_ops] || ''
+          @qiniu_can_overwrite = options[:qiniu_can_overwrite] || false
           init
         end
 
         def store(file, key)
+          qiniu_upload_scope = @qiniu_bucket
+          qiniu_upload_scope = @qiniu_bucket + ':' + key if @qiniu_can_overwrite
           token_opts = {
-            :scope => @qiniu_bucket, :expires_in => 3600 # https://github.com/qiniu/ruby-sdk/pull/15
+            :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
 
@@ -49,7 +52,7 @@ module CarrierWave
 
         def get_public_url(key)
           if @qiniu_bucket_domain and @qiniu_bucket_domain.size > 0
-            "#{@qiniu_protocal}://#{@qiniu_bucket_domain}/#{key}"
+            "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{key}"
           else
             res = ::Qiniu::RS.get(@qiniu_bucket, key)
             if res
@@ -93,7 +96,7 @@ module CarrierWave
 
         def url
           if @uploader.qiniu_bucket_domain and @uploader.qiniu_bucket_domain.size > 0
-            "#{@uploader.qiniu_protocal || 'http'}://#{@uploader.qiniu_bucket_domain}/#{@path}"
+            "#{@uploader.qiniu_protocol || 'http'}://#{@uploader.qiniu_bucket_domain}/#{@path}"
           else
             qiniu_connection.get_public_url(@path)
           end
@@ -119,7 +122,7 @@ module CarrierWave
               :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_protocol      => @uploader.qiniu_protocol
             }
 
             if @uploader.respond_to?(:qiniu_async_ops) and !@uploader.qiniu_async_ops.nil? and @uploader.qiniu_async_ops.size > 0
@@ -130,6 +133,14 @@ module CarrierWave
               end
             end
 
+            if @uploader.respond_to?(:qiniu_can_overwrite) and !@uploader.qiniu_can_overwrite.nil?
+              if @uploader.qiniu_can_overwrite.is_a?(TrueClass) or @uploader.is_a?(FalseClass)
+                config.merge!(:qiniu_can_overwrite => @uploader.qiniu_can_overwrite)
+              else
+                config.merge!(:qiniu_can_overwrite => false)
+              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.8"
+    VERSION = "0.0.9"
   end
 end

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ ActiveRecord::Migration.verbose = false
   config.qiniu_bucket        = "spec-test"
   config.qiniu_bucket_domain = "spec-test.qiniudn.com"
   config.qiniu_block_size    = 4*1024*1024
-  config.qiniu_protocal      = "http"
+  config.qiniu_protocol      = "http"
 end
 
 def load_file(fname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
-- huobazi
+- Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -59,7 +59,8 @@ files:
 - spec/spec_helper.rb
 - spec/upload_spec.rb
 homepage: https://github.com/huobazi/carrierwave-qiniu
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Qiniu Storage support for CarrierWave