dota2_api27n 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863323cbd5fe66dcbe5dbd5333ad9c82a235f08029051e9cb2270f2f7aa354e5
-  data.tar.gz: 7669b29f3dc1ebc04e5d4f9905649c32abd69360231622829473836f80f6fc82
+  metadata.gz: ff48b0e5301e2bf95d9597af8d6d5dfbbe1ebbb3e79a02d972383902846786a6
+  data.tar.gz: 69d6810017d78316900b76de1effe4150090914b7372fec0685f6091f08d45c7
 SHA512:
-  metadata.gz: ee46696d18aff07bfd1788e4a9185a2c3ad788b22f21a03cd7e3999c80b97d079f76aae3d48f3ce82e9296ac0f3f4f5a2dbfb208254228436982df51386bd8ff
-  data.tar.gz: 8007206d25402b74170b5b9ef6d2f41fe6dd591e60d65d01e7f02e6dda968722c401fc74a329b39aa58930e1326ceee32977c3c3e87d43dfcffa66757d2ed0fe
+  metadata.gz: 31cd5a8253f64791e8a3ea7f83d589c9be93587409e7af4a38756351c0c6b548f5dd48ccee02520e726a36a9cc84ebf5b95ca56dde4c9fd0be277bd887222447
+  data.tar.gz: d09d8c4d544257388c968d766045dc96c5dba125df812d029161855a55b635a1f78a7b9f96fd936efda710fddcf5a78db099bfb2ad17a18929db90b4a66b3c52

data/lib/dota2_api27n.rb

@@ -1,18 +1,18 @@
 require 'httparty'
-require 'pry'
 
-require_relative 'dota2_api27n/models/league'
 require_relative 'dota2_api27n/client'
-require_relative 'dota2_api27n/leagues'
+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)
-    Leagues.leagues(offset, limit)
+    LeaguesRequest.leagues(offset, limit)
   end
 
   def self.total_leagues(offset: 0, limit: 100)
-    Leagues.total_leagues(offset, limit)
+    LeaguesRequest.total_leagues(offset, limit)
   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.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Oleksii Protsenko
@@ -20,8 +20,9 @@ files:
 - 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/leagues_request.rb
 - lib/dota2_api27n/models/league.rb
+- lib/dota2_api27n/models/leagues.rb
 homepage: https://github.com/railkun/dota2_api27n
 licenses:
 - MIT

data/lib/dota2_api27n/leagues.rb

@@ -1,39 +0,0 @@
-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