fastdfs-client 1.4.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3763177868ef0c85ae82bcd8799ef7151abd6125
-  data.tar.gz: f2be6ac0bd9c5cc03e61a24e78304a06dd974cf8
+  metadata.gz: ba4443192b50ffc2e07f6173e31d58ec42b33531
+  data.tar.gz: 53f3b35f8742cbfebfdd1092938f53714ef834c8
 SHA512:
-  metadata.gz: c7ba9d398ab6a11e7462eb2b26f1282689fc879ac1d71ee69dc2b15f19f0b4271036637139f924cca74781c361c2a33b62a6e09ccc15ca3d3720b969618b889f
-  data.tar.gz: 1a14a43c0e7f1e3c7739066f412ae7e206f79a7627e456baa01dbdc0f175f6f7ff80f3f455d75733396f69ef884ea0b08160501a497003c761a2b04309867b6c
+  metadata.gz: 03f0b6d523e8596f9c455fea0517897201b23755d7ab7ab871e0c98328820db4366f72fc73e3a732047496421f6f7bd89ef45317109846451289a7292532bed1
+  data.tar.gz: 0eb796a19af1869c3b17785f16474ef521139fa35018f348cb6f7a3c0d5a07484899a2ee03dd53d4b64566356b6645f3e210cdc55ec5a0a29c6c52e76eeedf20

data/.gitignore

@@ -1,3 +1,5 @@
 *.gem
 Gemfile.lock
-tmp
+tmp
+.ruby-version
+.byebug_history

data/README.md

@@ -17,26 +17,49 @@ fastdfs client for ruby
   #
 
 
-  tracker = Fastdfs::Client::Tracker.new("192.168.1.1", "22122")
+  tracker = Fastdfs::Client::Tracker.new(trackers: {host: "192.168.1.1", port: "22122"})
+
+  # multiple trackers server
+  # trackers: [
+  #  {host: "192.168.1.1", port: "22122"},
+  #  {host: "192.168.1.2", port: "22122"}
+  # ]
+
+  # socket connection KEEPALIVE
+  tracker.pipeline do |s| 
+    files.each do |file|
+      s.upload(s)
+    end
+  end
 
-  @storage = tracker.get_storage
+  # @file class includes [File, Tempfile, ActionDispatch::Http::UploadedFile]
+  @tracker.upload(@file)
+  #result: {group_name: "group1", path: "m1/xfsd/fds.jpg"}
 
-  if @storage.is_a?(Fastdfs::Client::Storage)
+  @tracker.delete(path, group_name)  
 
-    @storage.upload(@file)
-    # @file class includes [File, Tempfile, ActionDispatch::Http::UploadedFile]
-    #result: {group_name: "group1", path: "m1/xfsd/fds.jpg"}
+  # flag params [cover, merge]
+  @tracker.set_metadata(path, group_name, {author: "kaka", width: "300"}, flag)
 
-    @storage.delete(path, group_name)  
+  @tracker.get_metadata(path, group_name) 
+  #result: {author: "kaka", width: "300"}
 
-    # flag params [cover, merge]
-    @storage.set_metadata(path, group_name, {author: "kaka", width: "300"}, flag)
+  @tracker.download(path, group_name) 
+  #result: #<Tempfile:/var/folders/m7/bt2j0rk54x555t44dpn4b7bm0000gn/T/test.jpg20160416-43738-1560vq3>  
 
-    @storage.get_metadata(path, group_name) 
-    #result: {author: "kaka", width: "300"}
 
