fog-xiaozhu 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab66dc904b634dd5a0abb2fe0407f7911a0ba5e
-  data.tar.gz: 73941e4d09c8d594ffa29ee489606c32c438edd0
+  metadata.gz: c1ed05f3f7da66e49b666241541244cc978362fc
+  data.tar.gz: 9982ae5765a7eed4a8d32177c85c46d538339578
 SHA512:
-  metadata.gz: 075aabe14c9415dec10c5b6240b696c5c7629e5c4bc9fa62d0698729bd67b3de786739fb48e2b4440151ff5b86d8077feffe72b28d5626d29148cb85afc81448
-  data.tar.gz: 1d90a461ed5bf521020ba7ac1e383a79af2f9d22f8d35b6dc60e1ddab814428f7aaa1c0f09886c4936e2e1ebc6fc9ff1b62461141febff7fc1ae25a51aa9e9b6
+  metadata.gz: 0f651be8538f6075bd546c6fe4511112aab5c4e080f243cc3fa87c46a703a2efb73701f59eb7e47e7630f5780c52af47c0f1e6220a6db0bf23a55bfe2a6f33b0
+  data.tar.gz: be45df163589e9742425b99240600cf9112757e629c18baed72103a25324ad59708934eff9fa85e63998d2b5e32909022d28cca4123fdd784de029e8ded478ac

data/README.md

@@ -32,7 +32,9 @@ Since it's a bad practice to have your credentials in source code, you should lo
 default:
   :aliyun_accesskey_id:     <YOUR_ACCESS_KEY_ID>,
   :aliyun_accesskey_secret: <YOUR_SECRET_ACCESS_KEY>,
-  :aliyun_region_id:        <YOUR_TARGET_REGION>
+  :aliyun_oss_endpoint:     <YOUR_OSS_ENDPOINT>,
+  :aliyun_oss_location:     <YOUR_OSS_LOACTION>,
+  :aliyun_oss_bucket:       <YOUR_OSS_BUCKET>
 ```
 
 ### Connecting to OSS
@@ -46,17 +48,12 @@ opt = {
   :provider                => 'aliyun',
   :aliyun_accesskey_id     => <YOUR_ACCESS_KEY_ID>,
   :aliyun_accesskey_secret => <YOUR_SECRET_ACCESS_KEY>,
-  :aliyun_oss_bucket       => <YOUR_OSS_BUCKET>,
-  :aliyun_region_id        => <YOUR_TARGET_REGION>,
   :aliyun_oss_endpoint     => <YOUR_OSS_ENDPOINT>,
+  :aliyun_oss_location     => <YOUR_OSS_LOACTION>,
+  :aliyun_oss_bucket       => <YOUR_OSS_BUCKET>,
 }
 conn = Fog::Storage.new(opt)
 ```
-**-> Note:** `:aliyun_region_id` is optional and  default to "cn-hangzhou".
-**-> Note:** `:aliyun_oss_endpoint` is optional. If it is not specified, it will be generated automatically by `:aliyun_region_id`.
-Its basic format is "oss-<region-id>.aliyuncs.com" and with default schema "http" and default port "80".
-If you want to use https or 443 port, you can use a format "<schema>://oss-<region-id>.aliyuncs.com:<port>".
-
 
 ## Fog::Aliyun Abstractions
 

data/lib/fog/aliyun/storage.rb

@@ -3,21 +3,11 @@ require 'xmlsimple'
 module Fog
   module Storage
     class Aliyun < Fog::Service
-
-      DEFAULT_REGION = 'cn-hangzhou'
-
-      DEFAULT_SCHEME = 'http'
-      DEFAULT_SCHEME_PORT = {
-          'http' => 80,
-          'https' => 443
-      }
-
       recognizes :aliyun_oss_endpoint,
                  :aliyun_oss_location,
-                 :aliyun_region_id
-      requires   :aliyun_accesskey_id,
-                 :aliyun_accesskey_secret,
                  :aliyun_oss_bucket
+      requires   :aliyun_accesskey_id,
+                 :aliyun_accesskey_secret
 
       model_path 'fog/aliyun/models/storage'
       model       :directory
@@ -47,9 +37,9 @@ module Fog
         # Initialize connection to OSS
         #
         # ==== Notes
