ivapi 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535ebd41e87d2ce434325939ed2cce35cdc8a556
-  data.tar.gz: e7f94686b9a33f2a30f54a7dfd2868e143f17714
+  metadata.gz: 14d8f0abbc80a600939fc7ac3a1c81a3ea22e47b
+  data.tar.gz: 6cbbf8322b4186982f36db9230a57e77d1dc596b
 SHA512:
-  metadata.gz: dc7dbcdfb2bae8e214856d0c3b7ce581bdef424039bd1dde5dfb99eaaf35a413372aaeac7e9c8a6a37545e5d7fb404515a2fe5d5c96e67780b8c42f2ac265fba
-  data.tar.gz: 53d8ea927d775fc9d9ffaca25734e887033f23ab27963b32cc5e4c98dcebaa723a19a4382d98c9d3923166ae7c7b4beb51519e59d4cb8a1d61262fe3d75078da
+  metadata.gz: cbb878f44d033f5828404fdf56bbe666e80349c81f40812797f7645b4d97face5408cfdd08fd348c98b11c273822540d1f82ed1a5cc3cf87ac4daa09dc13f318
+  data.tar.gz: ac15b5f60eb95e680cf72ee609861ea499da56e05dbfeef6172c425f7fc7f549c2593af1ae4ff96a3549f6a9f4b93b75ae49a6e597ccda985c0ca46e10df98ca

data/.rspec

@@ -1,3 +1,3 @@
 --color
 --fail-fast
---order random
+--order random

data/.travis.yml

@@ -1,7 +1,8 @@
+bundler_args: --without development
 language: ruby
 rvm:
   - jruby-19mode
   - rbx-19mode
   - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0.0

data/CONTRIBUTING.md

