fastdfs-client 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f837406bfbb7c59a4da740450c49232800e481
-  data.tar.gz: 900430e39aeea9db93faf42c460394eeb9087277
+  metadata.gz: 84bd058d40b079c23d2cc236c651aa48a5a4e4f9
+  data.tar.gz: 21b8ffd285416638286d3181134790665ce17c44
 SHA512:
-  metadata.gz: 106f6c4cc8406215c7fe22d4935e4b72538f8e7f70874c1f66e129eac483669f8d2d1493bb09f15b2a2d2389fa8e34ffdc21ba5b3944361b53c35836838f303d
-  data.tar.gz: a12327a458920d7c1b4eccdf4828c1a7dc24d3ad0a7bd3d58d108b22fa7932d0cc050d1b0d3dc03b6a9bde3022dd33b349be9245383f18681f786ebc8ed06794
+  metadata.gz: de8034cd485d98fa4825ccb745e408f1e41052162c7bd86b75c25bcf08d7c5204cac57107ca3c2566770298f09d7fbc5ad8b0df0872f7bcfbfd8087e4ec525da
+  data.tar.gz: 3de188e4493f56da22ce8ffb66c4d6cf332536381c0ec38de294a3e2d1acbd7bc02fec557302c062e17e4c3abaec93f2ff58e3f04149f9bd01bdac76e697d770

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fastdfs-client (0.0.5)
+    fastdfs-client (1.0.0)
 
 GEM
   remote: http://gems.ruby-china.org/

data/README.md

@@ -4,8 +4,7 @@ fastdfs client for ruby
 
 ### Install
 
-    #Gemfile
-    gem 'fastdfs-client', git: "git@github.com:huxinghai1988/fastdfs-client-ruby.git"
+    gem install 'fastdfs-client'
 
 ### Using
 

data/lib/fastdfs-client.rb

@@ -1,7 +1,7 @@
 require "fastdfs-client/extend_core"
 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/hook'
 require "fastdfs-client/tracker"

data/lib/fastdfs-client/client_proxy.rb

@@ -0,0 +1,32 @@
+module Fastdfs
+  module Client
+
+    class ClientProxy
+      attr_accessor :data, :header, :content, :socket
+
+      def initialize(cmd, socket, content_len, header = [])
+        @cmd = cmd
+        socket.connection
+        @socket = socket
+        @header = ProtoCommon.header_bytes(cmd, content_len) + header
+        @content = []
+      end
+
+      def push_content
+        raise "argument not block!" unless block_given?
+        @content << yield
+      end
+
+      def dispose(&block)
+        @socket.write(@cmd, @header)
+        @content.each do |c|
+          @socket.write(@cmd, c)
+        end
+        @socket.receive &block
+      ensure
+        @socket.close
+      end
+    end
+
+  end
+end

data/lib/fastdfs-client/extend_core.rb

@@ -4,6 +4,9 @@ class Array
     self.each_with_index.inject(0){|s, item| s = s | (item[0] << (56 - (item[1] * 8))); s }
   end
   
+  def full_fill(val, len)
+    self.fill(val, self.length...len)
+  end
 end
 
 class Object

data/lib/fastdfs-client/storage.rb

@@ -4,11 +4,6 @@ module Fastdfs
   module Client
 
     class Storage
-      extend Hook
-
-      before(:upload, :delete, :get_metadata, ){ @socket.connection }
-      after(:upload, :delete, :get_metadata, ){ @socket.close }
-
       attr_accessor :host, :port, :group_name, :store_path, :socket, :options
 
       def initialize(host, port, store_path = nil, options = {})
@@ -22,23 +17,33 @@ module Fastdfs
         @store_path = store_path || 0
       end
 
-      def upload(file)  
-        _upload(file)
+      def upload(file, options = {})  
+        ext_name_bs = File.extname(file)[1..-1].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)
+
+        client = ClientProxy.new(CMD::UPLOAD_FILE, @socket, content_len, size_byte + ext_name_bs)
+        client.push_content{ IO.read(file) }
+        client.dispose 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
+        end
       end
 
       def delete(path, group_name = nil)
-        cmd = CMD::DELETE_FILE
-        path_bytes = header_path_bytes(cmd, path, group_name)
-        @socket.write(cmd, path_bytes)
-        @socket.receive{ true }
+        path_bytes = group_path_bytes(path, group_name).flatten
+        client = ClientProxy.new(CMD::DELETE_FILE, @socket, path_bytes.length, path_bytes)
+        client.dispose
       end
 
       def get_metadata(path, group_name = nil)
-        cmd = CMD::GET_METADATA
-        path_bytes = header_path_bytes(cmd, path, group_name)
-        @socket.write(cmd, path_bytes)
-        @socket.receive do |content|
-          res = content.split(ProtoCommon::RECORD_SEPERATOR).map do |c| 
+        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|
+          res = body.split(ProtoCommon::RECORD_SEPERATOR).map do |c| 
             c.split(ProtoCommon::FILE_SEPERATOR) 
           end.flatten
           Utils.symbolize_keys(Hash[*res])
@@ -46,8 +51,6 @@ module Fastdfs
       end
 
       def set_metadata(path, group_name = nil, options = {}, flag = :cover)
-        cmd = CMD::SET_METADATA
-        
         unless options.is_a?(Hash)
           flag = options
           options = {}
@@ -57,28 +60,15 @@ module Fastdfs
           options = group_name
           group_name = nil
         end
-        flag = convert_meta_flag(flag)
-        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).fill(0, size_bytes.length...16)
-        total = size_bytes.length + flag.length + group_bytes.length + path_bytes.length + meta_bytes.length
-        header_bytes = ProtoCommon.header_bytes(cmd, total)
-        @socket.write(cmd, (header_bytes + size_bytes + flag.bytes + group_bytes + path_bytes))
-        @socket.write(cmd, meta_bytes) 
-        @socket.receive
+        _set_metadata(path, group_name, options, flag)
       end
 
       def download(path, group_name = nil)
-        cmd = CMD::DOWNLOAD_FILE
-        group_bytes, path_bytes = group_path_bytes(path, group_name)
+        path_bytes = group_path_bytes(path, group_name).flatten
         download_bytes = Utils.number_to_buffer(0) + Utils.number_to_buffer(0)
-
-        header_bytes = ProtoCommon.header_bytes(cmd, group_bytes.length + path_bytes.length + download_bytes.length)
-
-        @socket.write(cmd, header_bytes + download_bytes + group_bytes + path_bytes)
-        @socket.receive do |body|
+        data = download_bytes + path_bytes
+        client = ClientProxy.new(CMD::DOWNLOAD_FILE, @socket, data.length, data)
+        client.dispose do |body|
           create_tempfile(path, body) if body
         end
       end
@@ -86,7 +76,7 @@ module Fastdfs
       private
       def group_path_bytes(path, group_name = nil)
         group_name, path = extract_path!(path, group_name)
-        group_bytes = group_name.bytes.fill(0, group_name.length...ProtoCommon::GROUP_NAME_MAX_LEN)
+        group_bytes = group_name.bytes.full_fill(0, ProtoCommon::GROUP_NAME_MAX_LEN)
         [group_bytes, path.bytes]
       end      
 
@@ -105,24 +95,18 @@ module Fastdfs
         return group_name, path
       end
 
-      def _upload(file)
-        cmd = CMD::UPLOAD_FILE
-
-        extname = File.extname(file)[1..-1]
-        ext_name_bs = extname.bytes.fill(0, extname.length...@extname_len)
-        hex_len_bytes = Utils.number_to_buffer(file.size)
-        size_byte = [@store_path].concat(hex_len_bytes).fill(0, (hex_len_bytes.length+1)...@size_len)
+      def _set_metadata(path, group_name = nil, options = {}, flag = :cover)
+        flag = convert_meta_flag(flag)
+        group_bytes, path_bytes = group_path_bytes(path, group_name)
+        meta_bytes = meta_to_bytes(options)
 
-        header = ProtoCommon.header_bytes(cmd, (size_byte.length + @extname_len + file.size))
-        pkg = header + size_byte + ext_name_bs
+        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
 
-        @socket.write(cmd, pkg)
-        @socket.write(cmd, IO.read(file))
-        @socket.receive do |body|
-          group_name_max_len = ProtoCommon::GROUP_NAME_MAX_LEN
-          
-          {group_name: body[0...group_name_max_len].strip, path: body[group_name_max_len..-1]}
-        end
+        client = ClientProxy.new(CMD::SET_METADATA, @socket, total, (size_bytes + flag.bytes + group_bytes + path_bytes))
+        client.push_content{ meta_bytes }
+        client.dispose
       end
 
       def convert_meta_flag(flag)

data/lib/fastdfs-client/tracker.rb

@@ -4,10 +4,6 @@ module Fastdfs
   module Client
 
     class Tracker
-      extend Hook
-
-      before(:get_storage){ @socket.connection }
-      after(:get_storage){ @socket.close }
 
       attr_accessor :socket, :cmd, :options
 
@@ -17,16 +13,15 @@ module Fastdfs
       end
 
       def get_storage
-        header = ProtoCommon.header_bytes(@cmd, 0)
-        @socket.write(@cmd, header)
-        res = @socket.receive
-        return res unless res[:status]
-
-        storage_ip = @socket.content[ProtoCommon::IPADDR].strip
-        storage_port = @socket.content[ProtoCommon::PORT].unpack("C*").to_pack_long
-        store_path = @socket.content[ProtoCommon::TRACKER_BODY_LEN-1].unpack("C*")[0]
+        client = ClientProxy.new(@cmd, @socket, 0)
+        res = client.dispose 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, options)
+        end
+        res[:status] ? res[:result] : res
       end
     end
 

data/lib/fastdfs-client/version.rb

@@ -1,5 +1,5 @@
 module Fastdfs
   module Client
-    VERSION = '0.0.5'
+    VERSION = '1.0.0'
   end
 end

