chgk_rating 1.0.0 → 2.2.0

data/lib/chgk_rating/collections/{tournaments.rb → tournaments/tournaments.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class Tournaments < Base
@@ -7,18 +9,18 @@ module ChgkRating
         @team = build_model params[:team]
 
         @season_id = params[:season_id]
-        params.merge!(lazy: true) if @team || @season_id
+        params[:lazy] = true if @team || @season_id
         super
       end
 
       def revert_to_hash(key, values)
         [
-            key,
-            {
-                'idteam' => @team.id.to_s,
-                'idseason' => key,
-                'tournaments' => values.map(&:to_h)
-            }
+          key,
+          {
+            'idteam' => @team&.id.to_s,
+            'idseason' => key,
+            'tournaments' => values.map(&:to_h)
+          }
         ]
       end
 
@@ -35,13 +37,16 @@ module ChgkRating
         end
       end
 
+      # @return [String] Either `tournaments`, `teams/ID/tournaments`, or `teams/ID/tournaments/SEASON_ID`
       def api_path
         path = 'tournaments'
         return path unless @team
+
         path = "teams/#{@team.id}/#{path}"
         return path unless @season_id
+
         path + "/#{@season_id}"
       end
     end
   end
-end
+end

data/lib/chgk_rating/concerns/searching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Concerns
     module Searching
@@ -5,21 +7,20 @@ module ChgkRating
       # Creates a Search child class of a given class that changes the URI where the
       # GET request should be sent
       def self.included(klass)
-        klass.const_set('Search',
-            Class.new(klass) do |*_args|
-              def api_path
-                super + '/search'
-              end
-            end
-        )
+        klass.const_set(:Search,
+                        Class.new(klass) do |*_args|
+                          def api_path
+                            "#{super}/search"
+                          end
+                        end)
 
         # The actual method to perform searching
         # Instantiates a Search class with the given search params
         # and send a GET request to the proper URI (defined above)
         klass.define_singleton_method :search do |params|
-          klass.const_get('Search').new(params)
+          klass.const_get(:Search).new(params)
         end
       end
     end
   end
-end
+end

data/lib/chgk_rating/connection.rb

@@ -1,19 +1,24 @@
+# frozen_string_literal: true
+
+require 'faraday/follow_redirects'
+
 module ChgkRating
   module Connection
-    BASE_URL = 'http://rating.chgk.info/api'.freeze
+    BASE_URL = 'http://rating.chgk.info/api'
 
     def connection
       options = {
-          headers: {
-              accept: 'application/json',
-              user_agent: "chgk_rating ruby gem/#{ChgkRating::VERSION}"
-          },
-          url: BASE_URL + '/'
+        headers: {
+          accept: 'application/json',
+          user_agent: "chgk_rating ruby gem/#{ChgkRating::VERSION}"
+        },
+        url: "#{BASE_URL}/"
       }
 
       Faraday.new options do |faraday|
+        faraday.use Faraday::FollowRedirects::Middleware
         faraday.adapter Faraday.default_adapter
       end
     end
   end
-end
+end

data/lib/chgk_rating/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   class Error < StandardError
     ClientError = Class.new(self)
@@ -26,10 +28,10 @@ module ChgkRating
     NotImplemented = Class.new(ServerError)
 
     ERRORS = {
-        400 => ChgkRating::Error::BadRequest,
-        404 => ChgkRating::Error::NotFound,
-        501 => ChgkRating::Error::NotImplemented
-    }
+      400 => ChgkRating::Error::BadRequest,
+      404 => ChgkRating::Error::NotFound,
+      501 => ChgkRating::Error::NotImplemented
+    }.freeze
 
     class << self
       # Create a new error from an HTTP response
@@ -43,4 +45,4 @@ module ChgkRating
       super(message)
     end
   end
-end
+end

data/lib/chgk_rating/models/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Base < ChgkObject
@@ -24,7 +26,8 @@ module ChgkRating
       # Set `force` to reload data even if it is already present.
       def eager_load!(force = false)
         return unless @lazy || force
-        extract_from raw_by(self.id)
+
+        extract_from raw_by(id)
         @lazy = false
         self
       end
@@ -36,26 +39,31 @@ module ChgkRating
       end
 
       def self.no_lazy_support!
-        self.const_set :NO_LAZY_SUPPORT, true
+        const_set :NO_LAZY_SUPPORT, true
         undef_method :lazy
       end
 
       def to_h
