fastdfs-client 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4dd420f881d1186e7f715d17e9046a6664175b
-  data.tar.gz: 88c89c5e2965f5d734557f09965da923ae71def2
+  metadata.gz: 564b4fc72139a1d9bc1faeba24ecf21394bf9e4b
+  data.tar.gz: ef2717e16860af59cfaeccc0b99d1ad0284d1972
 SHA512:
-  metadata.gz: 957b8d370b27114586c4e1c1caf67c3736c987a5dd86f460fcc61d5a7b8431c56c844285f3cd88865318e9df5e05f0eaa55bfca9bd3d79c7c242d8e7e7afb9c8
-  data.tar.gz: e7ef416611d1967bf72db8d292d29574ee6b60e4347968426a85380a3ccf28c509cb9794643acf7f6f01b8b31d2cb8923eff8f8d30d9732a00939eda671a1fcd
+  metadata.gz: afec497233fb8ecc7736dff565ea90db045376381d012cbede8f7f47e69f156410ab0fb87e017085066f03e55be2b049b41304fb105e6efd48dfc78745157a15
+  data.tar.gz: fc7979eb1bf964b0bc5ee5942535f264d4518453191ab76d9eecb73e7b56cafcbb508e464be17ad55337cb1cd5bd7391c3ac8ace7120d998c3ca08d23bf827a0

data/fastdfs-client.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec", "~> 3.4.0"
-  spec.add_development_dependency "debugger", "~> 1.6.8"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "debugger", "~> 1.6"
 
 end

data/lib/fastdfs-client/client_proxy.rb

@@ -1,28 +1,33 @@
+require 'monitor'
+
 module Fastdfs
   module Client
 
     class ClientProxy
-      attr_accessor :data, :header, :content, :socket
+      include MonitorMixin
 
-      def initialize(cmd, socket, content_len, header = [])
-        @cmd = cmd
-        socket.connection
-        @socket = socket
-        @header = ProtoCommon.header_bytes(cmd, content_len) + header
-        @content = []
-      end
+      attr_accessor :host, :port, :socket
 
-      def push_content
-        raise "argument not block!" unless block_given?
-        @content << yield
+      def initialize(host, port, options = {})
+        super()
+        options ||= {}
+        @host = host
+        @port = port
+        
+        @socket = Socket.new(host, port, options[:socket])
       end
 
-      def dispose(&block)
-        @socket.write(@cmd, @header)
-        @content.each do |c|
-          @socket.write(@cmd, c)
+      def dispose(cmd, content_len, header = [], content = [], &block)
+        synchronize do
+          @socket.connection do 
+            full_header = ProtoCommon.header_bytes(cmd, content_len) + header
+            @socket.write(cmd, full_header)
+            Array(@content).each do |c|
+              @socket.write(cmd, c)
+            end
+            @socket.receive &block
+          end
         end
-        @socket.receive &block
       ensure
         @socket.close
       end

data/lib/fastdfs-client/socket.rb

@@ -29,12 +29,13 @@ module Fastdfs
         @socket.close if connected
       end
 
-      def connection
+      def connection(&block)
         if @socket.nil? || !connected
           @socket = Timeout.timeout(@connection_timeout) do
             TCPSocket.new(@host, @port)  
           end
         end
+        yield if block_given?
       end
 
       def connected
@@ -58,7 +59,7 @@ module Fastdfs
       def parseHeader
         err_msg = nil
         err_msg = "recv package size #{@header} is not equal #{@header_len}, cmd: #{@cmd}" unless @header.length == @header_len || err_msg
-        err_msg = "recv cmd: #{@header[8]} is not correct, expect cmd: #{CMD::RESP_CODE}, cmd: #{@cmd}" unless @header[8] == CMD::RESP_CODE || err_msg
+        err_msg = "recv cmd: #{@header[8]} is not correct, expect recv code: #{CMD::RESP_CODE}, cmd: #{@cmd}" unless @header[8] == CMD::RESP_CODE || err_msg
         err_msg = "recv erron #{@header[9]}, 0 is correct cmd: #{@cmd}" unless @header[9] == 0 || err_msg
         {status: err_msg.nil?, err_msg: err_msg}
       end

data/lib/fastdfs-client/storage.rb

@@ -4,14 +4,14 @@ module Fastdfs
   module Client
 
     class Storage
-      attr_accessor :host, :port, :group_name, :store_path, :socket, :options
+      attr_accessor :group_name, :store_path, :proxy, :options, :socket
 
       def initialize(host, port, store_path = nil, options = {})
-        @host = host
-        @port = port
         @options = options || {}
         @options = store_path if store_path.is_a?(Hash)
-        @socket = Socket.new(host, port, @options[:socket])
+
+        @proxy = ClientProxy.new(host, port, @options[:socket])
+        @socket = @proxy.socket
         @extname_len = ProtoCommon::EXTNAME_LEN
         @size_len = ProtoCommon::SIZE_LEN        
         @store_path = store_path || 0
@@ -22,9 +22,7 @@ module Fastdfs
         size_byte = ([@store_path] + Utils.number_to_buffer(file.size)).full_fill(0, @size_len)
         content_len = (@size_len + @extname_len + file.size)
 
-        client = ClientProxy.new(CMD::UPLOAD_FILE, @socket, content_len, size_byte + ext_name_bs)
-        client.push_content{ IO.read(file) }
-        client.dispose do |body|
+        @proxy.dispose(CMD::UPLOAD_FILE, content_len, size_byte + ext_name_bs, 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]}
@@ -35,14 +33,12 @@ module Fastdfs
 
       def delete(path, group_name = nil)
         path_bytes = group_path_bytes(path, group_name).flatten
-        client = ClientProxy.new(CMD::DELETE_FILE, @socket, path_bytes.length, path_bytes)
-        client.dispose
+        @proxy.dispose(CMD::DELETE_FILE, path_bytes.length, path_bytes)
       end
 
       def get_metadata(path, group_name = nil)
         path_bytes = group_path_bytes(path, group_name).flatten
-        client = ClientProxy.new(CMD::GET_METADATA, @socket, path_bytes.length, path_bytes)
-        client.dispose do |body|
+        @proxy.dispose(CMD::GET_METADATA, path_bytes.length, path_bytes) do |body|
           res = body.split(ProtoCommon::RECORD_SEPERATOR).map do |c| 
             c.split(ProtoCommon::FILE_SEPERATOR) 
           end.flatten
@@ -51,15 +47,8 @@ module Fastdfs
       end
 
       def set_metadata(path, group_name = nil, options = {}, flag = :cover)
-        unless options.is_a?(Hash)
-          flag = options
-          options = {}
-        end
-
-        if group_name.is_a?(Hash)
-          options = group_name
-          group_name = nil
-        end
+        flag, options = options, {} unless options.is_a?(Hash)
+        options, group_name = group_name, nil if group_name.is_a?(Hash)
         _set_metadata(path, group_name, options, flag)
       end
 
@@ -67,8 +56,7 @@ module Fastdfs
         path_bytes = group_path_bytes(path, group_name).flatten
         download_bytes = Utils.number_to_buffer(0) + Utils.number_to_buffer(0)
         data = download_bytes + path_bytes
-        client = ClientProxy.new(CMD::DOWNLOAD_FILE, @socket, data.length, data)
-        client.dispose do |body|
+        @proxy.dispose(CMD::DOWNLOAD_FILE, data.length, data) do |body|
           create_tempfile(path, body) if body
         end
       end
@@ -103,9 +91,7 @@ module Fastdfs
         size_bytes = (size_bytes).full_fill(0, 16)
         total = size_bytes.length + flag.length + group_bytes.length + path_bytes.length + meta_bytes.length
 
-        client = ClientProxy.new(CMD::SET_METADATA, @socket, total, (size_bytes + flag.bytes + group_bytes + path_bytes))
-        client.push_content{ meta_bytes }
-        client.dispose
+        @proxy.dispose(CMD::SET_METADATA, total, (size_bytes + flag.bytes + group_bytes + path_bytes), meta_bytes)
       end
 
       def convert_meta_flag(flag)

data/lib/fastdfs-client/tracker.rb

@@ -5,17 +5,17 @@ module Fastdfs
 
     class Tracker
 
-      attr_accessor :socket, :cmd, :options
+      attr_accessor :socket, :cmd, :options, :socket
 
       def initialize(host, port, options = {})
         @options = options
-        @socket = Socket.new(host, port, @options[:socket])
+        @proxy = ClientProxy.new(host, port, @options[:socket])
+        @socket = @proxy.socket
         @cmd = CMD::STORE_WITHOUT_GROUP_ONE
       end
 
       def get_storage
-        client = ClientProxy.new(@cmd, @socket, 0)
-        res = client.dispose do |body|
+        res = @proxy.dispose(@cmd, 0) 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]

data/lib/fastdfs-client/version.rb

@@ -1,5 +1,5 @@
 module Fastdfs
   module Client
-    VERSION = '1.0.2'
+    VERSION = '1.2.0'
   end
 end

data/spec/mock_tcp_socket.rb

@@ -13,9 +13,9 @@ class MockTCPSocket
   end
 
   def write(*args)
+    sleep(0..7)
     pkg = args[0].unpack("C*")
-    @cmd ||= pkg[8] 
-    sleep(2)
+    @cmd ||= pkg[8]
   end
 
   def recv(len)

data/spec/tracker_spec.rb

@@ -13,7 +13,7 @@ describe Fastdfs::Client::Tracker do
   end
 
   it "should have access to the storage connection" do
-    expect(tracker.socket).to receive(:connection)
+    expect(tracker.socket).to receive(:connection).and_return({})
     expect(tracker.socket).to receive(:close)
     tracker.get_storage
   end
@@ -23,9 +23,9 @@ describe Fastdfs::Client::Tracker do
   end
 
   it "verify the server address and port" do 
-    expect(tracker.get_storage.host).to eq(TestConfig::STORAGE_IP)
+    expect(tracker.get_storage.socket.host).to eq(TestConfig::STORAGE_IP)
     #[0, 0, 0, 0, 0, 89, 216, 0]
-    expect(tracker.get_storage.port.to_s).to eq(TestConfig::STORAGE_PORT)
+    expect(tracker.get_storage.socket.port.to_s).to eq(TestConfig::STORAGE_PORT)
     expect(tracker.get_storage.store_path).to eq(TestConfig::STORE_PATH)
   end
 
@@ -37,13 +37,20 @@ describe Fastdfs::Client::Tracker do
   end
 
   it "run server flow" do 
-    1.times.map do
-      tracker.get_storage
+    items = 5.times.map do
+      Thread.new do 
+        storage = tracker.get_storage
+        results = storage.upload(File.open(File.expand_path("../page.png", __FILE__)))[:result]
+        puts results
+        puts storage.delete(results[:path], results[:group_name])
+      end
     end
 
+    items.each{|item|  item.join }
+
     # storage = tracker.get_storage
     # puts "#{storage.host}, #{storage.port}"
-    # results = storage.upload(File.open("/Users/huxinghai/Documents/shark/app/assets/images/page.png"))
+    # results = storage.upload(File.open("page.png"))
     # puts results
     # puts storage.delete(results[:path], results[:group_name])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ka Ka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.6'
 description: fastdfs upload file client for ruby
 email:
 - huxinghai1988@gmail.com
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -73,7 +74,9 @@ files:
 - lib/fastdfs-client/tracker.rb
 - lib/fastdfs-client/utils.rb
 - lib/fastdfs-client/version.rb
+- spec/.DS_Store
 - spec/mock_tcp_socket.rb
+- spec/page.png
 - spec/spec_helper.rb
 - spec/storage_spec.rb
 - spec/test_config.rb
@@ -103,7 +106,9 @@ signing_key:
 specification_version: 4
 summary: fastdfs upload file client for ruby
 test_files:
+- spec/.DS_Store
 - spec/mock_tcp_socket.rb
+- spec/page.png
 - spec/spec_helper.rb
 - spec/storage_spec.rb
 - spec/test_config.rb