vultr 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d228aac0df7c724995a66e8825e4627d2578557427a08fdfd3472c9fa4c8f67
-  data.tar.gz: cbaadf4151d305cac4946f756a4f6a5974a7eb60821c43c5eb7505f0bd6ccd15
+  metadata.gz: dbb52a12c7cdc57603fa024d78fdad2d7dcbcf4c0d9671366bffb1d77e10f4c8
+  data.tar.gz: 03c29fab7c22d02da8899cb7991179af78c7b5401d3e6a77d8dd8f6be13f3d6c
 SHA512:
-  metadata.gz: 6f94f4581bac3bc02b65c57f1d5906250d0c2f256bfbd2a1df26274409836ca1da10ba03d046dc857fb0f4b433aedf98b2592344ac16603a3b297ccb9e9b16fb
-  data.tar.gz: 9d64fdd19409ccc87834c1bb86b4e04cc299bcb69d183051729e27d1c46639ebc7103a0a64cee29479677a3c0f18742b7bb8ea0f1af4c6283289ab727832491a
+  metadata.gz: 600a9f8c3a4254770c3c45dc16d9c744bff7775e44350a67b73dc86525e7c6c80ac20c273456279d4e3384b1315731071604a25fd7787452d7203afc2a1521a0
+  data.tar.gz: aeed5037be9893cbf7765127ac0f1c6d6f5d60050192ddd79623c15f029b68bb4c48bbcfc4b80d1ae2eb3ea152f7c8a0126d102b20ec4e97616ca761c9be9304

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+== 0.4.1 / 2018-09-25
+
+* Make the params of Vultr::Server.list correct.
+* Fix #11, pass params to query string only giving their values.
+
+== 0.4.0 / 2018-09-12
+
+* Update to the latest APIs.
+
+== 0.3.5 / 2018-08-14
+
+* Update dependencies.
+
 == 0.3.4 / 2017-09-26
 
 * Fix ReservedIP API

data/Gemfile

@@ -1,5 +1,12 @@
 source 'https://rubygems.org'
-gemspec
 
 gem 'rake', '~> 10.5.0' if RUBY_VERSION < '1.9.3'
 gem 'rake' if RUBY_VERSION >= '1.9.3'
+
+group :test do
+    gem 'coveralls', :require => false
+    gem 'minitest', '>= 5.0.5'
+    gem 'simplecov'
+end
+
+gemspec

data/README.md

@@ -1,5 +1,10 @@
 # VULTR Rubygem
 
+[![Waffle.io - Columns and their card count](https://badge.waffle.io/tolbkni/vultr.rb.svg?columns=all)](https://waffle.io/tolbkni/vultr.rb)
+[![Build Status](https://img.shields.io/travis/tolbkni/vultr.rb.svg)](https://travis-ci.org/tolbkni/vultr.rb)
+[![Gem Version](https://badge.fury.io/rb/vultr.svg)](https://badge.fury.io/rb/vultr)
+
+
 The easiest and most complete rubygem for [VULTR](https://www.vultr.com).
 
 ```ruby

data/Rakefile

@@ -1 +1,10 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/lib/vultr.rb

@@ -2,246 +2,886 @@ require 'faraday'
 require 'faraday_middleware'
 require 'vultr/version'
 
-module Vultr
-  extend self
+module Vultr extend self
 
-  DEFINITIONS = {
-      Account: {
-          info: [:get, '/v1/account/info?api_key=[api_key]']
-      },
-      App: {
-          list: [:get, '/v1/app/list']
-      },
-      Auth: {
-          info: [:get, '/v1/auth/info?api_key=[api_key]']
-      },
-      Backup: {
-          list: [:get, '/v1/backup/list?api_key=[api_key]']
-      },
-      Block: {
-          attach: [:post, '/v1/block/attach?api_key=[api_key]', ['SUBID', 'attach_to_SUBID']],
-          create: [:post, '/v1/block/create?api_key=[api_key]', ['DCID', 'size_gb', 'label']],
-          delete: [:post, '/v1/block/delete?api_key=[api_key]', ['SUBID']],
-          detach: [:post, '/v1/block/detach?api_key=[api_key]', ['SUBID']],
-          label_set: [:post, '/v1/block/label_set?api_key=[api_key]', ['SUBID', 'label']],
-          list: [:get, '/v1/block/list?api_key=[api_key]&SUBID=[SUBID]'],
-          resize: [:post, '/v1/block/resize?api_key=[api_key]', ['SUBID', 'size_gb']]
-      },
-      DNS: {
-          create_domain: [:post, '/v1/dns/create_domain?api_key=[api_key]', ['domain', 'serverip']],
-          create_record: [:post, '/v1/dns/create_record?api_key=[api_key]', ['domain', 'name', 'type', 'data', 'ttl', 'priority']],
-          delete_domain: [:post, '/v1/dns/delete_domain?api_key=[api_key]', ['domain']],
-          delete_record: [:post, '/v1/dns/delete_record?api_key=[api_key]', ['domain', 'RECORDID']],
-          list: [:get, '/v1/dns/list?api_key=[api_key]'],
-          records: [:get, '/v1/dns/records?api_key=[api_key]&domain=[domain]'],
-          update_record: [:post, '/v1/dns/update_record?api_key=[api_key]', ['domain', 'RECORDID', 'name', 'type', 'data', 'ttl', 'priority']]
-      },
-      ISO: {
-          list: [:get, '/v1/iso/list?api_key=[api_key]']
-      },
-      OS: {
-          list: [:get, '/v1/os/list']
-      },
-      Plans: {
-          list: [:get, '/v1/plans/list?type=[type]'],
-          list_vc2: [:get, '/v1/plans/list_vc2'],
-          list_vdc2: [:get, '/v1/plans/list_vdc2']
-      },
-      Regions: {
-          availability: [:get, '/v1/regions/availability?DCID=[DCID]'],
-          list: [:get, '/v1/regions/list']
-      },
-      ReservedIP: {
-          attach: [:post, '/v1/reservedip/attach?api_key=[api_key]', ['ip_address', 'attach_SUBID']],
-          convert: [:post, '/v1/reservedip/convert?api_key=[api_key]', ['SUBID', 'ip_address', 'label']],
-          create: [:post, '/v1/reservedip/create?api_key=[api_key]', ['DCID', 'ip_type', 'label']],
-          destroy: [:post, '/v1/reservedip/destroy?api_key=[api_key]', ['ip_address']],
-          detach: [:post, '/v1/reservedip/detach?api_key=[api_key]', ['ip_address', 'detach_SUBID']],
-          list: [:get, '/v1/reservedip/list?api_key=[api_key]']
-      },
-      Server: {
-          app_change: [:post, '/v1/server/app_change?api_key=[api_key]', ['SUBID', 'APPID']],
-          app_change_list: [:get, '/v1/server/app_change?api_key=[api_key]&SUBID=[SUBID]'],
-          backup_disable: [:post, '/v1/server/backup_disable?api_key=[api_key]', ['SUBID']],
-          backup_enable: [:post, '/v1/server/backup_enable?api_key=[api_key]', ['SUBID']],
-          backup_get_schedule: [:post, '/v1/server/backup_get_schedule?api_key=[api_key]', ['SUBID']],
-          backup_set_schedule: [:post, '/v1/server/backup_set_schedule?api_key=[api_key]', ['SUBID', 'cron_type', 'hour', 'dow', 'dom']],
-          bandwidth: [:get, '/v1/server/bandwidth?api_key=[api_key]&SUBID=[SUBID]'],
-          create: [:post, '/v1/server/create?api_key=[api_key]',
-                   ['DCID', 'VPSPLANID', 'OSID', 'ipxe_chain_url', 'ISOID', 'SCRIPTID', 'SNAPSHOTID',
-                    'enable_ipv6', 'enable_private_network', 'private_network', 'label', 'SSHKEYID', 'auto_backups',
-                    'APPID', 'userdata', 'notify_activate', 'ddos_protection', 'reserved_ip_v4', 'hostname', 'tag']],
-          create_ipv4: [:post, '/v1/server/create_ipv4?api_key=[api_key]', ['SUBID', 'reboot']],
-          destroy: [:post, '/v1/server/destroy?api_key=[api_key]', ['SUBID']],
-          destroy_ipv4: [:post, '/v1/server/destroy_ipv4?api_key=[api_key]', ['SUBID', 'ip']],
-          get_app_info: [:get, '/v1/server/get_app_info?api_key=[api_key]&SUBID=[SUBID]'],
-          get_user_data: [:get, '/v1/server/set_user_data?api_key=[api_key]&SUBID=[SUBID]'],
-          halt: [:post, '/v1/server/halt?api_key=[api_key]', ['SUBID']],
-          iso_attach: [:post, '/v1/server/iso_detach?api_key=[api_key]', ['SUBID', 'ISOID']],
-          iso_detach: [:post, '/v1/server/iso_detach?api_key=[api_key]', ['SUBID']],
-          iso_status: [:get, '/v1/server/iso_status?api_key=[api_key]&SUBID=[SUBID]'],
-          label_set: [:post, '/v1/server/label_set?api_key=[api_key]', ['SUBID', 'label']],
-          list: [:get, '/v1/server/list?api_key=[api_key]&SUBID=[SUBID]&tag=[tag]'],
-          list_ipv4: [:get, '/v1/server/list_ipv4?api_key=[api_key]&SUBID=[SUBID]'],
-          list_ipv6: [:get, '/v1/server/list_ipv6?api_key=[api_key]&SUBID=[SUBID]'],
-          neighbors: [:get, '/v1/server/neighbors?api_key=[api_key]&SUBID=[SUBID]'],
-          os_change: [:post, '/v1/server/os_change?api_key=[api_key]', ['SUBID', 'OSID']],
-          os_change_list: [:get, '/v1/server/os_change_list?api_key=[api_key]&SUBID=[SUBID]'],
-          reboot: [:post, '/v1/server/reboot?api_key=[api_key]', ['SUBID']],
-          reinstall: [:post, '/v1/server/reinstall?api_key=[api_key]', ['SUBID', 'hostname']],
-          restore_backup: [:post, '/v1/server/restore_backup?api_key=[api_key]', ['SUBID', 'BACKUPID']],
-          restore_snapshot: [:post, '/v1/server/restore_snapshot?api_key=[api_key]', ['SUBID', 'SNAPSHOTID']],
-          reverse_default_ipv4: [:post, '/v1/server/reverse_default_ipv4?api_key=[api_key]', ['SUBID', 'ip']],
-          reverse_delete_ipv6: [:post, '/v1/server/reverse_delete_ipv6?api_key=[api_key]', ['SUBID', 'ip']],
-          reverse_list_ipv6: [:get, '/v1/server/reverse_list_ipv6?api_key=[api_key]&SUBID=[SUBID]'],
-          reverse_set_ipv4: [:post, '/v1/server/reverse_set_ipv4?api_key=[api_key]', ['SUBID', 'ip', 'entry']],
-          reverse_set_ipv6: [:post, '/v1/server/reverse_set_ipv6?api_key=[api_key]', ['SUBID', 'ip', 'entry']],
-          set_user_data: [:post, '/v1/server/set_user_data?api_key=[api_key]', ['SUBID', 'userdata']],
-          start: [:post, '/v1/server/start?api_key=[api_key]', ['SUBID']],
-          upgrade_plan: [:post, '/v1/server/upgrade_plan?api_key=[api_key]', ['SUBID', 'VPSPLANID']],
-          upgrade_plan_list: [:get, '/v1/server/upgrade_plan_list?api_key=[api_key]&SUBID=[SUBID]']
-      },
-      Snapshot: {
-          destroy: [:post, '/v1/snapshot/destroy?api_key=[api_key]', ['SNAPSHOTID']],
-          create: [:post, '/v1/snapshot/create?api_key=[api_key]', ['SUBID']],
-          list: [:get, '/v1/snapshot/list?api_key=[api_key]']
-      },
-      SSHKey: {
-          create: [:post, '/v1/sshkey/create?api_key=[api_key]', ['name', 'ssh_key']],
-          destroy: [:post, '/v1/sshkey/destroy?api_key=[api_key]', ['SSHKEYID']],
-          list: [:get, '/v1/sshkey/list?api_key=[api_key]'],
-          update: [:post, '/v1/sshkey/update?api_key=[api_key]', ['SSHKEYID', 'name', 'ssh_key']]
-      },
-      StartupScript: {
-          create: [:post, '/v1/startupscript/create?api_key=[api_key]', ['name', 'script', 'type']],
-          destroy: [:post, '/v1/startupscript/destroy?api_key=[api_key]', ['SCRIPTID']],
-          list: [:get, '/v1/startupscript/list?api_key=[api_key]'],
-          update: [:post, '/v1/startupscript/update?api_key=[api_key]', ['SCRIPTID', 'name', 'script']]
-      },
-      User: {
-          create: [:post, '/v1/user/create?api_key=[api_key]', ['email', 'name', 'password', 'api_enabled', 'acls']],
-          delete: [:post, '/v1/user/delete?api_key=[api_key]', ['USERID']],
-          list: [:get, '/v1/user/list?api_key=[api_key]'],
-          update: [:post, '/v1/user/update?api_key=[api_key]', ['USERID', 'email', 'name', 'password', 'api_enabled', 'acls']]
-      }
-  }
-
-  DEFINITIONS.each do |resource|
-    resource_name = resource[0]
+    DEFINITIONS = {
+        # Account
+        Account: {
+            info: {
+                :method => :get,
+                :path => '/v1/account/info',
+                :apikey_required => true
+            }
+        },
+        # Application
+        App: {
+            list: {
+                :method => :get,
+                :path => '/v1/app/list',
+                :apikey_required => false
+            }
+        },
+        # API Key
+        Auth: {
+            info: {
+                :method => :get,
+                :path => '/v1/auth/info',
+                :apikey_required => true
+            }
+        },
+        # Backup
+        Backup: {
+            list: {
+                :method => :get,
+                :path => '/v1/backup/list',
+                :params => %w(SUBID BACKUPID),
+                :apikey_required => true
+            }
+        },
+        # Bare Metal
+        BareMetal: {
+            app_change: {
+                :method => :post,
+                :path => '/v1/baremetal/app_change',
+                :params => %w(SUBID APPID),
+                :apikey_required => true
+            },
+            app_change_list: {
+                :method => :get,
+                :path => '/v1/baremetal/app_change_list',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            bandwidth: {
+                :method => :get,
+                :path => '/v1/baremetal/bandwidth',
+                :apikey_required => true
+            },
+            create: {
+                :method => :post,
+                :path => '/v1/baremetal/create',
+                :params => %w(DCID METALPLANID OSID SCRIPTID SNAPSHOTID enable_ipv6 label SSHKEYID APPID userdata notify_activate hostname tag),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/baremetal/destroy',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            get_app_info: {
+                :method => :get,
+                :path => '/v1/baremetal/get_app_info',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            get_user_data: {
+                :method => :get,
+                :path => '/v1/baremetal/get_user_data',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            halt: {
+                :method => :post,
+                :path => '/v1/baremetal/halt',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            ipv6_enable: {
+                :method => :post,
+                :path => '/v1/baremetal/ipv6_enable',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            label_set: {
+                :method => :post,
+                :path => '/v1/baremetal/label_set',
+                :params => %w(SUBID label),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/baremetal/list',
+                :params => %w(SUBID tag label main_ip),
+                :apikey_required => true
+            },
+            list_ipv4: {
+                :method => :get,
+                :path => '/v1/baremetal/list_ipv4',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            list_ipv6: {
+                :method => :get,
+                :path => '/v1/baremetal/list_ipv6',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            os_change: {
+                :method => :post,
+                :path => '/v1/baremetal/os_change',
+                :params => %w(SUBID OSID),
+                :apikey_required => true
+            },
+            os_change_list: {
+                :method => :get,
+                :path => '/v1/baremetal/os_change_list',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            reboot: {
+                :method => :post,
+                :path => '/v1/baremetal/reboot',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            reinstall: {
+                :method => :post,
+                :path => '/v1/baremetal/reinstall',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            set_user_data: {
+                :method => :post,
+                :path => '/v1/baremetal/set_user_data',
+                :params => %w(SUBID userdata),
+                :apikey_required => true
+            },
+            tag_set: {
+                :method => :post,
+                :path => '/v1/baremetal/tag_set',
+                :params => %w(SUBID tag),
+                :apikey_required => true
+            }
+        },
+        # Block Storage
+        Block: {
+            attach: {
+                :method => :post,
+                :path => '/v1/block/attach?api_key=[api_key]',
+                :params => %w(SUBID attach_to_SUBID),
+                :apikey_required => true
+            },
+            create: {
+                :method => :post,
+                :path => '/v1/block/create',
+                :params => %w(DCID size_gb label),
+                :apikey_required => true
+            },
+            delete: {
+                :method => :post,
+                :path => '/v1/block/delete',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            detach: {
+                :method => :post,
+                :path => '/v1/block/detach',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            label_set: {
+                :method => :post,
+                :path => '/v1/block/label_set',
+                :params => %w(SUBID label),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/block/list',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            resize: {
+                :method => :post,
+                :path => '/v1/block/resize',
+                :params => %w(SUBID size_gb),
+                :apikey_required => true
+            }
+        },
+        # DNS
+        DNS: {
+            create_domain: {
+                :method => :post,
+                :path => '/v1/dns/create_domain',
+                :params => %w(domain serverip),
+                :apikey_required => true
+            },
+            create_record: {
+                :method => :post,
+                :path => '/v1/dns/create_record',
+                :params => %w(domain name type data ttl priority),
+                :apikey_required => true
+            },
+            delete_domain: {
+                :method => :post,
+                :path => '/v1/dns/delete_domain',
+                :params => %w(domain),
+                :apikey_required => true
+            },
+            delete_record: {
+                :method => :post,
+                :path => '/v1/dns/delete_record',
+                :params => %w(domain RECORDID),
+                :apikey_required => true
+            },
+            dnssec_enable: {
+                :method => :post,
+                :path => '/v1/dns/dnssec_enable',
+                :params => %w(domain enable),
+                :apikey_required => true
+            },
+            dnssec_info: {
+                :method => :post,
+                :path => '/v1/dns/dnssec_info',
+                :params => %w(domain),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/dns/list',
+                :apikey_required => true
+            },
+            records: {
+                :method => :get,
+                :path => '/v1/dns/records',
+                :params => %w(domain),
+                :apikey_required => true
+            },
+            soa_info: {
+                :method => :get,
+                :path => '/v1/dns/records',
+                :params => %w(domain),
+                :apikey_required => true
+            },
+            soa_update: {
+                :method => :get,
+                :path => '/v1/dns/records',
+                :params => %w(domain),
+                :apikey_required => true
+            },
+            update_record: {
+                :method => :post,
+                :path => '/v1/dns/update_record',
+                :params => %w(domain RECORDID name type data ttl priority),
+                :apikey_required => true
+            }
+        },
+        # Firewall
+        Firewall: {
+            group_create: {
+                :method => :post,
+                :path => '/v1/firewall/group_create',
+                :params => %w(description),
+                :apikey_required => true
+            },
+            group_delete: {
+                :method => :post,
+                :path => '/v1/firewall/group_delete',
+                :params => %w(FIREWALLGROUPID),
+                :apikey_required => true
+            },
+            group_list: {
+                :method => :get,
+                :path => '/v1/firewall/group_list',
+                :params => %w(FIREWALLGROUPID),
+                :apikey_required => true
+            },
+            group_set_description: {
+                :method => :post,
+                :path => '/v1/firewall/group_set_description',
+                :params => %w(FIREWALLGROUPID description),
+                :apikey_required => true
+            },
+            rule_create: {
+                :method => :post,
+                :path => '/v1/firewall/rule_create',
+                :params => %w(FIREWALLGROUPID direction ip_type protocol subnet subnet_size port notes),
+                :apikey_required => true
+            },
+            rule_delete: {
+                :method => :post,
+                :path => '/v1/firewall/rule_delete',
+                :params => %w(FIREWALLGROUPID rulenumber),
+                :apikey_required => true
+            },
+            rule_list: {
+                :method => :get,
+                :path => '/v1/firewall/rule_list',
+                :params => %w(FIREWALLGROUPID direction ip_type),
+                :apikey_required => true
+            }
+        },
+        # ISO Image
+        ISO: {
+            create_from_url: {
+                :method => :post,
+                :path => '/v1/iso/create_from_url',
+                :params => %w(url),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/iso/list',
+                :apikey_required => true
+            },
+            list_public: {
+                :method => :get,
+                :path => '/v1/iso/list_public',
+                :apikey_required => true
+            }
+        },
+        # Network
+        Network: {
+            create: {
+                :method => :post,
+                :path => '/v1/network/create',
+                :params => %w(DCID description v4_subnet v4_subnet_mask),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/network/destroy',
+                :params => %w(NETWORKID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/network/list',
+                :apikey_required => true
+            }
+        },
+        # Operating System
+        OS: {
+            list: {
+                :method => :get,
+                :path => '/v1/os/list',
+                :auth_required => false
+            }
+        },
+        # Plans
+        Plans: {
+            list: {
+                :method => :get,
+                :path => '/v1/plans/list',
+                :params => %w(type),
+                :auth_required => true
+            },
+            list_baremetal: {
+                :method => :get,
+                :path => '/v1/plans/list_baremetal',
+                :auth_required => true
+            },
+            list_vc2: {
+                :method => :get,
+                :path => '/v1/plans/list_vc2',
+                :apikey_required => false
+            },
+            list_vdc2: {
+                :method => :get,
+                :path => '/v1/plans/list_vdc2',
+                :apikey_required => false
+            }
+        },
+        # Regions
+        Regions: {
+            availability: {
+                :method => :get,
+                :path => '/v1/regions/availability',
+                :params => %w(DCID type),
+                :apikey_required => false
+            },
+            availability_baremetal: {
+                :method => :get,
+                :path => '/v1/regions/availability_baremetal',
+                :params => %w(DCID),
+                :apikey_required => true
+            },
+            availability_vc2: {
+                :method => :get,
+                :path => '/v1/regions/availability_vc2',
+                :params => %w(DCID),
+                :apikey_required => false
+            },
+            availability_vdc2: {
+                :method => :get,
+                :path => '/v1/regions/availability_vdc2',
+                :params => %w(DCID),
+                :apikey_required => false
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/regions/list',
+                :params => %w(availability),
+                :apikey_required => false
+            }
+        },
+        # Reserved IP
+        ReservedIP: {
+            attach: {
+                :method => :post,
+                :path => '/v1/reservedip/attach',
+                :params => %w(ip_address attach_SUBID),
+                :apikey_required => true
+            },
+            convert: {
+                :method => :post,
+                :path => '/v1/reservedip/convert',
+                :params => %w(SUBID ip_address label),
+                :apikey_required => true
+            },
+            create: {
+                :method => :post,
+                :path => '/v1/reservedip/create',
+                :params => %w(DCID ip_type label),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/reservedip/destroy',
+                :params => %w(ip_address),
+                :apikey_required => true
+            },
+            detach: {
+                :method => :post,
+                :path => '/v1/reservedip/detach',
+                :params => %w(ip_address detach_SUBID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/reservedip/list',
+                :apikey_required => true
+            }
+        },
+        # Server
+        Server: {
+            app_change: {
+                :method => :post,
+                :path => '/v1/server/app_change',
+                :params => %w(SUBID APPID),
+                :auth_required => true
+            },
+            app_change_list: {
+                :method => :get,
+                :path => '/v1/server/app_change_list',
+                :params => ['SUBID'],
+                :auth_required => true
+            },
+            backup_disable: {
+                :method => :post,
+                :path => '/v1/server/backup_disable',
+                :params => %w(SUBID),
+                :auth_required => true
+            },
+            backup_enable: {
+                :method => :post,
+                :path => '/v1/server/backup_enable',
+                :params => %w(SUBID),
+                :auth_required => true
+            },
+            backup_get_schedule: {
+                :method => :post,
+                :path => '/v1/server/backup_get_schedule',
+                :params => %w(SUBID),
+                :auth_required => true
+            },
+            backup_set_schedule: {
+                :method => :post,
+                :path => '/v1/server/backup_set_schedule',
+                :params => %w(SUBID cron_type hour dow dom),
+                :auth_required => true
+            },
+            bandwidth: {
+                :method => :get,
+                :path => '/v1/server/bandwidth',
+                :params => %w(SUBID),
+                :auth_required => true
+            },
+            create: {
+                :method => :post,
+                :path => '/v1/server/create',
+                :params => %w(DCID VPSPLANID OSID ipxe_chain_url ISOID SCRIPTID SNAPSHOTID enable_ipv6 enable_private_network NETWORKID label SSHKEYID auto_backups APPID userdata notify_activate ddos_protection reserved_ip_v4 hostname tag FIREWALLGROUPID),
+                :auth_required => true
+            },
+            create_ipv4: {
+                :method => :post,
+                :path => '/v1/server/create_ipv4',
+                :params => %w(SUBID reboot),
+                :auth_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/server/destroy',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            destroy_ipv4: {
+                :method => :post,
+                :path => '/v1/server/destroy_ipv4',
+                :params => %w(SUBID ip),
+                :apikey_required => true
+            },
+            firewall_group_set: {
+                :method => :post,
+                :path => '/v1/server/firewall_group_set',
+                :params => %w(SUBID FIREWALLGROUPID),
+                :apikey_required => true
+            },
+            get_app_info: {
+                :method => :get,
+                :path => '/v1/server/get_app_info',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            get_user_data: {
+                :method => :get,
+                :path => '/v1/server/set_user_data',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            halt: {
+                :method => :post,
+                :path => '/v1/server/halt',
+                :params => %w('SUBID'),
+                :apikey_required => true
+            },
+            ipv6_enable: {
+                :method => :post,
+                :path => '/v1/server/ipv6_enable',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            iso_attach: {
+                :method => :post,
+                :path => '/v1/server/iso_detach',
+                :params => %w(SUBID, ISOID),
+                :apikey_required => true
+            },
+            iso_detach: {
+                :method => :post,
+                :path => '/v1/server/iso_detach',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            iso_status: {
+                :method => :get,
+                :path => '/v1/server/iso_status',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            label_set: {
+                :method => :post,
+                :path => '/v1/server/label_set',
+                :params => %w(SUBID label),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/server/list',
+                :params => %w(SUBID tag label main_ip),
+                :apikey_required => true
+            },
+            list_ipv4: {
+                :method => :get,
+                :path => '/v1/server/list_ipv4',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            list_ipv6: {
+                :method => :get,
+                :path => '/v1/server/list_ipv6',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            neighbors: {
+                :method => :get,
+                :path => '/v1/server/neighbors',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            os_change: {
+                :method => :post,
+                :path => '/v1/server/os_change',
+                :params => %w(SUBID OSID),
+                :apikey_required => true
+            },
+            os_change_list: {
+                :method => :get,
+                :path => '/v1/server/os_change_list',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            private_network_disable: {
+                :method => :post,
+                :path => '/v1/server/private_network_disable',
+                :params => %w(SUBID NETWORKID),
+                :apikey_required => true
+            },
+            private_network_enable: {
+                :method => :post,
+                :path => '/v1/server/private_network_enable',
+                :params => %w(SUBID NETWORKID),
+                :apikey_required => true
+            },
+            private_networks: {
+                :method => :get,
+                :path => '/v1/server/private_networks',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            reboot: {
+                :method => :post,
+                :path => '/v1/server/reboot' 'SUBID',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            reinstall: {
+                :method => :post,
+                :path => '/v1/server/reinstall',
+                :params => %w(SUBID hostname),
+                :apikey_required => true
+            },
+            restore_backup: {
+                :method => :post,
+                :path => '/v1/server/restore_backup',
+                :params => %w(SUBID BACKUPID),
+                :apikey_required => true
+            },
+            restore_snapshot: {
+                :method => :post,
+                :path => '/v1/server/restore_snapshot',
+                :params => %w(SUBID SNAPSHOTID),
+                :apikey_required => true
+            },
+            reverse_default_ipv4: {
+                :method => :post,
+                :path => '/v1/server/reverse_default_ipv4',
+                :params => %w(SUBID ip),
+                :apikey_required => true
+            },
+            reverse_delete_ipv6: {
+                :method => :post,
+                :path => '/v1/server/reverse_delete_ipv6',
+                :params => %w(SUBID ip),
+                :apikey_required => true
+            },
+            reverse_list_ipv6: {
+                :method => :get,
+                :path => '/v1/server/reverse_list_ipv6',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            reverse_set_ipv4: {
+                :method => :post,
+                :path => '/v1/server/reverse_set_ipv4',
+                :params => %w(SUBID ip entry),
+                :apikey_required => true
+            },
+            reverse_set_ipv6: {
+                :method => :post,
+                :path => '/v1/server/reverse_set_ipv6',
+                :params => %w(SUBID ip entry),
+                :apikey_required => true
+            },
+            set_user_data: {
+                :method => :post,
+                :path => '/v1/server/set_user_data',
+                :params => %w(SUBID userdata),
+                :apikey_required => true
+            },
+            start: {
+                :method => :post,
+                :path => '/v1/server/start',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            tag_set: {
+                :method => :post,
+                :path => '/v1/server/tag_set',
+                :params => %w(SUBID tag),
+                :apikey_required => true
+            },
+            upgrade_plan: {
+                :method => :post,
+                :path => '/v1/server/upgrade_plan',
+                :params => %w(SUBID VPSPLANID),
+                :apikey_required => true
+            },
+            upgrade_plan_list: {
+                :method => :get,
+                :path => '/v1/server/upgrade_plan_list',
+                :params => %w(SUBID),
+                :apikey_required => true
+            }
+        },
+        # Snapshot
+        Snapshot: {
+            create: {
+                :method => :post,
+                :path => '/v1/snapshot/create',
+                :params => %w(SUBID),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/snapshot/destroy',
+                :params => %w(SNAPSHOTID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/snapshot/list',
+                :apikey_required => true
+            }
+        },
+        # SSH Key
+        SSHKey: {
+            create: {
+                :method => :post,
+                :path => '/v1/sshkey/create',
+                :params => %w(name ssh_key),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/sshkey/destroy',
+                :params => %w(SSHKEYID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/sshkey/list',
+                :apikey_required => true
+            },
+            update: {
+                :method => :post,
+                :path => '/v1/sshkey/update',
+                :params => %w(SSHKEYID name ssh_key)
+            }
+        },
+        # Startup Script
+        StartupScript: {
+            create: {
+                :method => :post,
+                :path => '/v1/startupscript/create',
+                :params => %w(name script type),
+                :apikey_required => true
+            },
+            destroy: {
+                :method => :post,
+                :path => '/v1/startupscript/destroy',
+                :params => %w(SCRIPTID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/startupscript/list',
+                :apikey_required => true
+            },
+            update: {
+                :method => :post,
+                :path => '/v1/startupscript/update',
+                :params => %w(SCRIPTID name script),
+                :apikey_required => true
+            }
+        },
+        # User Management
+        User: {
+            create: {
+                :method => :post,
+                :path => '/v1/user/create',
+                :params => %w(email name password api_enabled acls),
+                :apikey_required => true
+            },
+            delete: {
+                :method => :post,
+                :path => '/v1/user/delete',
+                :params => %w(USERID),
+                :apikey_required => true
+            },
+            list: {
+                :method => :get,
+                :path => '/v1/user/list',
+                :apikey_required => true
+            },
+            update: {
+                :method => :post,
+                :path => '/v1/user/update',
+                :params => %w(USERID email name password api_enabled acls),
+                :apikey_required => true
+            }
+        }
+    }
 
-    resource_class = Class.new(Object) do
-      DEFINITIONS[resource_name].each do |action, array|
-        method_name = array[0]
-        path, query = array[1].split('?')
-        params = array[2]
+    DEFINITIONS.each do |resource_name, actions|
+        resource_class = Class.new(Object) do
+            actions.each do |action, config|
+                method = config.fetch(:method)
+                path = config.fetch(:path)
+                params = config.fetch(:params, nil)
+                apikey_required = config.fetch(:apikey_required, false)
 
-        define_singleton_method "_#{action}" do |*args|
-          query_for_method = Vultr.process_query_args_from_path(query, args)
-          url = [Vultr.api_endpoint, path].join('')
+                define_singleton_method action do |*args|
+                    headers = apikey_required ? {'API-Key': Vultr::APIKey} : {}
+                    body = nil
+                    if method == :get
+                        extra_params = Hash.new
+                        hash = args[-1]
+                        if hash.is_a?(Hash)
+                            hash.each do |key, value|
+                                extra_params[key] = value if params.include? key.to_s
+                            end
+                        end
+                        url = Vultr.request.build_url(path, extra_params)
+                    elsif method == :post
+                        body = Hash.new
+                        hash = args[-1]
+                        if hash.is_a?(Hash)
+                            hash.each do |key, value|
+                                body[key] = value if params.include? key.to_s
+                            end
+                        end
+                        url = Vultr.request.build_url(path)
+                    end
 
-          if query_for_method.nil?
-            url
-          else
-            [url, query_for_method].join('?')
-          end
+                    resp = Vultr.request.run_request(method, url, body, headers)
+                    {status: resp.status, result: resp.body}
+                end
+            end
         end
 
-        define_singleton_method action do |*args|
-          post_for_method = Vultr.process_params_args_from_keys(params, args)
-          Vultr.request_and_respond(method_name, send("_#{action}", *args), post_for_method)
-        end
-      end
-    end
-
-    Vultr.const_set(resource_name, resource_class)
-  end
-
-  def request=(request)
-    @request = request
-  end
-
-  def request
-    @request
-  end
-
-  def api_key=(api_key)
-    @api_key = api_key
-    setup_request!
-
-    @api_key
-  end
-
-  def api_key
-    return @api_key if @api_key
-    'api_key_required'
-  end
-
-  def api_endpoint
-    'https://api.vultr.com'
-  end
-
-  def request_and_respond(method_name, url, body = nil)
-    if body.nil?
-      resp = Vultr.request.send method_name, url
-    else
-      resp = Vultr.request.send method_name, url, body
+        Vultr.const_set(resource_name, resource_class)
     end
-    {status: resp.status, result: resp.body}
-  end
-
-  def process_api_key(parts)
-    api_key_index = parts.index 'api_key=[api_key]'
-    parts[api_key_index].sub!(/\[api_key\]/, api_key) if api_key_index
-
-    parts
-  end
-
-  def process_query_args_from_path(query, args)
-    return if query.nil?
 
-    parts = query.split('&')
-    parts = process_api_key(parts)
-
-    hash = args[-1]
-    if hash.is_a?(Hash)
-      hash.each do |key, value|
-        query_arg_index = parts.index "#{key}=[#{key}]"
-        parts[query_arg_index].sub!(/\[.*\]/, value.to_s) if query_arg_index
-      end
+    def request=(request)
+        @request = request
     end
 
-    parts.delete_if do |x|
-      x =~ /=\[.*\]/
+    def request
+        @request
     end
-    parts.join('&')
-  end
 
-  def process_params_args_from_keys(params, args)
-    return if params.nil?
+    def api_key=(api_key)
+        Vultr.const_set('APIKey', api_key)
+        setup_request!
 
-    body = Hash.new
-    hash = args[-1]
-    if hash.is_a?(Hash)
-      hash.each do |key, value|
-        body[key] = value if params.include? key.to_s
-      end
+        Vultr::APIKey
     end
 
-    body unless body.empty?
-  end
+    def api_key
+        return Vultr::APIKey if Vultr::APIKey
+        'API Key is required'
+    end
 
-  private
+    private
 
-  def setup_request!
-    options = {
-        headers: {:Accept => 'application/json'}
-    }
-
-    Vultr.request = Faraday.new(options) do |faraday|
-      faraday.request :url_encoded
-      faraday.response :json, :content_type => 'application/json'
-      faraday.response :follow_redirects
-      faraday.adapter Faraday.default_adapter
+    def setup_request!
+        Vultr.request = Faraday.new do |faraday|
+            faraday.url_prefix = 'https://api.vultr.com'
+            faraday.request :url_encoded
+            faraday.response :json, :content_type => 'application/json'
+            faraday.adapter :net_http
+        end
     end
-  end
 end