fastdfs-client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84bd058d40b079c23d2cc236c651aa48a5a4e4f9
-  data.tar.gz: 21b8ffd285416638286d3181134790665ce17c44
+  metadata.gz: b7c9c31e2cc224ba06f1ed3645106403401593f9
+  data.tar.gz: d6d383e70e70bc1ae9a4e89319728d2d2f631253
 SHA512:
-  metadata.gz: de8034cd485d98fa4825ccb745e408f1e41052162c7bd86b75c25bcf08d7c5204cac57107ca3c2566770298f09d7fbc5ad8b0df0872f7bcfbfd8087e4ec525da
-  data.tar.gz: 3de188e4493f56da22ce8ffb66c4d6cf332536381c0ec38de294a3e2d1acbd7bc02fec557302c062e17e4c3abaec93f2ff58e3f04149f9bd01bdac76e697d770
+  metadata.gz: 6f7622606be3975880698f78691a4bd1fd61306fd0cf7495069199e6140810e8d95b5522aae45c153021b67dc8aa7bfcfb335d435adb74f27026e6cf7c800846
+  data.tar.gz: ae1834faa05d1e4c81faeefa1849fea0a8ca44909bf7ce44e10d1e331bf1a437314f56ba825e680aa8a36de1459b42f6a9e067f871eeec5d20a59cdf15e9fdfb

data/.gitignore

@@ -1 +1,2 @@
-*.gem
+*.gem
+Gemfile.lock

data/Gemfile

@@ -1,8 +1,3 @@
 source 'http://gems.ruby-china.org/'
 
-gemspec
-
-group :test, :development do
-  gem 'debugger'
-  gem 'rspec'
-end
+gemspec

data/README.md

@@ -15,7 +15,7 @@ fastdfs client for ruby
   #
 
 
-  tracker = new Fastdfs::Client::Tracker("192.168.1.1", "22122")
+  tracker = Fastdfs::Client::Tracker.new("192.168.1.1", "22122")
 
   @storage = tracker.get_storage
 

data/fastdfs-client.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |spec|
   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"
+
 end

data/lib/fastdfs-client/extend_core.rb

@@ -7,11 +7,4 @@ class Array
   def full_fill(val, len)
     self.fill(val, self.length...len)
   end
-end
-
-class Object
-
-  def blank?
-    self.nil? || self.empty?
-  end
 end

data/lib/fastdfs-client/socket.rb

@@ -31,8 +31,8 @@ module Fastdfs
 
       def connection
         if @socket.nil? || !connected
-          Timeout.timeout(@connection_timeout) do
-            @socket = TCPSocket.new(@host, @port)  
+          @socket = Timeout.timeout(@connection_timeout) do
+            TCPSocket.new(@host, @port)  
           end
         end
       end
@@ -42,8 +42,8 @@ module Fastdfs
       end
 
       def receive(&block)
-        timeout_recv do 
-          @header = @socket.recv(@header_len).unpack("C*")
+        @header = timeout_recv do 
+          @socket.recv(@header_len).unpack("C*")
         end
         res_header = parseHeader
         if res_header[:status]
@@ -56,11 +56,11 @@ module Fastdfs
 
       private
       def parseHeader
-        err_msg = ""
-        err_msg = "recv package size #{@header} is not equal #{@header_len}, cmd: #{@cmd}" unless @header.length == @header_len
-        err_msg = "recv cmd: #{@header[8]} is not correct, expect cmd: #{CMD::RESP_CODE}, cmd: #{@cmd}" unless @header[8] == CMD::RESP_CODE
-        err_msg = "recv erron #{@header[9]}, 0 is correct cmd: #{@cmd}" unless @header[9] == 0
-        {status: err_msg.blank?, err_msg: err_msg}
+        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 erron #{@header[9]}, 0 is correct cmd: #{@cmd}" unless @header[9] == 0 || err_msg
+        {status: err_msg.nil?, err_msg: err_msg}
       end
 
       def timeout_recv
@@ -88,7 +88,7 @@ module Fastdfs
             body_len -= len
           end
         end
-        @content = nil if @content.blank?
+        @content = nil if Utils.is_blank? @content
       end
 
     end

data/lib/fastdfs-client/storage.rb

@@ -28,7 +28,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 options.blank?
+          _set_metadata(res[:path], res[:group_name], options) unless Utils.is_blank?(options)
           res
         end
       end
@@ -86,12 +86,11 @@ module Fastdfs
       end
 
       def extract_path!(path, group_name = nil)
-        raise "path arguments is empty!" if path.blank?
-        if group_name.blank?
+        raise "path arguments is empty!" if Utils.is_blank? path
+        if Utils.is_blank? group_name
           group_name = /^\/?(\w+)/.match(path)[1]
           path = path.gsub(Regexp.new("/?#{group_name}/?"), "")
         end
-        raise "group_name arguments is empty!" if group_name.blank?
         return group_name, path
       end
 
@@ -114,7 +113,7 @@ module Fastdfs
           cover: ProtoCommon::SET_METADATA_FLAG_OVERWRITE,
           merge: ProtoCommon::SET_METADATA_FLAG_MERGE
         }
-        flag = :cover if flag.blank?
+        flag ||= :cover 
         data[flag.to_sym]
       end
 
@@ -122,7 +121,7 @@ module Fastdfs
         meta_bytes = options.map do |a| 
           a.join(ProtoCommon::FILE_SEPERATOR) 
         end.join(ProtoCommon::RECORD_SEPERATOR).bytes
