open_dota_api 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808512136e0502bf89c7a10c8922302f70917042d7a866cf10ff3e8a441ee299
-  data.tar.gz: 0d8487e5a03d1d4c7020c1a739938ecacd52edc60a55801918d3a693310215b6
+  metadata.gz: 41e0de50f5999f18334dd3bc4feb1504de64fb93123e104d738601b6128254c8
+  data.tar.gz: f5cc9056ef69f00d95ad1f534d1e3d870be1e51fa6f6195eaea5a3e4db8a5644
 SHA512:
-  metadata.gz: 795eac8e9764bca6fe5cba16bcf29965cc3e4efef6ec6d41dc89303f1d0be0f46d62332c40d2b3928648de259a05f5ccda7158b057aed9e8cc8d6d1a1f341392
-  data.tar.gz: d2844e9bd2e35298cfce1f4b0664ae188ede5b2d5a912b0978e497aab99cd77056655d4069bb01c25c4b87100d090c625ab5cc2907d01a362acf6e7e4b36bd15
+  metadata.gz: 0fae16428f8cf5aef6be3f2f85248ddc055e873d3c8b0dd9ca60b63421313a41f775ec78b3661ee83835cf551e5cb5af6f157d872e430be1f6dbd415582a3c49
+  data.tar.gz: bd954371cd4a6ad867be36f184830efe93816088b6fb46984c1d749f39fc12b327d2b311a7b4c54b5b10685589bab4af4c6fec24a51f96ca58c9ba3301120531

data/lib/open_dota_api.rb

@@ -3,7 +3,7 @@ require 'open_dota_api/version'
 
 module OpenDotaApi
   extend SingleForwardable
-  def_delegators :client, :leagues, :teams, :matches, :heroes, :pro_players, :explorer
+  def_delegators :client, :limits, :leagues, :teams, :matches, :heroes, :pro_players, :explorer
 
   def self.client
     @client ||= Client.new

data/lib/open_dota_api/client.rb

@@ -1,4 +1,5 @@
 require 'open_dota_api/connection'
+require 'open_dota_api/health'
 require 'open_dota_api/league'
 require 'open_dota_api/team'
 require 'open_dota_api/match'
@@ -10,46 +11,41 @@ module OpenDotaApi
   class Client
     INTERFACE = 'api'.freeze
 
-    def leagues(attributes = {})
-      leagues_data = request(League::ENDPOINT, query_params: { api_key: attributes.delete(:api_key) }.compact)
-      return {} unless leagues_data.success?
+    def limits(attributes = {})
+      return @limits unless @limits.nil?
 
-      League.instantiate(leagues_data)
+      request(Health::ENDPOINT, params: attributes)
+      @limits
     end
 
-    def teams(attributes = {})
-      teams_data = request(Team::ENDPOINT, query_params: { api_key: attributes.delete(:api_key) }.compact)
-      return {} unless teams_data.success?
+    def leagues(attributes = {})
+      data = request(League::ENDPOINT, params: attributes)
+      League.instantiate(data)
+    end
 
-      Team.instantiate(teams_data)
+    def teams(attributes = {})
+      data = request(Team::ENDPOINT, params: attributes)
+      Team.instantiate(data)
     end
 
     def matches(match_id = nil, attributes = {})
-      match_data = request(Match::ENDPOINT, match_id, query_params: { api_key: attributes.delete(:api_key) }.compact)
-      return {} unless match_data.success?
-
-      Match.new(match_data)
+      data = request(Match::ENDPOINT, match_id, params: attributes)
+      Match.new(data)
     end
 
     def heroes(attributes = {})
-      heroes_data = request(Hero::ENDPOINT, query_params: { api_key: attributes.delete(:api_key) }.compact)
-      return {} unless heroes_data.success?
-
-      Hero.instantiate(heroes_data)
+      data = request(Hero::ENDPOINT, params: attributes)
+      Hero.instantiate(data)
     end
 
     def pro_players(attributes = {})
-      pro_players_data = request(ProPlayer::ENDPOINT, query_params: { api_key: attributes.delete(:api_key) }.compact)
-      return {} unless pro_players_data
-
-      ProPlayer.instantiate(pro_players_data)
+      data = request(ProPlayer::ENDPOINT, params: attributes)
+      ProPlayer.instantiate(data)
     end
 
     def explorer(league_id = nil, attributes = {})
