dota2_api27n 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b20a82a269629634b4825635e773aeaa155f5b77ec78813ae7ffbf7fa329d0
-  data.tar.gz: 857367a7f7d68d5e5bacc37ed871b54a1bc14e4b760c880090201dae33c61ea8
+  metadata.gz: b1365fd58c09a6b22e7dc2831117e8890d036a80531946ea2e1c0fa1e430e089
+  data.tar.gz: f27c9e527734a4e10f3b2c29ad9e822290a68f5aeef29a0590ab75e8551bd42d
 SHA512:
-  metadata.gz: 9a542727da32c1399b23aa6f1174adfe9abf55e285b0ab15e0a067d80b25d06963aaf8debb9188de46ec36873a250913babcd99c4cccddc7970c29f6544d098e
-  data.tar.gz: 74771a7ad27fb7cf0bc0e99841925e49236ccbb00f3d3af159766692183ea21831f3ded32d998266cb7f314feb846f2e83c35abc89696ddb20080d9af89394ee
+  metadata.gz: d8394f2aa0308d14f83642ab1e9835b694ae176c83dfbf053c0e4994c314d83ee68e06d02685e3b16c209112c8cc9b987f3a30fbee795433a51409b286f75dc7
+  data.tar.gz: 66405a57f71b9c1c66780f29b9ab90b3ce00cb7ae4f61d7ecf08644e5f084d01e3a7f472217efb06df200b45e1f5cc2ad1df2c757abaaccf2ae9bd481df718b6

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.new(offset, limit).leagues
   end
 
-  private
-
-  def self.request(method, options = nil)
-    Client.new.get(method, options)
+  def self.total_leagues(offset: 0, limit: 100)
+    total_leagues ||= Leagues.new(offset, limit).total_leagues
   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,38 @@
+module Dota2Api27n
+  class Leagues
+    attr_reader :leagues, :total_leagues
+
+    def initialize(offset, limit)
+      leagues_request = leagues_request(offset, limit)
+
+      @leagues = leagues_request[:results]
+      @total_leagues = leagues_request[:total_leagues]
+    end
+
+    private
+
+    def leagues_request(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.empty?
+
+      results = leagues['results'].map { |league| League.new(league) }
+      total_leagues = leagues['meta']['total']
+
+      {results: results, total_leagues: total_leagues}
+    end
+
+    def 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.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Oleksii Protsenko
@@ -18,8 +18,11 @@ 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/dota_leagues_api
+homepage: https://github.com/railkun/dota2_api27n
 licenses:
 - MIT
 metadata: {}