saklient 0.0.1.1 → 0.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0126534b4a62bcf833c8479800e27011c71204e
-  data.tar.gz: dbac41ad2d602d535e3ae05b43f4fffc1cf158e7
+  metadata.gz: 748198f5c71149eaa9d33f85f745c8449ae74680
+  data.tar.gz: 5a66f4f992fff57b4ba0ccefb0b4dddbbb22bfb1
 SHA512:
-  metadata.gz: ec870815bfb4be70fd55d446c8f408338f8fdfc87b15fb0133fd65e674a6d7de6de307a97eea3a80282f192f7402b143729a06a1d0732eb67439d34ec30220dd
-  data.tar.gz: 39e1e7dc632e20389343d65032ac3981c60d5d44a2f66e031732941d51ae078ee2365e127966e9ee030e4a6b874ef590115d450aaa36f765b5c35abe1d2ff425
+  metadata.gz: 79c177e6f7d0c678a39bbe4bb0f7b0364b6d519f442ba902140a8a7da25e7c9c9844dceb0a38d498530115acb6b3919bb1cdd38ddc4dfe5c46716270596ec69c
+  data.tar.gz: 096eb145cc4318322f8ecd38ea826987ec4518f2757861e3269670dd0a5b5dbd2c7ceed39e2fcd78198156b5a3ac760cf1959561d432693871c382d26929d355

data/lib/saklient/cloud/client.rb

@@ -56,7 +56,7 @@ module Saklient
           url = url_root + 'api/cloud/1.1' + path
         end
 
-        url += '?' + URI.escape(json) if method == 'GET' and !params.empty?
+        url += '?' + URI.escape(json) if method == 'GET' and !params.nil?
 
         #println '// APIリクエスト中: #{method} #{path}'
 
@@ -73,7 +73,7 @@ module Saklient
 
         extra_headers = {
           'Content-Type'     => 'application/x-www-form-urlencoded',
-          'User-Agent'       => 'sacloud-client-ruby',
+          'User-Agent'       => 'saklient.ruby ver-0.0.2.2 rev-0de622ef1458f0fe03cbb11b1bec990a3bfa25c4',
           'X-Requested-With' => 'XMLHttpRequest',
           'X-Sakura-HTTP-Method' => method,
           'X-Sakura-Error-Level' => 'warning',

data/lib/saklient/cloud/models/model.rb

@@ -202,19 +202,28 @@ module Saklient
           return self
         end
 
+        # @private
+        # @param [String] className
+        # @param [any] obj
+        # @param [bool] wrapped
+        # @return [Saklient::Cloud::Resources::Resource]
+        def _create_resource_with(className, obj, wrapped = false)
+          Saklient::Util::validate_type(className, 'String')
+          Saklient::Util::validate_type(wrapped, 'bool')
+          className = _class_name if (className).nil?
+          return Saklient::Cloud::Resources::Resource::create_with(className, @_client, obj, wrapped)
+        end
+
         # 新規リソース作成用のオブジェクトを用意します.
         #
         # 返り値のオブジェクトにパラメータを設定し, save() を呼ぶことで実際のリソースが作成されます.
         #
         # @private
+        # @param [String] className
         # @return [Saklient::Cloud::Resources::Resource] リソースオブジェクト
-        def _create
-          a = [
-            @_client,
-            nil,
-            false
-          ]
-          return Saklient::Util::create_class_instance('saklient.cloud.resources.' + _class_name, a)
+        def _create(className = nil)
+          Saklient::Util::validate_type(className, 'String')
+          return _create_resource_with(className, nil)
         end
 
         # 指定したIDを持つ唯一のリソースを取得します.
@@ -229,12 +238,7 @@ module Saklient
           result = @_client.request('GET', _api_path + '/' + Saklient::Util::url_encode(id), query)
           @_total = 1
           @_count = 1
-          a = [
-            @_client,
-            result,
-            true
-          ]
-          return Saklient::Util::create_class_instance('saklient.cloud.resources.' + _class_name, a)
+          return _create_resource_with(nil, result, true)
         end
 
         # リソースの検索リクエストを実行し, 結果をリストで取得します.
@@ -250,13 +254,7 @@ module Saklient
           data = []
           records = result[_root_key_m.to_sym]
           for record in records
-            a = [
-              @_client,
-              record,
-              false
-            ]
-            i = Saklient::Util::create_class_instance('saklient.cloud.resources.' + _class_name, a)
-            data << i
+            data << _create_resource_with(nil, record)
           end
           return data
         end
@@ -273,12 +271,7 @@ module Saklient
           @_count = result[:Count]
           return nil if @_total == 0
           records = result[_root_key_m.to_sym]
-          a = [
-            @_client,
-            records[0],
-            false
-          ]
-          return Saklient::Util::create_class_instance('saklient.cloud.resources.' + _class_name, a)
+          return _create_resource_with(nil, records[0])
         end
 
         # 指定した文字列を名前に含むリソースに絞り込みます.

data/lib/saklient/cloud/models/model_appliance.rb

@@ -3,6 +3,9 @@
 require_relative '../client'
 require_relative 'model'
 require_relative '../resources/appliance'
+require_relative '../resources/load_balancer'
+require_relative '../resources/vpc_router'
+require_relative '../resources/swytch'
 
 module Saklient
   module Cloud
@@ -76,6 +79,25 @@ module Saklient
           return _reset
         end
 
+        # @param [Saklient::Cloud::Resources::Swytch] swytch
+        # @param [Fixnum] vrid
+        # @param [Array<String>] realIps
+        # @param [bool] isHighSpec
+        # @return [Saklient::Cloud::Resources::LoadBalancer]
+        def create_load_balancer(swytch, vrid, realIps, isHighSpec = false)
+          Saklient::Util::validate_type(swytch, 'Saklient::Cloud::Resources::Swytch')
+          Saklient::Util::validate_type(vrid, 'Fixnum')
+          Saklient::Util::validate_type(realIps, 'Array')
+          Saklient::Util::validate_type(isHighSpec, 'bool')
+          ret = _create('LoadBalancer')
+          return ret.set_initial_params(swytch, vrid, realIps, isHighSpec)
+        end
+
+        # @return [Saklient::Cloud::Resources::VpcRouter]
+        def create_vpc_router
+          return _create('VpcRouter')
+        end
+
         # 指定したIDを持つ唯一のリソースを取得します.
         #
         # @param [String] id

data/lib/saklient/cloud/models/model_archive.rb

@@ -3,6 +3,8 @@
 require_relative '../client'
 require_relative 'model'
 require_relative '../resources/archive'
+require_relative '../resources/load_balancer'
+require_relative '../resources/vpc_router'
 require_relative '../enums/escope'
 
 module Saklient

data/lib/saklient/cloud/models/model_router.rb

@@ -114,6 +114,38 @@ module Saklient
           return _with_name_like(name)
         end
 
+        # 指定したタグを持つリソースに絞り込みます.
+        #
+        # 複数のタグを指定する場合は withTags() を利用してください.
+        #
+        # @todo Implement test case
+        # @param [String] tag
+        # @return [Model_Router]
+        def with_tag(tag)
+          Saklient::Util::validate_type(tag, 'String')
+          return _with_tag(tag)
+        end
+
+        # 指定したすべてのタグを持つリソースに絞り込みます.
+        #
+        # @todo Implement test case
+        # @param [Array<String>] tags
+        # @return [Model_Router]
+        def with_tags(tags)
+          Saklient::Util::validate_type(tags, 'Array')
+          return _with_tags(tags)
+        end
+
+        # 指定したDNFに合致するタグを持つリソースに絞り込みます.
+        #
+        # @todo Implement test case
+        # @param [Array<Array<String>>] dnf
+        # @return [Model_Router]
+        def with_tag_dnf(dnf)
+          Saklient::Util::validate_type(dnf, 'Array')
+          return _with_tag_dnf(dnf)
+        end
+
         # 名前でソートします.
         #
         # @todo Implement test case

data/lib/saklient/cloud/models/model_swytch.rb

@@ -114,6 +114,38 @@ module Saklient
           return _with_name_like(name)
         end
 
+        # 指定したタグを持つリソースに絞り込みます.
+        #
+        # 複数のタグを指定する場合は withTags() を利用してください.
+        #
+        # @todo Implement test case
+        # @param [String] tag
+        # @return [Model_Swytch]
+        def with_tag(tag)
+          Saklient::Util::validate_type(tag, 'String')
+          return _with_tag(tag)
+        end
+
+        # 指定したすべてのタグを持つリソースに絞り込みます.
+        #
+        # @todo Implement test case
+        # @param [Array<String>] tags
+        # @return [Model_Swytch]
+        def with_tags(tags)
+          Saklient::Util::validate_type(tags, 'Array')
+          return _with_tags(tags)
+        end
+
+        # 指定したDNFに合致するタグを持つリソースに絞り込みます.
+        #
+        # @todo Implement test case
+        # @param [Array<Array<String>>] dnf
+        # @return [Model_Swytch]
+        def with_tag_dnf(dnf)
+          Saklient::Util::validate_type(dnf, 'Array')
+          return _with_tag_dnf(dnf)
+        end
+
         # 名前でソートします.
         #
         # @todo Implement test case