-      explorer_data = request(Explorer::ENDPOINT, query_params: { api_key: attributes.delete(:api_key) }.merge(Explorer.query_params(league_id)).compact)
-      return {} unless explorer_data.success?
-
-      Explorer.new(explorer_data)
+      data = request(Explorer::ENDPOINT, params: Explorer.query_params(league_id).merge(attributes))
+      Explorer.new(data)
     end
 
     private
@@ -58,12 +54,23 @@ module OpenDotaApi
       @connection ||= Connection.new
     end
 
-    def request(method, argument = nil, query_params: {})
-      params = query_params.merge({ api_key: OpenDotaApi.api_key }.compact)
-      argument = argument ? "/#{argument}" : nil
-      pathname = "/#{INTERFACE}/#{method}#{argument}"
+    def request(method, argument = nil, params: {})
+      pathname = "/#{INTERFACE}/#{method}#{("/#{argument}" if argument)}"
+
+      global_api_key = { api_key: OpenDotaApi.api_key }.compact
+
+      data = connection.get(pathname, query: global_api_key.merge(params.compact))
+      return {} unless data.success?
+
+      limits_fixation(data)
+      data
+    end
 
-      connection.get(pathname, query: params)
+    def limits_fixation(data)
+      @limits = {
+        per_min: data.headers['x-rate-limit-remaining-minute'],
+        per_month: data.headers['x-rate-limit-remaining-month']
+      }
     end
   end
 end

data/lib/open_dota_api/health.rb

@@ -0,0 +1,5 @@
+module OpenDotaApi
+  class Health
+    ENDPOINT = 'health'.freeze
+  end
+end

data/lib/open_dota_api/version.rb

@@ -1,3 +1,3 @@
 module OpenDotaApi
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/lib/open_dota_api/client_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe OpenDotaApi::Client do
-  let(:client) { described_class.new }
   let(:endpoint) {}
   let(:match_id) { 3_149_215_336 }
   let(:league_id) { 5401 }
@@ -14,7 +13,9 @@ describe OpenDotaApi::Client do
   let(:data_file) {}
   let(:headers) do
     {
-      'content-type' => ['application/json; charset=utf-8']
+      'content-type' => ['application/json; charset=utf-8'],
+      'x-rate-limit-remaining-minute' => rand(60),
+      'x-rate-limit-remaining-month' => rand(50000)
     }
   end
 
@@ -33,6 +34,14 @@ describe OpenDotaApi::Client do
     stub_request(:get, api_url)
       .with(headers: { 'Accept': '*/*', 'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent': 'Ruby' })
       .to_return(status: 200, body: data_file, headers: headers)