-        meta_bytes << 0 if meta_bytes.blank?
+        meta_bytes << 0 if meta_bytes.length <= 0
         meta_bytes
       end
 

data/lib/fastdfs-client/tracker.rb

@@ -8,7 +8,8 @@ module Fastdfs
       attr_accessor :socket, :cmd, :options
 
       def initialize(host, port, options = {})
-        @socket = Socket.new(host, port, options[:socket])
+        @options = options
+        @socket = Socket.new(host, port, @options[:socket])
         @cmd = CMD::STORE_WITHOUT_GROUP_ONE
       end
 
@@ -19,7 +20,7 @@ module Fastdfs
           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

data/lib/fastdfs-client/utils.rb

@@ -13,4 +13,8 @@ module Utils
   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.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/mock_tcp_socket.rb

@@ -1,5 +1,5 @@
 
-class TCPSocket
+class MockTCPSocket
   include Fastdfs::Client
 
   attr_accessor :host, :port, :cmd, :recv_offset, :connect_state
@@ -15,11 +15,24 @@ class TCPSocket
   def write(*args)
     pkg = args[0].unpack("C*")
     @cmd ||= pkg[8] 
+    sleep(2)
   end
 
   def recv(len)
-    recv_data = recv_config[@cmd.to_s] || {}
-    data = recv_data.key?(:recv_bytes) ? recv_data[:recv_bytes].call(len) : nil
+    data = case @cmd
+    when 101
+      gate_tracker(len)
+    when 11
+      upload_file(len)
+    when 12
+      delete_file(len)
+    when 15
+      get_metadata(len)
+    when 13
+      set_metadata(len)
+    when 14
+      download_file(len)
+    end
     @recv_offset = len
     data
   end
@@ -35,62 +48,50 @@ class TCPSocket
   end
 
   private 
+  def gate_tracker(len)
+    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    header[7] = ProtoCommon::TRACKER_BODY_LEN
 
-  def recv_config
-    {
-      "101" => {
-        recv_bytes: lambda do |len|
-          header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
-          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 = Utils.number_to_buffer(TestConfig::STORAGE_PORT.to_i)
+    store_path = Array(TestConfig::STORE_PATH)
 
-          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)
-          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)
+    group_name = Utils.array_merge([].fill(0, 0...16), TestConfig::GROUP_NAME.bytes)
+    file_name = TestConfig::FILE_NAME.bytes
+    res = (group_name + file_name)
+    header[7] = (header + res).length
+    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.pack("C*")
+  end
+
+  def get_metadata(len)
+    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    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.pack("C*")
+  end
 
-          (header+group_name+ip+port+store_path)[@recv_offset...@recv_offset+len].pack("C*")
-        end
-      },
-      "11" => {
-        recv_bytes: lambda do |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)
-          header[7] = (header + res).length
-          res = (header + res)
-          
-          res[@recv_offset...@recv_offset+len].pack("C*")
-        end
-      },
-      "12" => {
-        recv_bytes: lambda do |len|
-          header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
-          header.pack("C*")
-        end
-      },
-      "15" => {
-        recv_bytes: lambda do |len|
-          header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
-          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
-      },
-      "13" => {
-        recv_bytes: lambda do |len|
-          header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
-          header.pack("C*")
-        end
-      },
-      "14" => {
-        recv_bytes: lambda do |len|
-          header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
-          body = IO.read(TestConfig::FILE).bytes
-          header[7] = body.length
-          (header + body)[@recv_offset...@recv_offset+len].pack("C*")
-        end
-      }
-    }
+  def download_file(len)
+    header = ProtoCommon.header_bytes(CMD::RESP_CODE, 0)
+    body = IO.read(TestConfig::FILE).bytes
+    header[7] = body.length
+    (header + body)[@recv_offset...@recv_offset+len].pack("C*")
   end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,13 @@ require File.expand_path('../mock_tcp_socket', __FILE__)
 FC = Fastdfs::Client
 
 RSpec.configure do |config|
+  config.before(:each) do 
+    TCPSocket.stub(:new) do |h, p|
+      MockTCPSocket.new(h, p)
+    end
+  end 
   config.mock_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
 end
+  

data/spec/storage_spec.rb

@@ -40,7 +40,7 @@ describe Fastdfs::Client::Storage 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)
-    TCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
+    MockTCPSocket.any_instance.stub("recv").and_return(result.pack("C*"))
     expect( storage.delete("fdsaf", res[:group_name])[:status] ).to be_falsey
   end
 
@@ -58,6 +58,5 @@ describe Fastdfs::Client::Storage do
     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

data/spec/tracker_spec.rb

@@ -29,7 +29,18 @@ describe Fastdfs::Client::Tracker do
     expect(tracker.get_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
+  end
+
   it "run server flow" do 
+    1.times.map do
+      tracker.get_storage
+    end
+
     # storage = tracker.get_storage
     # puts "#{storage.host}, #{storage.port}"
     # results = storage.upload(File.open("/Users/huxinghai/Documents/shark/app/assets/images/page.png"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastdfs-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ka Ka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 description: fastdfs upload file client for ruby
 email:
 - huxinghai1988@gmail.com
@@ -33,7 +61,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - README.md
 - fastdfs-client.gemspec
 - lib/fastdfs-client.rb

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fastdfs-client (1.0.0)
-
-GEM
-  remote: http://gems.ruby-china.org/
-  specs:
-    columnize (0.9.0)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.8)
-    diff-lcs (1.2.5)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  debugger
-  fastdfs-client!
-  rspec