vscale-api 0.2.46 → 0.2.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a759f760acb59de98213ddd7055077549dba0e
-  data.tar.gz: bc740e8e471c5388b910deb7653cc65824f53c59
+  metadata.gz: 9ac876acdea7222da72661d422f9305e3b8226a3
+  data.tar.gz: 555e9cf0095d7a126c7d2dd63938a22f8c0fb511
 SHA512:
-  metadata.gz: b38bfbd7ff70d9547f44b6f249013c3798ce6ed7c381bea5a4d40612bf6ad35f438fd2cb90c67bd1e27759146d463fb4b40879eb9d3c2d0c28a820557644eca3
-  data.tar.gz: 75b8771f65ed1f374902ebf3d7cc325cf9b01137dac5df7c1130bb38692de6bc16e2dc1a7cfd535a15abe7855b72213b24213efa4c5e2fed72671f639070e3e6
+  metadata.gz: b80fcefe8bcdc4b3d150cfeb412d11f48515de0273f5b3311eec19f265e2cd3cc9724622f4636ca8b38ccab42defc595eba6eea437fc4f828e5e46739b8e6bf5
+  data.tar.gz: a091c6e04ca8a0971fbfec310618ab86ab80bcd8248f519edacd457d904b82e28b35880ac371605fb459beecfcd38fa6a7444441f4bf7df37eadc1ea80b6cad1

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -1,6 +1,6 @@
 ### VScale API v1 (WIP)
 
-[![Coverage Status](https://coveralls.io/repos/Smolget/vscale-api/badge.svg?branch=master&service=github)](https://coveralls.io/github/Smolget/vscale-api?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/Smolget/vscale-api/badge.svg?branch=feature%2Fcoveralls)](https://coveralls.io/github/Smolget/vscale-api?branch=feature%2Fcoveralls)
 [![Build Status](https://travis-ci.org/Smolget/vscale-api.svg?branch=master)](https://travis-ci.org/Smolget/vscale-api)
 [![Gem Version](https://badge.fury.io/rb/vscale-api.svg)](https://badge.fury.io/rb/vscale-api)
 ![](http://ruby-gem-downloads-badge.herokuapp.com/vscale-api?type=total)  

data/lib/vscale/api.rb

@@ -1,6 +1,5 @@
 require 'net/http'
 require 'openssl'
-require 'ostruct'
 require 'json'
 require 'uri'
 
@@ -34,11 +33,10 @@ module Vscale
       include Servers
       include SSHKeys
 
-      def initialize(token, api_endpoint = API_ENDPOINT)
+      def initialize(token)
         @token = token
-        @api_endpoint = api_endpoint
 
-        uri = URI.parse(@api_endpoint)
+        uri = URI.parse(API_ENDPOINT)
 
         # TODO: rescue StandardError
         @http = Net::HTTP.start(uri.host, uri.port, use_ssl: true)
@@ -50,27 +48,35 @@ module Vscale
 
       def request_json(meth, path, params = {})
         response = request(meth, path, params)
-        body     = JSON.parse(response.body)
-        OpenStruct.new(code: response.code, body: body)
-      rescue JSON::ParserError
-        response # TODO: convert to Hash
+
+        result = Struct.new(:code, :body)
+
+        if response.body.nil? || response.body.empty?
+          result.new(nil, nil)
+        else
+          json_body = JSON.parse(response.body, quirks_mode: true) # TODO: TypeError if nil
+          result.new(response.code, json_body)
+        end
       end
 
       def request(meth, path, params = {})
-        full_path = encode_path_params(@api_endpoint + path, params)
+        full_path = encode_path_params([API_ENDPOINT, path].join, params)
+        
         request = VERB_MAP[meth.to_sym].new(full_path)
+        
         request['Accept'] = 'application/json, text/plain'
         request['Content-Type'] = 'application/json'
         request['X-Token'] = @token
 
-        request.set_form_data(params) if ['post', 'put', 'patch'].include?(meth)
-
+        if ['post', 'put', 'patch'].include?(meth.to_s)
+          request.body = params.to_json
+          return @http.request(request)
+        end
         @http.request(request)
       end
 
       def encode_path_params(path, params)
-        encoded = URI.encode_www_form(params)
-        [path, encoded].join('?')
+        [path, URI.encode_www_form(params)].join('?')
       end
     end
   end

data/lib/vscale/api/backups.rb

@@ -1,5 +1,13 @@
 module Vscale
   module Backups
+    def create_backup(scalet_id, params)
+      post("#{scalet_id}/backup", params)
+    end
+
+    def create_from_backup(scalet_id, params)
+      patch("scalets/#{scalet_id}/rebuild", params)
+    end
+
     def backups
       get('backups')
     end

data/lib/vscale/api/version.rb

@@ -1,5 +1,5 @@
 module Vscale
   module Api
-    VERSION = '0.2.46' # TODO: {APIversion}.10
+    VERSION = '0.2.47' # TODO: {APIversion}.10
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vscale-api
 version: !ruby/object:Gem::Version
-  version: 0.2.46
+  version: 0.2.47
 platform: ruby
 authors:
 - Ilya V
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"