vscale-api 0.2.45 → 0.2.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89fa87eeb45f99da9ffea89b99520c150f994af0
-  data.tar.gz: cd66725465b9d5b4231952a32b70a84862d790b2
+  metadata.gz: 55a759f760acb59de98213ddd7055077549dba0e
+  data.tar.gz: bc740e8e471c5388b910deb7653cc65824f53c59
 SHA512:
-  metadata.gz: 935bafcefa0562a89052e5934a5a16b079240305cdf1c35eb5cefb433a6c942a4f4dd8c1da4cb5c7b955778f4d2c7a9557e8131e5569cb47005a58be6708d45c
-  data.tar.gz: 0411e31f4454df3e518f4120ff31570a21d05bd5b7bba5384fdb8e42706e25285c2bd62e65ca97054df323e67c9126867b38c28ca281b3f599da674f60d1ac0d
+  metadata.gz: b38bfbd7ff70d9547f44b6f249013c3798ce6ed7c381bea5a4d40612bf6ad35f438fd2cb90c67bd1e27759146d463fb4b40879eb9d3c2d0c28a820557644eca3
+  data.tar.gz: 75b8771f65ed1f374902ebf3d7cc325cf9b01137dac5df7c1130bb38692de6bc16e2dc1a7cfd535a15abe7855b72213b24213efa4c5e2fed72671f639070e3e6

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
-cache: bundler
 
 rvm:
-  - 2.2.2
-  - 2.2.3
+  - 2.2.5
+
+script: rspec spec
 
 notifications:
   email:
     recipients:
       - ilya@codeplay.ru
     on_failure: change
-    on_success: never
+    on_success: never

data/README.md

