football_ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e318cacb2e1d0e12f454581beab87f26d3ef2fe
-  data.tar.gz: 91713e935c224aae90a1368faaea2d6c8682c36c
+  metadata.gz: 5aede82050753e7212b727656ac94ef0d905df7c
+  data.tar.gz: 4ea9926f9fd653da526c12eaffc3bc9f3a00e555
 SHA512:
-  metadata.gz: 616918fc9b2e19178aa1ae6e62250b603894167c8fd29e8a096b03cee24974069d65a91d657dc77d69da1056b8ebaeee89e1aa08b4180a1a69fe829cf85277f8
-  data.tar.gz: 73cb0464ef1b5867674c7fa0cfe8836e80d357b257eccf0ee45db8b9379d9ce5600618cdf526491076ae72f829775931c699fe8d0c2e3255f593a8c67874ac75
+  metadata.gz: d306d3dfa5008a27631c4f8a6d2683ac25d54ae779fff4688defc0494dc2755ceccf3949c3416a4a8051f136ef1e457347958d8fe95d4172e6abc21df507b536
+  data.tar.gz: bc45e56165a30bc5ec2afee39868d0d40ffb731c6ebc0d6f11e641af845a63688618f07c799d9d71b3c1ab58c328c09cf784140d44576d977c92e7a22487d509

data/README.md

@@ -1,3 +1,4 @@
+![Travis Master](https://travis-ci.org/Saidbek/football_ruby.svg?branch=master)
 # FootballRuby
 
 football-data.org API Container for Ruby

data/football_ruby.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Said Kaldybaev']
   spec.email         = ['said.kaldybaev@gmail.com']
 
-  spec.summary       = %q{ruby wrapper for football-data.org API}
-  spec.description   = %q{ruby wrapper for football-data.org API}
+  spec.summary       = %q{football-data.org API wrapper in ruby}
+  spec.description   = %q{football-data.org API wrapper in ruby}
   spec.homepage      = 'https://github.com/Saidbek/football_ruby'
   spec.license       = 'MIT'
 

data/lib/football_ruby.rb

@@ -1,3 +1,10 @@
+require 'net/http'
 require 'football_ruby/base'
 require 'football_ruby/client'
+require 'football_ruby/configuration'
+require 'football_ruby/errors'
 require 'football_ruby/version'
+
+module FootballRuby
+  extend Configuration
+end

data/lib/football_ruby/base.rb

@@ -1,32 +1,26 @@
-require 'net/http'
-require 'football_ruby/errors'
-
 module FootballRuby
   class Base
-    API_ENDPOINT = 'http://api.football-data.org'
-    API_VERSION = 'v1'
-    API_LIVE = 'http://soccer-cli.appspot.com'
-
     def get(path, params={})
-      uri = URI("#{API_ENDPOINT}/#{API_VERSION}/#{path}")
-
+      uri = URI("#{FootballRuby::Configuration::API_ENDPOINT}/#{path}")
       request = build_request(uri, build_headers(params))
+
       build_response(uri, request)
     end
 
     def get_live_scores
-      uri = URI("#{API_LIVE}/")
-
+      uri = URI("#{FootballRuby::Configuration::LIVE_ENDPOINT}/")
       request = build_request(uri)
+
       build_response(uri, request)
     end
 
     private
 
     def build_headers(params)
+      raise ApiTokenMissingError, 'Please set up your api token' if FootballRuby.api_token.nil?
+
       {
-        'X-Auth-Token' => '31d3d417db12416abbb83e1e3f0a47a9',
-        'X-Response-Control' => 'full'
+        'X-Auth-Token': FootballRuby.api_token
       }.merge(params)
     end
 
@@ -35,15 +29,9 @@ module FootballRuby
     end
 
     def build_response(uri, request)
-      response = Net::HTTP.start(uri.host, uri.port) do |http|
+      Net::HTTP.start(uri.host, uri.port) do |http|
         http.request(request)
       end
-
-      if response.kind_of? Net::HTTPSuccess
-        response
-      else
-        raise FootballRuby::ResponseError.new(response)
-      end
     end
   end
 end

data/lib/football_ruby/client.rb

@@ -12,7 +12,7 @@ module FootballRuby
 
     # List all teams for a certain league.
     def league_teams(id)
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       json_response get("competitions/#{id}/teams")
     end
@@ -23,7 +23,7 @@ module FootballRuby
     # match_day=/\d+/
 
     def league_table(id, opts={})
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       match_day = opts[:match_day]
 
@@ -40,7 +40,7 @@ module FootballRuby
     # match_day=/\d+/
 
     def league_fixtures(id, opts={})
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       time_frame  = opts[:time_frame]
       match_day   = opts[:match_day]
@@ -75,7 +75,7 @@ module FootballRuby
     # head2head=/\d+/
 
     def fixture(id, opts={})
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       head2head = opts[:head2head]
 
@@ -93,7 +93,7 @@ module FootballRuby
     # venue=/home|away/
 
     def team_fixtures(id, opts={})
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       season      = opts[:season]
       time_frame  = opts[:time_frame]
@@ -109,14 +109,14 @@ module FootballRuby
 
     # Show one team.
     def team(id)
-      raise 'missing id' if id.nil?
+      raise IdMissingError, 'missing id' if id.nil?
 
       json_response get("teams/#{id}/")
     end
 
     # Show all players for a certain team.
     def team_players(id)
-      raise 'missing team id' if id.nil?
+      raise IdMissingError, 'missing team id' if id.nil?
 
       json_response get("teams/#{id}/players/")
     end

data/lib/football_ruby/configuration.rb

@@ -0,0 +1,12 @@
+module FootballRuby
+  module Configuration
+    API_ENDPOINT = 'http://api.football-data.org/v1'
+    LIVE_ENDPOINT = 'http://soccer-cli.appspot.com'
+
+    attr_accessor :api_token
+
+    def configure
+      yield self
+    end
+  end
+end

data/lib/football_ruby/errors.rb

@@ -1,11 +1,6 @@
 module FootballRuby
   class Error < StandardError; end
-
-  class ResponseError < Error
-    attr_reader :response
-
-    def initialize(response)
-      @response = response
-    end
-  end
+  class ResponseError < Error; end
+  class ApiTokenMissingError < Error; end
+  class IdMissingError < Error; end
 end

data/lib/football_ruby/version.rb

@@ -1,3 +1,3 @@
 module FootballRuby
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: football_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Said Kaldybaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: ruby wrapper for football-data.org API
+description: football-data.org API wrapper in ruby
 email:
 - said.kaldybaev@gmail.com
 executables: []
@@ -58,6 +58,7 @@ files:
 - lib/football_ruby.rb
 - lib/football_ruby/base.rb
 - lib/football_ruby/client.rb
+- lib/football_ruby/configuration.rb
 - lib/football_ruby/errors.rb
 - lib/football_ruby/version.rb
 homepage: https://github.com/Saidbek/football_ruby
@@ -83,5 +84,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for football-data.org API
+summary: football-data.org API wrapper in ruby
 test_files: []