chgk_rating 2.1.0 → 2.2.0

data/lib/chgk_rating/collections/tournaments/tournament_teams.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Collections
     class TournamentTeams < Base
       attr_reader :tournament
+
       def initialize(params = {})
         @tournament = build_model params[:tournament], ChgkRating::Models::Tournament
 
@@ -19,4 +22,4 @@ module ChgkRating
       end
     end
   end
-end
+end

data/lib/chgk_rating/collections/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
 
@@ -39,10 +41,12 @@ module ChgkRating
       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,20 +1,22 @@
-require 'faraday_middleware'
+# 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 FaradayMiddleware::FollowRedirects
+        faraday.use Faraday::FollowRedirects::Middleware
         faraday.adapter Faraday.default_adapter
       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,29 +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
 
-      # Grab the attribute mapping for the class and its superclass
-      # (as superclass may present common mappings for multiple classes)
-      def self.attribute_mapping
-        return nil unless self.name
-        ChgkRating::AttributeMappings.find(self.name).
-            merge(ChgkRating::AttributeMappings.find(self.superclass.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
@@ -85,16 +90,18 @@ module ChgkRating
         self.class.attribute_mapping.each do |attr, mapping|
           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] ]
+        raw.is_a?(self.class) ? raw.send(attr) : raw[mapping[:raw_name]]
       end
 
       def transform_up(data, mapping)
-        return data unless mapping.has_key?(:transform_up)
+        return data unless mapping.key?(:transform_up)
+
         mapping[:transform_up].call(data)
       end
     end

data/lib/chgk_rating/models/player.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Player < Base
@@ -33,4 +35,4 @@ module ChgkRating
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class PlayerRating < Rating
@@ -13,4 +15,4 @@ module ChgkRating
       end
     end
   end
-end
+end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class TeamRating < Rating
@@ -13,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
@@ -59,4 +61,4 @@ module ChgkRating
       end
     end
   end
-end
+end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class Tournament < Base
@@ -43,4 +45,4 @@ module ChgkRating
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ChgkRating
   module Models
     class TournamentTeam < Base
@@ -26,4 +28,4 @@ module ChgkRating
       end
     end
   end
-end
+end

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

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

data/lib/chgk_rating/models/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,43 +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'),
-          tournament: chgk_object('Tournament'),
-          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 = '2.1.0'.freeze
-end
+  VERSION = '2.2.0'
+end

data/lib/chgk_rating.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'uri'
 require 'faraday'
@@ -54,4 +56,4 @@ module ChgkRating
   def self.client
     @client ||= ChgkRating::Client.new
   end
-end
+end

data/lib/ext/date.rb

@@ -1,11 +1,9 @@
+# frozen_string_literal: true
+
 class Date
   def self.parse_safely(raw_date_time)
-    begin
-      self.parse raw_date_time
-    rescue ArgumentError
-      nil
-    rescue TypeError
-      nil
-    end
+    parse raw_date_time
+  rescue ArgumentError, TypeError
+    nil
   end
-end
+end

data/lib/ext/date_time.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class DateTime
   def to_s_chgk
-    self.strftime('%Y-%m-%d %H:%M:%S')
+    strftime('%Y-%m-%d %H:%M:%S')
   end
-end
+end

data/lib/ext/uri.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 module URI
   def self.parse_safely(raw_uri)
-    begin
-      URI.parse raw_uri
-    rescue URI::InvalidURIError
-      nil
-    end
+    URI.parse raw_uri
+  rescue URI::InvalidURIError
+    nil
   end
-end
+end