@@ -8,17 +8,19 @@ The following guidelines for contribution should be followed if you want to subm
 
 * You need a [GitHub account](https://github.com/signup/free)
 * Submit an [issue ticket](https://github.com/jpalumickas/ivapi/issues) for your issue if the is no one yet.
-  * Describe the issue and include steps to reproduce when it's a bug.
+  * Describe the issue and include steps to reproduce if it's a bug.
   * Ensure to mention the earliest version that you know is affected.
-* Fork the repository on GitHub
+* If you are able and want to fix this, fork the repository on GitHub
 
 ## Make Changes
 
-* In your forked repository, create a topic branch for your upcoming patch.
+* In your forked repository, create a topic branch for your upcoming patch. (e.g. `feature--autoplay` or `bugfix--ios-crash`)
   * Usually this is based on the master branch.
   * Create a branch based on master; `git branch
   fix/master/my_contribution master` then checkout the new branch with `git
   checkout fix/master/my_contribution`.  Please avoid working directly on the `master` branch.
+* Make sure you stick to the coding style that is used already.
+* Make use of the `.editorconfig`-file if provided with the repository.
 * Make commits of logical units and describe them properly.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 
@@ -29,7 +31,9 @@ The following guidelines for contribution should be followed if you want to subm
 
 * Push your changes to a topic branch in your fork of the repository.
 * Open a pull request to the original repository and choose the right original branch you want to patch.
-* If not done in commit messages (which you really should do) please reference and update your issue with the code changes.
+  _Advanced users may use [`hub`](https://github.com/defunkt/hub#git-pull-request) gem for that._
+* If not done in commit messages (which you really should do) please reference and update your issue with the code changes. But _please do not close the issue yourself_.
+_Notice: You can [turn your previously filed issues into a pull-request here](http://issue2pr.herokuapp.com/)._
 * Even if you have write access to the repository, do not directly push or merge pull-requests. Let another team member review your pull request and approve.
 
 # Additional Resources

data/Gemfile

@@ -3,12 +3,12 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :test do
-  gem 'json', '~> 1.7', platforms: [:ruby_18, :jruby]
-  gem 'rspec', '>= 2.13'
-  gem 'simplecov', require: false
-  gem 'webmock'
-  gem 'coveralls', require: false
-  gem 'guard-rspec'
+  gem 'json',         '~> 1.8.0', platforms: [:ruby_18, :jruby]
+  gem 'rspec',        '~> 2.14.1'
+  gem 'simplecov',    '~> 0.7.1', require: false
+  gem 'webmock',      '~> 1.13.0'
+  gem 'coveralls',    '~> 0.6.7', require: false
+  gem 'guard-rspec',  '~> 3.0.2'
 end
 
 gemspec

data/LICENSE

@@ -0,0 +1,21 @@
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Justas Palumickas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Ivapi
 
-Gem which helps to communicate with [iv.lt][] API
+Gem which helps to communicate with [http://iv.lt][iv.lt] ([http://dedikuoti.lt][dedikuoti.lt]) API.
 
 [![Gem Version](https://badge.fury.io/rb/ivapi.png)][rubygems]
 [![Build Status](https://secure.travis-ci.org/jpalumickas/ivapi.png?branch=master)][travis]
@@ -56,4 +56,5 @@ See [LICENSE][] for details.
 [codeclimate]: https://codeclimate.com/github/jpalumickas/ivapi
 
 [iv.lt]: http://www.iv.lt
+[dedikuoti.lt]: http://www.dedikuoti.lt
 [license]: LICENSE.md

data/Rakefile

@@ -5,4 +5,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task test: :spec
-task default: :spec
+task default: :spec

data/ivapi.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'bundler', '~> 1.0'
-  gem.add_dependency 'addressable', '~> 2.2'
+  gem.add_dependency 'addressable', '~> 2.3'
   gem.add_dependency 'faraday', '~> 0.8'
   gem.add_dependency 'faraday_middleware', '~> 0.9'
   gem.add_dependency 'hashie', '~> 2.0'
-  gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_dependency 'multi_json', '~> 1.7'
 
   gem.version = Ivapi::VERSION
 end

data/lib/faraday/response/raise_ivapi_error.rb

@@ -21,4 +21,4 @@ module Faraday
       raise ERROR_MAP[key].new(response) if ERROR_MAP.has_key? key
     end
   end
-end
+end

data/lib/ivapi.rb

@@ -7,7 +7,7 @@ module Ivapi
 
   class << self
 
-    def new(options={})
+    def new(options = {})
         Ivapi::Client.new(options)
     end
 

data/lib/ivapi/authentication.rb

@@ -12,4 +12,4 @@ module Ivapi
       !authentication.empty?
     end
   end
-end
+end

data/lib/ivapi/client.rb

@@ -9,7 +9,7 @@ module Ivapi
   class Client
     attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
 
-    def initialize(options={})
+    def initialize(options = {})
       options = Ivapi.options.merge(options)
       Configuration::VALID_OPTIONS_KEYS.each do |key|
        send("#{key}=", options[key])
@@ -24,4 +24,4 @@ module Ivapi
     include Ivapi::Client::Server
 
   end
-end
+end

data/lib/ivapi/client/account.rb

@@ -2,9 +2,9 @@ module Ivapi
   class Client
     module Account
 
-      # Get account information.
+      # Get information about account.
       #
-      # Returns the hash of account information.
+      # Returns the Hash of account information.
       def account_info
         params = { command: 'account_info' }
         get('/json.php', params)
@@ -12,7 +12,7 @@ module Ivapi
 
       # Get account orders.
       #
-      # Returns the hash of account orders.
+      # Returns the Hash of account orders.
       def account_orders
         params = { command: 'account_orders' }
         get('/json.php', params)
@@ -20,7 +20,7 @@ module Ivapi
 
       # Get account services.
       #
-      # Returns the hash of account services.
+      # Returns the Hash of account services.
       def account_services
         params = { command: 'account_services' }
         get('/json.php', params)
@@ -28,17 +28,21 @@ module Ivapi
 
       # Get account credits.
       #
-      # Returns the hash of account credits.
+      # count - The Integer of how many rows need to return (default: 10).
+      #
+      # Returns the Hash of account credits.
       def account_credits(count = 10)
-        options = { command: 'account_credits', count: count }
+        params = { command: 'account_credits', count: count }
         get('/json.php', params)
       end
 
       # Get account bonuses.
       #
-      # Returns the hash of account bonuses.
+      # count - The Integer of how many rows need to return (default: 10).
+      #
+      # Returns the Hash of account bonuses.
       def account_bonuses(count = 10)
-        params = { :command => 'account_bonuses', count: count }
+        params = { command: 'account_bonuses', count: count }
         get('/json.php', params)
       end
     end

data/lib/ivapi/client/server.rb

@@ -2,9 +2,9 @@ module Ivapi
   class Client
     module Server
 
-      # Get server information.
+      # Get information about server.
       #
-      # Returns the hash of server information.
+      # Returns the Hash of server information.
       def server_info
         params = { command: 'server_info', id: server_id }
         get('/json.php', params)
@@ -12,29 +12,39 @@ module Ivapi
 
       # Get server tasks.
       #
-      # count  - The Integer number of results count (Max 1000).
-      # options - The Hash of options (Available: task, task_id).
+      # count   - The Integer number of results count (max: 1000).
+      # options - The Hash options (default: {}):
+      #           :task    - The String of task name (optional).
+      #           :task_id - The Integer of task id (optional).
       #
-      # Returns The Hash of server tasks.
-      def server_tasks(count, options={})
-        params = options.merge({ command: 'server_tasks', id: server_id, count: count })
+      # Returns the Hash of server tasks.
+      def server_tasks(count, options = {})
+        params = options.merge({
+          command: 'server_tasks', id: server_id, count: count })
+
         get('/json.php', params)
       end
 
       # Get server graphs.
       #
-      # width  - The Integer number of graphs width (Max 1000, Optimal: 768).
-      # ip - The String of IP, who can view graphs.
+      # width - The Integer number of graphs width (max: 1000, optimal: 768).
+      # ip    - The String of ip, from which graphs can be viewed.
       #
-      # Returns the hash of server graphs.
+      # Returns the Hash of server graphs.
       def server_graphs(width, ip)
-        params = { command: 'server_graphs' , id: server_id, width: width, ip: ip }
+        params = {
+          command: 'server_graphs',
+          id: server_id,
+          width: width,
+          ip: ip
+        }
+
         get('/json.php', params)
       end
 
-      # Get all available server os.
+      # Get all available server operating systems.
       #
-      # Returns the hash of server os.
+      # Returns the Hash of available server os.
       def server_os
         params = { command: 'server_os', id: server_id }
         get('/json.php', params)
@@ -42,7 +52,7 @@ module Ivapi
 
       # Send command to reboot the server.
       #
-      # Returns The Integer of task id.
+      # Returns the Integer of task id.
       def server_reboot
         params = { command: 'server_reboot', id: server_id }
         get('/json.php', params)
@@ -50,56 +60,76 @@ module Ivapi
 
       # Send command to recreate the server.
       #
-      # os - The String of OS id.
-      # new_password - The String of new server password (8-64 lenght).
-      #
-      # Returns The Integer of task id.
-      def server_recreate(os, options={})
-        params = options.merge({ command: 'server_recreate', id: server_id, os: os })
+      # os      - The String of os (operating system) id.
+      # options - The Hash options (default: {}):
+      #           :new_password - The String of new server
+      #                           password (min: 8, max: 64).
+      #
+      # Returns the Integer of task id.
+      def server_recreate(os, options = {})
+        params = options.merge({
+          command: 'server_recreate',
+          id: server_id,
+          os: os
+        })
+
         get('/json.php', params)
       end
 
       # Send command to reset server password.
       #
-      # new_password - The String of new server password (8-64 lenght).
+      # options - The Hash options (default: {}):
+      #           :new_password - The String of new server
+      #                           password (min: 8, max: 64).
       #
-      # Returns The Integer of task id.
-      def server_reset_password(options={})
-        params = options.merge({ command: 'server_reset_password', id: server_id })
+      # Returns the Integer of task id.
+      def server_reset_password(options = {})
+        params = options.merge({
+          command: 'server_reset_password',
+          id: server_id
+        })
+
         get('/json.php', params)
       end
 
       # Send command to clean server firewall rules.
       #
-      # Returns The Integer of task id.
+      # Returns the Integer of task id.
       def server_flush_iptables
         params = { command: 'server_flush_iptables', id: server_id }
         get('/json.php', params)
       end
 
-      # Send command to change firewall settings
-      #
-      # pps - The Integer of incoming ICMP, UDP, TCP joins per second (1000 - 5000).
-      # pps_icmp - The Integer of ICMP packets per second (0 or 10 - 500).
-      # pps_udp - The Integer of UDP packets per second (0 or 10 - 500).
-      # pps_syn - The Integer of TCP SYN packets per second from one IP (0 or 2 - 20).
-      # connlimit - The Integer of collateral connections from one IP (0 or 16 - 512).
-      #
-      # Returns The Hash of new firewall settings.
-      def server_firewall(options={})
+      # Send command to change firewall settings.
+      #
+      # options - The Hash options (default: {}):
+      #           :pps       - The Integer of incoming ICMP, UDP, TCP joins per
+      #                        second (min: 1000, max: 5000).
+      #           :pps_icmp  - The Integer of ICMP packets per
+      #                        second (0 or min: 10, max: 500).
+      #           :pps_udp   - The Integer of UDP packets per
+      #                        second (0 or min: 10, max: 500).
+      #           :pps_syn   - The Integer of TCP SYN packets per second from
+      #                        one IP (0 or min: 2, max: 20).
+      #           :connlimit - The Integer of collateral connections from one
+      #                        IP (0 or min: 16, max: 512).
+      #
+      # Returns the Hash of new firewall settings.
+      def server_firewall(options = {})
         params = options.merge({ command: 'server_firewall', id: server_id })
         get('/json.php', params)
       end
 
       # Send command to change server plan.
       #
-      # cpu - The Integer of GHz (2 - 16)
-      # ram - The Integer of MB (2048 - 16384)
-      # quota - The Integer of GB (20 - 800)
-      # bandwidth - The Integer of Mbps (20 - 400)
+      # options - The Hash options (default: {}):
+      #           :cpu -       The Integer of GHz (min: 2, max: 16).
+      #           :ram -       The Integer of MB (min: 2048, max: 16384).
+      #           :quota -     The Integer of GB (min: 20, max: 800).
+      #           :bandwidth - The Integer of Mbps (min: 20, max: 400).
       #
-      # Returns The Integer of task id.
-      def server_change(options={})
+      # Returns the Integer of task id.
+      def server_change(options = {})
         params = options.merge({ command: 'server_change', id: server_id })
         get('/json.php', params)
       end
@@ -108,7 +138,7 @@ module Ivapi
       #
       # domain - The String of new server hostname.
       #
-      # Returns The Integer of task id.
+      # Returns the Integer of task id.
       def server_domain(domain)
         params = { command: 'server_domain', id: server_id, domain: domain }
         get('/json.php', params)

data/lib/ivapi/configuration.rb

@@ -26,7 +26,7 @@ module Ivapi
     end
 
     def options
-      VALID_OPTIONS_KEYS.inject({}){|o,k| o.merge!(k => send(k)) }
+      VALID_OPTIONS_KEYS.reduce({}) { |a, e| a.merge!(e => send(e)) }
     end
 
     def faraday_config(&block)
@@ -37,7 +37,8 @@ module Ivapi
       self.adapter = DEFAULT_ADAPTER
       self.username = nil
       self.password = nil
+      self.server_id = nil
       self.user_agent = DEFAULT_USER_AGENT
     end
   end
-end
+end

data/lib/ivapi/connection.rb

@@ -5,7 +5,7 @@ module Ivapi
   module Connection
     private
 
-    def connection(options={})
+    def connection(options = {})
       connection = Faraday.new(options) do |builder|
 
         builder.request :json
@@ -26,4 +26,4 @@ module Ivapi
       connection
     end
   end
-end
+end

data/lib/ivapi/error.rb

@@ -32,4 +32,4 @@ module Ivapi
 
   # Raised when iv.lt returns a 503 HTTP status code
   class ServiceUnavailable < Error; end
-end
+end

data/lib/ivapi/request.rb

@@ -1,13 +1,13 @@
 module Ivapi
   module Request
-    def get(path, options={})
+    def get(path, options = {})
       request(:get, path, options).body
     end
 
-    def request(method, path, options={})
+    def request(method, path, options = {})
 
       conn_options = {
-        :url => "https://api.iv.lt"
+        url: 'https://api.iv.lt'
       }
 
       options.merge!(authentication)
@@ -19,4 +19,4 @@ module Ivapi
       response
     end
   end
-end
+end

data/lib/ivapi/version.rb

@@ -1,3 +1,3 @@
 module Ivapi
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/fixtures/account_bonuses.json

@@ -17,4 +17,4 @@
     "bo_amount": "3.00",
     "bo_description": "SMS +370.61234569 (example)"
   }
-]
+]

data/spec/fixtures/account_info.json

@@ -39,4 +39,4 @@
       "us_description":"API"
     }
   ]
-}
+}

data/spec/fixtures/account_orders.json

@@ -26,4 +26,4 @@
     "or_cost": "13.13",
     "or_url": "https://saskaitos.iv.lt/"
   }
-]
+]

