upyun-rb 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c996a66c6930c4daa33dbb9ec0ea018a4206de9e
-  data.tar.gz: b4a07ad4c4e4f78a5050701728071009c186006c
+  metadata.gz: 2635ae3a9f18e342a3e09ab3d30064733b359c78
+  data.tar.gz: 355c81c11444068839fde3a601b59c1bf3813c10
 SHA512:
-  metadata.gz: 56358ab06793ce64e67bd7dc130e4e4f6d5e01eef000d70a9d1870944eb1bb3aaf94d5ed10091bb8ab7584a1dd975fd0b6477744f8179602bd90fbe26df8ecc3
-  data.tar.gz: 4692f1f31c41763e6bac355d9dda7687b1db208da5577c9d85b9dc3c96d43b90c2fd5e0ed8a4321903b3c486bbc18d4a8d1c6a555b2650cff56ea03ed198575c
+  metadata.gz: 365393dda78bdb64b91294b64908cdc0b78d7c6c27df6334cc85df1eef65e5f88022bd1cd65b460f29e0f0fb1413e483ccf71092d91414645010f1a0d78447c7
+  data.tar.gz: 4563c501c4619052e1d1f4cb6885ead158d5d935258dd229edd8bafa913a117cafb2642044d804133a48da04817cdd8608bf15f8986341d72ce0316e10056f31

data/lib/upyun-rb/bucket.rb

@@ -3,14 +3,19 @@ module Upyun
     def initialize(bucket, operator, password, options={})
       upyun_host = options[:upyun_host] || "http://v0.api.upyun.com"
 
+      pool    = options[:pool] || 2
+      timeout = options[:timeout] || 10
+
       @bucket = bucket
       @operator = operator
       @signed_password = Digest::MD5.hexdigest(password)
 
-      @connection = Faraday.new(:url => upyun_host) do |faraday|
-        faraday.request  :url_encoded             # form-encode POST params
-        faraday.response :logger                  # log requests to STDOUT
-        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      @pool = ConnectionPool.new(size: pool, timeout: timeout) do
+        Faraday.new(:url => upyun_host) do |faraday|
+          faraday.request  :url_encoded             # form-encode POST params
+          faraday.response :logger                  # log requests to STDOUT
+          faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+        end
       end
     end
 
@@ -19,11 +24,13 @@ module Upyun
       date = Upyun::Util.current_date
       sign = Digest::MD5.hexdigest("HEAD&#{uri}&#{date}&0&#{@signed_password}")
 
-      @connection.head do |req|
-        req.url uri
-        req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
-        req.headers['Date'] = date
-        req.headers['Expect'] = ''
+      @pool.with do |conn|
+        conn.head do |req|
+          req.url uri
+          req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
+          req.headers['Date'] = date
+          req.headers['Expect'] = ''
+        end
       end
     end
 
@@ -31,18 +38,20 @@ module Upyun
       uri = "/#{@bucket}/#{path}"
       date = Upyun::Util.current_date
       mime_type = `file -b --mime #{file}`.gsub(/\n/,"").split(';')[0]
-      file_size = file.nil? ? 0 : File.size(file) 
+      file_size = file.nil? ? 0 : File.size(file)
       sign = Digest::MD5.hexdigest("PUT&#{uri}&#{date}&#{file_size}&#{@signed_password}")
 
-      @connection.put do |req|
-        req.url uri
-        req.body = Faraday::UploadIO.new(file, mime_type)
-        req.headers['Mkdir'] = 'true'
-        req.headers['Content-Type'] = mime_type
-        req.headers['Content-Length'] = file_size.to_s
-        req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
-        req.headers['Date'] = date
-        req.headers['Expect'] = ''
+      @pool.with do |conn|
+        conn.put do |req|
+          req.url uri
+          req.body = Faraday::UploadIO.new(file, mime_type)
+          req.headers['Mkdir'] = 'true'
+          req.headers['Content-Type'] = mime_type
+          req.headers['Content-Length'] = file_size.to_s
+          req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
+          req.headers['Date'] = date
+          req.headers['Expect'] = ''
+        end
       end
     end
 
@@ -50,12 +59,14 @@ module Upyun
       uri = "/#{@bucket}/#{path}"
       date = Upyun::Util.current_date
       sign = Digest::MD5.hexdigest("DELETE&#{uri}&#{date}&0&#{@signed_password}")
-      
-      @connection.delete do |req|
-        req.url uri
-        req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
-        req.headers['Date'] = date
-        req.headers['Expect'] = ''
+
+      @pool.with do |conn|
+        conn.delete do |req|
+          req.url uri
+          req.headers['Authorization'] = "UpYun #{@operator}:#{sign}"
+          req.headers['Date'] = date
+          req.headers['Expect'] = ''
+        end
       end
     end
   end

data/lib/upyun-rb/version.rb

@@ -1,3 +1,3 @@
 module Upyun
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: upyun-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement