baidubce-sdk 0.9.3 → 0.9.4

checksums.yaml

@@ -1,4 +1,7 @@
 ---
+SHA256:
+  metadata.gz: 54459c307d8f0e22399d42565dc66f5895deaa489cf88a51ee868aa6c27cb342
+  data.tar.gz: 52f14924396670c789493344807183f2255d2ccd1bdd17651b8d74e66334f96a
 SHA512:
-  metadata.gz: 165934a1406f4fe922c2b3240f3924e0fce9412d003420eaf6aa121120c7b66647f118c954da4f1bdf81514a04173e8856b4b125becfafa280ebb46545b18eac
-  data.tar.gz: 79bda68cf94da4ccadfe92ae501e8d8676b5fc647617b2f09dc46da23af421086e71730973c9df0a1c80549eab802d371d183ec69b16cba53d0872e218b0ad9b
+  metadata.gz: 014507f6ddf03fe3f0755a3648d81d5d91fb6e8a56d7e70cce8df332d33d0a402eb7215bf1aa01ea4b55e8f1675355ffcc54dabfbcfc36a6fef07c52b2b0c8ee
+  data.tar.gz: d5a179e2b931199b2f5f4b74d85a4cca4058db3c4049c6174382bd3dec07859df1d746b9fe3f9138d1e1a88a8952da94c5ea878cdca843237d833023e9ce7816

data/lib/baidubce/bce_constants.rb

@@ -15,6 +15,7 @@
 module Baidubce
 
     DEFAULT_SERVICE_DOMAIN = 'baidubce.com'
+    DEFAULT_BOS_DOMAIN = 'bcebos.com'
     DEFAULT_ENCODING = 'UTF-8'
 
     SOCKET_ERROR_CODE = -100

data/lib/baidubce/services/bos/bos_client.rb

@@ -21,11 +21,10 @@ module Baidubce
     module Services
 
         class BosClient < BceBaseClient
-
             # List buckets of user.
             # returns all buckets owned by the user.
             def list_buckets()
-                send_request(GET)
+                send_request(GET, "", {}, "", {}, "", nil, false, true)
             end
 
             # Create bucket with specific name.
@@ -162,9 +161,6 @@ module Baidubce
 
             def get_object(bucket_name, key, range, save_path=nil, return_body=true)
                 headers = range.nil? ? {} : get_range_header_dict(range)
-                if key.size == 0 || key  =~ /^\/+$/
-                    raise BceClientException.new("Key can not be empty or all is '/'.")
-                end
                 send_request(GET, bucket_name, {}, key, headers, "", save_path, return_body)
             end
 
@@ -251,7 +247,7 @@ module Baidubce
             def generate_pre_signed_url(bucket_name, key, options={})
                 headers = options['headers'].nil? ? {} : options['headers']
                 params = options['params'].nil? ? {} : options['params']
-
+                gen_host(bucket_name, false)
                 path = Utils.append_uri("/", key)
                 url, headers[HOST] = Utils.parse_url_host(@config)
                 unless @config.cname_enabled || Utils.is_cname_like_host(@config.endpoint)
@@ -425,13 +421,45 @@ module Baidubce
                 send_request(DELETE, bucket_name, params, key)
             end
 
-            def send_request(http_method, bucket_name="", params={}, key="", headers={}, body="", save_path=nil, return_body=false, &block)
+            def gen_host(bucket_name, is_bucket_api)
+                endpoint = @config.endpoint
+                unless endpoint.include?"://"
+                    protocol = @config.protocol.downcase
+                    raise "Invalid protocol #{protocol}." if protocol != "http" && protocol != 'https'
+                    endpoint = sprintf("%s://%s", protocol, endpoint)
+                end
+                parsed_endpoint = URI.parse(endpoint)
+                scheme = parsed_endpoint.scheme.downcase
+                host = parsed_endpoint.host
+                parts = host.split('.')
+                if is_bucket_api == true
+                    @config.cname_enabled = false
+                    if host.include?(DEFAULT_BOS_DOMAIN)
+                        last_three_elements = parts.last(3)
+                        host = last_three_elements.join('.')
+                    end
+                else
+                    if @config.cname_enabled == false
+                        @config.cname_enabled = true
+                        if parts.length == 3
+                            host = [bucket_name, parts[0], parts[1], parts[2]].join('.')
+                        end 
+                    end
+                end
+                port = parsed_endpoint.port
+                host += ":#{port}" unless scheme == 'http' && port == 80 || scheme == 'https' && port == 443
+                @config.endpoint = host
+            end
+
+            def send_request(http_method, bucket_name="", params={}, key="", headers={}, body="", save_path=nil, return_body=false, is_bucket_api=false, &block)
+                gen_host(bucket_name, is_bucket_api)
                 if @config.cname_enabled || Utils.is_cname_like_host(@config.endpoint)
                     path = Utils.append_uri("/", key)
                 else
-                    path = Utils.append_uri("/", bucket_name, key)
+                    if is_bucket_api == false 
+                        path = Utils.append_uri("/", bucket_name, key)
+                    end
                 end
-
                 begin
                     resp_body, resp_headers = @http_client.send_request(@config, @signer, http_method, path, params,
                                                           headers, body, save_path, false, &block)

data/lib/baidubce/version.rb

@@ -2,6 +2,6 @@
 
 module Baidubce
 
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
 
 end

data/samples/baidubce/bos_sample.rb

@@ -19,8 +19,8 @@ include Baidubce
 
 # debug
 credentials = Auth::BceCredentials.new(
-    # "your ak",
-    # "your sk"
+   # "your ak",
+   # "your sk"
 )
 
 conf = BceClientConfiguration.new(
@@ -176,7 +176,6 @@ demo "put object" do
                 'Content-Disposition' => 'inline',
                 'user-metadata' => user_metadata
     }
-
     client.put_object_from_string(bucket_name, "obj.txt", "obj", options)
     puts client.get_object_as_string(bucket_name, "obj.txt")
     puts client.get_object_to_file(bucket_name, "obj.txt", "obj_file.txt")

metadata

@@ -1,115 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: baidubce-sdk
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - xiaoyong
 autorequire:
 bindir: lib/baidubce
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
@@ -133,7 +133,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -169,16 +169,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: BaiduBce BOS Ruby SDK