mlb_gameday 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afb572d47ba8e0600616d659f913fd1b130e706a
-  data.tar.gz: a1a020d170a635355a210c5490965e2129f41f19
+SHA256:
+  metadata.gz: 499145f925f463abfdf236a63966ee0e8bedfae2dddabe69d3a6b5781c934951
+  data.tar.gz: 140ba72b1cfbdcc55a093159b6030c9059fe29cd41b52343ee601560b155619a
 SHA512:
-  metadata.gz: 9b4a14b8ef055db01a778d8b48739b4b612057e2ef12577ade28137181938f5817f1ac9971235b5a5e23ad099e17cae9b193fbaaaf301df37edec38d7d78fc14
-  data.tar.gz: f99acf4627c0f9bf6ad877dbb339fc33fc41bd2a09372d2b2642ac923ce51fc49b3396adb7f96154b2f24e6312794a385c05f4932fa2d2547edea7c2464c831d
+  metadata.gz: 39daa28891b1a746e7736fb15025e347a69720a79b70d13d5cf3c64868f1606eae9515341356e2a3d07a68ea8af649f907a810b83eaec018e996628ddf988b17
+  data.tar.gz: 9f29ea34ca7af20a0d19bc7b8cff5bb650e8e4fefd824a24c38fae1fc83585a255494ff5d5988ac28bd48014bc02e487d272d84a68b2614ef37eab95483eed0f

data/.rubocop.yml

@@ -2,7 +2,10 @@ AllCops:
   Include:
     - Rakefile
     - Gemfile
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
 
 Metrics/AbcSize:
   Enabled: false
@@ -18,6 +21,3 @@ Metrics/MethodLength:
 
 Style/Documentation:
   Enabled: false
-
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.0
+
+* Changed data source to gd-terr-origin.mlb.com since gdx.mlb.com redirects there.
+* Code cleanup.
+
 ## 0.2.3 / 0.2.4
 
 * Add All Star teams

data/README.md

@@ -1,4 +1,4 @@
-# MlbGameday
+# MLBGameday
 
 TODO: Write a gem description
 

data/lib/mlb_gameday.rb

@@ -11,13 +11,11 @@ require 'chronic'
 end
 
 module MLBGameday
-  API_URL = 'http://gd2.mlb.com/components/game/mlb'
+  API_URL = 'http://gd-terr-origin.mlb.com/components/game/mlb'
 
-  BATTER = '/year_%{year}/batters/%{id}'
-  PITCHER = '/year_%{year}/pitchers/%{id}'
-  RAWBOXSCORE = '/year_%{year}/month_%{month}/day_%{day}/gid_%{gid}/rawboxscore'
-  GAMECENTER = '/year_%{year}/month_%{month}/day_%{day}/gid_%{gid}/gamecenter'
-  LINESCORE = '/year_%{year}/month_%{month}/day_%{day}/gid_%{gid}/linescore'
+  BATTER = '/year_%<year>d/batters/%<id>d'
+  PITCHER = '/year_%<year>d/pitchers/%<id>d'
+  GAME_FOLDER = '/year_%<year>d/month_%02<month>d/day_%02<day>d/gid_%<gid>s'
   SCOREBOARD = '/year_%Y/month_%m/day_%d/miniscoreboard'
 
   class API
@@ -107,43 +105,33 @@ module MLBGameday
     end
 
     def linescore_xml(gid)
-      year, month, day, = gid.split '_'
-
-      fetch_xml LINESCORE, year: year, month: month, day: day, gid: gid
+      fetch_xml "#{GAME_FOLDER}/linescore", gid: gid
     end
 
     def rawboxscore_xml(gid)
-      year, month, day, = gid.split '_'
-
-      fetch_xml RAWBOXSCORE, year: year, month: month, day: day, gid: gid
+      fetch_xml "#{GAME_FOLDER}/rawboxscore", gid: gid
     end
 
     def gamecenter_xml(gid)
-      year, month, day, = gid.split '_'
-
-      fetch_xml GAMECENTER, year: year, month: month, day: day, gid: gid
+      fetch_xml "#{GAME_FOLDER}/gamecenter", gid: gid
     end
 
     def batter_xml(id, year: nil)
-      # We only really want one piece of data from this file...
-      year_data = fetch_xml BATTER, id: id, year: (year || Date.today.year)
-
-      gid = year_data.xpath('//batting/@game_id').text
-      year, month, day, = gid.split '/'
+      # We only really want one piece of data from this file. This gives us
+      # the GID of their most recent appearance.
+      gid = fetch_xml(BATTER, id: id, year: (year || Date.today.year))
+        .xpath('//batting/@game_id').text.gsub(/[^a-z0-9]/, '_')
 
-      fetch_xml "/year_#{year}/month_#{month}/day_#{day}/" \
-                "gid_#{gid.gsub(/[^a-z0-9]/, '_')}/batters/#{id}"
+      fetch_xml "#{GAME_FOLDER}/batters/%<batter>s", gid: gid, batter: id
     end
 
     def pitcher_xml(id, year: nil)
-      # We only really want one piece of data from this file...
-      year_data = fetch_xml PITCHER, id: id, year: (year || Date.today.year)
+      # We only really want one piece of data from this file. This gives us
+      # the GID of their most recent appearance.
+      gid = fetch_xml(PITCHER, id: id, year: (year || Date.today.year))
+        .xpath('//pitching/@game_id').text.gsub(/[^a-z0-9]/, '_')
 
-      gid = year_data.xpath('//pitching/@game_id').text
-      year, month, day, = gid.split '/'
-
-      fetch_xml "/year_#{year}/month_#{month}/day_#{day}/" \
-                "gid_#{gid.gsub(/[^a-z0-9]/, '_')}/pitchers/#{id}"
+      fetch_xml "#{GAME_FOLDER}/pitchers/%<pitcher>s", gid: gid, pitcher: id
     end
 
     protected
@@ -151,6 +139,14 @@ module MLBGameday
     def fetch_xml(path, interpolations = {})
       full_path = "#{API_URL}#{path}.xml"
 
+      if interpolations[:gid]
+        year, month, day, = interpolations[:gid].split '_'
+
+        interpolations[:year] = year
+        interpolations[:month] = month
+        interpolations[:day] = day
+      end
+
       full_path = format(full_path, interpolations) if interpolations.any?
 
       Nokogiri::XML open full_path

data/lib/mlb_gameday/game.rb

@@ -10,16 +10,10 @@ module MLBGameday
     def initialize(api, gid, files = {})
       @api = api
       @gid = gid
-
       @files = files
 
-      if files[:linescore]
-        @home_team = @api.team files[:linescore].xpath('//game/@home_name_abbrev').text
-        @away_team = @api.team files[:linescore].xpath('//game/@away_name_abbrev').text
-      else
-        @home_team = @api.team files[:gamecenter].xpath('//game/@id').text[18, 6]
-        @away_team = @api.team files[:gamecenter].xpath('//game/@id').text[11, 6]
-      end
+      @home_team = @api.team home_team_identifier
+      @away_team = @api.team away_team_identifier
     end
 
     def teams
@@ -290,5 +284,24 @@ module MLBGameday
     def inspect
       %(#<MLBGameday::Game @gid="#{@gid}">)
     end
+
+    protected
+
+    def home_team_identifier
+      if files[:linescore]
+        return files[:linescore].xpath('//game/@home_name_abbrev').text
+      end
+
+      files[:gamecenter].xpath('//game/@id').text[18, 6]
+    end
+
+    def away_team_identifier
+      if files[:linescore]
+        return files[:linescore].xpath('//game/@away_name_abbrev').text
+      end
+
+      files[:gamecenter].xpath('//game/@id').text[11, 6]
+    end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/mlb_gameday/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MLBGameday
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/mlb_gameday.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path('../lib', __FILE__)
@@ -12,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['git@fustrate.com']
   spec.description   = 'Access data about games and players from the ' \
                        'official MLB Gameday API'
-  spec.summary       = %(Fetches gameday data from the MLB Gameday API)
+  spec.summary       = 'Fetches gameday data from the MLB Gameday API'
   spec.homepage      = 'http://github.com/fustrate/mlb_gameday'
   spec.license       = 'MIT'
 
@@ -22,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'minitest', '~> 5.5'
+  spec.add_development_dependency 'rake', '~> 10.4'
 
+  spec.add_dependency 'chronic', '~> 0.10'
   spec.add_dependency 'httparty', '~> 0.13'
   spec.add_dependency 'nokogiri', '~> 1.6'
-  spec.add_dependency 'chronic', '~> 0.10'
 end

data/test/game_spec.rb

@@ -9,7 +9,7 @@ class MockedApi < MLBGameday::API
 
   def open(url, &block)
     dir = File.dirname __FILE__
-    base = url.gsub 'http://gd2.mlb.com/components/game/mlb/', ''
+    base = url.gsub 'http://gd-terr-origin.mlb.com/components/game/mlb/', ''
     path = File.join dir, base
 
     unless File.exist?(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mlb_gameday
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,75 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.6'
 description: Access data about games and players from the official MLB Gameday API
 email:
 - git@fustrate.com
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fetches gameday data from the MLB Gameday API