ivapi 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d8f0abbc80a600939fc7ac3a1c81a3ea22e47b
-  data.tar.gz: 6cbbf8322b4186982f36db9230a57e77d1dc596b
+  metadata.gz: f16f6f658dc9c5313b61480a9e80d0ec23b3f192
+  data.tar.gz: 25d6a316598b14a45a0ead33578b71905ff02dc6
 SHA512:
-  metadata.gz: cbb878f44d033f5828404fdf56bbe666e80349c81f40812797f7645b4d97face5408cfdd08fd348c98b11c273822540d1f82ed1a5cc3cf87ac4daa09dc13f318
-  data.tar.gz: ac15b5f60eb95e680cf72ee609861ea499da56e05dbfeef6172c425f7fc7f549c2593af1ae4ff96a3549f6a9f4b93b75ae49a6e597ccda985c0ca46e10df98ca
+  metadata.gz: 5eb17f1b2ed5a8b476d9c7b6ef746fe38b93a75680d8bd31e2b3b751be23e28b02331b08f068448e59b2350eaa4ce64989c171736e0b4f7a0053ace4f84b6b25
+  data.tar.gz: 0bae8edb9d16cf01d12e8cdd493dcd662cb6c18612194391facfa32b591ab31257df3da110783760986fcefd0cb9e5ff0184f727f7ca0e6b804cb5675bf2282f

data/.gitignore

@@ -2,12 +2,13 @@
 *.rbc
 .bundle
 .config
+.DS_Store
 .yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
+bin/test.rb
 coverage
 doc/
+Gemfile.lock
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc
@@ -15,5 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-bin/test.rb
-.DS_Store
+_yardoc

data/.travis.yml

@@ -1,8 +1,18 @@
 bundler_args: --without development
+
 language: ruby
+
 rvm:
-  - jruby-19mode
-  - rbx-19mode
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
+  - rbx
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx

data/Gemfile

@@ -3,12 +3,12 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :test do
-  gem 'json',         '~> 1.8.0', platforms: [:ruby_18, :jruby]
+  gem 'json',         '~> 1.8.1', platforms: [: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'
+  gem 'simplecov',    '~> 0.8.2', require: false
+  gem 'webmock',      '~> 1.17.1'
+  gem 'coveralls',    '~> 0.7.0', require: false
+  gem 'guard-rspec',  '~> 4.2.4'
 end
 
 gemspec

data/README.md

@@ -1,12 +1,12 @@
 # Ivapi
 
-Gem which helps to communicate with [http://iv.lt][iv.lt] ([http://dedikuoti.lt][dedikuoti.lt]) API.
+Gem which helps to communicate with Interneto vizija [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]
+[![Gem Version](https://badge.fury.io/rb/ivapi.svg)][rubygems]
+[![Build Status](https://secure.travis-ci.org/jpalumickas/ivapi.svg?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/jpalumickas/ivapi.png?travis)][gemnasium]
-[![Coverage Status](https://coveralls.io/repos/jpalumickas/ivapi/badge.png?branch=master)][coveralls]
-[![Code Climate](https://codeclimate.com/github/jpalumickas/ivapi.png)][codeclimate]
+[![Coverage Status](http://img.shields.io/coveralls/jpalumickas/ivapi/master.svg)][coveralls]
+[![Code Climate](http://img.shields.io/codeclimate/github/jpalumickas/ivapi.svg)][codeclimate]
 
 ## Installation
 
@@ -24,29 +24,56 @@ Or install it yourself as:
 
 ## Usage
 
-Create new account at https://klientams.iv.lt/users.php with description "API".
+> The Ivapi Wiki has lots of additional information about this gem including many examples. Please browse the Wiki at:
+https://github.com/jpalumickas/ivapi/wiki
 
-```ruby
-require 'ivapi'
+Create a new account at https://klientams.iv.lt/users.php with description "API".
 
-client = Ivapi::Client.new(username: 'foo', password: 'bar')
-account_info = client.account_info
+### Authentication
+```rb
+Ivapi::Client.new(username: 'foo', password: 'bar')
+```
+
+Or create file under `config/initializers/ivapi.rb`
+
+```rb
+Ivapi.configure do |config|
+  config.username = 'foo'
+  config.password = 'bar'
+end
+```
+
+### Account information
+
+Basic information
+```rb
+Ivapi.account.information
+```
+
+Orders
+```
+Ivapi.account.orders
+```
+
+### Server information
 
-puts "Account name: #{account_info.ac_name}"
-puts "Account created: #{account_info.ac_created}"
+Basic information
+```rb
+Ivapi.server.information
 ```
 
+
 ## Supported Ruby Versions
 
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1.0
 
 ## Copyright
-Copyright (c) 2012-2013 Justas Palumickas.
+Copyright (c) 2012-2014 Justas Palumickas.
 See [LICENSE][] for details.
 
 [rubygems]: https://rubygems.org/gems/ivapi

data/ivapi.gemspec

@@ -4,25 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ivapi/version'
 
 Gem::Specification.new do |gem|
-  gem.name = "ivapi"
-  gem.authors = ["Justas Palumickas"]
-  gem.email = ["justas@elish.lt"]
-  gem.description = %q{ Gem which helps to communicate with iv.lt API }
+  gem.name = 'ivapi'
+  gem.author = 'Justas Palumickas'
+  gem.email = 'jpalumickas@gmail.com'
+  gem.description = %q{ Gem which helps to communicate with http://www.iv.lt API. }
   gem.summary = gem.description
-  gem.homepage = "https://github.com/jpalumickas/ivapi/"
-  gem.licenses = ['MIT']
+  gem.homepage = 'https://github.com/jpalumickas/ivapi/'
+  gem.license = 'MIT'
 
   gem.files = `git ls-files`.split($/)
   gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_dependency 'addressable', '~> 2.3'
-  gem.add_dependency 'faraday', '~> 0.8'
+  gem.add_dependency 'faraday', ['>= 0.8.4', '< 0.9']
   gem.add_dependency 'faraday_middleware', '~> 0.9'
-  gem.add_dependency 'hashie', '~> 2.0'
-  gem.add_dependency 'multi_json', '~> 1.7'
+  gem.add_dependency 'hashie', '~> 2.1'
+  gem.add_dependency 'multi_json', '~> 1.9'
 
   gem.version = Ivapi::VERSION
 end

data/lib/ivapi.rb

@@ -1,15 +1,35 @@
-require 'ivapi/configuration'
-require 'ivapi/error'
 require 'ivapi/client'
-
+require 'ivapi/default'
+require 'pry'
 module Ivapi
-  extend Configuration
+  extend Ivapi::Configuration
 
   class << self
 
-    def new(options = {})
-        Ivapi::Client.new(options)
+    def client
+      unless defined?(@client) && @client.same_options?(options)
+        @client = Ivapi::Client.new(options)
+      end
+
+      @client
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      client.respond_to?(method_name, include_private)
+    end if RUBY_VERSION >= '1.9'
+
+    def respond_to?(method_name, include_private = false)
+      client.respond_to?(method_name, include_private) || super
+      end if RUBY_VERSION < '1.9'
+
+    private
+
+    def method_missing(method_name, *args, &block)
+      return super unless client.respond_to?(method_name)
+      client.send(method_name, *args, &block)
     end
 
   end
 end
+
+Ivapi.setup

data/lib/ivapi/authentication.rb

@@ -1,8 +1,8 @@
 module Ivapi
   module Authentication
     def authentication
-      if username && password
-        { nick: username, password: password }
+      if @username && @password
+        { nick: @username, password: @password }
       else
         {}
       end

data/lib/ivapi/client.rb

@@ -1,27 +1,36 @@
+require 'ivapi/configuration'
 require 'ivapi/authentication'
-require 'ivapi/connection'
-require 'ivapi/request'
 
+require 'ivapi/client/base'
 require 'ivapi/client/account'
 require 'ivapi/client/server'
 
 module Ivapi
   class Client
-    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
+    include Ivapi::Authentication
+    include Ivapi::Configuration
+
+    attr_reader *Ivapi::Configuration.keys
 
     def initialize(options = {})
-      options = Ivapi.options.merge(options)
-      Configuration::VALID_OPTIONS_KEYS.each do |key|
-       send("#{key}=", options[key])
+      # Use options passed in, but fall back to module defaults
+      Ivapi::Configuration.keys.each do |key|
+        instance_variable_set(
+          :"@#{key}", options[key] || Ivapi.instance_variable_get(:"@#{key}")
+        )
       end
     end
 
-    include Ivapi::Authentication
-    include Ivapi::Connection
-    include Ivapi::Request
+    def account
+      Ivapi::Client::Account.new(self)
+    end
 
-    include Ivapi::Client::Account
-    include Ivapi::Client::Server
+    def server(server_id = @server_id)
+      Ivapi::Client::Server.new(self, server_id)
+    end
 
+    def same_options?(opts)
+      opts.hash == options.hash
+    end
   end
 end

data/lib/ivapi/client/account.rb

@@ -1,11 +1,11 @@
 module Ivapi
   class Client
-    module Account
+    class Account < Base
 
       # Get information about account.
       #
       # Returns the Hash of account information.
-      def account_info
+      def information
         params = { command: 'account_info' }
         get('/json.php', params)
       end
@@ -13,7 +13,7 @@ module Ivapi
       # Get account orders.
       #
       # Returns the Hash of account orders.
-      def account_orders
+      def orders
         params = { command: 'account_orders' }
         get('/json.php', params)
       end
@@ -21,7 +21,7 @@ module Ivapi
       # Get account services.
       #
       # Returns the Hash of account services.
-      def account_services
+      def services
         params = { command: 'account_services' }
         get('/json.php', params)
       end
@@ -31,7 +31,7 @@ module Ivapi
       # count - The Integer of how many rows need to return (default: 10).
       #
       # Returns the Hash of account credits.
-      def account_credits(count = 10)
+      def credits(count = 10)
         params = { command: 'account_credits', count: count }
         get('/json.php', params)
       end
@@ -41,7 +41,7 @@ module Ivapi
       # count - The Integer of how many rows need to return (default: 10).
       #
       # Returns the Hash of account bonuses.
-      def account_bonuses(count = 10)
+      def bonuses(count = 10)
         params = { command: 'account_bonuses', count: count }
         get('/json.php', params)
       end

data/lib/ivapi/client/base.rb

@@ -0,0 +1,34 @@
+module Ivapi
+  class Client
+    class Base
+      attr_reader :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def get(path, options = {})
+        request(:get, path, options).body
+      end
+
+      private
+
+      def request(method, path, options = {})
+        options.merge!(client.authentication)
+
+        response = connection.send(method) do |request|
+          request.url(path, options)
+        end
+        response
+      end
+
+      def connection(options = {})
+        conn_opts = client.connection_options
+        conn_opts[:url] = client.api_endpoint
+        conn_opts[:builder] = client.middleware if client.middleware
+
+        Faraday.new(conn_opts)
+      end
+    end
+  end
+end

data/lib/ivapi/client/server.rb

@@ -1,14 +1,21 @@
 module Ivapi
   class Client
-    module Server
+    class Server < Base
+      attr_reader :server_id
+
+      def initialize(client, server_id)
+        super(client)
+        @server_id = server_id
+      end
 
       # Get information about server.
       #
       # Returns the Hash of server information.
-      def server_info
+      def information
         params = { command: 'server_info', id: server_id }
         get('/json.php', params)
       end
+      alias_method :info, :information
 
       # Get server tasks.
       #
@@ -18,7 +25,7 @@ module Ivapi
       #           :task_id - The Integer of task id (optional).
       #
       # Returns the Hash of server tasks.
-      def server_tasks(count, options = {})
+      def tasks(count, options = {})
         params = options.merge({
           command: 'server_tasks', id: server_id, count: count })
 
@@ -31,7 +38,7 @@ module Ivapi
       # ip    - The String of ip, from which graphs can be viewed.
       #
       # Returns the Hash of server graphs.
-      def server_graphs(width, ip)
+      def graphs(width, ip)
         params = {
           command: 'server_graphs',
           id: server_id,
@@ -45,7 +52,7 @@ module Ivapi
       # Get all available server operating systems.
       #
       # Returns the Hash of available server os.
-      def server_os
+      def os
         params = { command: 'server_os', id: server_id }
         get('/json.php', params)
       end
@@ -53,7 +60,7 @@ module Ivapi
       # Send command to reboot the server.
       #
       # Returns the Integer of task id.
-      def server_reboot
+      def reboot
         params = { command: 'server_reboot', id: server_id }
         get('/json.php', params)
       end
@@ -66,7 +73,7 @@ module Ivapi
       #                           password (min: 8, max: 64).
       #
       # Returns the Integer of task id.
-      def server_recreate(os, options = {})
+      def recreate(os, options = {})
         params = options.merge({
           command: 'server_recreate',
           id: server_id,
@@ -83,7 +90,7 @@ module Ivapi
       #                           password (min: 8, max: 64).
       #
       # Returns the Integer of task id.
-      def server_reset_password(options = {})
+      def reset_password(options = {})
         params = options.merge({
           command: 'server_reset_password',
           id: server_id
@@ -95,7 +102,7 @@ module Ivapi
       # Send command to clean server firewall rules.
       #
       # Returns the Integer of task id.
-      def server_flush_iptables
+      def flush_iptables
         params = { command: 'server_flush_iptables', id: server_id }
         get('/json.php', params)
       end
@@ -115,7 +122,7 @@ module Ivapi
       #                        IP (0 or min: 16, max: 512).
       #
       # Returns the Hash of new firewall settings.
-      def server_firewall(options = {})
+      def firewall(options = {})
         params = options.merge({ command: 'server_firewall', id: server_id })
         get('/json.php', params)
       end
@@ -129,7 +136,7 @@ module Ivapi
       #           :bandwidth - The Integer of Mbps (min: 20, max: 400).
       #
       # Returns the Integer of task id.
-      def server_change(options = {})
+      def change(options = {})
         params = options.merge({ command: 'server_change', id: server_id })
         get('/json.php', params)
       end
@@ -139,10 +146,11 @@ module Ivapi
       # domain - The String of new server hostname.
       #
       # Returns the Integer of task id.
-      def server_domain(domain)
+      def domain(domain)
         params = { command: 'server_domain', id: server_id, domain: domain }
         get('/json.php', params)
       end
+      alias_method :hostname, :domain
     end
   end
 end