@@ -3,6 +3,7 @@
 [![Coverage Status](https://coveralls.io/repos/Smolget/vscale-api/badge.svg?branch=master&service=github)](https://coveralls.io/github/Smolget/vscale-api?branch=master)
 [![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)  
 
 ## Vscale API v1  
 
@@ -30,4 +31,9 @@ api.images
 02. Change  
 03. PR  
 
+## TODO
+* [ ] Refactoring
+* [ ] Usage examples
+* [ ] Tests
+
 *WIP*

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+RSpec::Core::RakeTask.new(:spec)

data/lib/vscale/api.rb

@@ -6,56 +6,65 @@ require 'uri'
 
 require 'vscale/api/account'
 require 'vscale/api/background'
+require 'vscale/api/backups'
 require 'vscale/api/billing'
 require 'vscale/api/configurations'
+require 'vscale/api/domains'
+require 'vscale/api/notifications'
 require 'vscale/api/request'
 require 'vscale/api/servers'
 require 'vscale/api/sshkeys'
-require 'vscale/api/tickets'
-require 'vscale/api/tokens'
 require 'vscale/api/version'
 
+## TODO :
+## API Chain: api.add_tag(params).restart_server(id)
+## Batch Request: API_queue{job1, job2, job3}.batch
+
 module Vscale
   module Api
     class Client
       include Account
       include Background
+      include Backups
       include Billing
       include Configurations
+      include Domains
+      include Notifications
       include Request
       include Servers
       include SSHKeys
-      include Tickets
-      include Tokens
+
       def initialize(token, api_endpoint = API_ENDPOINT)
         @token = token
         @api_endpoint = api_endpoint
 
         uri = URI.parse(@api_endpoint)
 
+        # TODO: rescue StandardError
         @http = Net::HTTP.start(uri.host, uri.port, use_ssl: true)
         @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         @http.ssl_version = :TLSv1_2
       end
 
-      private
-
-      def request_json(method, path, params)
-        response = request(method, path, params)
-        body = JSON.parse(response.body)
+    private
 
+      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
+        response # TODO: convert to Hash
       end
 
-      def request(method, path, params = {})
+      def request(meth, path, params = {})
         full_path = encode_path_params(@api_endpoint + path, params)
-        request = VERB_MAP[method.to_sym].new(full_path)
+        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)
+
         @http.request(request)
       end
 

data/lib/vscale/api/account.rb

@@ -3,9 +3,5 @@ module Vscale
     def account
       get('account')
     end
-
-    def auth
-      get('auth')
-    end
   end
 end

data/lib/vscale/api/backups.rb

@@ -0,0 +1,15 @@
+module Vscale
+  module Backups
+    def backups
+      get('backups')
+    end
+
+    def backup(id)
+      get("backups/#{id}")
+    end
+
+    def delete_backup(backup_id)
+      delete("backups/#{backup_id}")
+    end
+  end
+end

data/lib/vscale/api/billing.rb

@@ -1,7 +1,7 @@
 module Vscale
   module Billing
     def payments
-      get('billing/payments')
+      get('billing/payments/')
     end
 
     def consumption(params)

data/lib/vscale/api/domains.rb

@@ -0,0 +1,97 @@
+module Vscale
+  module Domains
+    def domains
+      get('domains/')
+    end
+
+    def add_domain(params = {})
+      post('domains/', params)
+    end
+
+    def domain_id(id)
+      get("domains/#{id}")
+    end
+
+    alias_method :find_domain, :domain_id
+    alias_method :domain_info, :domain_id
+
+    def update_domain(domain_id, params = {})
+      patch("domains/#{domain_id}", params)
+    end
+
+    alias_method :change_domain, :update_domain
+
+    def remove_domain(domain_id)
+      delete("domains/#{domain_id}")
+    end
+
+    alias_method :delete_domain, :remove_domain
+    alias_method :rm_domain, :remove_domain
+
+    ##  Domains Records
+
+    def domain_records(domain_id)
+      get("domains/#{domain_id}/records/")
+    end
+
+    def add_domain_record(domain_id, params = {})
+      post("domains/#{domain_id}/records/", params)
+    end
+
+    def update_domain_record(domain_id, record_id, params = {})
+      put("domains/#{domain_id}/records/#{record_id}", params)
+    end
+
+    def remove_domain_record(domain_id, record_id)
+      delete("domains/#{domain_id}/records/#{record_id}")
+    end
+
+    def domain_record(domain_id, record_id)
+      get("domains/#{domain_id}/records/#{record_id}")
+    end
+
+    ## Domains Tags
+
+    def add_domains_tags(params = {})
+      post('domains/tags/', params)
+    end
+
+    def domains_tags
+      get('domains/tags/')
+    end
+
+    def domains_tag_id(tag_id)
+      get("domains/tags/#{tag_id}")
+    end
+
+    def update_domains_tag(tag_id, params = {})
+      put("domains/tags/#{tag_id}", params)
+    end
+
+    def remove_domains_tag(tag_id)
+      delete("domains/tags/#{tag_id}")
+    end
+
+    ## PTR Records
+
+    def add_domains_ptr(params = {})
+      post('domains/ptr/', params)
+    end
+
+    def domains_ptr
+      get('domains/ptr/')
+    end
+
+    def domains_ptr_id(ptr_id)
+      get("domains/ptr/#{ptr_id}")
+    end
+
+    def update_ptr_id(ptr_id, params = {})
+      put("domains/ptr/#{ptr_id}", params)
+    end
+
+    def remove_ptr_id(ptr_id)
+      delete("domains/ptr/#{ptr_id}")
+    end
+  end
+end

data/lib/vscale/api/notifications.rb

@@ -0,0 +1,11 @@
+module Vscale
+  module Notifications
+    def notify
+      get('billing/notify')
+    end
+
+    def update_notify(params = {})
+      put('billing/notify', params)
+    end
+  end
+end

data/lib/vscale/api/request.rb

@@ -22,8 +22,8 @@ module Vscale
       request_json :put, path, params
     end
 
-    def delete(path, params = {})
-      request_json :delete, path, params
+    def delete(path)
+      request_json :delete, path
     end
 
     def patch(path, params = {})

data/lib/vscale/api/servers.rb

@@ -36,8 +36,28 @@ module Vscale
       get('tasks')
     end
 
-    def scalet_sshkeys(params)
+    def scalet_sshkeys(id, params)
       patch("sshkeys/scalets/#{id}", params)
     end
+
+    def add_scalet_tag(params)
+      post('scalets/tags', params)
+    end
+
+    def scalets_tags
+      get('scalets/tags')
+    end
+
+    def scalet_tag(tag_id)
+      get("scalets/tags/#{tag_id}")
+    end
+
+    def update_scalet_tag(tag_id, params)
+      put("scalets/tags/#{tag_id}", params)
+    end
+
+    def remove_scalet_tag(tag_id)
+      delete("scalets/tags/#{tag_id}")
+    end
   end
 end

data/lib/vscale/api/version.rb

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

data/vscale-api.gemspec

@@ -27,9 +27,11 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vscale-api
 version: !ruby/object:Gem::Version
-  version: 0.2.45
+  version: 0.2.46
 platform: ruby
 authors:
 - Ilya V
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,8 +52,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Vscale API v1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "    Vscale API v1\n"
 email:
 - ilya@codeplay.ru
 executables: []
@@ -61,15 +74,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/.name"
-- ".idea/.rakeTasks"
-- ".idea/encodings.xml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/ruby-vscale-api.iml"
-- ".idea/scopes/scope_settings.xml"
-- ".idea/vcs.xml"
-- ".idea/workspace.xml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -83,13 +87,14 @@ files:
 - lib/vscale/api.rb
 - lib/vscale/api/account.rb
 - lib/vscale/api/background.rb
+- lib/vscale/api/backups.rb
 - lib/vscale/api/billing.rb
 - lib/vscale/api/configurations.rb
+- lib/vscale/api/domains.rb
+- lib/vscale/api/notifications.rb
 - lib/vscale/api/request.rb
 - lib/vscale/api/servers.rb
 - lib/vscale/api/sshkeys.rb
-- lib/vscale/api/tickets.rb
-- lib/vscale/api/tokens.rb
 - lib/vscale/api/version.rb
 - vscale-api.gemspec
 homepage: https://github.com/Smolget/vscale-api
@@ -113,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Vscale API v1

data/lib/vscale/api/tickets.rb

@@ -1,23 +0,0 @@
-module Vscale
-  module Tickets
-    def tickets
-      get('tickets')
-    end
-
-    def tickets_new(params)
-      post('tickets', params)
-    end
-
-    def ticket_comments
-      get("tickets/#{id}/comments")
-    end
-
-    def tickets_add_comment(params)
-      post('tickets', params)
-    end
-
-    def tickets_close(id)
-      post("tickets/#{id}/close")
-    end
-  end
-end

data/lib/vscale/api/tokens.rb

@@ -1,19 +0,0 @@
-module Vscale
-  module Tokens
-    def tokens(params = {})
-      params.empty? ? get('tokens') : post('tokens', params)
-    end
-
-    def find_token(id)
-      get("tokens/#{id}")
-    end
-
-    def update_token(id, params)
-      post("tokens/#{id}", params)
-    end
-
-    def remove_token(id)
-      delete("tokens/#{id}")
-    end
-  end
-end