-        self.class.attribute_mapping.inject({}) do |memo, (attr, mapping)|
-          data = self.send attr
-          data = mapping[:transform_down].call(data) if mapping.has_key?(:transform_down)
-          memo[ mapping[:raw_name] ] = data
-          memo
+        self.class.attribute_mapping.each_with_object({}) do |(attr, mapping), memo|
+          data = send attr
+          data = mapping[:transform_down].call(data) if mapping.key?(:transform_down)
+          memo[mapping[:raw_name]] = data
         end
       end
 
-      private
+      class << self
+        # Grab the attribute mapping for the class and its superclass
+        # (as superclass may present common mappings for multiple classes)
+        def attribute_mapping
+          return nil unless name
 
-      def self.attribute_mapping
-        return nil unless self.name
-        ChgkRating::AttributeMappings.find self.name
+          ChgkRating::AttributeMappings.find(name).
+            merge(ChgkRating::AttributeMappings.find(superclass.name))
+        end
       end
 
+      private
+
       def lazy_load?(params)
         self.class.const_defined?(:NO_LAZY_SUPPORT) ? false : params[:lazy]
       end
@@ -80,11 +88,22 @@ module ChgkRating
 
       def extract_from(raw_data)
         self.class.attribute_mapping.each do |attr, mapping|
-          data = raw_data.is_a?(self.class) ? raw_data.send(attr) : raw_data[ mapping[:raw_name] ]
-          data = mapping[:transform_up].call(data) if mapping.has_key?(:transform_up)
-          instance_variable_set "@#{attr}", data
+          data = get_data_from raw_data, attr, mapping
+          next unless data
+
+          instance_variable_set "@#{attr}", transform_up(data, mapping)
         end
       end
+
+      def get_data_from(raw, attr, mapping)
+        raw.is_a?(self.class) ? raw.send(attr) : raw[mapping[:raw_name]]
+      end
+
+      def transform_up(data, mapping)
+        return data unless mapping.key?(:transform_up)
+
+        mapping[:transform_up].call(data)
+      end
     end
   end
-end
+end

data/lib/chgk_rating/models/player.rb

@@ -1,6 +1,33 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Player < Base
+      # Returns rating for the current Player in a given release
+      #
+      # @return [ChgkRating::Models::PlayerRating] The requested rating.
+      # @param release_id [String or Integer] Release to load rating for.
+      def rating(release_id)
+        ChgkRating::Models::PlayerRating.new release_id, player: self
+      end
+
+      # Returns an array-like ratings collection for the current Player.
+      #
+      # @return [ChgkRating::Collection::PlayerRatings] The collection of ratings.
+      def ratings
+        ChgkRating::Collections::PlayerRatings.new player: self
+      end
+
+      # Returns a collection of Tournaments that the current player participated at based on the given criteria
+      #
+      # @raise [ChgkRating::Error::NotFound] Error raised when nothing can be found based on the given criteria.
+      # @return [ChgkRating::Collection::PlayerTournaments] The collection of tournaments.
+      # @param season_id [String or Integer] Season to load tournaments for
+      # @option params [String or Integer] :page The requested page. Default is 1
+      def tournaments(season_id = nil)
+        ChgkRating::Collections::PlayerTournaments.new player: self, season_id: season_id
+      end
+
       private
 
       def api_path
@@ -8,4 +35,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/rating/player_rating.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ChgkRating
+  module Models
+    class PlayerRating < Rating
+      def initialize(release_id_or_hash, params = {})
+        @player_id = extract_id_from params[:player], ChgkRating::Models::Player
+        super
+      end
+
+      private
+
+      def api_path
+        "players/#{@player_id}/rating"
+      end
+    end
+  end
+end

