lx_data_validation 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8f0c3775062f5b47c7b04662dcd3a9841e96b9
-  data.tar.gz: fcbe2e175c963495e725a7f9204cf5fa2509ef37
+  metadata.gz: f7d1360b98bf511978dedb618feac1a7eaa9222b
+  data.tar.gz: 62f16aff299c6d951469fb8d32f2a45ad8cdd1e7
 SHA512:
-  metadata.gz: 0f6799754bb9077081ad1d35f24193f7d81ec3a35340e48b37640bcadc6f6a16cff47896d37fc95f0682b6ff466fbfff32488e164b1ff121ba407da93efb206d
-  data.tar.gz: 33779c94c8db7d0aaeabcfc0b2041f2e08fa0b3bab8799291c2f52a2d3510c7e39b2b4ef959e3417b7f6c39f57e7c27b9aa2ae6a3ccdfd45f4c338cb3978cef9
+  metadata.gz: a63b5a8185e595b3e39a12c93e96b0dbbcc0340c092a01abb8f918d975bec8d57454d9bef848bae3f041224662550ce41645b9073ebd383c5996ae7c6ffaae85
+  data.tar.gz: fb22665b5a4558712763ffa0d4a25438fa9b09fb6791ccbeaeb638f8aba826f293e4ff0c6e958697492e6408c0368e4a9cc3007012a401c7ddbc75270b635418

data/bin/compare_national

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'data_validation'
+
+season = '17'
+if ARGV[0]
+  season = ARGV[0]
+end
+
+DataValidation.compare_national season

data/data_validation.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
-  spec.executables   = ["compare", "compare_url"]
+  spec.executables   = ["compare", "compare_url", "compare_national"]
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'nokogiri', '1.6.6.2'

data/lib/data_validation/comparison/comparison_base.rb

@@ -22,7 +22,12 @@ module DataValidation
         data_access = DataValidation::DataAccess.new(web_url, DataValidation.api_request_host + api_path, determine_request_body_and_logger_name)
 
         puts 'requesting web page...'
-        web_data = data_access.get_main_table_data
+        if web_url.match /rating[a-z]+.php/
+          web_data = data_access.get_regional_rating_table_data
+        else
+          web_data = data_access.get_main_table_data
+        end
+
         puts 'requesting mobile api data: ' + DataValidation.api_request_host + api_path
         api_data = data_access.get_response_from_mobile_api
 
@@ -130,6 +135,28 @@ module DataValidation
 
       end
 
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        @division_id = web_url.match(/(\d+)\.php/)[1].to_i
+
+        operation = web_url.match(/\/([a-z]+)\d+.php/)[1]
+
+        @logger_name = "log/#{season}/#{category.downcase}/#{operation}/#{operation}_#{season}_#{category}_#{division_id}.log"
+
+        %Q|{"category":"#{category}","season":#{season},"divisionId":#{division_id},"currPage":1,"pageSize":1000}|
+      end
+
       private
 
       def logger
@@ -145,27 +172,7 @@ module DataValidation
         end
       end
 
-      def determine_request_body_and_logger_name
-        @category = if web_url.match /bingrl/
-                     'GIRLS'
-                   elsif web_url.match /binboy/
-                     'BOYS'
-                   elsif web_url.match /binmen/
-                     'MEN'
-                   elsif web_url.match /binwom/
-                     'WOMEN'
-                   end
-
-        @season = "20#{web_url.match(/update(..)/)[1]}"
-
-        @division_id = web_url.match(/(\d+)\.php/)[1].to_i
-
-        operation = web_url.match(/\/([a-z]+)\d+.php/)[1]
 
-        @logger_name = "log/#{season}/#{category.downcase}/#{operation}/#{operation}_#{season}_#{category}_#{division_id}.log"
-
-        %Q|{"category":"#{category}","season":#{season},"divisionId":#{division_id},"currPage":1,"pageSize":1000}|
-      end
     end
   end
 end

data/lib/data_validation/comparison/comparison_factory.rb

@@ -8,6 +8,14 @@ require 'data_validation/comparison/ranking_table_mw_trend_comparison'
 require 'data_validation/comparison/ranking_table_mw_tsi_comparison'
 require 'data_validation/comparison/ranking_table_mw_pr_comparison'
 require 'data_validation/comparison/ranking_table_pro_pr_comparison'
+require 'data_validation/comparison/ranking_table_hs_crr_comparison'
+require 'data_validation/comparison/ranking_table_hs_poll_comparison'
+require 'data_validation/comparison/ranking_table_hs_rating_comparison'
+require 'data_validation/comparison/ranking_table_hs_sos_comparison'
+require 'data_validation/comparison/ranking_table_hs_rpi_comparison'
+require 'data_validation/comparison/ranking_table_hs_qwf_comparison'
+require 'data_validation/comparison/ranking_table_hs_wl_comparison'
+require 'data_validation/comparison/state_ranking_comparison'
 
 module DataValidation
   module Comparison
@@ -17,6 +25,8 @@ module DataValidation
           return DivRankingPrComparison.new url
         elsif url.match /update\d\d\/bin\S+\/rating\d+.php/ # division Computer Rating page for men and women
           return RankingTableMwPrComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/rating[a-z]+.php/ # Regional Ratings
+          return StateRankingComparison.new url
         elsif url.match /update\d\d\/bin\S+\/sos\d+.php/ # division Strength of Schedule page for boys/girls
           return RankingTableMwSosComparison.new url
         elsif url.match /update\d\d\/bin\S+\/rpi\d+.php/ # division RPI Rankings page for boys/girls
@@ -33,6 +43,20 @@ module DataValidation
           return RankingTableMwTsiComparison.new url
         elsif url.match /\.com\/(mll|nll)/ # Pro ranking page
           return RankingTableProPrComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlccr.php/ # National Coaches/Computer Ratings
+          return RankingTableHsCrrComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlpoll.php/ # National Poll
+          return RankingTableHsPollComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlrating.php/ # National Computer Ratings
+          return RankingTableHsRatingComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlsos.php/ # National Strength of Schedule
+          return RankingTableHsSosComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlrpi.php/ # National Ratings Percentage Index
+          return RankingTableHsRpiComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natlqwf.php/ # National Quality Win Factor
+          return RankingTableHsQwfComparison.new url
+        elsif url.match /update\d\d\/bin\S+\/natl-wl.php/ # National Quality Win Factor
+          return RankingTableHsWlComparison.new url
         end
       end
     end

data/lib/data_validation/comparison/ranking_table_hs_comparison_base.rb

@@ -0,0 +1,32 @@
+require 'data_validation/comparison/comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsComparisonBase < ComparisonBase
+
+      def api_path
+        '/rest/LaxPower/rankingTableHS'
+      end
+
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        metric = web_url.match(/\/natl([a-z]+).php/)[1]
+
+        @logger_name = "log/#{season}/#{category.downcase}/natl#{metric}_#{season}_#{category}.log"
+
+        %Q|{"category":"#{category}","season":#{season}, "type": "#{metric.upcase}", "currPage":1,"pageSize":5000}|
+      end
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_crr_comparison.rb

@@ -0,0 +1,13 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsCrrComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'state', 'totalWins', 'totalLosses', 'totalTies', 'ccr', 'pollPoint', 'powerRating']
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_poll_comparison.rb

@@ -0,0 +1,13 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsPollComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'state', 'totalWins', 'totalLosses', 'totalTies', 'pollPoint', 'pollFirst']
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_qwf_comparison.rb

@@ -0,0 +1,32 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsQwfComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'region', 'gameScheduled', 'qwf', 'totalWins', 'totalLosses', 'totalTies']
+      end
+
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        metric = web_url.match(/\/natl([a-z]+).php/)[1]
+
+        @logger_name = "log/#{season}/#{category.downcase}/natl#{metric}_#{season}_#{category}.log"
+
+        %Q|{"category":"#{category}","season":#{season}, "type": "QWR", "currPage":1,"pageSize":5000}|
+      end
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_rating_comparison.rb

@@ -0,0 +1,35 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsRatingComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'state', 'powerRating', 'pollRank', 'sos', 'winLossTotal', 'totalWins', 'totalLosses', 'totalTies']
+      end
+
+      def empty_field
+        'pollRank'
+      end
+
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        @logger_name = "log/#{season}/#{category.downcase}/natlrating_#{season}_#{category}.log"
+
+        %Q|{"category":"#{category}","season":#{season}, "type": "PR", "currPage":1,"pageSize":1000}|
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_rpi_comparison.rb

@@ -0,0 +1,13 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsRpiComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'region', 'gameScheduled', 'rpi', 'totalWins', 'totalLosses', 'totalTies']
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_sos_comparison.rb

@@ -0,0 +1,13 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsSosComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'region', 'gameScheduled', 'sos', 'totalWins', 'totalLosses', 'totalTies']
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/ranking_table_hs_wl_comparison.rb

