dota2_api27n 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e22170d6eb491caea8f52f640e12e2f5b32a9c6ec5b22ac0aa3bbaea7f35e8
-  data.tar.gz: 4bf9fffb868b1bfca1ba5c74dca294d9becbe4002d922fc07e099de147e055e4
+  metadata.gz: ff48b0e5301e2bf95d9597af8d6d5dfbbe1ebbb3e79a02d972383902846786a6
+  data.tar.gz: 69d6810017d78316900b76de1effe4150090914b7372fec0685f6091f08d45c7
 SHA512:
-  metadata.gz: 259eafb4c1e1c33e010d4a93c89ac784c957e65ec9d3b6667b3d32faf328949bbf68d5734fe82c862da2a64c1bd624c732be0c4543601536d69f7a45a0f5fb4d
-  data.tar.gz: 7872fff524194152ec731d1f37b70d6291140fb99b93d152957dcbfb037b8bb043021e8dd255c18c552afbe5a0b2ad8875b0c5d4aef7c41faf460757c5e560df
+  metadata.gz: 31cd5a8253f64791e8a3ea7f83d589c9be93587409e7af4a38756351c0c6b548f5dd48ccee02520e726a36a9cc84ebf5b95ca56dde4c9fd0be277bd887222447
+  data.tar.gz: d09d8c4d544257388c968d766045dc96c5dba125df812d029161855a55b635a1f78a7b9f96fd936efda710fddcf5a78db099bfb2ad17a18929db90b4a66b3c52

data/lib/dota2_api27n.rb

@@ -1,30 +1,18 @@
 require 'httparty'
-require 'pry'
 
-require_relative 'dota2_api27n/models/league'
 require_relative 'dota2_api27n/client'
+require_relative 'dota2_api27n/models/league'
+require_relative 'dota2_api27n/models/leagues'
+require_relative 'dota2_api27n/leagues_request'
+require_relative 'dota2_api27n/exceptions/request_error'
+require_relative 'dota2_api27n/exceptions/request_empty'
 
 module Dota2Api27n
-
   def self.leagues(offset: 0, limit: 100)
-    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)
-      leagues = leagues['results']
-    else
-      leagues = leagues['results']
-    end
-
-    leagues.map { |league| League.new(league) }
+    LeaguesRequest.leagues(offset, limit)
   end
 
-  private
-
-  def self.request(method, options = nil)
-    Client.new.get(method, options)
+  def self.total_leagues(offset: 0, limit: 100)
+    LeaguesRequest.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_request.rb

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

data/lib/dota2_api27n/models/leagues.rb

@@ -0,0 +1,10 @@
+module Dota2Api27n
+  class Leagues
+    attr_reader :results, :total
+
+    def initialize(results, total)
+      @results = results
+      @total   = total
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dota2_api27n
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Oleksii Protsenko
@@ -18,7 +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_request.rb
 - lib/dota2_api27n/models/league.rb
+- lib/dota2_api27n/models/leagues.rb
 homepage: https://github.com/railkun/dota2_api27n
 licenses:
 - MIT