data/spec/fixtures/account_services.json

@@ -32,4 +32,4 @@
     "se_unit": "mėn.",
     "se_description": "Serverio nuoma (planas 1GHz:1024MB:10GB:10Mbps, server.example.com)"
   }
-]
+]

data/spec/fixtures/server_change.json

@@ -1,3 +1,3 @@
 {
   "task_id": "14"
-}
+}

data/spec/fixtures/server_domain.json

@@ -1,3 +1,3 @@
 {
   "task_id": "15"
-}
+}

data/spec/fixtures/server_flush_iptables.json

@@ -1,3 +1,3 @@
 {
   "task_id": "16"
-}
+}

data/spec/fixtures/server_graphs.json

@@ -23,4 +23,4 @@
   "cpu_weekly": "//stats.serveriai.lt/graph.php?Ds252x+6Lek1o0SV2+u99fqhNaiflbCcb6QuGzlRJ9yy2R1VycHOc6baz3zRB6Am1RJcniVrpCjj+A47DMwkyfQ==",
   "cpu_monthly": "//stats.serveriai.lt/graph.php?Ds252x+6Lek1o0SV2+u99fqhNaiflbCcb6QuGzlRJ9yxK/MZyMfdX4eflJC8xIf8j1/FtFwPGQkKJH2lwumDXzw==",
   "cpu_yearly": "//stats.serveriai.lt/graph.php?Ds252x+6Lek1o0SV2+u99fqhNaiflbCcb6QuGzlRJ9yxZA7jroJOYQwMT3OKsz00xRJcniVrpCjj+A47DMwkyfQ=="
-}
+}

data/spec/fixtures/server_info.json

@@ -27,4 +27,4 @@
     "in_mm_usage": "1297",
     "in_ips": "12.23.34.45"
   }
-}
+}

data/spec/fixtures/server_os.json

@@ -129,4 +129,4 @@
     "title": "Ubuntu 12.04",
     "arch": "64-bit"
   }
-}
+}

data/spec/fixtures/server_reboot.json

@@ -1,3 +1,3 @@
 {
   "task_id": "11"
-}
+}

data/spec/fixtures/server_recreate.json

@@ -1,3 +1,3 @@
 {
   "task_id": "12"
-}
+}

data/spec/fixtures/server_reset_password.json

@@ -1,3 +1,3 @@
 {
   "task_id": "13"
-}
+}

data/spec/fixtures/server_tasks.json

@@ -11,4 +11,4 @@
     },
     "ta_results": "Stopping container ...\nContainer was stopped\nContainer is unmounted\nDestroying container private area: /vz/private/11\nContainer private area was destroyed\nCreating container private area (debian-6.0-x86_64)\nPerforming postcreate actions\nCT configuration saved to /etc/vz/conf/1.conf\nContainer private area was created\nStarting container...\nContainer is mounted\nContainer start in progress...\nKilling container ...\nContainer was stopped\nContainer is unmounted\nCT configuration saved to /etc/vz/conf/1.conf\nCT configuration saved to /etc/vz/conf/1.conf\nStarting container...\nContainer is mounted\nAdding IP address(es): 12.23.34.45\nSetting CPU limit: 0\nSetting CPU units: 200\nSetting CPUs: 1\nContainer start in progress...\n\nID:        1\nHost:      server.example.com\nBandwidth: 10240 Kbps\nQuota:     10 GB\nCPU:       1 unit(s)\nRAM:       1024 MB\nIP:        12.23.34.45\nPassword:  secret"
   }
-]
+]

data/spec/fixtures/version.json

@@ -1,3 +1,3 @@
 {
   "version":"0.1"
-}
+}

data/spec/ivapi/client/account_spec.rb

@@ -6,29 +6,42 @@ describe Ivapi::Client::Account do
     @client = Ivapi::Client.new(username: 'foo', password: 'bar')
   end
 
-  it "returns account information" do
-    stub_command("account_info").to_return(json_response("account_info.json"))
+  it 'returns account information' do
+    stub_command('account_info').to_return(json_response('account_info.json'))
+
     account_info = @client.account_info
-    expect(account_info.ac_name).to eq("Name Surname")
+
+    expect(account_info.ac_name).to eq('Name Surname')
   end
 
-  it "returns account orders" do
-    stub_command("account_orders").to_return(json_response("account_orders.json"))
+  it 'returns account orders' do
+    stub_command('account_orders')
+      .to_return(json_response('account_orders.json'))
+
     account_orders = @client.account_orders
+
     expect(account_orders.count).to eq(3)
-    expect(account_orders.first.or_cost).to eq("11.11")
+    expect(account_orders.first.or_cost).to eq('11.11')
   end
 
-  it "returns account services" do
-    stub_command("account_services").to_return(json_response("account_services.json"))
+  it 'returns account services' do
+    stub_command('account_services')
+      .to_return(json_response('account_services.json'))
+
     account_services = @client.account_services
+
     expect(account_services.count).to eq(3)
-    expect(account_services.first.se_description).to eq("Adreso metinis mokestis (example.com)")
+    expect(account_services.first.se_description)
+      .to eq('Adreso metinis mokestis (example.com)')
   end
 
-  it "returns account bonuses" do
-    stub_command("account_bonuses", {count: 10}).to_return(json_response("account_bonuses.json"))
+  it 'returns account bonuses' do
+    stub_command('account_bonuses', { count: 10 })
+      .to_return(json_response('account_bonuses.json'))
+
     account_bonuses = @client.account_bonuses
-    expect(account_bonuses[2].bo_description).to eq("SMS +370.61234569 (example)")
+
+    expect(account_bonuses[2].bo_description)
+      .to eq('SMS +370.61234569 (example)')
   end
-end
+end

data/spec/ivapi/client/server_spec.rb

@@ -6,77 +6,89 @@ describe Ivapi::Client::Server do
     @client = Ivapi::Client.new(username: 'foo', password: 'bar', server_id: 3)
   end
 
-  it "should return server information" do
-    stub_command("server_info", {id: 3}).to_return(json_response("server_info.json"))
+  it 'should return server information' do
+    stub_command('server_info', { id: 3 })
+      .to_return(json_response('server_info.json'))
     server_info = @client.server_info
-    expect(server_info.se_domain).to eq("server.example.com")
-    expect(server_info.se_info.in_node).to eq("Robinija")
+    expect(server_info.se_domain).to eq('server.example.com')
+    expect(server_info.se_info.in_node).to eq('Robinija')
   end
 
-  it "should return server tasks" do
-    stub_command("server_tasks", {id: 3, count: 1}).to_return(json_response("server_tasks.json"))
+  it 'should return server tasks' do
+    stub_command('server_tasks', { id: 3, count: 1 })
+      .to_return(json_response('server_tasks.json'))
     server_tasks = @client.server_tasks(1)
-    expect(server_tasks.first.ta_params.domain).to eq("server.example.com")
+    expect(server_tasks.first.ta_params.domain).to eq('server.example.com')
   end
 
-  it "should return server tasks with specified options" do
-    stub_command("server_tasks", {id: 3, count: 1, task_id: 1}).to_return(json_response("server_tasks.json"))
-    server_tasks = @client.server_tasks(1, {task_id: 1})
-    expect(server_tasks.first.ta_params.domain).to eq("server.example.com")
+  it 'should return server tasks with specified options' do
+    stub_command('server_tasks', { id: 3, count: 1, task_id: 1 })
+      .to_return(json_response('server_tasks.json'))
+    server_tasks = @client.server_tasks(1, { task_id: 1 })
+    expect(server_tasks.first.ta_params.domain).to eq('server.example.com')
   end
 
-  it "should return server graphs" do
-    stub_command("server_graphs", {id: 3, width: 1000, ip: "12.23.34.45"}).to_return(json_response("server_graphs.json"))
-    server_graphs = @client.server_graphs(1000, "12.23.34.45")
-    expect(server_graphs.cpu_weekly).to eq("//stats.serveriai.lt/graph.php?Ds252x+6Lek1o0SV2+u99fqhNaiflbCcb6QuGzlRJ9yy2R1VycHOc6baz3zRB6Am1RJcniVrpCjj+A47DMwkyfQ==")
+  it 'should return server graphs' do
+    stub_command('server_graphs', { id: 3, width: 1000, ip: '12.23.34.45' })
+      .to_return(json_response('server_graphs.json'))
+    server_graphs = @client.server_graphs(1000, '12.23.34.45')
+    expect(server_graphs.cpu_weekly).to eq('//stats.serveriai.lt/graph.php?Ds252x+6Lek1o0SV2+u99fqhNaiflbCcb6QuGzlRJ9yy2R1VycHOc6baz3zRB6Am1RJcniVrpCjj+A47DMwkyfQ==')
   end
 
-  it "should return server os" do
-    stub_command("server_os", {id: 3}).to_return(json_response("server_os.json"))
+  it 'should return server os' do
+    stub_command('server_os', { id: 3 })
+      .to_return(json_response('server_os.json'))
     server_os = @client.server_os
-    expect(server_os["debian-6.0-x86_64"].title).to eq("Debian 6")
+    expect(server_os['debian-6.0-x86_64'].title).to eq('Debian 6')
   end
 
-  it "should reboot server" do
-    stub_command("server_reboot", {id: 3}).to_return(json_response("server_reboot.json"))
+  it 'should reboot server' do
+    stub_command('server_reboot', { id: 3 })
+      .to_return(json_response('server_reboot.json'))
     server_reboot = @client.server_reboot
-    expect(server_reboot.task_id).to eq("11")
+    expect(server_reboot.task_id).to eq('11')
   end
 
-  it "should recreate server" do
-    stub_command("server_recreate", {id: 3, os: "debian-6.0-x86_64"}).to_return(json_response("server_recreate.json"))
-    server_recreate = @client.server_recreate("debian-6.0-x86_64")
-    expect(server_recreate.task_id).to eq("12")
+  it 'should recreate server' do
+    stub_command('server_recreate', { id: 3, os: 'debian-6.0-x86_64' })
+      .to_return(json_response('server_recreate.json'))
+    server_recreate = @client.server_recreate('debian-6.0-x86_64')
+    expect(server_recreate.task_id).to eq('12')
   end
 
-  it "should reset server password" do
-    stub_command("server_reset_password", {id: 3}).to_return(json_response("server_reset_password.json"))
+  it 'should reset server password' do
+    stub_command('server_reset_password', { id: 3 })
+      .to_return(json_response('server_reset_password.json'))
     server_reset_password = @client.server_reset_password
-    expect(server_reset_password.task_id).to eq("13")
+    expect(server_reset_password.task_id).to eq('13')
   end
 
-  it "should flush server iptables" do
-    stub_command("server_flush_iptables", {id: 3}).to_return(json_response("server_flush_iptables.json"))
+  it 'should flush server iptables' do
+    stub_command('server_flush_iptables', { id: 3 })
+      .to_return(json_response('server_flush_iptables.json'))
     server_flush_iptables = @client.server_flush_iptables
-    expect(server_flush_iptables.task_id).to eq("16")
+    expect(server_flush_iptables.task_id).to eq('16')
   end
 
-  it "should change server firewall settings" do
-    stub_command("server_firewall", {id: 3}).to_return(json_response("server_firewall.json"))
+  it 'should change server firewall settings' do
+    stub_command('server_firewall', { id: 3 })
+      .to_return(json_response('server_firewall.json'))
     server_firewall = @client.server_firewall
-    expect(server_firewall.pps).to eq("1000")
+    expect(server_firewall.pps).to eq('1000')
   end
 
-  it "should change server plan" do
-    stub_command("server_change", {id: 3}).to_return(json_response("server_change.json"))
+  it 'should change server plan' do
+    stub_command('server_change', { id: 3 })
+      .to_return(json_response('server_change.json'))
     server_change = @client.server_change
-    expect(server_change.task_id).to eq("14")
+    expect(server_change.task_id).to eq('14')
   end
 
-  it "should change server hostname" do
-    stub_command("server_domain", {id: 3, domain: "example.com"}).to_return(json_response("server_domain.json"))
-    server_domain = @client.server_domain("example.com")
-    expect(server_domain.task_id).to eq("15")
+  it 'should change server hostname' do
+    stub_command('server_domain', { id: 3, domain: 'example.com' })
+      .to_return(json_response('server_domain.json'))
+    server_domain = @client.server_domain('example.com')
+    expect(server_domain.task_id).to eq('15')
   end
 
 end

data/spec/ivapi/client_spec.rb

@@ -2,12 +2,26 @@ require 'spec_helper'
 
 describe Ivapi::Client do
 
-  it "works with basic auth and password" do
-    stub_request(:get, "https://api.iv.lt/json.php?nick=foo&password=bar&command=version").
-      to_return(:status => 200, :body => '{"commits":[]}', :headers => {})
-    expect {
-      Ivapi::Client.new(:username => 'foo', :password => 'bar')
-    }.not_to raise_exception
+  it 'works with basic auth and password' do
+    url = 'https://api.iv.lt/json.php?nick=foo&password=bar&command=version'
+
+    stub_request(:get, url)
+      .to_return(status: 200, body: '{"commits":[]}', headers: {})
+
+    expect { Ivapi::Client.new(username: 'foo', password: 'bar') }
+      .not_to raise_exception
+  end
+
+  describe 'authentication' do
+    it 'is authenticated with username and password' do
+      client = Ivapi::Client.new(username: 'foo', password: 'bar')
+      expect(client).to be_authenticated
+    end
+
+    it 'is not authenticated without username and password' do
+      client = Ivapi::Client.new
+      expect(client).to_not be_authenticated
+    end
   end
 
-end
+end

data/spec/ivapi_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 describe Ivapi do
 
-  describe ".respond_to?" do
-    it "is true if method exists" do
+  describe '.respond_to?' do
+    it 'is true if method exists' do
       expect(Ivapi.respond_to?(:new, true)).to eq(true)
     end
   end
 
-  describe ".new" do
-    it "is a Ivapi::Client" do
+  describe '.new' do
+    it 'is a Ivapi::Client' do
       expect(Ivapi.new).to be_a Ivapi::Client
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -23,17 +23,17 @@ def stub_get(url)
   stub_request(:get, iv_url(url))
 end
 
-def stub_command(command, options={})
+def stub_command(command, options = {})
 
   params = { command: command }
   params.merge!(options)
   params.merge!(@client.authentication)
 
-  stub_request(:get, "https://api.iv.lt/json.php").with(query: params)
+  stub_request(:get, 'https://api.iv.lt/json.php').with(query: params)
 end
 
 def fixture_path
-  File.expand_path("../fixtures", __FILE__)
+  File.expand_path('../fixtures', __FILE__)
 end
 
 def fixture(file)
@@ -42,9 +42,9 @@ end
 
 def json_response(file)
   {
-    :body => fixture(file),
-    :headers => {
-      :content_type => 'application/json; charset=utf-8'
+    body: fixture(file),
+    headers: {
+      content_type: 'application/json; charset=utf-8'
     }
   }
 end
@@ -59,8 +59,8 @@ end
 
 def iv_command_url(command)
   if @client && @client.authenticated?
-    "https://api.iv.lt?nick=#{@client.username}&password=#{@client.password}&command=#{command}"
+    iv_url("?nick=#{@client.username}&password=#{@client.password}&command=#{command}")
   else
-    "https://api.iv.lt?command=#{command}"
+    iv_url("?command=#{command}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ivapi
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 description: ' Gem which helps to communicate with iv.lt API '
 email:
 - justas@elish.lt
@@ -107,7 +107,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - ivapi.gemspec
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Gem which helps to communicate with iv.lt API

data/LICENSE.md

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Justas Palumickas
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.