@@ -0,0 +1,33 @@
+require 'data_validation/comparison/ranking_table_hs_comparison_base'
+
+module DataValidation
+  module Comparison
+    class RankingTableHsWlComparison < RankingTableHsComparisonBase
+
+      def field_array
+        ['rank', 'teamName', 'region', 'gameScheduled', 'winLossTotal', 'winLossState', 'winLossDate', 'winLossSite', 'totalWins', 'totalLosses', 'totalTies']
+      end
+
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        metric = 'wl'
+
+        @logger_name = "log/#{season}/#{category.downcase}/natl#{metric}_#{season}_#{category}.log"
+
+        %Q|{"category":"#{category}","season":#{season}, "type": "#{metric.upcase}", "currPage":1,"pageSize":5000}|
+      end
+
+    end
+  end
+end

data/lib/data_validation/comparison/state_ranking_comparison.rb

@@ -0,0 +1,37 @@
+require 'data_validation/comparison/comparison_base'
+
+module DataValidation
+  module Comparison
+    class StateRankingComparison < ComparisonBase
+
+      def api_path
+        '/rest/LaxPower/stateRanking'
+      end
+
+      def field_array
+        ['rank', 'teamName', 'powerRating', 'sosRank', %w|record wins|, %w|record losses|, %w|record ties|, 'state']
+      end
+
+      def determine_request_body_and_logger_name
+        @category = if web_url.match /bingrl/
+                      'GIRLS'
+                    elsif web_url.match /binboy/
+                      'BOYS'
+                    elsif web_url.match /binmen/
+                      'MEN'
+                    elsif web_url.match /binwom/
+                      'WOMEN'
+                    end
+
+        @season = "20#{web_url.match(/update(..)/)[1]}"
+
+        state = web_url.match(/\/rating([a-z]+).php/)[1]
+
+        @logger_name = "log/#{season}/#{category.downcase}/rating/rating_#{season}_#{category}_#{state}.log"
+
+        %Q|{"category":"#{category}","season":#{season},"state":"#{state.upcase}","currPage":1,"pageSize":1000}|
+      end
+
+     end
+  end
+end

data/lib/data_validation/data_access.rb

@@ -16,7 +16,7 @@ module DataValidation
     def get_main_table_data
       doc = Nokogiri::HTML(open(html_url))
 
-      if html_url.match /rating/
+      if html_url.match /rating\d+/
         extract_conf_standing_data(doc)
       end
 
@@ -26,8 +26,31 @@ module DataValidation
 
       index = 0
       doc.search('div.cs1 div.cs1').text.lines.map do |line|
-        if /^\s*(?<rank>\d+)\s+(?<rest>.*)/ =~ line
+        if /^\s*(?<rank>\d+)\s+(?<region>[a-zA-Z][a-zA-Z\/\d-]*\s([a-zA-Z\/\d-]+\s)*)?(?<rest>.*)/ =~ line
           data_array = ([rank] << team_names[index])
+          data_array << region.strip unless region.nil? || region.strip.empty?
+          rest_parts = rest.split(' ')
+          rest_parts.each do |item|
+            if item.match /^\d+-/ # win-loss-tie value
+              data_array += item.split('-')
+            else
+              data_array << item
+            end
+          end
+          index += 1
+          data_array
+        end
+      end.compact
+    end
+
+    def get_regional_rating_table_data
+      doc = Nokogiri::HTML(open(html_url))
+      index = 0
+
+      doc.search('div.cs1').text.lines.map do |line|
+        if /^\s*(?<rank>\d+)\s+(?<name>[a-zA-Z][a-zA-Z\/\d-]*\s([a-zA-Z\/\d-]+\s)*)?(?<rest>.*)/ =~ line
+          data_array = [rank]
+          data_array << name.strip unless name.nil? || name.strip.empty?
           rest_parts = rest.split(' ')
           rest_parts.each do |item|
             if item.match /^\d+-/ # win-loss-tie value

data/lib/data_validation/version.rb

@@ -1,3 +1,3 @@
 module DataValidation
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/data_validation.rb

@@ -35,6 +35,17 @@ module DataValidation
       puts "Complete validation of web url: #{url}"
       puts '=============================='
     end
+
+    def compare_national(season = '17')
+      categories = %w|boy grl|
+      metrics = %w|ccr poll rating sos rpi qwf -wl|
+
+      categories.each do |category|
+        metrics.each do |metric|
+          compare_with_url "http://php.admin.laxpower.com/update#{season}/bin#{category}/natl#{metric}.php"
+        end
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lx_data_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Roger Tong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -46,6 +46,7 @@ email:
 executables:
 - compare
 - compare_url
+- compare_national
 extensions: []
 extra_rdoc_files: []
 files:
@@ -57,6 +58,7 @@ files:
 - README.md
 - Rakefile
 - bin/compare
+- bin/compare_national
 - bin/compare_url
 - data_validation.gemspec
 - lib/data_validation.rb
@@ -65,6 +67,14 @@ files:
 - lib/data_validation/comparison/conference_ranking_table_comparison.rb
 - lib/data_validation/comparison/div_ranking_pr_comparison.rb
 - lib/data_validation/comparison/div_ranking_wl_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_comparison_base.rb
+- lib/data_validation/comparison/ranking_table_hs_crr_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_poll_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_qwf_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_rating_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_rpi_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_sos_comparison.rb
+- lib/data_validation/comparison/ranking_table_hs_wl_comparison.rb
 - lib/data_validation/comparison/ranking_table_mw_poll_comparison.rb
 - lib/data_validation/comparison/ranking_table_mw_pr_comparison.rb
 - lib/data_validation/comparison/ranking_table_mw_qw_comparison.rb
@@ -73,6 +83,7 @@ files:
 - lib/data_validation/comparison/ranking_table_mw_trend_comparison.rb
 - lib/data_validation/comparison/ranking_table_mw_tsi_comparison.rb
 - lib/data_validation/comparison/ranking_table_pro_pr_comparison.rb
+- lib/data_validation/comparison/state_ranking_comparison.rb
 - lib/data_validation/data_access.rb
 - lib/data_validation/version.rb
 homepage: https://gitlab.dev.activenetwork.com/rtong/data-validation-for-laxpower