+
+    stub_request(:get, "http://api.opendota.com/api/health").
+      with(headers: { 'Accept': '*/*', 'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent': 'Ruby' }).
+      to_return(status: 200, body: "", headers: headers)
+
+    stub_request(:get, "http://api.opendota.com/api/health?api_key=random-value").
+      with(headers: { 'Accept': '*/*', 'Accept-Encoding': 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent': 'Ruby' }).
+      to_return(status: 200, body: "", headers: {})
   end
 
   it 'returns interface' do
@@ -40,16 +49,38 @@ describe OpenDotaApi::Client do
   end
 
   describe 'default attributes' do
+    describe '#limits' do
+      let(:endpoint) { OpenDotaApi::Health::ENDPOINT }
+
+      it 'updates limits' do
+        expect{ subject.limits }.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
+      end
+
+      context 'check limit after it was set' do
+        before do
+          subject.limits
+        end
+
+        it 'reads limits' do
+          expect{subject.limits}.to_not change(subject, :limits)
+        end
+      end
+    end
+
     describe '#leagues' do
       let(:endpoint) { OpenDotaApi::League::ENDPOINT }
       let(:data_file) { leagues_file }
 
       it 'returns array of objects' do
-        expect(client.leagues.all? { |league| league.is_a? OpenDotaApi::League }).to be_truthy
+        expect(subject.leagues.all? { |league| league.is_a? OpenDotaApi::League }).to be_truthy
       end
 
       it 'returns list' do
-        expect(client.leagues.to_deep_hash).to eq expected_leagues.to_deep_hash
+        expect(subject.leagues.to_deep_hash).to eq expected_leagues.to_deep_hash
+      end
+
+      it 'updates limits' do
+        expect{subject.leagues}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
     end
 
@@ -58,11 +89,15 @@ describe OpenDotaApi::Client do
       let(:data_file) { teams_file }
 
       it 'returns array of objects' do
-        expect(client.teams.all? { |team| team.is_a? OpenDotaApi::Team }).to be_truthy
+        expect(subject.teams.all? { |team| team.is_a? OpenDotaApi::Team }).to be_truthy
       end
 
       it 'returns list' do
-        expect(client.teams.to_deep_hash).to eq expected_teams.to_deep_hash
+        expect(subject.teams.to_deep_hash).to eq expected_teams.to_deep_hash
+      end
+
+      it 'updates limits' do
+        expect{subject.teams}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
     end
 
@@ -71,11 +106,15 @@ describe OpenDotaApi::Client do
       let(:data_file) { match_file }
 
       it 'returns object' do
-        expect(client.matches(match_id).is_a?(OpenDotaApi::Match)).to be_truthy
+        expect(subject.matches(match_id).is_a?(OpenDotaApi::Match)).to be_truthy
       end
 
       it 'returns match' do
-        expect(client.matches(match_id).to_deep_hash).to eq expected_match.to_deep_hash
+        expect(subject.matches(match_id).to_deep_hash).to eq expected_match.to_deep_hash
+      end
+
+      it 'updates limits' do
+        expect{subject.matches(match_id)}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
     end
 
@@ -84,11 +123,15 @@ describe OpenDotaApi::Client do
       let(:data_file) { heroes_file }
 
       it 'returns array of objects' do
-        expect(client.heroes.all? { |hero| hero.is_a? OpenDotaApi::Hero }).to be_truthy
+        expect(subject.heroes.all? { |hero| hero.is_a? OpenDotaApi::Hero }).to be_truthy
       end
 
       it 'returns list' do
-        expect(client.heroes.to_deep_hash).to eq expected_heroes.to_deep_hash
+        expect(subject.heroes.to_deep_hash).to eq expected_heroes.to_deep_hash
+      end
+
+      it 'updates limits' do
+        expect{subject.heroes}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
     end
 
@@ -97,22 +140,30 @@ describe OpenDotaApi::Client do
       let(:data_file) { pro_players_file }
 
       it 'returns array of objects' do
-        expect(client.pro_players.all? { |hero| hero.is_a? OpenDotaApi::ProPlayer }).to be_truthy
+        expect(subject.pro_players.all? { |hero| hero.is_a? OpenDotaApi::ProPlayer }).to be_truthy
       end
 
       it 'returns list' do
-        expect(client.pro_players.to_deep_hash).to eq expected_heroes.to_deep_hash
+        expect(subject.pro_players.to_deep_hash).to eq expected_heroes.to_deep_hash
+      end
+
+      it 'updates limits' do
+        expect{subject.pro_players}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
     end
 
     describe '#explorer' do
       let(:query) { OpenDotaApi::Explorer.query_params(league_id) }
-      let(:endpoint) { "#{OpenDotaApi::Explorer::ENDPOINT}" }
+      let(:endpoint) { OpenDotaApi::Explorer::ENDPOINT }
       let(:params) { "?#{query.keys[0]}=#{query.values[0]}" }
       let(:data_file) { explorer_file }
 
       it 'returns array of match ids' do
-        expect(client.explorer(league_id).league_matches_ids.is_a?(Array)).to be_truthy
+        expect(subject.explorer(league_id).league_matches_ids.is_a?(Array)).to be_truthy
+      end
+
+      it 'updates limits' do
+        expect{subject.explorer(league_id)}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
       end
 
       context 'API_KEY' do
@@ -122,7 +173,11 @@ describe OpenDotaApi::Client do
         end
 
         it 'returns array of match ids' do
-          expect(client.explorer(league_id).league_matches_ids.is_a?(Array)).to be_truthy
+          expect(subject.explorer(league_id).league_matches_ids.is_a?(Array)).to be_truthy
+        end
+
+        it 'updates limits' do
+          expect{subject.explorer(league_id)}.to change{ subject.instance_variable_get(:@limits) }.from(nil).to(Hash)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_dota_api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - YaroslavO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashable
@@ -148,6 +148,7 @@ files:
 - lib/open_dota_api/entities/instantiable.rb
 - lib/open_dota_api/entity.rb
 - lib/open_dota_api/explorer.rb
+- lib/open_dota_api/health.rb
 - lib/open_dota_api/hero.rb
 - lib/open_dota_api/league.rb
 - lib/open_dota_api/match.rb