-    @storage.download(path, group_name) 
-    #result: #<Tempfile:/var/folders/m7/bt2j0rk54x555t44dpn4b7bm0000gn/T/test.jpg20160416-43738-1560vq3>  
-  end
+  # Make compatible 1.x version
+  
+  @storage = tracker.get_storage
+  
+  @storage.upload ...
+  @storage.delete ...
+  @storage.set_metadata ...
+  @storage.get_metadata ...
+  @storage.download ...
+
+```
+
+### License
 
-```
+[MIT License](https://opensource.org/licenses/MIT)

data/fastdfs-client.gemspec

@@ -21,6 +21,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "debugger", "~> 1.6"
 
+  if RUBY_VERSION.start_with?('2.2')
+    # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+    spec.add_development_dependency "byebug", "~> 9.1.0"
+  else
+    # Call 'debugger' anywhere in the code to stop execution and get a debugger console
+    spec.add_development_dependency "debugger", "~> 1.6"
+  end
 end

data/lib/fastdfs-client.rb

@@ -1,8 +1,9 @@
+require 'fastdfs-client/version'
 require "fastdfs-client/extend_core"
+require 'fastdfs-client/delegation'
 require 'fastdfs-client/socket'
 require 'fastdfs-client/client_proxy'
 require 'fastdfs-client/cmd'
 require 'fastdfs-client/proto_common'
 require 'fastdfs-client/utils'
-require "fastdfs-client/tracker"
-
+require "fastdfs-client/tracker"

data/lib/fastdfs-client/client_proxy.rb

@@ -6,34 +6,44 @@ module Fastdfs
     class ClientProxy
       include MonitorMixin
 
-      attr_accessor :host, :port, :socket
+      attr_accessor :host, :port, :socket, :alive
 
       def initialize(host, port, options = {})
         super()
         options ||= {}
-        @host = host
-        @port = port
+        @host, @port = host, port
+        @alive = options.delete(:alive) || false
         
-        @socket = Socket.new(host, port, options[:socket])
+        @socket = Socket.new(host, port, options)
       end
 
       def dispose(cmd, header = [], content = [], &block)
         synchronize do
           @socket.connection do
-            contents = Array(content)
-            body_len = contents.map{|c| c.bytes.size }.inject(header.length){|sum, x| sum + x }
-            full_header = ProtoCommon.header_bytes(cmd, body_len).concat(header)
-            @socket.write(cmd, full_header)
-            contents.each do |c|
-              @socket.write(cmd, c)
+            begin
+              contents = Array(content)
+              body_len = contents.map{|c| c.bytes.size }.inject(header.length){|sum, x| sum + x }
+              full_header = ProtoCommon.header_bytes(cmd, body_len).concat(header)
+              @socket.socket.reload_data if Fastdfs::Client.mock_test && @socket.socket.respond_to?(:reload_data)
+              @socket.write(cmd, full_header)
+              contents.each do |c|
+                @socket.write(cmd, c)
+              end
+              @socket.receive &block  
+            rescue Exception => e
+              close
+              @socket.response_obj.update(status: false, err_msg: e.message)              
             end
-            @socket.receive &block
-          end
+            
+          end            
         end
       ensure
+        close unless @alive   
+      end
+      
+      def close
         @socket.close
       end
     end
-
   end
 end

data/lib/fastdfs-client/delegation.rb

@@ -0,0 +1,24 @@
+module Fastdfs
+  module Client
+
+    module Delegation
+      module ClassMethods
+        
+        def delegate(*methods, to:)
+          methods.each do |m|
+            class_eval <<-EVAL, __FILE__, __LINE__ + 1
+              def #{m}(*args, &block)
+                #{to}.#{m}(*args, &block)
+              end
+            EVAL
+          end
+        end
+      end
+      
+      def self.included(receiver)
+        receiver.extend ClassMethods
+      end
+    end
+
+  end
+end

data/lib/fastdfs-client/socket.rb

@@ -9,12 +9,12 @@ module Fastdfs
     class Socket
       attr_accessor :socket, :host, :port
 
-      def initialize(host, port, options = {})
+      def initialize(host, port, options)
         @host, @port = host, port
         @header_len = ProtoCommon::HEAD_LEN
         @options = options || {}
-        @connection_timeout = @options[:connection_timeout] || 3
-        @recv_timeout = @options[:recv_timeout] || 20
+        @connection_timeout = @options[:connection_timeout]
+        @recv_timeout = @options[:recv_timeout]
       end
 
       def write(*args)
@@ -39,7 +39,7 @@ module Fastdfs
       end
 
       def connected
-        !@socket.closed?
+        @socket.nil? ? false : !@socket.closed?
       end
 
       def receive(&block)
@@ -55,13 +55,18 @@ module Fastdfs
         res_header
       end
 
+      def response_obj
+        Hash[status: true, err_msg: nil, result: nil]
+      end
+
       private
       def parseHeader
-        err_msg = nil
-        err_msg = "recv package size #{@header} is not equal #{@header_len}, cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header.length == @header_len || err_msg
-        err_msg = "recv cmd: #{@header[8]} is not correct, expect recv code: #{CMD::RESP_CODE}, cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header[8] == CMD::RESP_CODE || err_msg
-        err_msg = "recv erron #{@header[9]}, 0 is correct cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header[9] == 0 || err_msg
-        {status: err_msg.nil?, err_msg: err_msg}
+        obj = response_obj
+        obj[:err_msg] = "recv package size #{@header} is not equal #{@header_len}, cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header.length == @header_len || obj[:err_msg]
+        obj[:err_msg] = "recv cmd: #{@header[8]} is not correct, expect recv code: #{CMD::RESP_CODE}, cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header[8] == CMD::RESP_CODE || obj[:err_msg]
+        obj[:err_msg] = "recv erron #{@header[9]}, 0 is correct cmd: #{CMD::MAPPING_NAME[@cmd]}" unless @header[9] == 0 || obj[:err_msg]
+        obj[:status] = obj[:err_msg].nil?
+        obj
       end
 
       def timeout_recv

data/lib/fastdfs-client/storage.rb

@@ -4,25 +4,29 @@ module Fastdfs
   module Client
 
     class Storage
-      attr_accessor :proxy, :options, :socket, :store_path
+      attr_accessor :proxy, :socket, :store_path
 
       def initialize(host, port, store_path = nil, options = {})
-        @options = options || {}
-        @options = store_path if store_path.is_a?(Hash)
-
-        @proxy = ClientProxy.new(host, port, @options[:socket])
+        @store_path = 0
+        options = if store_path.is_a?(Hash)
+                    store_path
+                  else
+                    @store_path = store_path
+                    options
+                  end
+
+        @proxy = ClientProxy.new(host, port, options)
         @socket = @proxy.socket
-        @store_path = store_path || 0
       end
 
       def upload(_file, options = {})  
         file, ext_name_bytes = convert_file_info(_file)
         size_byte = [@store_path].concat(file.size.to_eight_buffer).full_fill(0, file_size_len)
-        content_len = file_size_len + extname_len + file.size
 
-        @proxy.dispose(CMD::UPLOAD_FILE, size_byte + ext_name_bytes, IO.read(file)) do |body|
+        byte = size_byte + ext_name_bytes
+
+        @proxy.dispose(CMD::UPLOAD_FILE, byte , IO.read(file)) do |body|
           group_name_max_len = ProtoCommon::GROUP_NAME_MAX_LEN
-          
           res = {group_name: body[0...group_name_max_len].strip, path: body[group_name_max_len..-1]}
           _set_metadata(res[:path], res[:group_name], options) unless options.blank?
           res

data/lib/fastdfs-client/tracker.rb

@@ -5,23 +5,75 @@ module Fastdfs
 
     class Tracker
       
-      attr_accessor :options, :socket
+      include Delegation
+
+      attr_accessor :options
+
+      delegate :upload, :delete, :get_metadata, :set_metadata, :download, to: :get_storage
+
+      def initialize(options = {})
+        @options = default_options_merge(options)
+        @proxies = @options[:trackers].map do |tracker| 
+          opt = tracker.fs_symbolize_keys
+          ClientProxy.new(opt[:host], opt[:port], extract_proxy_options.merge(alive: true)) 
+        end
 
-      def initialize(host, port, options = {})
-        @options = options
-        @proxy = ClientProxy.new(host, port, @options[:socket])
-        @socket = @proxy.socket
       end
 
-      def get_storage
-        res = @proxy.dispose(CMD::STORE_WITHOUT_GROUP_ONE) do |body|
+      def get_storage(alive = false)
+        res = proxy.dispose(CMD::STORE_WITHOUT_GROUP_ONE) do |body|
           storage_ip = body[ProtoCommon::IPADDR].strip
           storage_port = body[ProtoCommon::PORT].unpack("C*").to_pack_long
           store_path = body[ProtoCommon::TRACKER_BODY_LEN-1].unpack("C*")[0]
         
-          Storage.new(storage_ip, storage_port, store_path, @options)
+          Storage.new(storage_ip, storage_port, store_path, extract_proxy_options.merge(alive: alive))
         end
-        res[:status] ? res[:result] : res
+        raise res[:err_msg] unless res[:status]
+        res[:result]
+      end
+
+      def pipeline
+        storage = get_storage(true)
+        yield storage
+        storage
+      ensure
+        storage.proxy.close
+      end
+
+      private 
+      def default_options_merge(options = {})
+        opts = default_options.merge(options)
+        tracker = {host: opts.delete(:host), port: opts.delete(:port)}
+        if !tracker[:host].nil?
+          opts[:trackers] = [tracker]
+        elsif opts[:trackers].is_a?(Hash)
+          opts[:trackers] = [opts[:trackers]]
+        end
+        opts
+      end
+
+      def default_options
+        {
+          host: nil,
+          port: nil,
+          trackers: [
+            {host: "127.0.0.1", port: "22122"}
+          ],
+          connection_timeout: 3,
+          recv_timeout: 20
+        }
+      end
+
+      def extract_proxy_options
+        keys = [:connection_timeout, :recv_timeout]
+        @options.select{|key| keys.include?(key) }
+      end
+
+      def proxy
+        @proxy_index ||= -1
+        @proxy_index += 1
+        @proxy_index = 0 if @proxy_index >= @proxies.length
+        @proxies[@proxy_index]
       end
     end
 

data/lib/fastdfs-client/version.rb

@@ -1,5 +1,10 @@
 module Fastdfs
   module Client
-    VERSION = '1.4.4'
+    VERSION = '2.0.0'
+
+    def self.mock_test
+      false
+    end
+    
   end
 end

data/spec/delegation_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+BLOG_URI = "http://168ta.com"
+
+class Profile
+
+  def messages(limit, offset); [limit, offset] end
+
+  def blog; BLOG_URI end
+
+  def change_email; yield end
+
+end
+
+class User
+  include Fastdfs::Client::Delegation
+
+  delegate :messages, :blog, :change_email, to: :profile
+
+  def profile
+    Profile.new
+  end
+end
+
+describe Fastdfs::Client::Delegation do 
+
+  let(:user){  User.new }
+
+  it "user should be three methods" do 
+    expect(user.respond_to?(:messages)).to be_truthy
+    expect(user.respond_to?(:blog)).to be_truthy
+    expect(user.respond_to?(:change_email)).to be_truthy
+    expect(user.respond_to?(:title)).to be_falsey
+  end
+
+  it "user method receive argments" do 
+    expect(user.messages(25, 0)).to eq([25, 0])
+    expect(user.blog).to eq(BLOG_URI)
+    expect(user.change_email{ "hello" }).to eq("hello")
+  end
+
+  it "argments of the execption" do 
+    begin
+      user.messages(25) 
+    rescue Exception => e
+      expect(e).to be_a_kind_of(ArgumentError)  
+    end
+
+    begin
+      user.change_email     
+    rescue Exception => e
+      expect(e).to be_a_kind_of(LocalJumpError)  
+    end  
+  end
+
+end

data/spec/mock_tcp_socket.rb

@@ -5,18 +5,17 @@ class MockTCPSocket
   attr_accessor :host, :port, :cmd, :recv_offset, :connect_state
 
   def initialize(host, port)
-    @host = host
-    @port = port
-    @recv_offset = 0
-    @connect_state = true
-    @cmd = nil
-    @content = []
-    @header = []
+    @host, @port = host, port
+    reload_data
   end
 
   def connection
-    @content = []
-    @header = []
+    reload_data
+  end
+
+  def reload_data
+    init_options
+    init_data
   end
 
   def write(*args)
@@ -51,69 +50,81 @@ class MockTCPSocket
   end
 
   def close
-    @recv_offset = 0
+    init_options
     @connect_state = false
-    @cmd = nil
   end
 
   def closed?
-    @connect_state
+    !@connect_state
   end
 
   private 
   def gate_tracker(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     header[7] = ProtoCommon::TRACKER_BODY_LEN
 
     group_name = Utils.array_merge([].fill(0, 0...16), TestConfig::GROUP_NAME.bytes)
     ip = Utils.array_merge([].fill(0, 0...15), TestConfig::STORAGE_IP.bytes)
     port = TestConfig::STORAGE_PORT.to_i.to_eight_buffer
     store_path = Array(TestConfig::STORE_PATH)
-
     (header+group_name+ip+port+store_path)[@recv_offset...@recv_offset+len].pack("C*")
   end
 
   def upload_file(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     group_name = Utils.array_merge([].fill(0, 0...16), TestConfig::GROUP_NAME.bytes)
     path = path_replace_extname
     file_path_bytes = path.bytes
     res = (group_name + file_path_bytes)
     header[7] = (header + res).length
-    res = (header + res)
     
+    res = (header + res)
     res[@recv_offset...@recv_offset+len].pack("C*")
   end
 
   def delete_file(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     header.pack("C*")
   end
 
   def get_metadata(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     body = TestConfig::METADATA.map{|a| a.join(ProtoCommon::FILE_SEPERATOR)}.join(ProtoCommon::RECORD_SEPERATOR).bytes
     header[7] = body.length
     (header + body)[@recv_offset...@recv_offset+len].pack("C*")
   end
 
   def set_metadata(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     header.pack("C*")
   end
 
   def download_file(len)
-    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header = init_header_bytes
     body = IO.read(TestConfig::FILE).bytes
     header[7] = body.length
     (header + body)[@recv_offset...@recv_offset+len].pack("C*")
   end
 
-  private 
+  def init_options
+    @recv_offset = 0
+    @connect_state = true
+    @cmd = nil
+  end
+
+  def init_data
+    @content = []
+    @header = []
+  end
+  
   def path_replace_extname
     path = TestConfig::FILE_PATH
     extname = File.extname(path)
     path.gsub!(extname, ".#{@header[19..-1].reject{|i| i.zero? }.pack('C*')}")
     path
   end
+
+  def init_header_bytes
+    ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-require 'debugger'
+if RUBY_VERSION.start_with?('2')
+  require 'byebug'
+else
+  require 'debugger'
+end
 require 'rspec'
 require 'rspec/core'
 require 'rspec/mocks'
@@ -7,6 +11,10 @@ require File.expand_path('../../lib/fastdfs-client', __FILE__)
 require File.expand_path('../test_config', __FILE__)
 require File.expand_path('../mock_tcp_socket', __FILE__)
 
+Fastdfs::Client.class_eval do 
+  def self.mock_test; true end
+end 
+
 FC = Fastdfs::Client
 
 RSpec.configure do |config|
@@ -14,7 +22,7 @@ RSpec.configure do |config|
     TCPSocket.stub(:new) do |h, p|
       MockTCPSocket.new(h, p)
     end
-  end 
+  end
   config.mock_with :rspec do |c|
     c.syntax = [:should, :expect]
   end

data/spec/storage_spec.rb

@@ -2,21 +2,20 @@ require 'spec_helper'
 
 describe Fastdfs::Client::Storage do 
 
-  let(:host){ "192.168.9.16" }
-  let(:port){ "22122" }
+  let(:server){ {host: "192.168.1.168", port: "22122"} }
+  let(:tracker){ FC::Tracker.new(trackers: server) }
 
-  let(:tracker){ FC::Tracker.new(host, port) }
   let(:storage){ tracker.get_storage }
   let(:tempfile) do 
-    file = Tempfile.new([nil, "1.txt"])
+    file = Tempfile.new(["/tmp", "1.txt"])
     file.write("testtest")
     file.close
     file
   end
 
   it "initialize the server" do 
-    expect(FC::Socket).to receive(:new).with(host, port, nil) 
-    FC::Storage.new(host, port) 
+    expect(FC::Socket).to receive(:new).with(server[:host], server[:port], {}) 
+    FC::Storage.new(server[:host], server[:port]) 
   end
 
   it "should have access to the storage connection" do
@@ -79,7 +78,7 @@ describe Fastdfs::Client::Storage do
       expect(storage.set_metadata(TestConfig::FILE_PATH, TestConfig::GROUP_NAME, TestConfig::METADATA)).to be_truthy
     end
 
-    it "download the file to the local" do 
+    it "download the file to the local" do
       res = storage.download(TestConfig::FILE_PATH, TestConfig::GROUP_NAME)
       expect(res[:status]).to be_truthy
       expect(res[:result]).to be_an_instance_of(Tempfile)

data/spec/test_config.rb

@@ -1,9 +1,10 @@
 module TestConfig
-  STORAGE_IP = "192.168.8.23"
+  STORAGE_IP = "192.168.1.168"
   STORAGE_PORT = "23000"
   STORE_PATH = 0
   GROUP_NAME = "group1"
   FILE_PATH = "M00/04/47/wKgIF1cHcQyAeAF7AAACVHeY6n8267.png"
+  SOCKET_DEFAULT_OPTION =  {connection_timeout: 3, recv_timeout: 20}
 
   METADATA = {
     width: "800",

data/spec/tracker_spec.rb

@@ -1,21 +1,12 @@
 require 'spec_helper'
 
 describe Fastdfs::Client::Tracker do 
-
-  let(:host){ "192.168.9.16" }
-  let(:port){ "22122" }
-
-  let(:tracker){ FC::Tracker.new(host, port) }
+  let(:server){ {host: "192.168.1.168", port: "22122"} }
+  let(:tracker){ FC::Tracker.new(trackers: server) }
 
   it "initialize the server" do 
-    expect(FC::Socket).to receive(:new).with(host, port, nil) 
-    FC::Tracker.new(host, port) 
-  end
-
-  it "should have access to the storage connection" do
-    expect(tracker.socket).to receive(:connection).and_return({})
-    expect(tracker.socket).to receive(:close)
-    tracker.get_storage
+    expect(FC::Socket).to receive(:new).with(server[:host], server[:port], TestConfig::SOCKET_DEFAULT_OPTION) 
+    FC::Tracker.new(trackers: server) 
   end
 
   it "should have access to the storage class" do 
@@ -23,17 +14,20 @@ describe Fastdfs::Client::Tracker do
   end
 
   it "verify the server address and port" do 
-    expect(tracker.get_storage.socket.host).to eq(TestConfig::STORAGE_IP)
+    storage = tracker.get_storage
+    expect(storage.proxy.host).to eq(TestConfig::STORAGE_IP)
 
-    expect(tracker.get_storage.socket.port.to_s).to eq(TestConfig::STORAGE_PORT)
-    expect(tracker.get_storage.store_path).to eq(TestConfig::STORE_PATH)
+    expect(storage.proxy.port.to_s).to eq(TestConfig::STORAGE_PORT)
+    expect(storage.store_path).to eq(TestConfig::STORE_PATH)
   end
 
   it "get to the server failed" do 
-    result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
-    MockTCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
-    expect(tracker.get_storage).to be_a_kind_of(Hash)
-    expect(tracker.get_storage[:status]).to be_falsey
+    if tracker.get_storage.socket.is_a?(MockTCPSocket)
+      result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
+      MockTCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
+      expect(tracker.get_storage).to be_a_kind_of(Hash)
+      expect(tracker.get_storage[:status]).to be_falsey
+    end
   end
 
   it "multi thread upload" do 
@@ -48,7 +42,48 @@ describe Fastdfs::Client::Tracker do
       end
     end
 
-    items.map{|item|  item.join }
+    items.map(&:join)
+  end
+
+  it "should be storage methods" do 
+    expect(tracker.respond_to?(:upload)).to be_truthy
+    expect(tracker.respond_to?(:delete)).to be_truthy
+    expect(tracker.respond_to?(:get_metadata)).to be_truthy
+    expect(tracker.respond_to?(:set_metadata)).to be_truthy
+    expect(tracker.respond_to?(:download)).to be_truthy
+  end
+
+  it "storage socket keepalive request" do 
+    storage = tracker.pipeline do |storage|
+      res = storage.upload(File.open(File.expand_path("../page.png", __FILE__)))[:result]
+      expect(storage.socket.connected).to be_truthy
+
+      tmp = storage.set_metadata(res[:path], res[:group_name], TestConfig::METADATA)
+      expect(tmp[:status]).to be_truthy
+      expect(storage.socket.connected).to be_truthy
+
+      tmp = storage.get_metadata(res[:path], res[:group_name])
+      expect(tmp[:status]).to be_truthy
+      expect(storage.socket.connected).to be_truthy
+
+      tmp = storage.download(res[:path], res[:group_name])
+      expect(tmp[:status]).to be_truthy
+      expect(storage.socket.connected).to be_truthy
+    end
+    expect(storage.socket.connected).to be_falsey
   end
 
+  it "multiple trackers server proxy" do 
+    trackers = [server]
+    two_server = {host: "192.168.1.169", port: "22122"}
+    trackers << two_server
+    ts = FC::Tracker.new(trackers: trackers)
+
+    1.upto(6).each do |i|
+      proxy = ts.send(:proxy)
+      res = i % 2 == 0 ?  two_server : server
+      expect({host: proxy.host, port: proxy.port}).to eq(res)
+    end
+  
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Ka Ka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 9.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 9.1.0
 description: fastdfs upload file client for ruby
 email:
 - huxinghai1988@gmail.com
@@ -67,6 +67,7 @@ files:
 - lib/fastdfs-client.rb
 - lib/fastdfs-client/client_proxy.rb
 - lib/fastdfs-client/cmd.rb
+- lib/fastdfs-client/delegation.rb
 - lib/fastdfs-client/extend_core.rb
 - lib/fastdfs-client/proto_common.rb
 - lib/fastdfs-client/socket.rb
@@ -75,6 +76,7 @@ files:
 - lib/fastdfs-client/utils.rb
 - lib/fastdfs-client/version.rb
 - spec/.DS_Store
+- spec/delegation_spec.rb
 - spec/mock_tcp_socket.rb
 - spec/page.png
 - spec/spec_helper.rb
@@ -102,12 +104,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: fastdfs upload file client for ruby
 test_files:
 - spec/.DS_Store
+- spec/delegation_spec.rb
 - spec/mock_tcp_socket.rb
 - spec/page.png
 - spec/spec_helper.rb
@@ -115,4 +118,3 @@ test_files:
 - spec/test_config.rb
 - spec/tracker_spec.rb
 - spec/upload.rb
-has_rdoc: