sportradar-api 0.1.38 → 0.9.0

data/lib/sportradar/api/soccer/boxscore.rb

@@ -5,18 +5,7 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_matches
-      end
-
-      private
-      def set_matches
-        if response['boxscore'] && response['boxscore']['matches'] && response["boxscore"]["matches"]["match"]
-          if response["boxscore"]["matches"]["match"].is_a?(Array)
-            @matches = response["boxscore"]["matches"]["match"].map {|x| Sportradar::Api::Soccer::Match.new x }
-          elsif response["boxscore"]["matches"]["match"].is_a?(Hash)
-            @matches = [ Sportradar::Api::Soccer::Match.new(response["boxscore"]["matches"]["match"]) ]
-          end
-        end
+        @matches = parse_into_array(selector: response["boxscore"]["matches"]["match"], klass: Sportradar::Api::Soccer::Match)  if response['boxscore'] && response['boxscore']['matches'] && response["boxscore"]["matches"]["match"]
       end
 
     end

data/lib/sportradar/api/soccer/category.rb

@@ -9,18 +9,7 @@ module Sportradar
         @name = data["name"]
         @country_code = data["country_code"]
         @country = data["country"]
-        set_tournament_group
-      end
-
-      private
-      def set_tournament_group
-        if response["tournament_group"]
-          if response["tournament_group"].is_a?(Array)
-            @tournament_groups = response["tournament_group"].map {|x| Sportradar::Api::Soccer::TournamentGroup.new x }
-          elsif response["tournament_group"].is_a?(Hash)
-            @tournament_groups = [ Sportradar::Api::Soccer::TournamentGroup.new(response["tournament_group"]) ]
-          end
-        end
+        @tournament_groups = parse_into_array(selector: response["tournament_group"], klass: Sportradar::Api::Soccer::TournamentGroup)  if response["tournament_group"]
       end
 
     end

data/lib/sportradar/api/soccer/hierarchy.rb

@@ -5,22 +5,10 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_categories
+        @categories = parse_into_array(selector: response["category"], klass: Sportradar::Api::Soccer::Category)  if response["category"]
       end
 
-      private
-
-      def set_categories
-        if response["category"]
-          if response["category"].is_a?(Array)
-            @categories = response["category"].map {|x| Sportradar::Api::Soccer::Category.new x }
-          elsif response["category"].is_a?(Hash)
-            @categories = [ Sportradar::Api::Soccer::Category.new(response["category"]) ]
-          end
-        end
-      end
-
-
     end
   end
 end
+

data/lib/sportradar/api/soccer/match.rb

@@ -18,12 +18,12 @@ module Sportradar
         @tournament = Sportradar::Api::Soccer::Tournament.new data["tournament"] if data["tournament"]
         @tournament_group = Sportradar::Api::Soccer::TournamentGroup.new data["tournament_group"] if data["tournament_group"]
 
-        @away = Sportradar::Api::Soccer::Team.new data["away"]
-        @home = Sportradar::Api::Soccer::Team.new data["home"]
+        @away = Sportradar::Api::Soccer::Team.new data["away"] if data["away"]
+        @home = Sportradar::Api::Soccer::Team.new data["home"] if data["home"]
         @venue = Sportradar::Api::Soccer::Venue.new data["venue"] if data["venue"]
 
         @future_game = @scheduled > Time.now.utc
-        @winner = find_winner unless future_game
+        @winner = find_winner if @home && @away && !future_game
 
         # Actual stats from match summary
         @period = data["period"]

data/lib/sportradar/api/soccer/player.rb

@@ -6,7 +6,8 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_teams
+        @teams = parse_into_array(selector: response["team"], klass: Sportradar::Api::Soccer::Team)  if response["team"]
+        @teams = parse_into_array(selector: response["teams"]["team"], klass: Sportradar::Api::Soccer::Team)  if response["teams"] && response["teams"]["team"]
         @id = data["id"]
         @first_name = data["first_name"]
         @last_name = data["last_name"]
@@ -31,8 +32,8 @@ module Sportradar
         @weight_kg = data["weight_kg"]
         @rank = data["rank"]
         @total = OpenStruct.new data["total"] if data["total"]
+        @statistics = parse_into_array(selector:response["statistics"]["season"], klass: Sportradar::Api::Soccer::Season)  if response["statistics"] &&  response["statistics"]["season"]
 
-        set_statistics
       end
 
       def name
@@ -63,7 +64,7 @@ module Sportradar
 
 
       def tactical_position_name
-        tactical_positions = { "0" => "Unknown", "1" => "Goalkeeper", "2" => "Right back", "3" => "Central defender", "4" => "Left back", "5" => "Right winger", "6" => "Central midfielder", "7" => "Left winger", "8" => "Forward" }
+        tactical_positions = { "0" => "Unknown", "1" => "Goalkeeper", "2" => "Right Back", "3" => "Central Defender", "4" => "Left Back", "5" => "Right winger", "6" => "Central Midfielder", "7" => "Left Winger", "8" => "Forward" }
         tactical_positions[tactical_position] if tactical_position
       end
 
@@ -82,34 +83,6 @@ module Sportradar
         end
       end
 
-      private
-
-      def set_teams
-        if response["team"]
-          if response["team"].is_a?(Array)
-            @teams = response["team"].map {|team| Sportradar::Api::Soccer::Team.new team }
-          elsif response["team"].is_a?(Hash)
-            @teams = [ Sportradar::Api::Soccer::Team.new(response["team"]) ]
-          end
-        elsif response["teams"] && response["teams"]["team"]
-          if response["teams"]["team"].is_a?(Array)
-            @teams = response["teams"]["team"].map {|team| Sportradar::Api::Soccer::Team.new team }
-          elsif response["teams"]["team"].is_a?(Hash)
-            @teams = [ Sportradar::Api::Soccer::Team.new(response["teams"]["team"]) ]
-          end
-        end
-      end
-
-      def set_statistics
-        if response["statistics"] && response["statistics"]["season"]
-          if response["statistics"]["season"].is_a?(Array)
-            @statistics = response["statistics"]["season"].map {|statistic| Sportradar::Api::Soccer::Season.new statistic }
-          elsif response["statistics"]["season"].is_a?(Hash)
-            @statistics = [ Sportradar::Api::Soccer::Season.new(response["statistics"]["season"]) ]
-          end
-        end
-      end
-
     end
   end
 end

data/lib/sportradar/api/soccer/ranking.rb

@@ -5,22 +5,9 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_categories
+        @categories = parse_into_array(selector: response["category"], klass: Sportradar::Api::Soccer::Category)  if response["category"]
       end
 
-      private
-
-      def set_categories
-        if response["category"]
-          if response["category"].is_a?(Array)
-            @categories = response["category"].map {|x| Sportradar::Api::Soccer::Category.new x }
-          elsif response["category"].is_a?(Hash)
-            @categories = [ Sportradar::Api::Soccer::Category.new(response["category"]) ]
-          end
-        end
-      end
-
-
     end
   end
 end

data/lib/sportradar/api/soccer/schedule.rb

@@ -5,7 +5,7 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_matches
+        @matches = parse_into_array(selector: response["schedule"]["matches"]["match"], klass: Sportradar::Api::Soccer::Match)  if response['schedule'] && response['schedule']['matches'] && response["schedule"]["matches"]["match"]
       end
 
       def league(league_name)
@@ -16,17 +16,6 @@ module Sportradar
         matches.map {|match| match.tournament_group.name}.uniq
       end
 
-      private
-      def set_matches
-        if response["schedule"]["matches"]["match"]
-          if response["schedule"]["matches"]["match"].is_a?(Array)
-            @matches = response["schedule"]["matches"]["match"].map {|x| Sportradar::Api::Soccer::Match.new x }
-          elsif response["schedule"]["matches"]["match"].is_a?(Hash)
-            @matches = [ Sportradar::Api::Soccer::Match.new(response["schedule"]["matches"]["match"]) ]
-          end
-        end
-      end
-
     end
   end
 end

data/lib/sportradar/api/soccer/season.rb

@@ -6,20 +6,7 @@ module Sportradar
       def initialize(data)
         @response = data
         @year = data["year"]
-        set_statistics
-
-      end
-
-      private
-
-      def set_statistics
-        if response["statistic"]
-          if response["statistic"].is_a?(Array)
-            @statistics = response["statistic"].map {|statistic| Sportradar::Api::Soccer::Statistic.new statistic }
-          elsif response["statistic"].is_a?(Hash)
-            @statistics = [ Sportradar::Api::Soccer::Statistic.new(response["statistic"]) ]
-          end
-        end
+        @statistics = parse_into_array(selector: response["statistic"], klass: Sportradar::Api::Soccer::Statistic)  if response["statistic"]
       end
 
     end

data/lib/sportradar/api/soccer/standing.rb

@@ -5,20 +5,9 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_categories
+        @categories = parse_into_array(selector: response["categories"]["category"], klass: Sportradar::Api::Soccer::Category)  if response["categories"] && response["categories"]["category"]
       end
 
-      private
-
-      def set_categories
-        if response["categories"] && response["categories"]["category"]
-          if response["categories"]["category"].is_a?(Array)
-            @categories = response["categories"]["category"].map {|x| Sportradar::Api::Soccer::Category.new x }
-          elsif response["categories"]["category"].is_a?(Hash)
-            @categories = [ Sportradar::Api::Soccer::Category.new(response["categories"]["category"]) ]
-          end
-        end
-      end
     end
   end
 end

data/lib/sportradar/api/soccer/summary.rb

@@ -5,19 +5,7 @@ module Sportradar
 
       def initialize(data)
         @response = data
-        set_matches
-      end
-
-      private
-
-      def set_matches
-        if response["summary"]["matches"]["match"]
-          if response["summary"]["matches"]["match"].is_a?(Array)
-            @matches = response["summary"]["matches"]["match"].map {|x| Sportradar::Api::Soccer::Match.new x }
-          elsif response["summary"]["matches"]["match"].is_a?(Hash)
-            @matches = [ Sportradar::Api::Soccer::Match.new(response["summary"]["matches"]["match"]) ]
-          end
-        end
+        @matches = parse_into_array(selector: response["summary"]["matches"]["match"], klass: Sportradar::Api::Soccer::Match)  if response['summary'] && response['summary']['matches'] && response["summary"]["matches"]["match"]
       end
 
     end

data/lib/sportradar/api/soccer/team.rb

@@ -32,6 +32,8 @@ module Sportradar
         @position = data["position"]
         @is_player = data["is_player"]
         @is_manager = data["is_manager"]
+
+        # Standings generate these
         @home = OpenStruct.new data["home"] if data["home"]
         @away = OpenStruct.new data["away"] if data["away"]
 
@@ -39,9 +41,8 @@ module Sportradar
         parse_scoring if scoring
 
         @statistics =  OpenStruct.new data["statistics"] if data["statistics"]
-        @players = data["players"]["player"].map {|player| Sportradar::Api::Soccer::Player.new player } if data["players"]
-
-        @players = data["roster"]["player"].map {|player| Sportradar::Api::Soccer::Player.new player } if data["roster"]
+        @players = parse_into_array(selector: data["players"]["player"], klass: Sportradar::Api::Soccer::Player)  if response['players'] && response['players']['player']
+        @players = parse_into_array(selector: data["roster"]["player"], klass: Sportradar::Api::Soccer::Player)  if response['roster'] && response['roster']['player']
         @manager =  Sportradar::Api::Soccer::Player.new data["manager"] if data["manager"]
       end
 

data/lib/sportradar/api/soccer/tournament.rb

@@ -12,20 +12,7 @@ module Sportradar
         @season = data["season"]
         @reference_id = data["reference_id"]
         @coverage = OpenStruct.new data["coverage"] if data["coverage"]
-        set_teams
-
-      end
-
-      private
-
-      def set_teams
-        if response["team"]
-          if response["team"].is_a?(Array)
-            @teams = response["team"].map {|team| Sportradar::Api::Soccer::Team.new team }
-          elsif response["team"].is_a?(Hash)
-            @teams = [ Sportradar::Api::Soccer::Team.new(response["team"]) ]
-          end
-        end
+        @teams = parse_into_array(selector: response["teams"], klass: Sportradar::Api::Soccer::Team)  if response["teams"]
       end
 
     end

data/lib/sportradar/api/soccer/tournament_group.rb

@@ -16,8 +16,7 @@ module Sportradar
         @top_assists = parse_players(data["top_assists"]["player"]) if data["top_assists"] && data["top_assists"]["player"]
         @top_cards = parse_players(data["top_cards"]["player"]) if data["top_cards"] && data["top_cards"]["player"]
         @top_points = parse_players(data["top_points"]["player"]) if data["top_points"] && data["top_points"]["player"]
-        set_tournaments
-
+        @tournaments = parse_into_array(selector: response["tournaments"], klass: Sportradar::Api::Soccer::Tournament)  if response["tournaments"]
       end
 
       private
@@ -30,15 +29,6 @@ module Sportradar
         end
       end
 
-      def set_tournaments
-        if response["tournament"]
-          if response["tournament"].is_a?(Array)
-            @tournaments = response["tournament"].map {|x| Sportradar::Api::Soccer::Tournament.new x }
-          elsif response["tournament"].is_a?(Hash)
-            @tournaments = [ Sportradar::Api::Soccer::Tournament.new(response["tournament"]) ]
-          end
-        end
-      end
 
     end
   end

data/lib/sportradar/api/version.rb

@@ -1,5 +1,5 @@
 module Sportradar
   module Api
-    VERSION = "0.1.38"
+    VERSION = "0.9.0"
   end
 end

data/sportradar-api.gemspec

@@ -36,8 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "minitest-focus"
   spec.add_development_dependency "dotenv"
+
   spec.add_dependency "httparty", ">= 0.14.0"
   spec.add_dependency "activesupport"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportradar-api
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.9.0
 platform: ruby
 authors:
 - Ben Eggett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - README.md
 - Rakefile
 - bin/console
@@ -277,7 +292,6 @@ files:
 - lib/sportradar/api/nfl/scoring.rb
 - lib/sportradar/api/nfl/season.rb
 - lib/sportradar/api/nfl/situation.rb
-- lib/sportradar/api/nfl/stat.rb
 - lib/sportradar/api/nfl/statistic.rb
 - lib/sportradar/api/nfl/summary.rb
 - lib/sportradar/api/nfl/team.rb

data/lib/sportradar/api/nfl/stat.rb

@@ -1,7 +0,0 @@
-module Sportradar
-  module Api
-    module Nfl::Stat
-      #
-    end
-  end
-end