saklient 0.0.2.5 → 0.0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950d3224ffc0b0dcd5b574e28ac96bde7fc96943
-  data.tar.gz: d5b980c1ea8b7c78868ccb8b04963b5d2cc1db57
+  metadata.gz: 4452225f5c19ef63758c70c0332415d3a0a9bc71
+  data.tar.gz: 34c349f3d12de616bafe96305381a11e7de963a2
 SHA512:
-  metadata.gz: 535fa1ff83ba2cf15754fda12ea80a58f4189b8dc1d05e0891e9f24088976d4b5eec99ce5fbfdb6ad4423c0141bb39761df3f233e1b1aa6fd1d3934f57a03bdc
-  data.tar.gz: 4b3a4ef1a50ffe6c8173336d8f7537c978bbff1441014914e58df9d5e5e4f9fb8adb1ed1df209e0ea1e9a99bd2c79bc72b46e34e675dab5d1b6db7fe7d510d7e
+  metadata.gz: 8948ac21bbcd87ad1b0a6330dc6acaadc48acb87b926286eba3710a3651451ab6809badd44c26140cebf6a34fd2f7215c7774d12c5463630beda7e17f0b9a001
+  data.tar.gz: 1f57759c4078a35ed822a89b57967e2e785dae3eed4be9b16a1f0a345a476551dec75ef5dff44cdceecbf8381a7e05450cb3da454f9ec6f0f51fa2e41b0581e4

data/lib/saklient/cloud/client.rb

@@ -73,7 +73,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'saklient.ruby ver-0.0.2.5 rev-a581b28f8ddd2cd75cb32f710d33d3d650bba044',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.6 rev-ea935ca9d640e87509db882d9fd06ec2bf75fe23',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

data/lib/saklient/cloud/resources/lb_server.rb

@@ -6,7 +6,7 @@ module Saklient
   module Cloud
     module Resources
 
-      # ロードバランサの監視対象サーバ.
+      # ロードバランサの監視対象サーバ設定.
       class LbServer
 
         protected
@@ -286,6 +286,7 @@ module Saklient
           }
         end
 
+        # @private
         # @param [any] obj
         # @return [LbServer]
         def update_status(obj)

data/lib/saklient/cloud/resources/lb_virtual_ip.rb

@@ -7,7 +7,7 @@ module Saklient
   module Cloud
     module Resources
 
-      # ロードバランサの仮想IPアドレス.
+      # ロードバランサの仮想IPアドレス設定.
       class LbVirtualIp
 
         protected
@@ -175,7 +175,9 @@ module Saklient
           end
         end
 
-        # @param [any] settings
+        # 監視対象サーバ設定を追加します.
+        #
+        # @param [any] settings 設定オブジェクト
         # @return [LbServer]
         def add_server(settings = nil)
           ret = Saklient::Cloud::Resources::LbServer.new(settings)
@@ -197,8 +199,10 @@ module Saklient
           }
         end
 
-        # @param [String] address
-        # @return [LbServer]
+        # 指定したIPアドレスにマッチする監視対象サーバ設定のうち, 最初にマッチしたものを取得します.
+        #
+        # @param [String] address 検索するIPアドレス
+        # @return [LbServer] 監視対象サーバ設定（見つからなかった場合はnull）
         def get_server_by_address(address)
           Saklient::Util::validate_type(address, 'String')
           for srv in @_servers
@@ -207,6 +211,21 @@ module Saklient
           return nil
         end
 
+        # 指定したIPアドレスにマッチする監視対象サーバ設定をすべて削除します.
+        #
+        # @param [String] address
+        # @return [LbVirtualIp]
+        def remove_server_by_address(address)
+          Saklient::Util::validate_type(address, 'String')
+          servers = []
+          for srv in @_servers
+            servers << srv if srv.ip_address != address
+          end
+          @_servers = servers
+          return self
+        end
+
+        # @private
         # @param [Array] srvs
         # @return [LbVirtualIp]
         def update_status(srvs)

data/lib/saklient/cloud/resources/load_balancer.rb

@@ -212,7 +212,9 @@ module Saklient
           return self
         end
 
-        # @param [any] settings
+        # 仮想IPアドレス設定を追加します.
+        #
+        # @param [any] settings 設定オブジェクト
         # @return [LbVirtualIp]
         def add_virtual_ip(settings = nil)
           ret = Saklient::Cloud::Resources::LbVirtualIp.new(settings)
@@ -220,6 +222,8 @@ module Saklient
           return ret
         end
 
+        # 指定したIPアドレスにマッチする仮想IPアドレス設定を取得します.
+        #
         # @param [String] address
         # @return [LbVirtualIp]
         def get_virtual_ip_by_address(address)
@@ -230,15 +234,19 @@ module Saklient
           return nil
         end
 
+        # 監視対象サーバのステータスを最新の状態に更新します.
+        #
         # @return [LoadBalancer]
         def reload_status
           result = request_retry('GET', _api_path + '/' + Saklient::Util::url_encode(_id) + '/status')
-          vips = result[:LoadBalancer]
-          for vipDyn in vips
-            vipStr = vipDyn[:VirtualIPAddress]
-            vip = get_virtual_ip_by_address(vipStr)
-            next if (vip).nil?
-            vip.update_status(vipDyn[:Servers])
+          if !result.nil? && result.key?(:LoadBalancer)
+            vips = result[:LoadBalancer]
+            for vipDyn in vips
+              vipStr = vipDyn[:VirtualIPAddress]
+              vip = get_virtual_ip_by_address(vipStr)
+              next if (vip).nil?
+              vip.update_status(vipDyn[:Servers])
+            end
           end
           return self
         end

data/lib/saklient/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: UTF-8 -*-
 
 module Saklient
-  VERSION = "0.0.2.5"
+  VERSION = "0.0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saklient
 version: !ruby/object:Gem::Version
-  version: 0.0.2.5
+  version: 0.0.2.6
 platform: ruby
 authors:
 - townewgokgok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: SAKURA Internet API Client Library for Ruby
@@ -300,3 +300,4 @@ test_files:
 - spec/server_spec.rb
 - spec/swytch_spec.rb
 - spec/util_spec.rb
+has_rdoc: