fix typo protocal => protocol

Author: dorentus

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
 ```
 

lib/carrierwave/qiniu/configuration.rb

@@ -10,6 +10,7 @@ module Configuration
         add_config :qiniu_access_key
         add_config :qiniu_secret_key
         add_config :qiniu_block_size
+        add_config :qiniu_protocol
         add_config :qiniu_protocal
       end
     end

lib/carrierwave/storage/qiniu.rb

@@ -13,7 +13,7 @@ def initialize(options={})
           @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] || ''
           init
         end
@@ -49,7 +49,7 @@ def delete(key)
 
         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 +93,7 @@ def path
 
         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 +119,7 @@ def qiniu_connection
               :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

spec/spec_helper.rb

@@ -30,7 +30,7 @@ def root
   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)