fastdfs-client 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0b3352eb6ff6a305d8083b19000e950632c6db
-  data.tar.gz: 80788d168fa8726c71cf8da1f9ef325e145da3c1
+  metadata.gz: a8009a29d5b18921a4b3d9f628a9f7eaea019635
+  data.tar.gz: ac88fd2d1e51070637b34496619e750ccda97d57
 SHA512:
-  metadata.gz: 4e4a2a249cd266bcac2fe453f7a0120f53589a006328a355b78475016ec91facb337c4d965164f872bcd188744c09dde55474d82810c26f400eaf57760fc0368
-  data.tar.gz: e555aba138f34c8088a3709e5426426a79bab48fea3edba8b033d89418bf1e2c9c477300ff1caafe5c7815f1ef21b6acc83bdf666fabd965c6799d71647f5b13
+  metadata.gz: 445d9a50ccb21df204e0210cb968610831e137352d94a2c2fc62504c48864af9ef28190f1552b0e38476d91a6621925d7361706616361c9e2da638874c21ea01
+  data.tar.gz: 928522790ed79785a931dd0ac000c5ee977f6f5329a5ff74102522a5da3a26ab3daf9271835fe41867deba809380867445e8b136e554d6cc267885b10305046e

data/README.md

@@ -21,18 +21,21 @@ fastdfs client for ruby
 
   @storage = tracker.get_storage
 
-  @storage.upload(@file)
-  #result: {group_name: "group1", path: "m1/xfsd/fds.jpg"}
+  if @storage.is_a?(Fastdfs::Client::Storage)
 
-  @storage.delete(path, group_name)  
+    @storage.upload(@file)
+    #result: {group_name: "group1", path: "m1/xfsd/fds.jpg"}
 
-  # flag params [cover, merge]
-  @storage.set_metadata(path, group_name, {author: "kaka", width: "300"}, flag)
+    @storage.delete(path, group_name)  
 
-  @storage.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)
 