data/spec/storage_spec.rb

@@ -8,47 +8,53 @@ describe Fastdfs::Client::Storage do
   let(:tracker){ FC::Tracker.new(host, port) }
   let(:storage){ tracker.get_storage }
 
-  # it "initialize the server" do 
-  #   expect(FC::Socket).to receive(:new).with(host, port, nil) 
-  #   FC::Storage.new(host, port) 
-  # end
-
-  # it "should have access to the storage connection" do
-  #   expect(storage.socket).to receive(:connection)
-  #   expect(storage.socket).to receive(:close)
-  #   storage.upload(TestConfig::FILE)
-  # 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)
-  # end
-
-  # it "can delete file by group and path" do 
-  #   res = storage.upload(TestConfig::FILE)[:result]
-  #   storage.delete(res[:path], res[:group_name])
-  # end
-
-  # it "can delete file raise exception" do 
-  #   res = storage.upload(TestConfig::FILE)[:result]
-  #   result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
-  #   TCPSocket.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 = storage.get_metadata("#{TestConfig::GROUP_NAME}/#{TestConfig::FILE_NAME}")
-  #   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 "initialize the server" do 
+    expect(FC::Socket).to receive(:new).with(host, port, nil) 
+    FC::Storage.new(host, port) 
+  end
+
+  it "should have access to the storage connection" do
+    expect(storage.socket).to receive(:connection)
+    expect(storage.socket).to receive(:close)
+    storage.upload(TestConfig::FILE)
+  end
+
+  it "should have access to the storage connection for 2 items" do
+    expect(storage.socket).to receive(:connection).at_most(2).times
+    expect(storage.socket).to receive(:close).at_most(2).times
+    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)
+  end
+
+  it "can delete file by group and path" do 
+    res = storage.upload(TestConfig::FILE)[:result]
+    storage.delete(res[:path], res[:group_name])
+  end
+
+  it "can delete file raise exception" do 
+    res = storage.upload(TestConfig::FILE)[:result]
+    result = FC::ProtoCommon.header_bytes(FC::CMD::RESP_CODE, 0, 22)
+    TCPSocket.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 = storage.get_metadata("#{TestConfig::GROUP_NAME}/#{TestConfig::FILE_NAME}")
+    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("M00/04/46/wKgIF1b7XLWAI2Q6AAACVHeY6n8655.png", "group1")
+    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))

data/spec/tracker_spec.rb

@@ -30,10 +30,10 @@ describe Fastdfs::Client::Tracker do
   end
 
   it "run server flow" do 
-    storage = tracker.get_storage
-    puts "#{storage.host}, #{storage.port}"
-    results = storage.upload(File.open("/Users/huxinghai/Documents/shark/app/assets/images/page.png"))
-    puts results
+    # storage = tracker.get_storage
+    # puts "#{storage.host}, #{storage.port}"
+    # results = storage.upload(File.open("/Users/huxinghai/Documents/shark/app/assets/images/page.png"))
+    # puts results
     # puts storage.delete(results[:path], results[:group_name])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Ka Ka
@@ -37,9 +37,9 @@ files:
 - README.md
 - fastdfs-client.gemspec
 - lib/fastdfs-client.rb
+- lib/fastdfs-client/client_proxy.rb
 - lib/fastdfs-client/cmd.rb
 - lib/fastdfs-client/extend_core.rb
-- lib/fastdfs-client/hook.rb
 - lib/fastdfs-client/proto_common.rb
 - lib/fastdfs-client/socket.rb
 - lib/fastdfs-client/storage.rb

data/lib/fastdfs-client/hook.rb

@@ -1,44 +0,0 @@
-module Hook
-  def before(*meth_names, &callback)
-    meth_names.each{|meth_name| add_hook :before, meth_name, &callback }
-  end
-  
-  def after(*meth_names, &callback)
-    meth_names.each{|meth_name| add_hook :after, meth_name, &callback }
-  end
-  
-  def hooks
-    @hooks ||= Hash.new do |hash, method_name|
-      hash[method_name] = { before: [], after: [], hijacked: false }
-    end
-  end
-  
-  def add_hook(where, meth_name, &callback)
-    hooks[meth_name][where] << callback
-    ensure_hijacked meth_name
-  end
-  
-  def method_added(meth_name)
-    ensure_hijacked meth_name if hooks.has_key? meth_name
-  end
-  
-  def ensure_hijacked(meth_name)
-    return if hooks[meth_name][:hijacked] || !instance_methods.include?(meth_name)
-    meth = instance_method meth_name
-    _hooks = hooks
-    _hooks[meth_name][:hijacked] = true
-    define_method meth_name do |*args, &block|
-      _hooks[meth_name][:before].each do |callback|
-        self.instance_exec(&callback)
-      end
-      begin
-        return_value = meth.bind(self).call *args, &block  
-      ensure
-        _hooks[meth_name][:after].each do |callback|
-          self.instance_exec(&callback)
-        end
-      end
-      return_value
-    end
-  end
-end