wot-api 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950e5aebd8c3e0e38d48e02369793b76e0e6c2b9
-  data.tar.gz: 2c469f79f7f17cc9707a107ec2c3d827c53ec0f5
+  metadata.gz: fdcb4b1021a09d973d2e4136b3ac15212a5aab90
+  data.tar.gz: 79ba8782152e833f008c226124a86057847deb11
 SHA512:
-  metadata.gz: 9b50c44a4600b4d7a2e280fd53a957aeb187130bd7ded509082792bde0e13e5fc7648a929ca013df0ba4941ae5f43ce6823c8f32019ee081981bc353a151a33d
-  data.tar.gz: c6f16eab94dacf7b04cf253f195887c59d302b09ef3f5d7040cb55b0f295225afcdcb238cb87ec9083c27c73a8d38ee0d7e0ff1890860aaf5ce884f1155fa802
+  metadata.gz: b4b80ba12430e3c56822cd8df6d0dd7261e97e6c981c6c87f2ed5765316cf9aef6b42c12184380ef67db0ef0229ab1efa82b37baca88192f41d20ee548f74492
+  data.tar.gz: 33f1bcea97ade195505afc29bd1c662a99e03fabf65bbfb726051d224c38231550cacd80827e9ebdc475ee9a77bd33f41537896d5cc7122b2a5c5884d4f46697

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-require 'wot-api'
+require 'wot/api'
 
 # create a new instance of api
 api = Wot::Api.new("EU")

data/lib/wot/api.rb

@@ -1,7 +1,90 @@
+require 'json'
+require 'rest-client'
+require 'active_support/core_ext/hash/indifferent_access'
 require "wot/api/version"
+require 'wot/api/clusters'
+require 'wot/api/error'
+require 'wot/player'
 
 module Wot
-  module Api
-    # Your code goes here...
+  class Api
+    
+    def initialize(region, language = 'en')
+      cluster = Wot::Api.cluster(region)
+      @app_id = cluster[:application_id]
+      @base_url = cluster[:base_url]
+      @language = language
+    end
+
+    def search(username, options = {})
+      return Wot::Player.search self, username, options
+    end
+
+    def find(account_ids, options = {})
+      return Wot::Player.find self, account_ids, options
+    end
+
+    def players_info(account_ids)
+      ids = (account_ids.class == Array ? account_ids : [account_ids])
+      return make_request "account/info/", {:account_id => ids.join(",")}
+    end
+
+    def player_tanks(account_id)
+      return make_request "account/tanks/", {:account_id => account_id}
+    end
+
+    def player_achievements(account_id)
+      return make_request "account/achievements/", {:account_id => account_id}
+    end
+
+    def player_stats(account_id,hours_ago)
+      return make_request "stats/accountbytime/", {:account_id => account_id, :hours_ago => hours_ago}
+    end
+
+    def player_raitings(account_id)
+      return make_request "account/raitings/", {:account_id => account_id}
+    end
+
+    def tanks_list()
+      return make_request "encyclopedia/tanks/", {}
+    end
+
+    def tank_info(tank_id)
+      return make_request "encyclopedia/tankinfo/", {:tank_id => tank_id}
+    end
+
+    def achievements_list()
+      raise NotImplementedError
+    end
+
+    def engines_list()
+      raise NotImplementedError
+    end
+
+    def guns_list()
+      raise NotImplementedError
+    end
+
+    def radios_list()
+      raise NotImplementedError
+    end
+
+    def suspensions_list()
+      raise NotImplementedError
+    end
+
+    def turrets_list
+      raise NotImplementedError
+    end
+
+    def make_request(suffix,parameters)
+      params = {:params => parameters.dup}
+      params[:params][:application_id] = @app_id
+      params[:params][:language] = @language
+      response = JSON.parse(RestClient.get("#{@base_url}/2.0/#{suffix}", params))
+      response = response.nested_under_indifferent_access
+      raise Wot::Api::Error.new(response[:error]) if response[:status].downcase == "error"
+      return response
+    end
   end
-end
+end

data/lib/wot/api/clusters.rb

@@ -0,0 +1,32 @@
+module Wot
+  class Api
+    CLUSTERS = {
+      "RU" => {
+        :base_url => "http://api.worldoftanks.ru",
+        :application_id => "171745d21f7f98fd8878771da1000a31"
+      },
+      "EU" => {
+        :base_url => "api.worldoftanks.eu",
+        :application_id => "d0a293dc77667c9328783d489c8cef73"
+      },
+      "NA" => {
+        :base_url => "http://api.worldoftanks.com",
+        :application_id => "16924c431c705523aae25b6f638c54dd"
+      },
+      "ASIA" => {
+        :base_url => "http://api.worldoftanks.asia",
+        :application_id => "39b4939f5f2460b3285bfa708e4b252c"
+      },
+      "KR" => {
+        :base_url => "http://api.worldoftanks.kr",
+        :application_id => "ffea0f1c3c5f770db09357d94fe6abfb"
+      }
+    }
+
+    def self.cluster(region)
+      cluster = CLUSTERS[region.to_s]
+      fail "Region '#{region}' not found!" if cluster.nil?
+      return cluster
+    end
+  end
+end

data/lib/wot/api/error.rb

@@ -0,0 +1,14 @@
+module Wot
+  class Api
+    class Error < StandardError
+      attr_accessor :field, :message, :code, :value
+      def initialize(options)
+        super options[:message]
+        @field = options[:field]
+        @message = options[:message]
+        @code = options[:code]
+        @value = options[:value]
+      end
+    end
+  end
+end

data/lib/wot/api/version.rb

@@ -1,5 +1,9 @@
 module Wot
-  module Api
-    VERSION = "0.0.1"
+  class Api
+    VERSION = "1.1.0"
+
+    def self.version
+      return VERSION
+    end
   end
 end

data/lib/{wot-api → wot}/player.rb

@@ -1,12 +1,10 @@
-
+require 'wot/player/info'
+require 'wot/player/tank'
+require 'wot/player/achievement'
+require 'wot/player/statistics'
+require 'wot/player/extended_statistics'
 module Wot
   class Player
-    autoload :Info,                   'wot-api/player/info'
-    autoload :Tank,                   'wot-api/player/tank'
-    autoload :Achievement,            'wot-api/player/achievement'
-    autoload :Statistics,             'wot-api/player/statistics'
-    autoload :ExtendedStatistics,     'wot-api/player/extended_statistics'
-
     attr_accessor :id, :account_id, :nickname, :api
 
     def self.search(api, nickname, options = {})

data/wot-api.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'wot-api/version'
+require 'wot/api/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "wot-api"
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["info@code-panic.com"]
   spec.summary       = %q{Ruby World of Tanks API v2.0}
   spec.description   = %q{A simple ruby library that allows to interface with World of Tanks API v2.0!}
-  spec.homepage      = "http://wot.code-panic.com"
+  spec.homepage      = "https://github.com/serioja90/wot-api"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10.3"
-  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "json","~> 1.8"
   spec.add_development_dependency "rest-client","~> 1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wot-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -95,23 +95,20 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/wot-api.rb
-- lib/wot-api/clusters.rb
-- lib/wot-api/error.rb
-- lib/wot-api/player.rb
-- lib/wot-api/player/achievement.rb
-- lib/wot-api/player/extended_statistics.rb
-- lib/wot-api/player/info.rb
-- lib/wot-api/player/statistics.rb
-- lib/wot-api/player/tank.rb
-- lib/wot-api/version.rb
 - lib/wot/api.rb
+- lib/wot/api/clusters.rb
+- lib/wot/api/error.rb
 - lib/wot/api/version.rb
+- lib/wot/player.rb
+- lib/wot/player/achievement.rb
+- lib/wot/player/extended_statistics.rb
+- lib/wot/player/info.rb
+- lib/wot/player/statistics.rb
+- lib/wot/player/tank.rb
 - spec/spec_helper.rb
 - spec/wot/api_spec.rb
-- test/wot_api_test.rb
 - wot-api.gemspec
-homepage: http://wot.code-panic.com
+homepage: https://github.com/serioja90/wot-api
 licenses:
 - MIT
 metadata: {}
@@ -138,4 +135,3 @@ summary: Ruby World of Tanks API v2.0
 test_files:
 - spec/spec_helper.rb
 - spec/wot/api_spec.rb
-- test/wot_api_test.rb

data/lib/wot-api.rb

