fog-sakuracloud 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9ea2f60debe6c88f5f1140e7f6a6d99c84506a5
-  data.tar.gz: a4c7e4cb451357320213c768e1b3f01c45f2dde3
+  metadata.gz: 897104786361cfe690b7b1f2578965818d31ad6f
+  data.tar.gz: 0541082923de0d63f41810c91082a669e0cf50ac
 SHA512:
-  metadata.gz: 1b1b21879d3a6a64c6775413d3aaf64c3ab4a825c0054a17f8bcae1fcace9fceed9e27338f8fcf27ea8524c9efc8f2e31b6f91bec3c0697bdcb9b794da99887a
-  data.tar.gz: 48030cda02ea34fed30b46e4c67081b41fbd008ea6368fc629973349e9150465646582160b3dc3fe49b704e521ec894d30442a4a33297e681a1d2ce4857f8759
+  metadata.gz: 464144e6b2575d09c15de82220f4044780d1c19fac34e546ae297bac95efa0796d5174b0fe9334c1ca14e546701a110f70fd8f837648b173baf5767f15e9ef86
+  data.tar.gz: ff5d5db70886fa695d67aa8fa03da6ed2b28ce1fb031e47c3c27fd82ac3993e595e776a2ca95a4a81434c756f36ea8ef6e7345b51a1cb7ffaac12fdc4d4994c0

data/.travis.yml

@@ -8,3 +8,5 @@ rvm:
   - 2.0.0
 gemfile:
   - Gemfile
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog of fog-sakuracloud
 
+## v1.6.0
+
+- Miscs: Wrap request for error messages to be readable. #22
+- Cleanup: replace @attribute[:id] to id #21
+
 ## v1.5.2
 
 - Feature: Add filter params Start and End to collect_monitor_router.

data/lib/fog/sakuracloud.rb

@@ -1,5 +1,6 @@
 require 'fog/core'
 require 'fog/json'
+require 'fog/sakuracloud/utils/request'
 
 module Fog
   module Compute

data/lib/fog/sakuracloud/compute.rb

@@ -27,6 +27,8 @@ module Fog
       request      :list_zones
 
       class Real
+        include Fog::SakuraCloud::Utils::Request
+
         def initialize(options = {})
           @auth_encode = Base64.strict_encode64([
             options[:sakuracloud_api_token],
@@ -41,18 +43,6 @@ module Fog
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end
-
-        def request(params)
-          response = parse @connection.request(params)
-          response
-        end
-
-        private
-        def parse(response)
-          return response if response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-          response
-        end
       end
 
       class Mock

data/lib/fog/sakuracloud/dns.rb

@@ -17,6 +17,8 @@ module Fog
       request      :modify_zone
 
       class Real
+        include Fog::SakuraCloud::Utils::Request
+
         def initialize(options = {})
           @auth_encode = Base64.strict_encode64([
             options[:sakuracloud_api_token],
@@ -31,18 +33,6 @@ module Fog
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end
-
-        def request(params)
-          response = parse @connection.request(params)
-          response
-        end
-
-        private
-        def parse(response)
-          return response if response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-          response
-        end
       end
 
       class Mock

data/lib/fog/sakuracloud/models/compute/server.rb

@@ -20,17 +20,17 @@ module Fog
 
         def boot
           requires :id
-          service.boot_server(@attributes[:id])
+          service.boot_server(id)
         end
 
         def stop(force = false)
           requires :id
-          service.stop_server(@attributes[:id], force)
+          service.stop_server(id, force)
         end
 
         def delete(force = false, disks = [])
           requires :id
-          service.delete_server(@attributes[:id], force, disks)
+          service.delete_server(id, force, disks)
           true
         end
         alias_method :destroy, :delete

data/lib/fog/sakuracloud/models/volume/disk.rb

@@ -32,13 +32,13 @@ module Fog
 
         def configure(sshkey_id)
           requires :id
-          service.configure_disk(@attributes[:id], sshkey_id )
+          service.configure_disk(id, sshkey_id )
           true
         end
 
         def carve_hostname_on_disk(hostname)
           requires :id
-          service.carve_hostname_on_disk(@attributes[:id], hostname )
+          service.carve_hostname_on_disk(id, hostname )
           true
         end
 
@@ -54,7 +54,7 @@ module Fog
             :defaultroute => defaultroute
           }
           requires :id
-          service.associate_ip_to_disk(@attributes[:id], subnet )
+          service.associate_ip_to_disk(id, subnet )
           true
         end
 
@@ -62,7 +62,7 @@ module Fog
           note_ids = []
           note_ids << notes
           requires :id
-          service.register_note_to_disk(@attributes[:id], note_ids.flatten )
+          service.register_note_to_disk(id, note_ids.flatten )
           true
         end
       end

data/lib/fog/sakuracloud/network.rb

@@ -28,6 +28,8 @@ module Fog
       request      :delete_interface
 
       class Real
+        include Fog::SakuraCloud::Utils::Request
+
         def initialize(options = {})
           @auth_encode = Base64.strict_encode64([
             options[:sakuracloud_api_token],
@@ -42,18 +44,6 @@ module Fog
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end
-
-        def request(params)
-          response = parse @connection.request(params)
-          response
-        end
-
-        private
-        def parse(response)
-          return response if response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-          response
-        end
       end
 
       class Mock

data/lib/fog/sakuracloud/script.rb

@@ -17,6 +17,8 @@ module Fog
       request      :delete_note
 
       class Real
+        include Fog::SakuraCloud::Utils::Request
+
         def initialize(options = {})
           @auth_encode = Base64.strict_encode64([
             options[:sakuracloud_api_token],
@@ -31,18 +33,6 @@ module Fog
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end
-
-        def request(params)
-          response = parse @connection.request(params)
-          response
-        end
-
-        private
-        def parse(response)
-          return response if response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-          response
-        end
       end
 
       class Mock

data/lib/fog/sakuracloud/utils/request.rb

@@ -0,0 +1,25 @@
+module Fog
+  module SakuraCloud
+    module Utils
+      module Request
+        def request(params)
+          response = parse @connection.request(params)
+
+          response
+          ## SakuraCloud API returns Japanese message.
+          #  This wrapper decodes and show message to be human readble.
+        rescue Excon::Errors::HTTPStatusError => e
+          Fog::Logger.warning ::JSON.parse(e.response.body)['error_msg']
+          raise e
+        end
+
+        private
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.5.2"
+    VERSION = "1.6.0"
   end
 end

data/lib/fog/sakuracloud/volume.rb

@@ -27,6 +27,8 @@ module Fog
       request      :carve_hostname_on_disk
 
       class Real
+        include Fog::SakuraCloud::Utils::Request
+
         def initialize(options = {})
           @auth_encode = Base64.strict_encode64([
             options[:sakuracloud_api_token],
@@ -41,18 +43,6 @@ module Fog
 
           @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
         end
-
-        def request(params)
-          response = parse @connection.request(params)
-          response
-        end
-
-        private
-        def parse(response)
-          return response if response.body.empty?
-          response.body = Fog::JSON.decode(response.body)
-          response
-        end
       end
 
       class Mock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -277,6 +277,7 @@ files:
 - lib/fog/sakuracloud/requests/volume/list_plans.rb
 - lib/fog/sakuracloud/requests/volume/register_note_to_disk.rb
 - lib/fog/sakuracloud/script.rb
+- lib/fog/sakuracloud/utils/request.rb
 - lib/fog/sakuracloud/version.rb
 - lib/fog/sakuracloud/volume.rb
 - tests/helper.rb