squash_matrix 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c24a61db8c036d8b4dbf10aed040446a6d3f2eb
-  data.tar.gz: ecfdb5e030bcedd8ee643a9f1caacb33d21b5872
+  metadata.gz: 7c7451a0708b8453d1b01238019f90ce0cb6ba9a
+  data.tar.gz: c30bf4f51f4d4052088790229cf7becfdf6601b4
 SHA512:
-  metadata.gz: 31ab76413209e60a0cdd66effad75366d04209db305b9650ac58334412664a8518fa1b053a146f1924e30d0adcbc749769b4d1b71502827f93f7dba419a4b849
-  data.tar.gz: 2f41bf2fa14b77c71b997810d6a8e0502d7f663da4f95ad364d2173176bd761b7c8669f616810e1ede857e707205f297578daf8610f93ac95f193582f6e19cb2
+  metadata.gz: aa4f3f77ddd2cd63a8d230cc1dd2e3c182073fd6576d942c4b402a9c1a337edafdaf0d7a321169843e4aed972779e2d03748df209d6e67a8a64fdc91dcf4922b
+  data.tar.gz: f307aa98a263ad7f7a860b641691acb50a76c227c4b3b5c73eb302f5edb3691fa86af768c6e5b4f1a0c7d82a104f5cad456917aa9f23370c308719ad0228fdd8

data/.gitignore