@@ -1,97 +0,0 @@
-
-require 'json'
-require 'rest-client'
-require 'active_support/core_ext/hash/indifferent_access'
-
-module Wot
-  autoload :Player,       'wot-api/player'
-  
-  class Api
-
-    def initialize(region, language = 'en')
-      cluster = Wot::cluster(region)
-      @app_id = cluster[:application_id]
-      @base_url = cluster[:base_url]
-      @language = language
-    end
-
-    def search(username, options = {})
-      return Wot::Player.search self, username, options
-    end
-
-    def find(account_ids, options = {})
-      return Wot::Player.find self, account_ids, options
-    end
-
-    def players_info(account_ids)
-      ids = (account_ids.class == Array ? account_ids : [account_ids])
-      return make_request "account/info/", {:account_id => ids.join(",")}
-    end
-
-    def player_tanks(account_id)
-      return make_request "account/tanks/", {:account_id => account_id}
-    end
-
-    def player_achievements(account_id)
-      return make_request "account/achievements/", {:account_id => account_id}
-    end
-
-    def player_stats(account_id,hours_ago)
-      return make_request "stats/accountbytime/", {:account_id => account_id, :hours_ago => hours_ago}
-    end
-
-    def player_raitings(account_id)
-      return make_request "account/raitings/", {:account_id => account_id}
-    end
-
-    def tanks_list()
-      return make_request "encyclopedia/tanks/", {}
-    end
-
-    def tank_info(tank_id)
-      return make_request "encyclopedia/tankinfo/", {:tank_id => tank_id}
-    end
-
-    def achievements_list()
-      unless @achievements
-        response = make_request "encyclopedia/achievements/", {}
-        @achievements = Wot::Parser.get_achievements_list(response[:data])
-      end
-      return @achievements
-    end
-
-    def engines_list()
-      raise NotImplementedError
-    end
-
-    def guns_list()
-      raise NotImplementedError
-    end
-
-    def radios_list()
-      raise NotImplementedError
-    end
-
-    def suspensions_list()
-      raise NotImplementedError
-    end
-
-    def turrets_list
-      raise NotImplementedError
-    end
-
-    def make_request(suffix,parameters)
-      params = {:params => parameters.dup}
-      params[:params][:application_id] = @app_id
-      params[:params][:language] = @language
-      response = JSON.parse(RestClient.get("#{@base_url}/2.0/#{suffix}", params))
-      response = response.nested_under_indifferent_access
-      raise Wot::Error.new(response[:error]) if response[:status].downcase == "error"
-      return response
-    end
-  end
-end
-
-require 'wot-api/clusters'
-require 'wot-api/error'
-require 'wot-api/version'

data/lib/wot-api/clusters.rb

@@ -1,33 +0,0 @@
-
-module Wot
-  CLUSTERS = {
-    "RU" => {
-      :base_url => "http://api.worldoftanks.ru",
-      :application_id => "171745d21f7f98fd8878771da1000a31"
-    },
-    "EU" => {
-      :base_url => "api.worldoftanks.eu",
-      :application_id => "d0a293dc77667c9328783d489c8cef73"
-    },
-    "NA" => {
-      :base_url => "http://api.worldoftanks.com",
-      :application_id => "16924c431c705523aae25b6f638c54dd"
-    },
-    "ASIA" => {
-      :base_url => "http://api.worldoftanks.asia",
-      :application_id => "39b4939f5f2460b3285bfa708e4b252c"
-    },
-    "KR" => {
-      :base_url => "http://api.worldoftanks.kr",
-      :application_id => "ffea0f1c3c5f770db09357d94fe6abfb"
-    }
-  }
-
-  module_function
-
-  def cluster(region)
-    cluster = Wot::CLUSTERS[region.to_s]
-    raise "Region '#{region}' not found!" if cluster.nil?
-    return cluster
-  end
-end

data/lib/wot-api/error.rb

@@ -1,13 +0,0 @@
-
-module Wot
-  class Error < StandardError
-    attr_accessor :field, :message, :code, :value
-    def initialize(options)
-      super options[:message]
-      @field = options[:field]
-      @message = options[:message]
-      @code = options[:code]
-      @value = options[:value]
-    end
-  end
-end

data/lib/wot-api/version.rb

@@ -1,10 +0,0 @@
-
-module Wot
-  class Api
-    VERSION = "1.0.2"
-
-    def self.version
-      return VERSION
-    end
-  end
-end

data/test/wot_api_test.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/ruby
-# @Author: Groza Sergiu
-# @Date:   2014-07-10 02:28:29
-# @Last Modified by:   Groza Sergiu
-# @Last Modified time: 2014-07-10 02:50:43
-require "minitest/autorun"
-
-class WotApiTest < Minitest::Test
-  def test_initialize
-  end
-end