data/lib/chgk_rating/models/{tournament_player.rb → rating/rating.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
-    class TournamentPlayer < Base
+    class Rating < Base
       no_eager_loading!
       no_lazy_support!
     end
   end
-end
+end

data/lib/chgk_rating/models/{rating.rb → rating/team_rating.rb}

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
-    class Rating < Base
-      no_eager_loading!
-      no_lazy_support!
-
+    class TeamRating < Rating
       def initialize(release_id_or_hash, params = {})
         @team_id = extract_id_from params[:team]
         super
@@ -16,4 +15,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/recap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Recap < Base
@@ -16,4 +18,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/team.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Team < Base
@@ -19,19 +21,19 @@ module ChgkRating
         ChgkRating::Models::TournamentTeam.new self, tournament: tournament_or_id, lazy: true
       end
 
-      # Returns Rating for the current Team in a given release
+      # Returns rating for the current Team in a given release
       #
-      # @return [ChgkRating::Models::Rating] The requested Rating.
+      # @return [ChgkRating::Models::TeamRating] The requested rating.
       # @param release_id [String or Integer] Release to load rating for.
       def rating(release_id)
-        ChgkRating::Models::Rating.new release_id, team: self
+        ChgkRating::Models::TeamRating.new release_id, team: self
       end
 
-      # Returns an array-like Ratings collection for the current team.
+      # Returns an array-like ratings collection for the current Team.
       #
-      # @return [ChgkRating::Collection::Ratings] The collection of ratings.
+      # @return [ChgkRating::Collection::TeamRatings] The collection of ratings.
       def ratings
-        ChgkRating::Collections::Ratings.new team: self
+        ChgkRating::Collections::TeamRatings.new team: self
       end
 
       # Returns an hash-like Recaps collection for the current team, grouped by seasons. Seasons act
@@ -59,4 +61,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/tournament/player_tournament.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ChgkRating
+  module Models
+    class PlayerTournament < Base
+      no_eager_loading!
+      no_lazy_support!
+    end
+  end
+end

data/lib/chgk_rating/models/{tournament.rb → tournament/tournament.rb}

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Tournament < Base
-      # Returns an array-like TournamentPlayers collection containing roster for a team at the current tournament.
+      # Returns an array-like TournamentTeamPlayers collection containing roster for a team at the current tournament.
       #
       # @raise [ChgkRating::Error::NotFound] Error raised when the requested Team cannot be found.
-      # @return [ChgkRating::Collection::TournamentPlayers] The collection of results.
+      # @return [ChgkRating::Collection::TournamentTeamPlayers] The collection of results.
       # @param team_or_id [String, Integer or ChgkRating::Models::Team] Team to load players for.
       def team_players(team_or_id)
-        ChgkRating::Collections::TournamentPlayers.new tournament: self, team: team_or_id
+        ChgkRating::Collections::TournamentTeamPlayers.new tournament: self, team: team_or_id
       end
 
       # Returns an array-like TournamentTeamResults collection with results for a given team in the current
@@ -32,7 +34,7 @@ module ChgkRating
       # @raise [ChgkRating::Error::NotFound] Error raised when the requested Team cannot be found.
       # @return [ChgkRating::Models::TournamentTeam] The requested TournamentTeam.
       # @param team_or_id [String, Integer or Team] Team to search for.
-      def team(team_or_id)
+      def team_by(team_or_id)
         ChgkRating::Models::TournamentTeam.new team_or_id, tournament: self, lazy: true
       end
 
@@ -43,4 +45,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/{tournament_team.rb → tournament/tournament_team.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class TournamentTeam < Base
@@ -11,11 +13,11 @@ module ChgkRating
         super extract_id_from(team_or_hash), params
       end
 
-      # Returns an array-like TournamentPlayers collection containing roster for the current TournamentTeam
+      # Returns an array-like TournamentTeamPlayers collection containing roster for the current TournamentTeam
       #
-      # @return [ChgkRating::Collection::TournamentPlayers] The collection of results.
+      # @return [ChgkRating::Collection::TournamentTeamPlayers] The collection of results.
       def players
-        ChgkRating::Collections::TournamentPlayers.new tournament: @tournament, team: @team
+        ChgkRating::Collections::TournamentTeamPlayers.new tournament: @tournament, team: @team
       end
 
       # Returns an array-like TournamentTeamResults collection containing results for the current TournamentTeam
@@ -26,4 +28,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/models/tournament/tournament_team_player.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ChgkRating
+  module Models
+    class TournamentTeamPlayer < Base
+      no_eager_loading!
+      no_lazy_support!
+    end
+  end
+end

data/lib/chgk_rating/models/{tournament_team_result.rb → tournament/tournament_team_result.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class TournamentTeamResult < Base
@@ -5,4 +7,4 @@ module ChgkRating
       no_lazy_support!
     end
   end
-end
+end

data/lib/chgk_rating/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Request
     include ChgkRating::Connection
@@ -16,17 +18,16 @@ module ChgkRating
     end
 
     def respond(response)
-      begin
-        body = MultiJson.load response.body
-        raise MultiJson::ParseError if body.respond_to?(:has_key?) && body.has_key?('error')
-        body
-      rescue MultiJson::ParseError
-        respond_with_error response.status, response.body
-      end
+      body = MultiJson.load response.body
+      raise MultiJson::ParseError if body.respond_to?(:has_key?) && body.key?('error')
+
+      body
+    rescue MultiJson::ParseError
+      respond_with_error response.status, response.body
     end
 
     def respond_with_error(code, body)
-      fail ChgkRating::Error::ERRORS[code].from_response(body)
+      raise ChgkRating::Error::ERRORS[code].from_response(body)
     end
   end
-end
+end

data/lib/chgk_rating/utils/snakecase.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Initial code taken from Facets gem by Rubyworks
 # https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/snakecase.rb
 
@@ -6,11 +8,11 @@ class String
   # replaced by underscores.
   def snakecase_upcase
     split('::').last.
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr('-', '_').
-        gsub(/\s/, '_').
-        gsub(/__+/, '_').
-        upcase
+      gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+      gsub(/([a-z\d])([A-Z])/, '\1_\2').
+      tr('-', '_').
+      gsub(/\s/, '_').
+      gsub(/__+/, '_').
+      upcase
   end
-end
+end

data/lib/chgk_rating/utils/transformations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Utils
     module Transformations
@@ -6,10 +8,10 @@ module ChgkRating
         up = 'integer' if up.nil? || up.empty?
         down = 'string' if down.nil? || down.empty?
 
-        %i(up down).inject({}) do |result, t|
+        %i[up down].reduce({}) do |result, t|
           current_transformer = binding.local_variable_get t
           result.merge({
-                           "transform_#{t}".to_sym => send(current_transformer)
+                         "transform_#{t}".to_sym => send(current_transformer)
                        })
         end
       end
@@ -24,10 +26,12 @@ module ChgkRating
         private
 
         def chgk_object(namespace, type = 'Models')
-          ->(d) do
-            opts = type == 'Models' ?
-                       [d, {lazy: true}] :
-                       [{collection: d, lazy: true}]
+          lambda do |d|
+            opts = if type == 'Models'
+                     [d, {lazy: true}]
+                   else
+                     [{collection: d, lazy: true}]
+                   end
 
             Module.const_get("ChgkRating::#{type}::#{namespace}").new(*opts)
           end
@@ -42,42 +46,45 @@ module ChgkRating
         end
 
         def to_star(method = :to_s, iterate = false)
-          ->(d) do
-            iterate ?
-                d.map {|obj| obj.send method } :
-                d.send(method)
+          lambda do |d|
+            if iterate
+              d.map { |obj| obj.send method }
+            else
+              d.send(method)
+            end
           end
         end
       end
 
       TRANSFORMERS = {
-          string: to_star,
-          integer: to_star(:to_i),
-          float: to_star(:to_f),
-          id: to_star(:id),
-          ids: to_star(:id, true),
-          sym: to_star(:to_sym),
-          strdate: to_star(:to_s_chgk),
-          uri: ->(d) { URI.parse_safely d },
-          boolean: to_boolean,
-          binboolean: to_binary_boolean,
-          date: ->(d) { Date.parse_safely d},
-          datetime: ->(d) { DateTime.parse_safely d},
-          splitboolean: ->(d) do
-            d&.split('')&.map {|result| to_boolean.call(result)}
-          end,
-          arraystrboolean: ->(d) do
-            d&.map {|result| to_binary_boolean.call(result)}
-          end,
-          arrayboolean: ->(d) do
-            d&.map {|result| to_boolean.call(result)}
-          end,
-          team: chgk_object('Team'),
-          player: chgk_object('Player'),
-          players: chgk_object('Players', 'Collections')
+        string: to_star,
+        integer: to_star(:to_i),
+        float: to_star(:to_f),
+        id: to_star(:id),
+        ids: to_star(:id, true),
+        sym: to_star(:to_sym),
+        strdate: to_star(:to_s_chgk),
+        uri: ->(d) { URI.parse_safely d },
+        boolean: to_boolean,
+        binboolean: to_binary_boolean,
+        date: ->(d) { Date.parse_safely d },
+        datetime: ->(d) { DateTime.parse_safely d },
+        splitboolean: lambda do |d|
+                        d&.split('')&.map { |result| to_boolean.call(result) }
+                      end,
+        arraystrboolean: lambda do |d|
+                           d&.map { |result| to_binary_boolean.call(result) }
+                         end,
+        arrayboolean: lambda do |d|
+                        d&.map { |result| to_boolean.call(result) }
+                      end,
+        team: chgk_object('Team'),
+        tournament: chgk_object('Tournament'),
+        player: chgk_object('Player'),
+        players: chgk_object('Players', 'Collections')
       }.freeze
 
       load_transformers!
     end
   end
-end
+end

data/lib/chgk_rating/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
-  VERSION = '1.0.0'.freeze
-end
+  VERSION = '2.2.0'
+end