tencent_cos_sdk 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4d601a61de87459a00b854374dd00ef5ef6dd5
-  data.tar.gz: cd25de1ae798210fecae01560d78e6a4f007e384
+  metadata.gz: 8c05cabab083444a58f54d2c23e20ad1a77a5889
+  data.tar.gz: cf903de3f333951eba8d7cc29737b5dd05544e33
 SHA512:
-  metadata.gz: 51e2daf4b0b20657ff8658f41d535c49da264f422b2a1edf73a3e17b3871d56f11c1c05ea8760661ee4b88565e25281772bc3dd6ff60da06761bea920e715c2b
-  data.tar.gz: f62f3b6d60375e8a12a88652cecd2b6f9bc0c62912900cb21c34813df266c2c11b24075bbffd1a2190c75d8829fb3549d375ca58f9217d903f470742c25fa2c9
+  metadata.gz: ab87e308ff8fc5907558384ad7c8eeb919a5e14098f78f81c707fcba53108d404e3970a6eafc6b2e07fa02416384e9f6ad0ec6f93d386d44ef9cf8e4c65d0ae0
+  data.tar.gz: df7cf33752d4cf4058fc517ed93ede94f63a2d6765b8a936bfd98297f44788d096e5f47baab8df34cde67ee946d9f07ce4d9f6c329e1d0e5ed7233a4363e7a18

data/lib/tencent_cos_sdk/request.rb

@@ -4,12 +4,12 @@ require 'tencent_cos_sdk/utils'
 
 module TencentCosSdk
     class Request
-        attr_accessor :http_method, :uri, :headers, :body, :file
+        attr_accessor :http_method, :path, :headers, :body, :file
         attr_accessor :response, :time_used
 
         def initialize options
             self.http_method    = options[:http_method]
-            self.uri            = options[:uri]
+            self.path           = options[:path]
             self.headers        = options[:headers] || {}
             self.body           = options[:body]
             self.file           = options[:file]
@@ -26,7 +26,7 @@ module TencentCosSdk
 
                 options = {
                     method:     http_method,
-                    url:        "https://#{TencentCosSdk.conf.host}#{uri}",
+                    url:        TencentCosSdk.url(path),
                     headers:    headers,
                     verify_ssl: false
                 }
@@ -47,11 +47,10 @@ module TencentCosSdk
                 puts response_description
             end
 
-            file_path = uri["#{TencentCosSdk.conf.parent_path}/".length..-1]
-
-            m = /attachment; filename\*="UTF-8''(.+)"/.match response.headers[:content_disposition]
-            FileUtils.mkdir_p File.dirname(file_path)
-            IO.binwrite(file_path, response) if m
+            if /attachment; filename\*="UTF-8''(.+)"/.match response.headers[:content_disposition]
+                FileUtils.mkdir_p File.dirname(path)
+                IO.binwrite(path, response)
+            end
 
             response
         end
@@ -60,7 +59,7 @@ module TencentCosSdk
 
         def description
             s = "\n\n"
-            s << "#{http_method.upcase} #{uri} HTTP/1.1\n".light_magenta
+            s << "#{http_method.upcase} #{TencentCosSdk.uri(@path)} HTTP/1.1\n".light_magenta
 
             headers.each do |k, v|
                 s << "#{k}: #{v}\n".red

data/lib/tencent_cos_sdk/utils.rb

@@ -2,6 +2,16 @@ require 'cgi'
 require 'openssl'
 
 module TencentCosSdk
+    class << self
+        def uri(path)
+            "#{TencentCosSdk.conf.parent_path.to_s}/#{path}"
+        end
+
+        def url(path)
+            "https://#{TencentCosSdk.conf.host}#{uri path}"
+        end
+    end
+
     class Request
         def get_authorization
             sign_time           = "#{Time.now.to_i - 3600};#{Time.now.to_i + 3600}"
@@ -26,7 +36,7 @@ module TencentCosSdk
 
         def get_http_string
             http_string  = http_method + "\n"
-            http_string += uri + "\n"
+            http_string += TencentCosSdk.uri(@path) + "\n"
             http_string += get_params + "\n"
             http_string += get_headers + "\n"
         end

data/lib/tencent_cos_sdk/version.rb

@@ -1,3 +1,3 @@
 module TencentCosSdk
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/tencent_cos_sdk.rb

@@ -9,27 +9,21 @@ module TencentCosSdk
         # TencentCosSdk.put '1/abc.txt', file: './xyz.txt'
         #
         def put path, options = {}
-            Request.new(options.merge http_method: 'put', uri: uri(path), sign: true).execute
+            Request.new(options.merge http_method: 'put', path: path, sign: true).execute
         end
 
         #
         # TencentCosSdk.get '1/abc.txt'
         #
         def get path, options = {}
-            Request.new(options.merge http_method: 'get', uri: uri(path)).execute
+            Request.new(options.merge http_method: 'get', path: path).execute
         end
 
         #
         # TencentCosSdk.delete '1/abc.txt'
         #
         def delete path, options = {}
-            Request.new(options.merge http_method: 'delete', uri: uri(path), sign: true).execute
-        end
-
-    private
-
-        def uri path
-            File.join TencentCosSdk.conf.parent_path, path
+            Request.new(options.merge http_method: 'delete', path: path, sign: true).execute
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tencent_cos_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - xia xiongjun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl