lib/sportradar/api/images.rb in sportradar-api-0.1.19 vs lib/sportradar/api/images.rb in sportradar-api-0.1.21

@@ -1,10 +1,10 @@
 module Sportradar
   module Api
     class Images < Request
       attr_accessor :sport, :league, :access_level
-      def initialize( sport, league = nil, access_level = 't')
+      def initialize( sport, access_level = 't', league = nil)
         raise Sportradar::Api::Error::InvalidSport unless allowed_sports.include? sport
         @sport = sport
         raise Sportradar::Api::Error::InvalidLeague unless soccer_leagues.include?(league) || league.nil?
         @league = league
 
@@ -12,33 +12,37 @@
         @access_level = access_level
       end
 
       def player_manifests(year = Date.today.year)
         if league
-          get request_url("#{league}/#{image_type}/players/#{year}/manifest")
+          response = get request_url("#{league}/#{image_type}/players/#{year}/manifest")
         else
-          get request_url("players/#{image_type}/manifests/all_assets")
+          response = get request_url("players/#{image_type}/manifests/all_assets")
         end
+        Sportradar::Api::Images::AssetList.new response["assetlist"]  if response.success? && response["assetlist"]
       end
+
       alias_method :all_players, :player_manifests
       # Coach Manifests
 
       def coach_manifests
         raise Sportradar::Api::Error::InvalidLeague unless league.nil?
-        get request_url("coaches/#{image_type}/manifests/all_assets")
+        response = get request_url("coaches/#{image_type}/manifests/all_assets")
+        Sportradar::Api::Images::AssetList.new response["assetlist"]  if response.success? && response["assetlist"]
       end
       alias_method :all_coaches, :coach_manifests
 
       def venue_manifests
         raise Sportradar::Api::Error::InvalidLeague unless league.nil?
-        get request_url("venues/manifests/all_assets")
+        response = get request_url("venues/manifests/all_assets")
+        Sportradar::Api::Images::AssetList.new response["assetlist"]  if response.success? && response["assetlist"]
       end
       alias_method :all_venues, :venue_manifests
 
       # The Player Images, Coach Images, Venue Images APIs aren't really meant to be used directly, the manifests return an href path of an image we can pass it into the image_url method to get the entire image url
       def image_url(href)
-        href.slice!(0) # remove initial '/'
+        href.slice!(0) if href.chars.first == '/' # remove initial '/'
         set_base request_url(href) + api_key_query_string
       end
       alias_method :player_images, :image_url
       alias_method :coach_images, :image_url
       alias_method :venue_images, :image_url
@@ -49,12 +53,20 @@
         "/#{sport}-images-#{access_level}#{version}/#{provider}/#{path}"
       end
 
       def api_key
         if league
-          Sportradar::Api.api_key_params("images_#{league}")
+          if access_level == 'p'
+            Sportradar::Api.api_key_params("images_#{league}", "production")
+          else
+            Sportradar::Api.api_key_params("images_#{league}")
+          end
         else
-          Sportradar::Api.api_key_params("images_#{sport}")
+          if access_level == 'p'
+            Sportradar::Api.api_key_params("images_#{sport}", "production")
+          else
+            Sportradar::Api.api_key_params("images_#{sport}")
+          end
         end
       end
 
       def api_key_query_string
         "?#{api_key.keys.first}=#{api_key.values.first}"