dota2_api27n 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebdeebb40c439f32db85de0707782498d3ea0f38d7e71e5681d59ce60ed3509
-  data.tar.gz: 2b7d584760e172e0a0535a60d9aa03a27b5a56d805bf69554778645ec3c5a6a9
+  metadata.gz: 863323cbd5fe66dcbe5dbd5333ad9c82a235f08029051e9cb2270f2f7aa354e5
+  data.tar.gz: 7669b29f3dc1ebc04e5d4f9905649c32abd69360231622829473836f80f6fc82
 SHA512:
-  metadata.gz: d27d0e2cd9f1ae600ae5a6ac6e15d134deed326a4ac0de972bc6f26e7543f2bbdb7f592a76da4b5d54f192d100b67d488e3369def8c6005f60a014c1d74fe5df
-  data.tar.gz: 66af061ad6d4a18aef82a29ddb37f8efd348f2fbc69246ad498eee1c088d91f741c07ade6ad87c20531c7024cf74b15358a38eb2be6e1789d2f67d6649e2332b
+  metadata.gz: ee46696d18aff07bfd1788e4a9185a2c3ad788b22f21a03cd7e3999c80b97d079f76aae3d48f3ce82e9296ac0f3f4f5a2dbfb208254228436982df51386bd8ff
+  data.tar.gz: 8007206d25402b74170b5b9ef6d2f41fe6dd591e60d65d01e7f02e6dda968722c401fc74a329b39aa58930e1326ceee32977c3c3e87d43dfcffa66757d2ed0fe

data/lib/dota2_api27n.rb

@@ -3,26 +3,16 @@ require 'pry'
 
 require_relative 'dota2_api27n/models/league'
 require_relative 'dota2_api27n/client'
+require_relative 'dota2_api27n/leagues'
+require_relative 'dota2_api27n/exceptions/request_error'
+require_relative 'dota2_api27n/exceptions/request_empty'
 
 module Dota2Api27n
-
-  def self.leagues
-    leagues = request(League::ENDPOINT, League::OPTIONS)
-
-    if leagues.headers['x-ratelimit-remaining'].to_i < 0
-      sleep leagues.headers['x-ratelimit-reset'].to_i
-      leagues = request(League::ENDPOINT, League::OPTIONS)
-      leagues = leagues['results']
-    else
-      leagues = leagues['results']
-    end
-
-    leagues.map { |league| League.new(league) }
+  def self.leagues(offset: 0, limit: 100)
+    Leagues.leagues(offset, limit)
   end
 
-  private
-
-  def self.request(method, options = nil)
-    Client.new.get(method, options)
+  def self.total_leagues(offset: 0, limit: 100)
+    Leagues.total_leagues(offset, limit)
   end
 end

data/lib/dota2_api27n/client.rb

@@ -3,7 +3,8 @@ module Dota2Api27n
     BASE_URL = 'https://dota-leagues.27n.gg/'
 
     def get(pathname, options)
-      HTTParty.get("#{BASE_URL}#{pathname}#{options}")
+      request = HTTParty.get("#{BASE_URL}#{pathname}#{options}")
+      request.code != 200 ? (raise RequestError) : request
     end
   end
 end

data/lib/dota2_api27n/exceptions/request_empty.rb

@@ -0,0 +1,3 @@
+module Dota2Api27n
+  class RequestEmpty < StandardError; end
+end

data/lib/dota2_api27n/exceptions/request_error.rb

@@ -0,0 +1,3 @@
+module Dota2Api27n
+  class RequestError < StandardError; end
+end

data/lib/dota2_api27n/leagues.rb

@@ -0,0 +1,39 @@
+module Dota2Api27n
+  class Leagues
+    attr_reader :leagues, :total_leagues
+
+    def self.leagues(offset, limit)
+      all_leagues(offset, limit)[:results]
+    end
+
+    def self.total_leagues(offset, limit)
+      all_leagues(offset, limit)[:total_leagues]
+    end
+
+    private
+
+    def self.all_leagues(offset, limit)
+      options = "?offset=#{offset}&limit=#{limit}"
+
+      leagues = request(League::ENDPOINT, options)
+
+      if leagues.headers['x-ratelimit-remaining'].to_i < 0
+        sleep leagues.headers['x-ratelimit-reset'].to_i
+        leagues = request(League::ENDPOINT, options)
+      else
+        leagues
+      end
+
+      raise RequestEmpty if leagues['results'].empty?
+
+      results = leagues['results'].map { |league| League.new(league) }
+      total_leagues = leagues['meta']['total']
+
+      {results: results, total_leagues: total_leagues}
+    end
+
+    def self.request(method, options = nil)
+      client = Client.new.get(method, options)
+    end
+  end
+end

data/lib/dota2_api27n/models/league.rb

@@ -1,7 +1,6 @@
 module Dota2Api27n
   class League
     ENDPOINT = 'leagues'.freeze
-    OPTIONS  = '?offset=0&limit=100'.freeze
 
     attr_reader :league_id, :name, :tier, :region, :url, :description, :start_timestamp,
                 :end_timestamp, :status, :total_prize_pool, :is_live

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dota2_api27n
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Oleksii Protsenko
@@ -18,6 +18,9 @@ extra_rdoc_files: []
 files:
 - lib/dota2_api27n.rb
 - lib/dota2_api27n/client.rb
+- lib/dota2_api27n/exceptions/request_empty.rb
+- lib/dota2_api27n/exceptions/request_error.rb
+- lib/dota2_api27n/leagues.rb
 - lib/dota2_api27n/models/league.rb
 homepage: https://github.com/railkun/dota2_api27n
 licenses: