cloudgarage-api 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e00990df04d52b953dc998488cfea4be937655552e6f8681428c86c58b35dde
-  data.tar.gz: 1ea09fc36a91ef2c284ae317622d062857f60330723433a3515d91b5a44a59ce
+  metadata.gz: ed9846103bf204429d93058dc290bfaf654ed47e41bffecb52fe81a56806de58
+  data.tar.gz: 0bf05055812f995cea5dc6af117ac4d990dbac38d34095b9a7da05ba625414d9
 SHA512:
-  metadata.gz: 7c13723cce461ca9417328b4a0abc9570d3c320c180731adbe8f4bda0d74bc6375531c7c9e87aeb5ac48dcbd502ad684d1c65236f95ad8dc779f111964c71161
-  data.tar.gz: 732e590bbffd3a9fdfa1e81762a43f5334653e723dee419cebbd28ac26e3faa41f07243b57ebd5c44b2eeef557ac0f2b972056d845ff23f9e8d09abb56b63efa
+  metadata.gz: 5411022bee23d99be2e61d88097ea14f16e19084524229691304b89117aaba76e6cd9cf2485588217fb9d1828ea0c079d2970754583a47367e4aa09cc1987944
+  data.tar.gz: 288146e09da86819d8816be459a43701f356fada580083fb411920ece08e56bd7e8b20e8caee056017892720e17c1d2595b05fdb3478e7891d578fd20141d12c

data/README.md

@@ -29,8 +29,6 @@ require 'cloudgarage-api'
 client = CloudGarage.new(client_id, client_secret)
 ```
 
-If you receive some exceptions of `RestClient`, see error messages by `$!.response.body`.
-
 ### Contract APIs
 
 ```ruby
@@ -70,10 +68,10 @@ client.servers
 client.server_info(server_id)
 #=> information of a server instance specified by UUID
 
-client.server_auto_backup_info(server_id) # not works well
+client.server_auto_backup_info(server_id)
 #=> information of a server auto backup specified by UUID
 
-client.server_security_info(server_id) # not works well
+client.server_security_info(server_id)
 #=> information of a server security specified by UUID
 
 # create a server

data/cloudgarage-api.gemspec

@@ -1,7 +1,7 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cloudgarage-api"
+require "cloudgarage-api/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "cloudgarage-api"

data/lib/cloudgarage-api.rb

@@ -7,7 +7,6 @@
 require 'rest-client'
 
 class CloudGarage
-  VERSION = "0.1.0".freeze
   BASE_URI = 'https://api.cloudgarage.jp'.freeze
 
   def initialize(client_id, client_secret)
@@ -17,49 +16,49 @@ class CloudGarage
 
   def token
     payload = {'client_id' => @client_id, 'client_secret' => @client_secret}
-    @token = post('tokens', payload)['token']['id']
+    @token = post('tokens', payload)[:token][:id]
   end
 
   def contracts(contract_id = nil)
     if contract_id 
-      get("contracts/#{contract_id}")['contract']
+      get("contracts/#{contract_id}")[:contract]
     else
-      get('contracts')['contracts']
+      get('contracts')[:contracts]
     end
   end
 
   # image_type: :os, :application, :private
   def images(image_type = nil)
-    images = get("images")['images']
+    images = get("images")[:images]
     if image_type
       image_type = image_type.to_s.upcase
-      images.select!{|i| i['image_type'] == image_type}
+      images.select!{|i| i[:image_type] == image_type}
     end
     return images
   end
 
   def keypairs(keypair_id = nil)
     if keypair_id
-      get("keypairs/#{keypair_id}")['keypair']
+      get("keypairs/#{keypair_id}")[:keypair]
     else
-      get('keypairs')['keypairs']
+      get('keypairs')[:keypairs]
     end
   end
 
   def servers()
-    get('servers')['servers']
+    get('servers')[:servers]
   end
 
   def server_info(server_id)
-    get("servers/#{server_id}")['server_detail']
+    get("servers/#{server_id}")[:server_detail]
   end
 
   def server_auto_backup_info(server_id)
-    get("servers/#{server_id}/autoBackup")['autoBackup']
+    get("servers/#{server_id}/autoBackup")[:autoBackup]
   end
 
   def server_security_info(server_id)
-    get("servers/#{server_id}/security")['securityRules']
+    get("servers/#{server_id}/security")[:securityRules]
   end
 
   def create_server(name, password, contract_id: nil, spec: {}, ports: [], image_id: nil, keyname: nil, comment: nil)
@@ -70,7 +69,7 @@ class CloudGarage
     payload['image_id'] = image_id if image_id
     payload['keyname'] = keyname if keyname
     payload['comment'] = comment if comment
-    post('servers', payload)['resource_id']
+    post('servers', payload)[:resource_id]
   end
 
   # operation: :start, :restart, :restart_hard, :stop
@@ -89,7 +88,7 @@ class CloudGarage
   end
 
   def version
-    get("version")['version']
+    get("version")[:version]
   end
 
 private
@@ -99,19 +98,40 @@ private
     return h
   end
 
+  def call_api
+    begin
+      yield
+    rescue RestClient::ExceptionWithResponse => ex
+      def ex.message
+        if @response
+          "#{default_message}: #{JSON.parse(response.body)['fault']['messages'].join(' ')}"
+        else
+          default_message
+        end
+      end
+      raise ex
+    end
+end
+
   def get(api)
-    parse_body(RestClient.get("#{BASE_URI}/#{api}", header))
+    call_api do
+      parse_body(RestClient.get("#{BASE_URI}/#{api}", header))
+    end
   end
 
   def post(api, payload)
-    parse_body(RestClient.post("#{BASE_URI}/#{api}", payload.to_json, header))
+    call_api do
+      parse_body(RestClient.post("#{BASE_URI}/#{api}", payload.to_json, header))
+    end
   end
 
   def delete(api)
-    RestClient.delete("#{BASE_URI}/#{api}", header)
+    call_api do
+      RestClient.delete("#{BASE_URI}/#{api}", header)
+    end
   end
 
   def parse_body(res)
-    JSON.parse(res.body)
+    JSON.parse(res.body, symbolize_names: true)
   end
 end

data/lib/cloudgarage-api/version.rb

@@ -0,0 +1,3 @@
+class CloudGarage
+  VERSION = "0.1.2".freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudgarage-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Tada, Tadashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -112,6 +112,7 @@ files:
 - bin/setup
 - cloudgarage-api.gemspec
 - lib/cloudgarage-api.rb
+- lib/cloudgarage-api/version.rb
 homepage: https://github.com/tdtds/cloudgarage-api
 licenses: []
 metadata: {}