-  @storage.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
 
 ```

data/lib/fastdfs-client.rb

@@ -4,4 +4,5 @@ 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

@@ -17,12 +17,14 @@ module Fastdfs
         @socket = Socket.new(host, port, options[:socket])
       end
 
-      def dispose(cmd, content_len, header = [], content = [], &block)
+      def dispose(cmd, header = [], content = [], &block)
         synchronize do
-          @socket.connection do 
-            full_header = ProtoCommon.header_bytes(cmd, content_len) + header
+          @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)
-            Array(content).each do |c|
+            contents.each do |c|
               @socket.write(cmd, c)
             end
             @socket.receive &block

data/lib/fastdfs-client/cmd.rb

@@ -9,6 +9,16 @@ module Fastdfs
       GET_METADATA = 15
       SET_METADATA = 13
       DOWNLOAD_FILE = 14
+
+      MAPPING_NAME = {
+        101 => "GET STORAGE",
+        11 => "UPLOAD FILE",
+        101 => "RESP CODE",
+        12 => "DELETE FILE",
+        15 => "GET METADATA",
+        13 => "SET METADATA",
+        14 => "DOWNLOAD FILE"
+      }
     end
 
   end

data/lib/fastdfs-client/extend_core.rb

@@ -1,4 +1,3 @@
-
 class Array
   def to_pack_long
     self.each_with_index.inject(0){|s, item| s = s | (item[0] << (56 - (item[1] * 8))); s }
@@ -9,7 +8,6 @@ class Array
   end
 end
 
-
 class NilClass
   def blank?
     true
@@ -28,6 +26,11 @@ class Object
   end
 end
 
+class Integer
+  def to_eight_buffer
+    8.times.map{|i| (self >> (56 - 8 * i)) & 255}
+  end
+end
 
 class Hash
 

data/lib/fastdfs-client/proto_common.rb

@@ -20,7 +20,7 @@ module Fastdfs
       SET_METADATA_FLAG_MERGE = "M"
 
       def self.header_bytes(cmd, hex_long, erron=0)
-        hex_bytes = Utils.number_to_buffer(hex_long)
+        hex_bytes = hex_long.to_eight_buffer
         header = hex_bytes.fill(0, hex_bytes.length...HEAD_LEN)
         header[8] = cmd
         header[9] = erron

data/lib/fastdfs-client/socket.rb

@@ -7,7 +7,7 @@ module Fastdfs
   module Client
 
     class Socket
-      attr_accessor :header, :content, :header_len, :cmd, :socket, :host, :port
+      attr_accessor :socket, :host, :port
 
       def initialize(host, port, options = {})
         @host, @port = host, port
@@ -19,7 +19,6 @@ module Fastdfs
       end
 
       def write(*args)
-        debugger if args[1] == 119
         @cmd = args.shift
         pkg = args.shift
 
@@ -60,9 +59,9 @@ module Fastdfs
       private
       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 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
+        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}
       end
 

data/lib/fastdfs-client/storage.rb

@@ -4,7 +4,7 @@ module Fastdfs
   module Client
 
     class Storage
-      attr_accessor :group_name, :store_path, :proxy, :options, :socket
+      attr_accessor :proxy, :options, :socket, :store_path
 
       def initialize(host, port, store_path = nil, options = {})
         @options = options || {}
@@ -12,17 +12,15 @@ module Fastdfs
 
         @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
       end
 
-      def upload(file, options = {})  
-        ext_name_bs = File.extname(file)[1..@extname_len].to_s.bytes.full_fill(0, @extname_len)
-        size_byte = ([@store_path] + Utils.number_to_buffer(file.size)).full_fill(0, @size_len)
-        content_len = (@size_len + @extname_len + file.size)
+      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, content_len, size_byte + ext_name_bs, IO.read(file)) do |body|
+        @proxy.dispose(CMD::UPLOAD_FILE, size_byte + ext_name_bytes, 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]}
@@ -32,13 +30,13 @@ module Fastdfs
       end
 
       def delete(path, group_name = nil)
-        path_bytes = group_path_bytes(path, group_name).flatten
-        @proxy.dispose(CMD::DELETE_FILE, path_bytes.length, path_bytes)
+        header_bytes = group_path_bytes(path, group_name).flatten
+        @proxy.dispose(CMD::DELETE_FILE, header_bytes)
       end
 
       def get_metadata(path, group_name = nil)
-        path_bytes = group_path_bytes(path, group_name).flatten
-        @proxy.dispose(CMD::GET_METADATA, path_bytes.length, path_bytes) do |body|
+        header_bytes = group_path_bytes(path, group_name).flatten
+        @proxy.dispose(CMD::GET_METADATA, header_bytes) do |body|
           res = body.split(ProtoCommon::RECORD_SEPERATOR).map do |c| 
             c.split(ProtoCommon::FILE_SEPERATOR) 
           end.flatten
@@ -54,9 +52,8 @@ module Fastdfs
 
       def download(path, group_name = nil)
         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
-        @proxy.dispose(CMD::DOWNLOAD_FILE, data.length, data) do |body|
+        header_bytes = 0.to_eight_buffer.concat(0.to_eight_buffer).concat(path_bytes)
+        @proxy.dispose(CMD::DOWNLOAD_FILE, header_bytes) do |body|
           create_tempfile(path, body) if body
         end
       end
@@ -87,10 +84,9 @@ module Fastdfs
         group_bytes, path_bytes = group_path_bytes(path, group_name)
         meta_bytes = meta_to_bytes(options)
 
-        size_bytes = Utils.number_to_buffer(path_bytes.length) + Utils.number_to_buffer(meta_bytes.length)
-        size_bytes = (size_bytes).full_fill(0, 16)
-        total = size_bytes.length + flag.length + group_bytes.length + path_bytes.length + meta_bytes.length
-        @proxy.dispose(CMD::SET_METADATA, total, (size_bytes + flag.bytes + group_bytes + path_bytes), meta_bytes.pack("C*"))
+        size_bytes = path_bytes.length.to_eight_buffer.concat(meta_bytes.length.to_eight_buffer).full_fill(0, 16)
+        # total = size_bytes.length + flag.length + group_bytes.length + path_bytes.length + meta_bytes.length
+        @proxy.dispose(CMD::SET_METADATA, (size_bytes + flag.bytes + group_bytes + path_bytes), meta_bytes.pack("C*"))
       end
 
       def convert_meta_flag(flag)
@@ -117,7 +113,21 @@ module Fastdfs
         tmp.close
         tmp
       end
-      
+
+      def extname_len; ProtoCommon::EXTNAME_LEN end;
+      def file_size_len; ProtoCommon::SIZE_LEN end;
+
+      def convert_file_info(file)
+        if file.class.name == "ActionDispatch::Http::UploadedFile"
+          return file.tempfile, convert_extname_bytes(file.original_filename)
+        else
+          return file, convert_extname_bytes(file.path)
+        end
+      end
+
+      def convert_extname_bytes(file_name)
+        File.extname(file_name)[1..extname_len].to_s.bytes.full_fill(0, extname_len)
+      end
     end
 
   end

data/lib/fastdfs-client/tracker.rb

@@ -4,8 +4,8 @@ module Fastdfs
   module Client
 
     class Tracker
-
-      attr_accessor :socket, :cmd, :options, :socket
+      
+      attr_accessor :options, :socket
 
       def initialize(host, port, options = {})
         @options = options
@@ -15,7 +15,7 @@ module Fastdfs
       end
 
       def get_storage
-        res = @proxy.dispose(@cmd, 0) do |body|
+        res = @proxy.dispose(@cmd) 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/utils.rb

@@ -1,9 +1,5 @@
 module Utils
 
-  def self.number_to_buffer(num)
-    8.times.map{|i| (num >> (56 - 8 * i)) & 255}
-  end
-
   def self.array_merge(arr1, arr2)
     raise "argument must be array" unless arr1.is_a?(Array) || arr2.is_a?(Array)
     arr2.each_with_index.map{|v, i| arr1[i] = v }

data/lib/fastdfs-client/version.rb

@@ -1,5 +1,5 @@
 module Fastdfs
   module Client
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

data/spec/mock_tcp_socket.rb

@@ -10,16 +10,28 @@ class MockTCPSocket
     @recv_offset = 0
     @connect_state = true
     @cmd = nil
+    @content = []
+    @header = []
+  end
+
+  def connection
+    @content = []
+    @header = []
   end
 
   def write(*args)
     pkg = args[0].unpack("C*")
+    if @header.length <= 0
+      @header = pkg
+    else
+      @content.concat(pkg)  
+    end
     @cmd ||= pkg[8]
     sleep(rand(0..4))
   end
 
   def recv(len)
-    sleep(rand(0..3))
+    sleep(rand(0..2))
     data = case @cmd
     when 101
       gate_tracker(len)
@@ -55,7 +67,7 @@ class MockTCPSocket
 
     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 = Utils.number_to_buffer(TestConfig::STORAGE_PORT.to_i)
+    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*")
@@ -64,8 +76,9 @@ class MockTCPSocket
   def upload_file(len)
     header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
     group_name = Utils.array_merge([].fill(0, 0...16), TestConfig::GROUP_NAME.bytes)
-    file_name = TestConfig::FILE_NAME.bytes
-    res = (group_name + file_name)
+    path = path_replace_extname
+    file_path_bytes = path.bytes
+    res = (group_name + file_path_bytes)
     header[7] = (header + res).length
     res = (header + res)
     
@@ -95,4 +108,12 @@ class MockTCPSocket
     header[7] = body.length
     (header + body)[@recv_offset...@recv_offset+len].pack("C*")
   end
+
+  private 
+  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
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'debugger'
 require 'rspec'
 require 'rspec/core'
 require 'rspec/mocks'
+require 'upload'
 require File.expand_path('../../lib/fastdfs-client', __FILE__)
 require File.expand_path('../test_config', __FILE__)
 require File.expand_path('../mock_tcp_socket', __FILE__)

data/spec/storage_spec.rb

@@ -7,6 +7,12 @@ describe Fastdfs::Client::Storage do
 
   let(:tracker){ FC::Tracker.new(host, port) }
   let(:storage){ tracker.get_storage }
+  let(:tempfile) do 
+    file = Tempfile.new([nil, "1.txt"])
+    file.write("testtest")
+    file.close
+    file
+  end
 
   it "initialize the server" do 
     expect(FC::Socket).to receive(:new).with(host, port, nil) 
@@ -26,10 +32,16 @@ describe Fastdfs::Client::Storage do
   end
 
   it "tempfile upload " do 
-    file = Tempfile.new("1.txt")
-    file.write("testtest")
-    file.close
-    expect(storage.upload(file)[:status]).to be_truthy
+    res = storage.upload(tempfile)
+    expect(res[:status]).to be_truthy
+    expect(File.extname(res[:result][:path])).to eq(".txt")
+  end
+
+  it "ActionDispatch::Http::UploadedFile upload" do 
+    file = ActionDispatch::Http::UploadedFile.new(tempfile: tempfile, filename: "test.tt")
+    res = storage.upload(file)
+    expect(res[:status]).to be_truthy
+    expect(File.extname(res[:result][:path])).to eq(".tt")
   end
 
   describe "upload file test " do 
@@ -64,11 +76,11 @@ describe Fastdfs::Client::Storage do
     end
 
     it "can set metadata" do 
-      expect(storage.set_metadata(TestConfig::FILE_NAME, TestConfig::GROUP_NAME, TestConfig::METADATA)).to be_truthy
+      expect(storage.set_metadata(TestConfig::FILE_PATH, TestConfig::GROUP_NAME, TestConfig::METADATA)).to be_truthy
     end
 
     it "download the file to the local" do 
-      res = storage.download(TestConfig::FILE_NAME, TestConfig::GROUP_NAME)
+      res = storage.download(TestConfig::FILE_PATH, TestConfig::GROUP_NAME)
       expect(res[:status]).to be_truthy
       expect(res[:result]).to be_an_instance_of(Tempfile)
       expect(IO.read(res[:result])).to eq(IO.read(TestConfig::FILE))

data/spec/test_config.rb

@@ -3,7 +3,7 @@ module TestConfig
   STORAGE_PORT = "23000"
   STORE_PATH = 0
   GROUP_NAME = "group1"
-  FILE_NAME = "M00/04/47/wKgIF1cHcQyAeAF7AAACVHeY6n8267.png"
+  FILE_PATH = "M00/04/47/wKgIF1cHcQyAeAF7AAACVHeY6n8267.png"
 
   METADATA = {
     width: "800",

data/spec/tracker_spec.rb

@@ -43,7 +43,7 @@ describe Fastdfs::Client::Tracker do
         res = storage.upload(File.open(File.expand_path("../page.png", __FILE__)))
         expect(res[:status]).to be_truthy
         results = res[:result]
-        results = storage.delete(results[:path], results[:group_name])
+        res = storage.delete(results[:path], results[:group_name])
         expect(res[:status]).to be_truthy
       end
     end

data/spec/upload.rb

@@ -0,0 +1,59 @@
+module ActionDispatch
+  module Http
+
+    class UploadedFile
+      attr_accessor :original_filename
+
+      attr_accessor :content_type
+
+      attr_accessor :tempfile
+      alias :to_io :tempfile
+
+      attr_accessor :headers
+
+      def initialize(hash)
+        @tempfile          = hash[:tempfile]
+        raise(ArgumentError, ":tempfile is required") unless @tempfile
+
+        @original_filename = hash[:filename]
+        if @original_filename
+          begin
+            @original_filename.encode!(Encoding::UTF_8)
+          rescue EncodingError
+            @original_filename.force_encoding(Encoding::UTF_8)
+          end
+        end
+        @content_type      = hash[:type]
+        @headers           = hash[:head]
+      end
+
+      def read(length=nil, buffer=nil)
+        @tempfile.read(length, buffer)
+      end
+
+      def open
+        @tempfile.open
+      end
+
+      def close(unlink_now=false)
+        @tempfile.close(unlink_now)
+      end
+
+      def path
+        @tempfile.path
+      end
+
+      def rewind
+        @tempfile.rewind
+      end
+
+      def size
+        @tempfile.size
+      end
+
+      def eof?
+        @tempfile.eof?
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ka Ka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - spec/storage_spec.rb
 - spec/test_config.rb
 - spec/tracker_spec.rb
+- spec/upload.rb
 homepage: https://github.com/huxinghai1988/fastdfs-client-ruby.git
 licenses:
 - MIT
@@ -113,4 +114,5 @@ test_files:
 - spec/storage_spec.rb
 - spec/test_config.rb
 - spec/tracker_spec.rb
+- spec/upload.rb
 has_rdoc: