fastdfs-client 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564b4fc72139a1d9bc1faeba24ecf21394bf9e4b
-  data.tar.gz: ef2717e16860af59cfaeccc0b99d1ad0284d1972
+  metadata.gz: 1e0b3352eb6ff6a305d8083b19000e950632c6db
+  data.tar.gz: 80788d168fa8726c71cf8da1f9ef325e145da3c1
 SHA512:
-  metadata.gz: afec497233fb8ecc7736dff565ea90db045376381d012cbede8f7f47e69f156410ab0fb87e017085066f03e55be2b049b41304fb105e6efd48dfc78745157a15
-  data.tar.gz: fc7979eb1bf964b0bc5ee5942535f264d4518453191ab76d9eecb73e7b56cafcbb508e464be17ad55337cb1cd5bd7391c3ac8ace7120d998c3ca08d23bf827a0
+  metadata.gz: 4e4a2a249cd266bcac2fe453f7a0120f53589a006328a355b78475016ec91facb337c4d965164f872bcd188744c09dde55474d82810c26f400eaf57760fc0368
+  data.tar.gz: e555aba138f34c8088a3709e5426426a79bab48fea3edba8b033d89418bf1e2c9c477300ff1caafe5c7815f1ef21b6acc83bdf666fabd965c6799d71647f5b13

data/README.md

@@ -9,6 +9,8 @@ fastdfs client for ruby
 ### Using
 
 ```RUBY
+  
+  require 'fastdfs-client'
 
   # return the result format 
   #  {status: true, err_msg: "", result: ...}

data/lib/fastdfs-client/client_proxy.rb

@@ -22,7 +22,7 @@ module Fastdfs
           @socket.connection do 
             full_header = ProtoCommon.header_bytes(cmd, content_len) + header
             @socket.write(cmd, full_header)
-            Array(@content).each do |c|
+            Array(content).each do |c|
               @socket.write(cmd, c)
             end
             @socket.receive &block

data/lib/fastdfs-client/extend_core.rb

@@ -7,4 +7,32 @@ class Array
   def full_fill(val, len)
     self.fill(val, self.length...len)
   end
+end
+
+
+class NilClass
+  def blank?
+    true
+  end
+end
+
+class String
+  def blank?
+    self.strip.empty?
+  end
+end
+
+class Object
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+end
+
+
+class Hash
+
+  def fs_symbolize_keys
+    defined?(super) ? super : self.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+  end
+
 end

data/lib/fastdfs-client/socket.rb

@@ -19,8 +19,10 @@ module Fastdfs
       end
 
       def write(*args)
+        debugger if args[1] == 119
         @cmd = args.shift
         pkg = args.shift
+
         pkg = pkg.pack("C*") if pkg.is_a?(Array)
         @socket.write pkg
       end
@@ -89,7 +91,7 @@ module Fastdfs
             body_len -= len
           end
         end
-        @content = nil if Utils.is_blank? @content
+        @content = nil if @content.blank?
       end
 
     end

data/lib/fastdfs-client/storage.rb

@@ -18,7 +18,7 @@ module Fastdfs
       end
 
       def upload(file, options = {})  
-        ext_name_bs = File.extname(file)[1..-1].to_s.bytes.full_fill(0, @extname_len)
+        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)
 
@@ -26,7 +26,7 @@ module Fastdfs
           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 Utils.is_blank?(options)
+          _set_metadata(res[:path], res[:group_name], options) unless options.blank?
           res
         end
       end
@@ -42,7 +42,7 @@ module Fastdfs
           res = body.split(ProtoCommon::RECORD_SEPERATOR).map do |c| 
             c.split(ProtoCommon::FILE_SEPERATOR) 
           end.flatten
-          Utils.symbolize_keys(Hash[*res])
+          Hash[*res].fs_symbolize_keys
         end
       end
 
@@ -74,8 +74,8 @@ module Fastdfs
       end
 
       def extract_path!(path, group_name = nil)
-        raise "path arguments is empty!" if Utils.is_blank? path
-        if Utils.is_blank? group_name
+        raise "path arguments is empty!" if path.blank?
+        if group_name.blank?
           group_name = /^\/?(\w+)/.match(path)[1]
           path = path.gsub(Regexp.new("/?#{group_name}/?"), "")
         end
@@ -90,8 +90,7 @@ module Fastdfs
         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)
+        @proxy.dispose(CMD::SET_METADATA, total, (size_bytes + flag.bytes + group_bytes + path_bytes), meta_bytes.pack("C*"))
       end
 
       def convert_meta_flag(flag)

data/lib/fastdfs-client/utils.rb

@@ -10,11 +10,4 @@ module Utils
     arr1
   end
 
-  def self.symbolize_keys(obj)
-    obj.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-  end
-
-  def self.is_blank?(obj)
-    obj.nil? || obj.empty?
-  end
 end

data/lib/fastdfs-client/version.rb

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

data/spec/mock_tcp_socket.rb

@@ -13,12 +13,13 @@ class MockTCPSocket
   end
 
   def write(*args)
-    sleep(0..7)
     pkg = args[0].unpack("C*")
     @cmd ||= pkg[8]
+    sleep(rand(0..4))
   end
 
   def recv(len)
+    sleep(rand(0..3))
     data = case @cmd
     when 101
       gate_tracker(len)

data/spec/storage_spec.rb

@@ -25,38 +25,53 @@ describe Fastdfs::Client::Storage do
     storage.upload(TestConfig::FILE, {author: "kaka", width: "800"})
   end
 
-  it "should the result attributes group_name and path" do 
-    res = storage.upload(TestConfig::FILE)
-    expect(res[:status]).to be_truthy
-    expect(res[:result]).to include(:group_name)
-    expect(res[:result]).to include(:path)
+  it "tempfile upload " do 
+    file = Tempfile.new("1.txt")
+    file.write("testtest")
+    file.close
+    expect(storage.upload(file)[:status]).to be_truthy
   end
 
-  it "can delete file by group and path" do 
-    res = storage.upload(TestConfig::FILE)[:result]
-    storage.delete(res[:path], res[:group_name])
-  end
+  describe "upload file test " do 
 
-  it "can delete file raise exception" do 
-    res = storage.upload(TestConfig::FILE)[:result]
-    result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
-    MockTCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
-    expect( storage.delete("fdsaf", res[:group_name])[:status] ).to be_falsey
-  end
+    before(:each) do 
+      @res_body = storage.upload(TestConfig::FILE)
+    end
 
-  it "can get metadata results" do 
-    res = storage.get_metadata("#{TestConfig::GROUP_NAME}/#{TestConfig::FILE_NAME}")
-    expect(res[:result]).to eq(TestConfig::METADATA)
-  end
+    it "should the result attributes group_name and path" do 
+      expect(@res_body[:status]).to be_truthy
+      expect(@res_body[:result]).to include(:group_name)
+      expect(@res_body[:result]).to include(:path)
+    end
 
-  it "can set metadata" do 
-    expect(storage.set_metadata(TestConfig::FILE_NAME, TestConfig::GROUP_NAME, TestConfig::METADATA)).to be_truthy
-  end
+    it "can delete file by group and path" do 
+      res = @res_body[:result]
+      storage.delete(res[:path], res[:group_name])
+    end
+
+    it "can delete file raise exception" do 
+      res = @res_body[:result]
+      result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
+      MockTCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
+      expect( storage.delete("fdsaf", res[:group_name])[:status] ).to be_falsey
+    end
+
+    it "can get metadata results" do 
+      res = @res_body[:result]
+      storage.set_metadata(res[:path], res[:group_name], TestConfig::METADATA)
+      res = storage.get_metadata("#{res[:group_name]}/#{res[:path]}")
+      expect(res[:result]).to eq(TestConfig::METADATA)
+    end
+
+    it "can set metadata" do 
+      expect(storage.set_metadata(TestConfig::FILE_NAME, 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)
-    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))
+    it "download the file to the local" do 
+      res = storage.download(TestConfig::FILE_NAME, 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))
+    end
   end
 end

data/spec/tracker_spec.rb

@@ -24,7 +24,7 @@ describe Fastdfs::Client::Tracker do
 
   it "verify the server address and port" do 
     expect(tracker.get_storage.socket.host).to eq(TestConfig::STORAGE_IP)
-    #[0, 0, 0, 0, 0, 89, 216, 0]
+
     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
@@ -36,22 +36,19 @@ describe Fastdfs::Client::Tracker do
     expect(tracker.get_storage[:status]).to be_falsey
   end
 
-  it "run server flow" do 
-    items = 5.times.map do
+  it "multi thread upload" do 
+    items = 6.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])
+        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])
+        expect(res[:status]).to be_truthy
       end
     end
 
-    items.each{|item|  item.join }
-
-    # storage = tracker.get_storage
-    # puts "#{storage.host}, #{storage.port}"
-    # results = storage.upload(File.open("page.png"))
-    # puts results
-    # puts storage.delete(results[:path], results[:group_name])
+    items.map{|item|  item.join }
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ka Ka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler