ivapi 1.0.4 → 1.1.0

data/spec/ivapi/client_spec.rb

@@ -13,15 +13,60 @@ describe Ivapi::Client do
   end
 
   describe 'authentication' do
-    it 'is authenticated with username and password' do
+    after(:each) do
+      Ivapi.reset!
+    end
+
+    it 'should possible to authenticate with configure' do
+      Ivapi.configure do |config|
+        config.username = 'foo'
+        config.password = 'bar'
+      end
+      expect(Ivapi.client).to be_authenticated
+    end
+
+    it 'should possible to authenticate with basic 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
+    it 'should not possible to authenticate without username and password' do
       client = Ivapi::Client.new
       expect(client).to_not be_authenticated
     end
   end
 
+  describe 'setting server id from client' do
+    before(:each) do
+      Ivapi.reset!
+    end
+
+    it 'should not have server id' do
+      client = Ivapi::Client.new(username: 'foo', password: 'bar')
+      expect(client.server_id).to be_nil
+    end
+
+    it 'should have server id when set manualy' do
+      client = Ivapi::Client.new(username: 'foo', password: 'bar', server_id: 3)
+      expect(client.server_id).to eq(3)
+    end
+  end
+
+  describe 'manualy setting server id' do
+    before(:each) do
+      Ivapi.reset!
+      Ivapi.configure do |config|
+        config.username = 'foo'
+        config.password = 'bar'
+      end
+    end
+
+    it 'should not have server id' do
+      expect(Ivapi.server_id).to be_nil
+    end
+
+    it 'should have server id when set manualy' do
+      expect(Ivapi.server(3).server_id).to eq(3)
+    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
-      expect(Ivapi.respond_to?(:new, true)).to eq(true)
-    end
-  end
+  # 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
-      expect(Ivapi.new).to be_a Ivapi::Client
-    end
-  end
+  # describe '.new' do
+  #   it 'is a Ivapi::Client' do
+  #     expect(Ivapi.new).to be_a Ivapi::Client
+  #   end
+  # end
 
 end

data/spec/spec_helper.rb

@@ -24,11 +24,10 @@ def stub_get(url)
 end
 
 def stub_command(command, options = {})
-
   params = { command: command }
   params.merge!(options)
-  params.merge!(@client.authentication)
-
+  client = @client || Ivapi.client
+  params.merge!(client.authentication)
   stub_request(:get, 'https://api.iv.lt/json.php').with(query: params)
 end
 

metadata

@@ -1,109 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: ivapi
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-description: ' Gem which helps to communicate with iv.lt API '
-email:
-- justas@elish.lt
+        version: '1.9'
+description: " Gem which helps to communicate with http://www.iv.lt API. "
+email: jpalumickas@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -111,16 +116,17 @@ files:
 - README.md
 - Rakefile
 - ivapi.gemspec
-- lib/faraday/response/raise_ivapi_error.rb
 - lib/ivapi.rb
 - lib/ivapi/authentication.rb
 - lib/ivapi/client.rb
 - lib/ivapi/client/account.rb
+- lib/ivapi/client/base.rb
 - lib/ivapi/client/server.rb
 - lib/ivapi/configuration.rb
-- lib/ivapi/connection.rb
+- lib/ivapi/default.rb
 - lib/ivapi/error.rb
-- lib/ivapi/request.rb
+- lib/ivapi/response/raise_error.rb
+- lib/ivapi/response/rename_keys.rb
 - lib/ivapi/version.rb
 - spec/fixtures/account_bonuses.json
 - spec/fixtures/account_info.json
@@ -153,20 +159,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Gem which helps to communicate with iv.lt API
+summary: Gem which helps to communicate with http://www.iv.lt API.
 test_files:
 - spec/fixtures/account_bonuses.json
 - spec/fixtures/account_info.json

data/lib/faraday/response/raise_ivapi_error.rb

@@ -1,24 +0,0 @@
-require 'faraday'
-require 'multi_json'
-
-module Faraday
-  class Response::RaiseIvapiError < Response::Middleware
-    ERROR_MAP = {
-      400 => Ivapi::BadRequest,
-      401 => Ivapi::Unauthorized,
-      403 => Ivapi::Forbidden,
-      404 => Ivapi::NotFound,
-      406 => Ivapi::NotAcceptable,
-      422 => Ivapi::UnprocessableEntity,
-      500 => Ivapi::InternalServerError,
-      501 => Ivapi::NotImplemented,
-      502 => Ivapi::BadGateway,
-      503 => Ivapi::ServiceUnavailable
-    }
-
-    def on_complete(response)
-      key = response[:status].to_i
-      raise ERROR_MAP[key].new(response) if ERROR_MAP.has_key? key
-    end
-  end
-end

data/lib/ivapi/connection.rb

@@ -1,29 +0,0 @@
-require 'faraday_middleware'
-require 'faraday/response/raise_ivapi_error'
-
-module Ivapi
-  module Connection
-    private
-
-    def connection(options = {})
-      connection = Faraday.new(options) do |builder|
-
-        builder.request :json
-
-        builder.use Faraday::Response::RaiseIvapiError
-        builder.use FaradayMiddleware::FollowRedirects
-        builder.use FaradayMiddleware::Mashify
-
-        builder.use FaradayMiddleware::ParseJson
-
-        faraday_config_block.call(builder) if faraday_config_block
-
-        builder.adapter *adapter
-      end
-
-      connection.headers[:user_agent] = user_agent
-
-      connection
-    end
-  end
-end

data/lib/ivapi/request.rb

@@ -1,22 +0,0 @@
-module Ivapi
-  module Request
-    def get(path, options = {})
-      request(:get, path, options).body
-    end
-
-    def request(method, path, options = {})
-
-      conn_options = {
-        url: 'https://api.iv.lt'
-      }
-
-      options.merge!(authentication)
-
-      response = connection(conn_options).send(method) do |request|
-        request.url(path, options)
-      end
-
-      response
-    end
-  end
-end