@@ -6,6 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+**/*.gem
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -2,13 +2,19 @@ PATH
   remote: .
   specs:
     squash_matrix (0.1.0)
-      nokogiri (~> 1.8.4)
+      http-cookie (~> 1.0, >= 1.0.3)
+      nokogiri (~> 1.8, >= 1.8.4)
+      user-agent-randomizer (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
     diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     method_source (0.8.2)
     mini_portile2 (2.3.0)
     nokogiri (1.8.4)
@@ -18,20 +24,24 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     slop (3.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    user-agent-randomizer (0.2.0)
 
 PLATFORMS
   ruby
@@ -44,4 +54,4 @@ DEPENDENCIES
   squash_matrix!
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/README.md

@@ -1,8 +1,8 @@
 # SquashMatrix
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/squash_matrix`. To experiment with that code, run `bin/console` for an interactive prompt.
+Ruby SDK for www.squashmatrix.com
 
-TODO: Delete this and the text above, and describe your gem
+The generated client interacts with www.squashmatrix.com by retrieving player and club information and performing search requests.
 
 ## Installation
 
@@ -22,7 +22,94 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+client = SquashMatrix::Client.new # initialize client
+=> SquashMatrix::Client
+client.player_info(42547) # retrieve player info for joshua wilkosz #42547
+=> [
+  {
+    :event=>"2017 Melbourne Autumn  State Open Pennant",
+    :division=>"State 2",
+    :round=>"7",
+    :position=>"3",
+    :games=>"2-3",
+    :points=>"67-73",
+    :rating_adjustment=>0.58,
+    :rating=>250.2,
+    :opponent_rating=>275.24,
+    :opponent_name=>"David Crossley",
+    :date=> Time,
+    :opponent_id=>26809,
+    :match_id=>1003302
+  }
+]
+client.club_info(336) # retrieve club info for melbourne university #336
+=> {
+  :name=>"Melbourne University Squash Club",
+  :players=>[
+    {
+      :name=>"David Clegg",
+      :rating=>342.5,
+      :rank=>0,
+      :id=>43076
+    }
+  ],
+  :juniors=>[
+    {
+      :name=>"Trevor Bryden",
+      :rating=>95.28,
+      :rank=>0,
+      :id=>72728
+    }
+  ]
+}
+client.search("joshua") # search for 'joshua'
+=> {
+  :players=>[
+    {
+      :name=>"Joshua Altmann",
+      :club_name=>"Monash University",
+      :id=>47508,
+      :rating=>107.821
+    }
+  ],
+  :teams=>[
+    {
+      :name=>"Joshua mallison",
+      :division_name=>"Box 08",
+      :event_name=>"2017 Briars @ Thornleigh Box Challenge (Season 29)",
+      :id=>80792
+    }
+  ],
+  :clubs=>[]
+}
+client.search("melbourne") # search for 'melbourne'
+=> {
+  :players=>[
+    {
+      :name=>"Melbourne Simpson",
+      :club_name=>"Mirrabooka",
+      :id=>17797,
+      :rating=>199.607
+    }
+  ],
+  :teams=>[
+    {
+      :name=>"Melbourne Uni (2)@Fitz",
+      :division_name=>"C Reserve",
+      :event_name=>"2012 Melbourne Spring SSL Women's Pennant",
+      :id=>39605
+    }
+  ],
+  :clubs=>[
+    {
+      :name=>"Melbourne University",
+      :state=>"Victoria",
+      :id=>336
+    }
+  ]
+}
+```
 
 ## Development
 
@@ -30,9 +117,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+To run tests, run `bundle exec rspec`
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/squash_matrix. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/wilkosz/squash_matrix. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/squash_matrix/client.rb

@@ -1,47 +1,47 @@
 require 'net/http'
 require 'date'
 require 'timeout'
+require 'http-cookie'
+require 'user_agent_randomizer'
 require_relative 'constants'
 require_relative 'nokogiri-parser'
 require_relative 'errors'
 
 module SquashMatrix
 
-  # Client for http interactions with squashmatrix.com website.
+  # Client for retrieving player and club information from squashmatrix.com.
   # If authentication credentials are provided squash matrix will allow
   # considerably more requests for an IP address and allow forbidden conent
   # to be requested.
 
   class Client
 
-    # Returns newly created Client for making club and player requests
+    # Returns newly created Client
     # @note If suppress_errors == false SquashMatrix::Errors::AuthorizationError will be raised if specified credentials are incorrect and squash matrix authentication returns forbidden
     # @param [Hash] opts the options to create client
     # @return [Client]
 
     def initialize(player: nil, email: nil, password: nil, suppress_errors: false, timeout: 60)
+      @user_agent =  UserAgentRandomizer::UserAgent.fetch(type: "desktop_browser").string
+      @squash_matrix_home_uri = URI::HTTP.build({ host: SquashMatrix::Constants::SQUASH_MATRIX_URL })
       @suppress_errors = suppress_errors
       @timeout = timeout
       if ![player || email, password].any?(&:nil?)
-        @authenticated = {
-          valid: false,
-          authenticated_at: nil,
-          updated_at: nil,
-          cookie: nil,
-          player: player,
-          email: email,
-          password: password
-        }
+        @cookie_jar = HTTP::CookieJar.new()
+        @player = player
+        @email = email
+        @password = password
         authenticate
       end
     end
 
-    # Returns club information.
+    # Returns club info.
     # @note If suppress_errors == false SquashMatrix Errors will be raised upon HttpNotFound, HttpConflict, Timeout::Error, etc...
-    # @param id [Numeric] club id found on squash matrix
+    # @param id [Fixnum] club id found on squash matrix
     # @return [Hash] hash object containing club information
 
     def club_info(id=nil)
+      return if id.nil?
       uri = URI::HTTP.build({
         host: SquashMatrix::Constants::SQUASH_MATRIX_URL,
         path: SquashMatrix::Constants::CLUB_PATH.gsub(':id', id.to_s)
@@ -50,9 +50,9 @@ module SquashMatrix
       handle_http_request(uri, success_proc)
     end
 
-    # Returns player information.
+    # Returns player info.
     # @note If suppress_errors == false SquashMatrix Errors will be raised upon HttpNotFound, HttpConflict, Timeout::Error, etc...
-    # @param id [Numeric] played id found on squash matrix
+    # @param id [Fixnum] played id found on squash matrix
     # @return [Hash] hash object containing player information
 
     def player_info(id=nil)
@@ -78,8 +78,8 @@ module SquashMatrix
         path: SquashMatrix::Constants::SEARCH_PATH})
       query_params = {
         Criteria: query,
-        SquashOnly: false,
-        RacquetballOnly: false}
+        SquashOnly: squash_only,
+        RacquetballOnly: racquetball_only}
       success_proc = lambda {|res| SquashMatrix::NokogiriParser.search_results(res.body)}
       handle_http_request(uri, success_proc,
         {
@@ -96,15 +96,23 @@ module SquashMatrix
           if is_get_request
             req = Net::HTTP::Get.new(uri)
             set_headers(req, headers: headers)
-            res = Net::HTTP.start(uri.hostname, uri.port) {|http| http.request(req)}
           else
-            res = Net::HTTP.post_form(uri, query_params)
+            req = Net::HTTP::Post.new(uri)
+            set_headers(req)
+            form_data = []
+            query_params.each {|key, value| form_data.push([key.to_s, value.to_s])}
+            set_headers(req, headers: headers)
+            req.set_form(form_data, SquashMatrix::Constants::MULTIPART_FORM_DATA)
           end
+          res = Net::HTTP.start(uri.hostname, uri.port, {use_ssl: uri.scheme == 'https'}) {|http| http.request(req)}
           case res
-          when Net::HTTPSuccess
+          when Net::HTTPSuccess, Net::HTTPFound
             return success_proc && success_proc.call(res) || res
           when Net::HTTPConflict
-            raise SquashMatrix::Errors::ForbiddenError.new(res) unless @suppress_errors
+            unless @suppress_errors
+              raise SquashMatrix::Errors::ForbiddenError.new(res.body) if SquashMatrix::Constants::FORBIDDEN_ERROR_REGEX.match(res.body)
+              raise SquashMatrix::Errors::TooManyRequestsError.new(res.body) if SquashMatrix::Constants::TOO_MANY_REQUESTS_ERROR_REGEX.match(res.body)
+            end
           else
             raise SquashMatrix::Errors::UnknownError.new(res) unless @suppress_errors
           end
@@ -115,32 +123,35 @@ module SquashMatrix
     end
 
     def authenticate
-      return unless @authenticated
-      uri = URI::HTTP.build({
+      uri = URI::HTTPS.build({
         host: SquashMatrix::Constants::SQUASH_MATRIX_URL,
         path: SquashMatrix::Constants::LOGIN_PATH})
-      headers = {
-        SquashMatrix::Constants::CONTENT_TYPE_HEADER.to_sym => SquashMatrix::Constants::X_WWW__FROM_URL_ENCODED
-      }
       query_params = {
-        UserName: @authenticated[:player] || @authenticated[:email],
-        Password: @authenticated[:password],
+        UserName: @player&.to_s || @email,
+        Password: @password,
         RememberMe: false
       }
+      headers = {
+        SquashMatrix::Constants::CONTENT_TYPE_HEADER => SquashMatrix::Constants::MULTIPART_FORM_DATA
+      }
+      # need to retrieve the asp.net session id
+      home_page_res = handle_http_request(@squash_matrix_home_uri, nil)
+      raise SquashMatrix::Errors::AuthorizationError.new(SquashMatrix::Constants::ERROR_RETRIEVING_ASPNET_SESSION) unless home_page_res
+      home_page_res[SquashMatrix::Constants::SET_COOKIE_HEADER].split('; ').each do |v|
+        @cookie_jar.parse(v, @squash_matrix_home_uri)
+      end
       res = handle_http_request(uri, nil,
         {
           is_get_request: false,
           query_params: query_params,
           headers: headers
         })
-      return unless res
-      @authenticated[:cookie] = res.response[SquashMatrix::Constants::SET_COOKIE_HEADER]
-      if auth_token_from_cookie(@authenticated[:cookie])
-        @authenticated[:authenticated_at] = Time.now.utc
-        @authenticated[:updated_at] = Time.now.utc
-        @authenticated[:valid] = true
-        @authenticated[:player] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(res.response[SquashMatrix::Constants::LOCATION_HEADER])[1] if @authenticated[:email] && res.response[SquashMatrix::Constants::LOCATION_HEADER]
-      elsif !@suppress_errors
+      raise SquashMatrix::Errors::AuthorizationError.new(SquashMatrix::Constants::ERROR_RETRIEVING_ASPAUX_TOKEN) unless res
+      res[SquashMatrix::Constants::SET_COOKIE_HEADER].split('; ').each do |v|
+        @cookie_jar.parse(v, @squash_matrix_home_uri)
+      end
+      @player = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(res[SquashMatrix::Constants::LOCATION_HEADER])[1] if @player.nil? && res[SquashMatrix::Constants::LOCATION_HEADER]
+      unless !@suppress_errors && @cookie_jar.cookies(@squash_matrix_home_uri).find {|c| c.name == SquashMatrix::Constants::ASPXAUTH_COOKIE_NAME && !c.value.empty?}
         error_string = SquashMatrix::NokogiriParser.log_on_error(res.body).join(', ')
         raise SquashMatrix::Errors::AuthorizationError.new(error_string)
       end
@@ -148,19 +159,21 @@ module SquashMatrix
 
     def set_headers(req=nil, headers: nil)
       return unless req
-      headers_to_add = {}
-      headers_to_add.merge(headers) if headers
-      headers_to_add.merge({
-        Cookie: @authenticated[:cookie],
-        Referer: SquashMatrix::Constants::REFERER.gsub(':id', @authenticated[:player]),
-      }) if @authenticated
-      headers_to_add.each {|key, val| req[key] = val}
-    end
-
-    def auth_token_from_cookie(cookie=nil)
-      return unless !cookie.nil? && !cookie.empty?
-      rtn = SquashMatrix::Constants::ASPXAUTH_TOKEN_FROM_COOKIE_REGEX.match(cookie)
-      rtn[1] if rtn
+      headers_to_add = {
+        SquashMatrix::Constants::USER_AGENT_HEADER => @user_agent,
+        SquashMatrix::Constants::HOST_HEADER => SquashMatrix::Constants::SQUASH_MATRIX_URL}
+      headers_to_add = headers_to_add.merge(headers) if headers
+      if @cookie_jar
+        cookies = @cookie_jar.cookies(@squash_matrix_home_uri).select do |c|
+          [
+            SquashMatrix::Constants::ASP_NET_SESSION_ID_COOKIE_NAME,
+            SquashMatrix::Constants::GROUP_ID_COOKIE_NAME,
+            SquashMatrix::Constants::ASPXAUTH_COOKIE_NAME
+          ].include?(c.name)
+        end
+        headers_to_add = headers_to_add.merge({SquashMatrix::Constants::COOKIE_HEADER => HTTP::Cookie.cookie_value(cookies)})
+      end
+      headers_to_add.each {|key, val| req[key.to_s] = val}
     end
   end
 end

data/lib/squash_matrix/constants.rb

@@ -8,17 +8,28 @@ module SquashMatrix
     SEARCH_PATH = "/Home/Search"
     PLAYER_RSULTS_QUERY = "max=0&X-Requested-With=XMLHttpRequest"
     SET_COOKIE_HEADER = 'set-cookie'
+    COOKIE_HEADER = 'cookie'
     LOCATION_HEADER = 'location'
     X_WWW__FROM_URL_ENCODED = 'application/x-www-form-urlencoded'
     MULTIPART_FORM_DATA = 'multipart/form-data'
-    CONTENT_TYPE_HEADER = 'Content-Type'
+    CONTENT_TYPE_HEADER = 'content-type'
     REFERER = "Home/Player/:id"
+    ASPXAUTH_COOKIE_NAME = ".ASPXAUTH"
+    ASP_NET_SESSION_ID_COOKIE_NAME = "ASP.NET_SessionId"
+    GROUP_ID_COOKIE_NAME = "GroupId"
+    HOST_HEADER = 'host'
+    USER_AGENT_HEADER = 'user-agent'
 
     PLAYER_FROM_PATH_REGEX = /\/Home\/Player\/(.*)/
     TEAM_FROM_PATH_REGEX = /\/Home\/Team\/(.*)/
     CLUB_FROM_PATH_REGEX = /\/Home\/Club\/(.*)/
     MATCH_FROM_PATH_REGEX = /\/Home\/Match\/(.*)/
     CLUB_FROM_TITLE_REGEX = /Club - (.*)/
-    ASPXAUTH_TOKEN_FROM_COOKIE_REGEX = /.ASPXAUTH=([a-zA-Z0-9]*);/
+
+    ERROR_RETRIEVING_ASPNET_SESSION = "Error retrieving ASP.NET_SessionId"
+    ERROR_RETRIEVING_ASPAUX_TOKEN = "Error retrieving .ASPXAUTH_TOKEN"
+
+    TOO_MANY_REQUESTS_ERROR_REGEX = /Request made too soon. This is to prevent abuse to the site. We apologise for the inconvenience/
+    FORBIDDEN_ERROR_REGEX = /Forbidden/
   end
 end

data/lib/squash_matrix/errors.rb

@@ -1,5 +1,6 @@
 module SquashMatrix
   module Errors
+    class TooManyRequestsError < StandardError; end
     class AuthorizationError < StandardError; end
     class ForbiddenError < StandardError; end
     class UnknownError < StandardError; end

data/lib/squash_matrix/nokogiri-parser.rb

@@ -3,122 +3,129 @@ require_relative 'constants'
 
 module SquashMatrix
   class NokogiriParser
-    def self.player_info(body)
-      Nokogiri::HTML(body)&.xpath('//table[@id="results"]//tbody//tr')&.map do |r|
-        date = r.at_css('td[1]')&.content
-        opponent_id = r.at_css('td[10]//a')&.attribute('href')&.content
-        match_id = r.at_css('td[12]//a')&.attribute('href')&.content
-        rtn = {
-          event: r.at_css('td[2]')&.content,
-          division: r.at_css('td[3]')&.content,
-          round: r.at_css('td[4]')&.content,
-          position: r.at_css('td[5]')&.content,
-          games: r.at_css('td[6]')&.content,
-          points: r.at_css('td[7]')&.content,
-          rating_adjustment: r.at_css('td[8]')&.content,
-          rating: r.at_css('td[9]')&.content,
-          opponent_rating: r.at_css('td[11]')&.content,
-          opponent_name: r.at_css('td[10]//a')&.content
-        }
-        rtn[:date] = Date.parse(date) if date
-        rtn[:opponent_id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(opponent_id)[1] if opponent_id
-        rtn[:match_id] = SquashMatrix::Constants::MATCH_FROM_PATH_REGEX.match(match_id)[1] if match_id
-        rtn.values.any?(&:nil?) ? nil : rtn
-      end.compact
-    end
+    class << self
+      def player_info(body)
+        Nokogiri::HTML(body)&.xpath('//table[@id="results"]//tbody//tr')&.map do |r|
+          date = r.at_css('td[1]')&.content
+          opponent_id = r.at_css('td[10]//a')&.attribute('href')&.content
+          match_id = r.at_css('td[12]//a')&.attribute('href')&.content
+          rtn = {
+            event: r.at_css('td[2]')&.content,
+            division: r.at_css('td[3]')&.content,
+            round: r.at_css('td[4]')&.content,
+            position: r.at_css('td[5]')&.content,
+            games: r.at_css('td[6]')&.content,
+            points: r.at_css('td[7]')&.content,
+            rating_adjustment: r.at_css('td[8]')&.content&.to_f,
+            rating: r.at_css('td[9]')&.content&.to_f,
+            opponent_rating: r.at_css('td[11]')&.content&.to_f,
+            opponent_name: r.at_css('td[10]//a')&.content
+          }
+          rtn[:date] = Date.parse(date) if date
+          rtn[:opponent_id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(opponent_id)[1].to_i if opponent_id
+          rtn[:match_id] = SquashMatrix::Constants::MATCH_FROM_PATH_REGEX.match(match_id)[1].to_i if match_id
+          rtn.values.any?(&:nil?) ? nil : rtn
+        end.compact
+      end
 
-    def self.club_info(body)
-      html = Nokogiri::HTML(body)
-      name = SquashMatrix::Constants::CLUB_FROM_TITLE_REGEX.match(html.css('title').text)[1]
-      players = html.xpath('//div[@id="Rankings"]//div[@class="columnmain"]//table[@class="alternaterows"]//tbody//tr')&.map do |r|
-        player_path = r.css('td[2]//a').attribute('href').value
-        rank = r.css('td[1]').text
-        rtn = {
-          name: r.css('td[2]').text,
-          rating: r.css('td[3]').text.to_f
+      def club_info(body)
+        html = Nokogiri::HTML(body)
+        name = SquashMatrix::Constants::CLUB_FROM_TITLE_REGEX.match(html.css('title').text)[1]
+        players = html.xpath('//div[@id="Rankings"]//div[@class="columnmain"]//table[@class="alternaterows"]//tbody//tr')&.map do |r|
+          player_path = r.css('td[2]//a').attribute('href').value
+          rank = r.css('td[1]').text
+          rtn = {
+            name: r.css('td[2]').text,
+            rating: r.css('td[3]').text.to_f
+          }
+          rtn[:rank] = rank.to_i if rank
+          rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(player_path)[1].to_i if player_path
+          rtn
+        end.compact
+        juniors = html.xpath('//div[@id="Rankings"]//div[@class="columnside"]//table[@class="alternaterows"]//tbody//tr')&.map do |r|
+          player_path = r.css('td[2]//a').attribute('href').value
+          rank = r.css('td[1]').text
+          rtn = {
+            name: r.css('td[2]').text,
+            rating: r.css('td[3]').text.to_f
+          }
+          rtn[:rank] = rank.to_i if rank
+          rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(player_path)[1].to_i if player_path
+          rtn
+        end.compact
+        {
+          name: name,
+          players: players,
+          juniors: juniors
         }
-        rtn[:rank] = rank.to_i if rank
-        rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(player_path)[1] if player_path
-        rtn
-      end.compact
-      juniors = html.xpath('//div[@id="Rankings"]//div[@class="columnside"]//table[@class="alternaterows"]//tbody//tr')&.map do |r|
-        player_path = r.css('td[2]//a').attribute('href').value
-        rank = r.css('td[1]').text
-        rtn = {
-          name: r.css('td[2]').text,
-          rating: r.css('td[3]').text.to_f
-        }
-        rtn[:rank] = rank.to_i if rank
-        rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(player_path)[1] if player_path
-        rtn
-      end.compact
-      {
-        name: name,
-        players: players,
-        juniors: juniors
-      }
-    end
+      end
 
-    def self.search_results(body)
-      bc = Nokogiri::HTML.parse(body).at_xpath('//div[@id="bodycontent"]')&.children
-      return unless bc&.length
-      rtn = {}
-      bc&.each_with_index do |c, i|
-        if c.name == "h2"
-          case c.text
-          when "Players"
-            rtn[:players] = players_from_search(bc[i+2]) if bc[i+2].children.length
-          when "Teams"
-            rtn[:teams] = teams_from_search(bc[i+2]) if bc[i+2].children.length
-          when "Clubs"
-            rtn[:clubs] = clubs_from_search(bc[i+2]) if bc[i+2].children.length
+      def search_results(body)
+        bc = Nokogiri::HTML.parse(body).at_xpath('//div[@id="bodycontent"]')&.children
+        return unless bc&.length
+        rtn = {}
+        bc&.each_with_index do |c, i|
+          if c.name == "h2"
+            case c.text
+            when "Players"
+              rtn[:players] = players_from_search(bc[i+2]) if bc[i+2].children.length
+            when "Teams"
+              rtn[:teams] = teams_from_search(bc[i+2]) if bc[i+2].children.length
+            when "Clubs"
+              rtn[:clubs] = clubs_from_search(bc[i+2]) if bc[i+2].children.length
+            end
           end
         end
+        rtn
       end
-      rtn
-    end
 
-    def self.log_on_error(body)
-      Nokogiri::HTML(body)&.xpath('//div[@class="validation-summary-errors"]//ul//li')&.map(&:content)
-    end
+      def log_on_error(body)
+        Nokogiri::HTML(body)&.xpath('//div[@class="validation-summary-errors"]//ul//li')&.map(&:content)
+      end
 
-    def self.players_from_search(node)
-      node.css('tbody').css('tr')&.map do |tr|
-        id = tr.css('td[1]//a')&.attribute('href')&.value
-        rating = tr.css('td[3]')&.text
-        rtn = {
-          name: tr.css('td[1]')&.text,
-          club_name: tr.css('td[2]')&.text
-        }
-        rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(id)[1].to_i if id && !id.empty?
-        rtn[:rating] = rating.to_f if rating
-        rtn
+      private
+
+      def players_from_search(node)
+        node.css('tbody//tr')&.map do |tr|
+          id = tr.css('td[1]//a')&.attribute('href')&.value
+          rating = tr.css('td[3]')&.text
+          rtn = {
+            name: tr.css('td[1]')&.text,
+            club_name: tr.css('td[2]')&.text
+          }
+          rtn[:id] = SquashMatrix::Constants::PLAYER_FROM_PATH_REGEX.match(id)[1].to_i if id && !id.empty?
+          rtn[:rating] = rating.to_f if rating
+          rtn
+        end
       end
-    end
 
-    def self.teams_from_search(node)
-      node.css('tbody').css('tr')&.map do |tr|
-        id = tr.css('td[1]//a')&.attribute('href')&.value
-        rtn = {
-          name: tr.css('td[1]')&.text,
-          division_name: tr.css('td[2]')&.text,
-          event_name: tr.css('td[3]')&.text
-        }
-        rtn[:id] = SquashMatrix::Constants::TEAM_FROM_PATH_REGEX.match(id)[1].to_i if id
-        rtn
+      def teams_from_search(node)
+        node.css('tbody//tr')&.map do |tr|
+          id = tr.css('td[1]//a')&.attribute('href')&.value
+          rtn = {
+            name: tr.css('td[1]')&.text,
+            division_name: tr.css('td[2]')&.text,
+            event_name: tr.css('td[3]')&.text
+          }
+          rtn[:id] = SquashMatrix::Constants::TEAM_FROM_PATH_REGEX.match(id)[1].to_i if id
+          rtn
+        end
       end
-    end
 
-    def self.clubs_from_search(node)
-      node.css('tbody').css('tr')&.map do |tr|
-        puts tr
-        id = tr.css('td[1]//a')&.attribute('href')&.value
-        rtn = {
-          name: tr.css('td[1]')&.text,
-          state: tr.css('td[2]')&.text
-        }
-        rtn[:id] = SquashMatrix::Constants::CLUB_FROM_PATH_REGEX.match(id)[1].to_i if id
-        rtn
+      def clubs_from_search(node)
+        node.css('tbody//tr')&.map do |tr|
+          id = tr.css('td[1]//a')&.attribute('href')&.value
+          rtn = {
+            name: tr.css('td[1]')&.text,
+            state: tr.css('td[2]')&.text
+          }
+          rtn[:id] = SquashMatrix::Constants::CLUB_FROM_PATH_REGEX.match(id)[1].to_i if id
+          rtn
+        end
+      end
+
+      def requests_made_to_soon?(body)
+        Nokogiri::HTML(body)&.xpath('//body')
       end
     end
   end

data/lib/squash_matrix/version.rb

@@ -1,3 +1,3 @@
 module SquashMatrix
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/squash_matrix.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Joshua Wilkosz"]
   spec.email         = ["joshua@wilkosz.com.au"]
 
-  spec.summary       = %q{Client for squashmatrix.com http request/response}
-  spec.description   = %q{User for retrieving information on squashmatrix.com}
+  spec.summary       = %q{Ruby SDK for www.squashmatrix.com}
+  spec.description   = %q{The generated client interacts with www.squashmatrix.com by retrieving player and club information and performing search requests}
   spec.homepage      = "https://github.com/wilkosz/squash_matrix"
   spec.license       = "MIT"
 
@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.3"
-
+  spec.add_runtime_dependency 'user-agent-randomizer', '~> 0.2'
+  spec.add_runtime_dependency 'http-cookie', '~> 1.0', '>= 1.0.3'
   spec.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.4'
   spec.required_ruby_version = '>= 2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squash_matrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joshua Wilkosz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: user-agent-randomizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +120,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.4
-description: User for retrieving information on squashmatrix.com
+description: The generated client interacts with www.squashmatrix.com by retrieving
+  player and club information and performing search requests
 email:
 - joshua@wilkosz.com.au
 executables: []
@@ -132,8 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Client for squashmatrix.com http request/response
+summary: Ruby SDK for www.squashmatrix.com
 test_files: []