infostrada 0.1.26 → 0.1.27

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWUyODUxNWQ3NjMyYjVmNDAwYWRmMDE4OTdjZDQ2ZjQ5ZGZjMDNlYw==
-  data.tar.gz: !binary |-
-    ZTlmMWIxYTFhM2Q2NTRlYmFhN2JjZTliOTM5ZjEwNDFlNGM0MmViZg==
+SHA1:
+  metadata.gz: 6b30c5898694a437a67d666cc76caa8065dd319f
+  data.tar.gz: c87943d6ee571431fcb73ef36538fe2170dc9ef4
 SHA512:
-  metadata.gz: !binary |-
-    ZWZlMzA5YWNjODBhZWZjMmJjYzgyZjVjMDMwOTgzZWJjY2UzNjI1ZTUyNzNk
-    OWM0MmU2Mzg4ODZiYzdiYzc3Y2VhMTZkNmM0MzVkMTkyZTQ4NDJhMjMxZTUy
-    OTI0NmMyMTczOGI5MThlNzM2NTE2YzliYWMzNWIxZThjNzIzOGE=
-  data.tar.gz: !binary |-
-    OGQzZTYwMmIxN2JlZGY2NmY2YmU1MTQyMzY2OGRkYmRiYWIyODZjZThmODg4
-    ZjAyOTBmYmI0NGM0MzBiNWI1MmU0ZDQ2ZDllZThiOWU3YjJlYjU1OGQ1Mzg3
-    NWEyMzVlOGI4NGY1ODcwMjBlM2U2NmZjODhhMWE4ZGE0YzEyODc=
+  metadata.gz: 54d404aaa60736bbec2de0aa39314db1deab3f0f39f509787195612d75936f2f8bb4aadd3b77770e28fa91ae0c7a7837d2d725d23e9dcc227bc2a7f39d16e896
+  data.tar.gz: 899739556ca72a86127484f470c54e45e93a6a8a4eab1ec368eeb70812b1038fadb25180247f9c83e4fd2b2955b86e05c881d76e5ab100870453a66949574306

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Metrics/LineLength:
+  Max: 100

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.0
+script: bundle exec rspec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/rikas/infostrada-api.svg?branch=master)](https://travis-ci.org/rikas/infostrada-api)
+
 # Infostrada API
 
 This is a wrapper for [infostrada](http://www.infostradasports.com/) football API.

data/infostrada.gemspec

@@ -16,13 +16,16 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ['lib', 'lib/infostrada' ]
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.2', '>= 10.2.2'
   spec.add_development_dependency 'reek', '~> 1.3', '>= 1.3.7'
   spec.add_development_dependency 'rubocop', '~> 0.20', '>= 0.20.1'
   spec.add_development_dependency 'pry', '~> 0.9', '>= 0.9.12'
+  spec.add_development_dependency 'pry-byebug', '~> 3.1', '>= 3.1.0'
+  spec.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
+  spec.add_development_dependency 'webmock', '~> 1.21', '>= 1.21.0'
 
   spec.add_dependency 'httparty', '~> 0.13', '>= 0.13.0'
   spec.add_dependency 'colored', '~> 1.2'

data/lib/infostrada.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
 require 'httparty'
 require 'active_model'
-
-require 'infostrada/core_ext/string'
+require 'pry'
 require 'infostrada/base_request'
-
 module Infostrada
+  require 'infostrada/core_ext/string'
+  require 'infostrada/core_ext/hash'
+  require 'infostrada/mock'
   extend ActiveModel::Serializers::JSON
 
   # The configuration of the API requests.
@@ -53,26 +54,19 @@ module Infostrada
 end
 
 require 'infostrada/competition'
-
 require 'infostrada/edition'
 require 'infostrada/edition_request'
-
+require 'infostrada/endpoint'
 require 'infostrada/errors'
-
 require 'infostrada/nation'
-
 require 'infostrada/formatter'
-
 require 'infostrada/team'
 require 'infostrada/team_request'
 require 'infostrada/team_info'
-
 require 'infostrada/match'
 require 'infostrada/phase'
 require 'infostrada/table'
-
 require 'infostrada/squad'
 require 'infostrada/player'
 require 'infostrada/person_info'
-
-require 'infostrada/version'
+require 'infostrada/version'

data/lib/infostrada/call_refresh.rb

@@ -64,10 +64,11 @@ module Infostrada
 
       list = get!(URL, query: { from: date_str, outputType: OUTPUT_TYPE, module: 'football' })
 
+      puts "Refresh call with #{date_str}"
       list.each_with_object([]) do |hash, endpoints|
         lang = hash['c_QueryString'].scan(/languagecode=(\d+)/).flatten.first.to_i
         endpoints << Endpoint.new(hash) if LANGUAGE_CODES.include?(lang)
       end
     end
   end
-end
+end

data/lib/infostrada/competition.rb

@@ -15,7 +15,7 @@ module Infostrada
     attr_accessor :id, :name, :set, :level, :nation
 
     def self.from_json(json = {})
-      self.new do |competition|
+      new do |competition|
         competition.id     = json['id']
         competition.name   = json['name']
         competition.nation = Nation.from_json(json['nation'], 'competition') if json['nation']
@@ -32,3 +32,4 @@ module Infostrada
     end
   end
 end
+

data/lib/infostrada/core_ext/hash.rb

@@ -0,0 +1,14 @@
+class Hash
+  def symbolize_keys
+    transform_keys{ |key| key.to_sym rescue key }
+  end
+
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = self.class.new
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+end

data/lib/infostrada/core_ext/string.rb

@@ -1,11 +1,28 @@
 class String
   # This is a version of the method stolen from railties and it converts 'Text-LikeThis' to
   # 'text_like_this'.
-  def snake_case
+  def info_snake_case
     result = self.gsub(/::/, '/')
     result.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
     result.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
     result.tr!("-", "_")
     result.downcase
   end
-end
+
+  # Weird name so inclusion with active support
+  # doesn't break things
+  def info_camelize
+    result = self.gsub(/(?<=_|^)(\w)/){$1.upcase}
+    result.gsub(/(?<=_|^)(\w)/){$1.upcase}.gsub(/(?:_)(\w)/,'\1')
+  end
+
+  # Weird name so inclusion with active support
+  # doesn't break things
+  def info_underscore
+    result = self.gsub(/::/, '/')
+    result.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          .gsub(/([a-z\d])([A-Z])/,'\1_\2')
+          .tr("-", "_")
+          .downcase
+  end
+end

data/lib/infostrada/match.rb

@@ -188,8 +188,8 @@ module Infostrada
       @referee                   = Referee.new(hash)      if hash['n_RefereeID']
       @phase                     = Phase.new(hash)        if hash['n_PhaseID']
 
-      @home_team                 = Team.new(hash, 'home') if hash['n_EditionID']
-      @away_team                 = Team.new(hash, 'away') if hash['n_EditionID']
+      @home_team                 = Team.new(hash, 'home') if hash['n_HomeTeamID']
+      @away_team                 = Team.new(hash, 'away') if hash['n_AwayTeamID']
 
       @goals                     = Goals.new(hash)        if hash['n_HomeGoals']
       @edition                   = Edition.new(hash)      if hash['n_EditionID']

data/lib/infostrada/match_event.rb

@@ -86,7 +86,7 @@ module Infostrada
       @time               = hash['n_ActionTime']
       @home_goals         = hash['n_HomeGoals']
       @away_goals         = hash['n_AwayGoals']
-      @home_event         = hash['n_HomeOrAway'] == 1 ? true : false
+      @home_event         = hash['n_HomeOrAway'] == 1
       @team_id            = hash['n_TeamID']
       @team_name          = hash['c_Team']
       @team_short_name    = hash['c_TeamShort']

data/lib/infostrada/mock.rb

@@ -0,0 +1,76 @@
+json_helper = File.join('..', '..', '..', 'spec', 'helpers', 'json_helper')
+require File.expand_path(json_helper, __FILE__)
+
+module Infostrada
+  class Mock
+    class << self
+      def explain
+        meths = %w(competition edition match_event match nation person_info
+          phase player referee team_info team)
+        puts 'Returns mock class instance for tests.'
+        puts 'Available methods:'
+        meths.each do |m|
+          puts "\t - Infostrada::Mock.#{m}"
+        end
+        puts 'All the methods accept one or more arguments.'
+        puts 'The first argument is *type*, which allows the selection of the mock json.'
+        puts ''
+      end
+
+      def competition(type = :default)
+        json = JSONHelper::Competition.get(type)
+        Infostrada::Competition.new(json)
+      end
+
+      def edition(type = :default)
+        json = JSONHelper::Edition.get(type)
+        Infostrada::Edition.new(json)
+      end
+
+      def match_event(type = :event_1, match_id = nil)
+        json = JSONHelper::MatchEvent.get(type)
+        Infostrada::MatchEvent.new(match_id, json)
+      end
+
+      def match(type = :cup_knock_out_finished_complete)
+        json = JSONHelper::Match.get(type)
+        Infostrada::Match.new(json)
+      end
+
+      def nation(type = :team)
+        json = JSONHelper::Nation.get(type)
+        Infostrada::Nation.new(json, type.to_s)
+      end
+
+      def person_info(person_id = 611_005, type = :default)
+        json = JSONHelper::PersonInfo.get(type)
+        Infostrada::PersonInfo.new(person_id, json)
+      end
+
+      def phase(type = :default)
+        json = JSONHelper::Phase.get(type).first
+        Infostrada::Phase.new(json)
+      end
+
+      def player(type = :default)
+        json = JSONHelper::Player.get(type)
+        Infostrada::Player.new(json)
+      end
+
+      def referee(type = :complete_referee_match)
+        json = JSONHelper::Referee.get(type)
+        Infostrada::Referee.new(json)
+      end
+
+      def team_info(type = :default)
+        json = JSONHelper::TeamInfo.get(type)
+        Infostrada::TeamInfo.new(json)
+      end
+
+      def team(type = :default)
+        json = JSONHelper::Team.get(type)
+        Infostrada::Team.new(json, '')
+      end
+    end
+  end
+end

data/lib/infostrada/nation.rb

@@ -1,7 +1,7 @@
 module Infostrada
   class Nation
-    attr_accessor :id, :name, :short_name
 
+    attr_accessor :id, :name, :short_name
 
     def self.from_json(hash = {}, prefix)
       self.new(prefix) do |nation|
@@ -13,7 +13,7 @@ module Infostrada
 
     def initialize(hash = {}, prefix, &block)
       hash.each do |key, value|
-        match = key.snake_case.match(/[cn]_#{prefix}_?(natio\w*)$/)
+        match = key.info_snake_case.match(/[cn]_#{prefix}_?(natio\w*)$/)
         self.send("#{$1}=", value) if match
       end
 

data/lib/infostrada/person_info.rb

@@ -12,24 +12,24 @@ module Infostrada
 
       info = get!(URL, query: { personid: id }).first
 
-      self.new(id, info)
+      new(id, info)
     end
 
     def initialize(id, info)
       @id = id
 
       # Sometimes info comes as an empty array...
-      if info && !info.empty?
-        @first_name = info['c_FirstName']
-        @last_name = info['c_LastName']
-        @public_name = info['c_PublicName']
-        @nickname = info['c_Nickname']
-        @birthdate = Formatter.format_date(info['d_BirthDate'])
-        @height = info['n_Height']
-        @weight = info['n_Weight']
-        @birth_city = info['c_BirthCity']
-        @birth_country = info['c_BirthCountry']
-      end
+      return unless info && !info.empty?
+
+      @first_name = info['c_FirstName']
+      @last_name = info['c_LastName']
+      @public_name = info['c_PublicName']
+      @nickname = info['c_Nickname']
+      @birthdate = Formatter.format_date(info['d_BirthDate'])
+      @height = info['n_Height']
+      @weight = info['n_Weight']
+      @birth_city = info['c_BirthCity']
+      @birth_country = info['c_BirthCountry']
     end
   end
 end

data/lib/infostrada/phase.rb

@@ -24,17 +24,14 @@ module Infostrada
 
       list = get!(URL, query: { editionid: edition_id.to_i })
 
-      phases = []
-      list.each do |phase_hash|
-        phases << Phase.new(phase_hash)
+      list.map do |phase_hash|
+        Phase.new(phase_hash)
       end
-
-      phases
     end
 
     # Useful method to get a Phase object from a json serialized Phase object.
     def self.from_json(json = {})
-      self.new do |phase|
+      new do |phase|
         phase.id          = json['id']
         phase.name        = json['name']
         phase.level       = json['level']
@@ -48,16 +45,11 @@ module Infostrada
         phase.has_table   = json['has_table']
         phase.current     = json['current']
         phase.currents    = json['currents']
-        phase.start_date  = Date.parse(json['start_date']) if json['start_date']
-        phase.end_date    = Date.parse(json['end_date'])   if json['end_date']
+        phase.start_date  = Date.parse(json['start_date'].to_s) if json['start_date']
+        phase.end_date    = Date.parse(json['end_date'].to_s)  if json['end_date']
       end
     end
 
-    # Get the classification table for this phase.
-    def table
-      Table.where(phase_id: id)
-    end
-
     def initialize(hash = {}, &block)
       @id          = hash['n_PhaseID']
       @name        = hash['c_Phase']
@@ -84,6 +76,12 @@ module Infostrada
       self
     end
 
+    # Get the classification table for this phase.
+    def table
+      Table.where(phase_id: id)
+    end
+
+
     def has_table?
       @has_table
     end

data/lib/infostrada/player.rb

@@ -48,17 +48,17 @@ module Infostrada
     def set_season_stats(hash)
       @season_stats = {}
 
-      @season_stats[:matches]               = hash['n_Matches']
-      @season_stats[:matches_start]         = hash['n_MatchesStart']
-      @season_stats[:matches_out]           = hash['n_MatchesOut']
-      @season_stats[:matches_in]            = hash['n_MatchesIn']
-      @season_stats[:minutes_played]        = hash['n_MinutesPlayed']
-      @season_stats[:goals]                 = hash['n_Goals']
-      @season_stats[:own_goals]             = hash['n_OwnGoals']
-      @season_stats[:assists]               = hash['n_Assists']
-      @season_stats[:cards_yellow]          = hash['n_CardsYellow']
-      @season_stats[:cards_red]             = hash['n_CardsRed']
-      @season_stats[:cards_red_direct]      = hash['n_CardsRedDirect']
+      @season_stats[:matches] = hash['n_Matches']
+      @season_stats[:matches_start] = hash['n_MatchesStart']
+      @season_stats[:matches_out] = hash['n_MatchesOut']
+      @season_stats[:matches_in] = hash['n_MatchesIn']
+      @season_stats[:minutes_played] = hash['n_MinutesPlayed']
+      @season_stats[:goals] = hash['n_Goals']
+      @season_stats[:own_goals] = hash['n_OwnGoals']
+      @season_stats[:assists] = hash['n_Assists']
+      @season_stats[:cards_yellow] = hash['n_CardsYellow']
+      @season_stats[:cards_red] = hash['n_CardsRed']
+      @season_stats[:cards_red_direct] = hash['n_CardsRedDirect']
       @season_stats[:cards_red_from_yellow] = hash['n_CardsRed2Yellow']
     end
   end

data/lib/infostrada/squad.rb

@@ -10,12 +10,9 @@ module Infostrada
 
       list = get!(URL, query: { editionid: edition_id, teamid: team_id })
 
-      players = []
-      list.each do |player_hash|
-        players << Player.new(player_hash)
+      list.map do |player_hash|
+        Player.new(player_hash)
       end
-
-      players
     end
   end
-end
+end

data/lib/infostrada/team.rb

@@ -6,15 +6,15 @@ module Infostrada
     def_delegator :@nation, :name, :nation_name
     def_delegator :@nation, :short_name, :nation_short_name
 
-    attr_accessor :id, :name, :short_name, :nation, :edition_id
+    attr_accessor :id, :name, :short_name, :nation, :edition_id, :details
 
     def self.where(options = {})
       edition_id = options.delete(:edition_id)
-      teams = TeamRequest.get_edition(edition_id.to_i)
+      TeamRequest.get_edition(edition_id.to_i)
     end
 
     def self.from_json(json = {}, prefix)
-      self.new(prefix) do |team|
+      new(prefix) do |team|
         team.id         = json['id']
         team.name       = json['name']
         team.short_name = json['short_name']
@@ -27,7 +27,7 @@ module Infostrada
       @edition_id = hash['edition_id']
 
       hash.each do |key, value|
-        case key.snake_case
+        case key.info_snake_case
         when /^[cn]\w+#{prefix}_?team_id$/
           self.send('team_id=', value)
         when /^[cn]\w+#{prefix}_?team$/