-        # options parameter must include values for :aliyun_accesskey_id, :aliyun_secret_access_key and :aliyun_oss_bucket in order to create a connection.
-        # :aliyun_oss_location will be replaced by :aliyun_region_id, and it has a default value cn-hangzhou
-        # if :aliyun_oss_endpoint is not specified, it will be generated by method region_to_endpoint
+        # options parameter must include values for :aliyun_oss_endpoint, :aliyun_accesskey_id,
+        # :aliyun_secret_access_key, :aliyun_oss_location and :aliyun_oss_bucket in order to create a connection.
+        # if you haven't set these values in the configuration file.
         #
         # ==== Examples
         #   sdb = Fog::Storage.new(:provider=>'aliyun',
@@ -65,37 +55,32 @@ module Fog
         attr_reader :aliyun_accesskey_id
         attr_reader :aliyun_accesskey_secret
         attr_reader :aliyun_oss_endpoint
-        attr_reader :aliyun_region_id
+        attr_reader :aliyun_oss_location
         attr_reader :aliyun_oss_bucket
 
         def initialize(options = {})
           # initialize the parameters
-          @aliyun_region_id        = options[:aliyun_region_id] || options[:aliyun_oss_location] || DEFAULT_REGION
-          @aliyun_oss_endpoint     = options[:aliyun_oss_endpoint] || region_to_endpoint(@aliyun_region_id)
+          @aliyun_oss_endpoint     = options[:aliyun_oss_endpoint]
+          @aliyun_oss_location     = options[:aliyun_oss_location]
           @aliyun_accesskey_id     = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
           @aliyun_oss_bucket       = options[:aliyun_oss_bucket]
 
           # check for the parameters
           missing_credentials = []
-          missing_credentials << :aliyun_oss_bucket unless @aliyun_oss_bucket
+          missing_credentials << :aliyun_oss_endpoint unless @aliyun_oss_endpoint
+          missing_credentials << :aliyun_oss_location unless @aliyun_oss_location
           missing_credentials << :aliyun_accesskey_id unless @aliyun_accesskey_id
           missing_credentials << :aliyun_accesskey_secret unless @aliyun_accesskey_secret
           raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
 
           @connection_options = options[:connection_options] || {}
 
-          endpoint = @aliyun_oss_endpoint
-
-          if !endpoint.start_with?(DEFAULT_SCHEME)
-            @aliyun_oss_endpoint = "#{DEFAULT_SCHEME}://#{endpoint}"
-          end
-
           uri = URI.parse(@aliyun_oss_endpoint)
           @host   = uri.host
           @path   = uri.path
-          @scheme = uri.scheme || DEFAULT_SCHEME
-          @port   = uri.port || DEFAULT_SCHEME_PORT[@scheme]
+          @port   = uri.port
+          @scheme = uri.scheme
 
           @persistent = options[:persistent] || false
         end
@@ -104,15 +89,6 @@ module Fog
           @connection.reset
         end
 
-        def region_to_endpoint(region=nil)
-          case region.to_s
-            when ''
-              "oss-#{DEFAULT_REGION}.aliyuncs.com"
-            else
-              "oss-#{region}.aliyuncs.com"
-          end
-        end
-
         def request(params)
           method = params[:method]
           time = Time.new.utc
@@ -205,14 +181,14 @@ module Fog
       class Mock
         def initialize(options = {})
           @aliyun_oss_endpoint     = options[:aliyun_oss_endpoint]
-          @aliyun_region_id        = options[:aliyun_region_id]
+          @aliyun_oss_location     = options[:aliyun_oss_location]
           @aliyun_accesskey_id     = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
           @aliyun_oss_bucket       = options[:aliyun_oss_bucket]
 
           # missing_credentials = Array.new
           # missing_credentials << :aliyun_oss_endpoint unless @aliyun_oss_endpoint
-          # missing_credentials << :aliyun_region_id unless @aliyun_region_id
+          # missing_credentials << :aliyun_oss_location unless @aliyun_oss_location
           # missing_credentials << :aliyun_accesskey_id  unless @aliyun_accesskey_id
           # missing_credentials << :aliyun_accesskey_secret unless @aliyun_accesskey_secret
           # raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?

data/lib/fog/aliyun/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Aliyun
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-xiaozhu
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han