fastdfs-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 711de59fe7605cadbe4820f3f852e79860e5c1ab
-  data.tar.gz: cd68e14f5f1932d19045e5c3c31fa77e91d75472
+  metadata.gz: 28e3d4bb5c9868a72bac8476c6d0580e124d852a
+  data.tar.gz: 8889ef8b0df440d0ca99e3d1c213d9d2d6a7d9c1
 SHA512:
-  metadata.gz: 673c80215e1b30fea0aae0f2b3b2471d6641027491f548365213915762cb092f8fec7d6643bbf3c7fc22501e534eb730f22e495e08253de45a4fda92cbe88374
-  data.tar.gz: 310349702c4c17c9316cae1a165c9f305a88f34445023a5f75139d26741a9642bdddcb5ca3176407211ec7e2f1c41c9cb7a83b384f838077dcd55b385be76a58
+  metadata.gz: 26e0eb1ebbf0d1d4934966f451e68db1e9bd280ab42e8c5ff1c822041f9e9b8ba5715e55e10cb145adacdffe79255b039b8bf3a1d1a2b939ee19712bb915100c
+  data.tar.gz: 3a917eafa99d2dd236a99c28e3ab7dd851e3b20a64e2fd866253b1c39fa592f7ca87d273aaa91e7270bc3ebe0bbec19c129fb13fe9bd32a6067683d52a561f34

data/lib/fastdfs-client.rb

@@ -4,4 +4,4 @@ require 'fastdfs-client/cmd'
 require 'fastdfs-client/proto_common'
 require 'fastdfs-client/utils'
 require 'fastdfs-client/hook'
-require "fastdfs-client/tracker"
+require "fastdfs-client/tracker"

data/lib/fastdfs-client/extend_core.rb

@@ -9,6 +9,6 @@ end
 class Object
 
   def blank?
-    self.empty? || self.nil?
+    self.nil? || self.empty?
   end
 end

data/lib/fastdfs-client/hook.rb

@@ -31,9 +31,12 @@ module Hook
       _hooks[meth_name][:before].each do |callback|
         self.instance_exec(&callback)
       end
-      return_value = meth.bind(self).call *args, &block
-      _hooks[meth_name][:after].each do |callback|
-        self.instance_exec(&callback)
+      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

data/lib/fastdfs-client/storage.rb

@@ -31,14 +31,14 @@ module Fastdfs
         raise "path arguments is empty!" if path.blank?
         if group_name.blank?
           group_name = /^\/?(\w+)/.match(path)[1]
-          path = path.gsub("/#{group_name}")
+          path = path.gsub(Regexp.new("/?#{group_name}/?"), "")
         end
         raise "group_name arguments is empty!" if group_name.blank?
         group_bytes = group_name.bytes.fill(0, group_name.length...ProtoCommon::GROUP_NAME_MAX_LEN)
         path_length = (group_bytes.length + path.bytes.length)
 
         @socket.write(cmd, (ProtoCommon.header_bytes(cmd, path_length) + group_bytes + path.bytes))
-        @socket.receive
+        @socket.receive{ true }
       end
 
       private 

data/lib/fastdfs-client/version.rb

@@ -1,5 +1,5 @@
 module Fastdfs
   module Client
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/tracker_spec.rb

@@ -30,9 +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"))
+    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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ka Ka