south_african_air_quality_index 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d697dae6b8a2a2239caa16f7107edfca19a6fe4ca3b13dbdf35ed2cd1220a55
-  data.tar.gz: cbb4c1a357e70556c6a1e778a24e740ac853de86f0a7780469fb240ab87a9f3f
+  metadata.gz: a23dbb1a42530463ec42613307c880649753409ab4fcc31d5a6e7ae9a1bb7c41
+  data.tar.gz: 3a8e0dc764b6c1487477893b5246829be7080f0a22a9ff399eef04cdd65cc8af
 SHA512:
-  metadata.gz: 7b94a2be9950e13b4f8b363e297a236271144801b436cb02e0b9ef55b011eea2714c85427bdd8df476f71e1839297b46689a4687492fc762200ffb1bc4959cbb
-  data.tar.gz: 15583299e9d8660eb9391642cc64f8d0495e1287368225e35c651c9b6d703cb681e6ab67ef46b0a6b6f79409c9d20641a23a76f838dcd24a842612f7724aa535
+  metadata.gz: 76ec747444e003f82a48c9ae1cd01ef0a54b2bdade29eb24d683e0b6e5103fc960b08d5c8fabc1c5ded3d299e716b909da7197fd7b31f21742e18461ae299172
+  data.tar.gz: 5213adc33c04ab0f81757a91592c92c56b4caf11748d53dfd8c6556ae2cc08bce10f8a3b73a21c2d00610d60e04034b729ebeb9a1eb10af7784f344aa0ae56e6

data/.gitignore

@@ -54,3 +54,5 @@ build-iPhoneSimulator/
 
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
+
+.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/Gemfile.lock

@@ -1,110 +1,121 @@
 PATH
   remote: .
   specs:
-    south_african_air_quality_index (0.0.1)
-      active_attr (~> 0.15)
-      httparty (~> 0.20)
+    south_african_air_quality_index (0.0.3)
+      active_attr (~> 0.16.0)
+      httparty (~> 0.21.0)
+      nokogiri (~> 1.16.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.3)
-      actionview (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.3)
-      activesupport (= 7.0.3)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_attr (0.15.4)
-      actionpack (>= 3.0.2, < 7.1)
-      activemodel (>= 3.0.2, < 7.1)
-      activesupport (>= 3.0.2, < 7.1)
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
+    active_attr (0.16.0)
+      actionpack (>= 3.0.2, < 7.2)
+      activemodel (>= 3.0.2, < 7.2)
+      activesupport (>= 3.0.2, < 7.2)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    erubi (1.10.0)
-    hashdiff (1.0.1)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    erubi (1.11.0)
+    hashdiff (1.1.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.15.0)
-    minitest-focus (1.1.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
+    minitest-focus (1.4.0)
       minitest (>= 4, < 6)
-    minitest-reporters (1.4.3)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.11.2)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
     multi_xml (0.6.0)
-    nokogiri (1.13.6-arm64-darwin)
+    nokogiri (1.16.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pry (0.14.1)
+    nokogiri (1.16.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86_64-linux)
+      racc (~> 1.4)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    public_suffix (5.0.4)
+    racc (1.6.1)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    rake (13.0.6)
-    rexml (3.2.5)
-    ruby-progressbar (1.11.0)
-    timecop (0.9.5)
-    tzinfo (2.0.4)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
+    rake (13.1.0)
+    rexml (3.2.6)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    timecop (0.9.8)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    webmock (3.23.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-23
+  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.3.5)
-  minitest (~> 5.0)
-  minitest-focus (~> 1.1.2)
-  minitest-reporters (~> 1.4.2)
-  mocha (~> 1.11.2)
-  pry (~> 0.14.1)
-  rake (~> 13.0)
+  minitest (~> 5.22.3)
+  minitest-focus (~> 1.4.0)
+  minitest-reporters (~> 1.6.1)
+  mocha (~> 2.1.0)
+  pry (~> 0.14.2)
+  rake (~> 13.1.0)
   south_african_air_quality_index!
-  timecop (~> 0.9.1)
-  webmock (~> 3.8.3)
+  timecop (~> 0.9.8)
+  webmock (~> 3.23.0)
 
 BUNDLED WITH
-   2.3.5
+   2.4.17

data/README.md

@@ -46,7 +46,7 @@ Or install it yourself as:
   end_date = Time.now
   client.station_report(station_name, start_date, end_date)
 
-  # To get a report from multiple stations at once
+  # To get a report from multiple stations at once (HTML is returned for now)
   # Some defaults that are used:
   # interval: DEFAULT_INTERVAL (60)
   # report_type: REPORT_TYPE (average)

data/lib/south_african_air_quality_index/client.rb

@@ -4,9 +4,10 @@ module SouthAfricanAirQualityIndex
 
     attr_reader :base_path, :port, :stations
 
-    def initialize(base_path: BASE_PATH, port: 80)
+    def initialize(base_path: BASE_PATH, port: BASE_PORT)
       @base_path = base_path
       @port = port
+      @cookie = authorise
     end
 
     def self.compatible_api_version
@@ -15,55 +16,91 @@ module SouthAfricanAirQualityIndex
 
     # This is the version of the API docs this client was built off-of
     def self.api_version
-      'v1 2022-06-08'
+      'v1 2024-03-18'
     end
 
     # Endpoints
+    def regions
+      return @regions if @regions
+
+      response = send_request(http_method: :get, path: '/v1/envista/regions', port: DATA_SOURCE_PORT, port_in_path: true)
+
+      if response["code"] != 200
+        puts "Fallback SAAQIS region fetch!"
+        @regions ||= fetch_regions_from_html
+      else
+        @regions ||= response["body"]
+      end
+    end
+
+    def fetch_regions_from_html
+      # https://saaqis.environment.gov.za/Report/HourlyReports
+      response = send_request(http_method: :get, path: 'Report/HourlyReports')
+      doc = Nokogiri::HTML(response["body"])
+
+      # JSON.parse(content).map { |j| j.dig("stations")}.flatten
+      # alex = JSON.parse(content).map { |j| j.dig("stations")}.flatten.select { |st| st["name"] == "Alexandra-NAQI" }.first
+      find_and_parse_m_regions(doc)
+    end
 
     # Memoize stations as they are unlikely to change often
     def stations
-      @stations ||= send(http_method: :get, path: 'ajax/getAllStationsNew')
+      # This endpoint is no longer active:
+      # @stations ||= send_request(http_method: :get, path: 'ajax/getAllStations')
+
+      @stations ||= regions.map { |regions| regions["stations"] }.flatten.uniq
     end
 
     def stations_from_code(codes, build_for_response: false)
-      stations['body']['Stations'].select do |station|
-        codes.map(&:to_s).include?(station["serialCode"].to_s)
+      unless codes.is_a?(Array)
+        codes = [codes]
+      end
+
+      stations.select do |station|
+        codes.map(&:to_s).include?(station["stationId"].to_s)
       end
     end
 
     def selected_stations(station_names)
-      stations['body']['Stations'].select do |station|
+      unless station_names.is_a?(Array)
+        station_names = [station_names]
+      end
+
+      stations.select do |station|
         station_matches?(station_names, station)
       end
     end
 
-    def station_report(station_name, start_date, end_date, interval: DEFAULT_INTERVAL, report_type: REPORT_TYPE)
+    def station_report(station_name, start_date, end_date, interval: DEFAULT_INTERVAL, report_type: REPORT_TYPE, precent_valid: DEFAULT_PERCENT_VALID)
       station = selected_stations([station_name]).first
       return if station.empty?
 
-      monitor_ids = fetch_monitor_ids(station)
-
-      body = {
-        "StationId": station['serialCode'],
-        "MonitorsChannels": monitor_ids,
-        "reportName": STATION_REPORT,
-        "startDateAbsolute": start_date.to_s,
-        "endDateAbsolute": end_date.to_s,
-        "startDate": start_date.to_s,
-        "endDate": end_date.to_s,
-        "reportType": report_type,
-        "fromTb": 60,
-        "toTb": 60
-      }.to_json
+      params = {
+        filterChannels: fetch_monitor_ids(station),
+        from: parse_time(start_date.to_s),
+        to: parse_time(end_date.to_s),
+        fromTimebase: interval,
+        toTimebase: interval,
+        precentValid: precent_valid,
+        timeBeginning: false,
+        useBackWard: true,
+        unitConversion: false,
+        includeSummary: true,
+        onlySummary: false,
+      }
 
-      send(http_method: :get, path: 'report/GetStationReportData', body: body, params: { 'InPopUp': false })
+      path = "v1/envista/stations/#{station['stationId']}/#{report_type}"
+      send_request(http_method: :get, path: path, params: params, port: DATA_SOURCE_PORT, port_in_path: true)
     end
 
+    # This now will only return HTML
+    # TODO: Parse the HTML
+    # May not work:
     def multi_station_report(station_names, start_date, end_date, interval: DEFAULT_INTERVAL, report_type: REPORT_TYPE)
       extracted_stations = selected_stations(station_names)
 
       monitor_channels_by_station_id = extracted_stations.map { |station|
-        [station['serialCode'].to_s, fetch_monitor_ids(station)]
+        [station['stationId'].to_s, fetch_monitor_ids(station)]
       }.to_h
 
       body = {
@@ -87,19 +124,21 @@ module SouthAfricanAirQualityIndex
         body = body.merge(hsh)
       end
 
-      send(http_method: :get, path: 'report/GetMultiStationReportData', body: body.to_json)
+      send_request(http_method: :get, path: 'report/MultiStationTable', body: body.to_json)
     end
 
     private
 
-    def send(http_method:, path:, body: {}, params: {})
+    def send_request(http_method:, path:, body: {}, params: {}, headers: {}, port: @port, port_in_path: false)
       start_time = micro_second_time
 
+      headers["Cookie"] = @cookie
+
       response = HTTParty.send(
         http_method.to_sym,
-        construct_base_path(path, params),
+        construct_base_path(path, params, port, port_in_path),
         body: body,
-        headers: { 'Content-Type': 'application/json' },
+        headers: headers.merge({ 'Content-Type': 'application/json' }),
         port: port,
         format: :json
       )
@@ -108,9 +147,19 @@ module SouthAfricanAirQualityIndex
       construct_response_object(response, path, start_time, end_time)
     end
 
+    # Quick n dirty time parsing
+    def parse_time(str_time)
+      time_components = str_time.to_s.split(' ')
+
+      # Have to leave out the timezone - #{time_components[2]}
+      "#{time_components[0]}T#{time_components[1]}"
+    end
+
     def construct_response_object(response, path, start_time, end_time)
       {
         'body' => parse_body(response, path),
+        'code' => response.code,
+        'cookies' => response.headers.dig('set-cookie'),
         'headers' => response.headers,
         'metadata' => construct_metadata(response, start_time, end_time)
       }
@@ -130,8 +179,12 @@ module SouthAfricanAirQualityIndex
       (Time.now.to_f * 1_000_000).to_i
     end
 
-    def construct_base_path(path, params)
-      constructed_path = "#{base_path}/#{path}"
+    def construct_base_path(path, params, port, port_in_path)
+      if port_in_path
+        constructed_path = "#{base_path}:#{port}/#{path}"
+      else
+        constructed_path = "#{base_path}/#{path}"
+      end
 
       if params == {}
         constructed_path
@@ -156,7 +209,8 @@ module SouthAfricanAirQualityIndex
         .any? do |station_name|
           processed_name = process_station(station_name)
 
-          process_station(station['city']) == processed_name ||
+          process_station(station['ShortName']) == processed_name ||
+            process_station(station['city']) == processed_name ||
             process_station(station['DisplayName']) == processed_name ||
             process_station(station['name']) == processed_name ||
             process_station(station['owner']) == processed_name ||
@@ -166,12 +220,89 @@ module SouthAfricanAirQualityIndex
 
     def fetch_monitor_ids(station)
       station['monitors'].map do |monitor|
-        monitor['channel']
+        monitor['channelId']
       end
     end
 
     def process_station(name)
-      name.downcase.gsub('  ', ' ')
+      name.to_s.downcase.gsub('  ', ' ')
+    end
+
+    def find_and_parse_m_regions(doc)
+      doc.xpath('//script').each do |script|
+        if script.content.include?("m_Regions")
+          content = script.content[/let\s+m_Regions\s*=\s*(.*?)\s*;/, 1]
+          return JSON.parse(content) if content
+        end
+      end
+
+      nil
+    end
+
+    def authorise
+      generate_token(get_api_token)
+    end
+
+    # This is terrible. Unsure why there is a JWT, since there is no secret
+    # and this is public information.
+    def generate_token(api_token)
+      headers = {
+        'Authorization': "ApiToken #{api_token}",
+        'Accept': "application/json",
+        'Content-Length': '0',
+        'Host': BASE_URI,
+        # 'envi-data-source': 'SAAQIS_ENVISTA',
+        # 'Access-Control-Allow-Origin': 'https://saaqis.environment.gov.za',
+        # 'Access-Control-Allow-Credentials': 'true',
+        # 'Authority': "#{BASE_URI}:#{DATA_SOURCE_PORT}",
+      }
+
+      res = send_request(http_method: :post, path: 'v1/GenerateToken', headers: headers, port: DATA_SOURCE_PORT, port_in_path: true)
+
+      @cookie ||= res["cookies"].first
+    end
+
+    def get_api_token
+      # Account/GetApiToken
+      body = { "userName": "Guest" }
+      res = send_request(http_method: :post, path: 'Account/GetApiToken', body: body.to_json)
+
+      res.dig("body")
+    end
+
+    # Experimental stuff
+    def generate_jwt
+      # header = {
+      #   "alg": "HS256",
+      #   "typ": "JWT"
+      # }
+
+      time_now = Time.now
+
+      payload = {
+        "unique_name": "Guest",
+        "nbf": time_now.to_i,
+        "exp": (time_now + 3600).to_i,
+        "iat": time_now.to_i
+      }
+
+      # IMPORTANT: set nil as password parameter
+      # token = JWT.encode payload, nil, 'none'
+
+      # hmac_secret = ""
+      # token = JWT.encode payload, hmac_secret, 'HS256'
+
+      # token = JWT.encode payload, nil, 'none', { typ: 'JWT' }
+      # token = JWT.encode payload, nil, 'HS256', { typ: 'JWT' }
+
+      hmac_secret = 'ApiToken '
+      _token = JWT.encode payload, hmac_secret, 'HS256', { typ: 'JWT' }
+
+
+      # Account/GetApiToken
+      # v1/GenerateToken
+
+      authorization = "ApiToken " + res
     end
   end
 end

data/lib/south_african_air_quality_index/constants.rb

@@ -1,8 +1,13 @@
 module SouthAfricanAirQualityIndex
   module Constants
-    BASE_PATH = 'https://saaqis.environment.gov.za'
+    BASE_URI = 'saaqis.environment.gov.za'
+    BASE_PATH = "https://#{BASE_URI}"
+
+    BASE_PORT = 443
+    DATA_SOURCE_PORT = 44301
 
     DEFAULT_INTERVAL = 60
+    DEFAULT_PERCENT_VALID = 75
     STATION_REPORT = 'station report'.freeze
     HOURLY_REPORT = 'hourly report'.freeze
     REPORT_TYPE = 'Average'.freeze

data/lib/south_african_air_quality_index/version.rb

@@ -1,3 +1,3 @@
 module SouthAfricanAirQualityIndex
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/south_african_air_quality_index.rb

@@ -1,4 +1,6 @@
 require 'httparty'
+# require 'jwt'
+require 'nokogiri'
 
 require 'south_african_air_quality_index/constants'
 require 'south_african_air_quality_index/version'

data/notes.txt

@@ -1,3 +1,4 @@
+
 https://aqicn.org/city/south-africa/ekurhuleni/bedfordview/
 https://saaqis.environment.gov.za/
 
@@ -173,4 +174,169 @@ Types of SA Air Quality reports
 - Index Report (AQI)
 - Matrix Report (1 station 1 metric gives stats)
 
+March 2024
+https://saaqis.environment.gov.za/ajax/getAllStationsNew
+
+curl 'https://saaqis.environment.gov.za/Report/stationreport?InPopUp=True' \
+  -H 'authority: saaqis.environment.gov.za' \
+  -H 'accept: */*' \
+  -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \
+  -H 'cookie: ASP.NET_SessionId=vldu0doftifewm5f1wrubrme; __RequestVerificationToken=mb7uM--kGvUTsScjOUsGIopNIJCn7BBY1kXuniYsvniLixU_TfQNWBc9nbi9uMbSX9lpIIHVf0s_-zMXNPjEKnMD6ZjVJvCHsS8thCvNVnI1; __FormVerificationToken=owO78ynW81P2O9ZDkqK0K30cT-MmY8bISAkF4yseane_nFfruM3Uvc1AVhk-3PDDnL4JcVatG1ob8Yy3wuAkid1LqvzuXoOmON7cMwv1nRY1; X-Access-Token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1bmlxdWVfbmFtZSI6Ikd1ZXN0IiwibmJmIjoxNzEwNTE3MTIzLCJleHAiOjE3MTA1MjA3MjMsImlhdCI6MTcxMDUxNzEyM30.aE39-GM-zc0PNlUJAukb37wGn7DuKUup2Qirq6UT3pA' \
+  -H 'dnt: 1' \
+  -H 'referer: https://saaqis.environment.gov.za/' \
+  -H 'sec-ch-ua: "Not A(Brand";v="99", "Google Chrome";v="121", "Chromium";v="121"' \
+  -H 'sec-ch-ua-mobile: ?0' \
+  -H 'sec-ch-ua-platform: "macOS"' \
+  -H 'sec-fetch-dest: empty' \
+  -H 'sec-fetch-mode: cors' \
+  -H 'sec-fetch-site: same-origin' \
+  -H 'sec-gpc: 1' \
+  -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36' \
+  -H 'x-requested-with: XMLHttpRequest' \
+  -H 'x-requestverificationtoken: owO78ynW81P2O9ZDkqK0K30cT-MmY8bISAkF4yseane_nFfruM3Uvc1AVhk-3PDDnL4JcVatG1ob8Yy3wuAkid1LqvzuXoOmON7cMwv1nRY1' \
+  --compressed
+
+curl 'https://saaqis.environment.gov.za/home/getPage?pageName=Hourly%20Monitoring%20Data&InPopUp=true' \
+  -H 'authority: saaqis.environment.gov.za' \
+  -H 'accept: */*' \
+  -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \
+  -H 'cookie: ASP.NET_SessionId=vldu0doftifewm5f1wrubrme; __RequestVerificationToken=VMM7f3rhky_AQ7cea4DpzOpnLa6VwibqHEiuFpB7QvpIKIhA3iweLsxtcUaFDTcfzRwBJAA477qe82Q1xELh1W5wNJ_g1QvRmUz4E4YYZEs1; __FormVerificationToken=CPVZjs1Bzr7xBI9fECT96iKK8auAmA21WS2j9o_ZiV58YoIcOoBqWSAyvmfG-HfcWFRsjpik55_672rbNNx3Jd-bADn0Zk17pkgGzQk1K7I1; X-Access-Token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1bmlxdWVfbmFtZSI6Ikd1ZXN0IiwibmJmIjoxNzEwNTE3MjMwLCJleHAiOjE3MTA1MjA4MzAsImlhdCI6MTcxMDUxNzIzMH0.5JNuKp15f0w9BQIpMwOiTc6Gx_3Gug3YD7i2efBwFE0' \
+  -H 'dnt: 1' \
+  -H 'referer: https://saaqis.environment.gov.za/' \
+  -H 'sec-ch-ua: "Not A(Brand";v="99", "Google Chrome";v="121", "Chromium";v="121"' \
+  -H 'sec-ch-ua-mobile: ?0' \
+  -H 'sec-ch-ua-platform: "macOS"' \
+  -H 'sec-fetch-dest: empty' \
+  -H 'sec-fetch-mode: cors' \
+  -H 'sec-fetch-site: same-origin' \
+  -H 'sec-gpc: 1' \
+  -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36' \
+  -H 'x-requested-with: XMLHttpRequest' \
+  -H 'x-requestverificationtoken: CPVZjs1Bzr7xBI9fECT96iKK8auAmA21WS2j9o_ZiV58YoIcOoBqWSAyvmfG-HfcWFRsjpik55_672rbNNx3Jd-bADn0Zk17pkgGzQk1K7I1' \
+  --compressed
+
+
+Needs cookie and JWT:
 
+  curl 'https://saaqis.environment.gov.za:44301/v1/envista/regions' \
+  -H 'authority: saaqis.environment.gov.za:44301' \
+  -H 'accept: application/json' \
+  -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \
+  -H 'access-control-allow-credentials: true' \
+  -H 'access-control-allow-origin: https://saaqis.environment.gov.za' \
+  -H 'authorization: JwtToken' \
+  -H 'cache-control: no-cache' \
+  -H 'compression: gzip' \
+  -H 'content-type: application/json; charset=utf-8' \
+  -H 'contentlength: 0' \
+  -H 'cookie: ASP.NET_SessionId=vldu0doftifewm5f1wrubrme; __RequestVerificationToken=u6thajdYfxMhX6czeh1L60HP3r_pGsGLqyXPwpBxYVuXLGbHqLEs0vyA0TX4kv3xHD9JcuP4cLxxWZvvVzwCG1V1F8H6VrUjuxWw7-qaMhg1; __FormVerificationToken=bpDKkVnfQ8bgG159kuknJXr9GvkzplWNAB18bKodU7O5oAJn0nQ1Q3rGyAsAydvMo1LM0EB6sCmOF9uGTrMeyFRcYyehUA03ZJbvLij_oBI1; X-Access-Token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1bmlxdWVfbmFtZSI6Ikd1ZXN0IiwibmJmIjoxNzEwNTE4MjMzLCJleHAiOjE3MTA1MjE4MzMsImlhdCI6MTcxMDUxODIzM30.ESillaQmk8cJBuUFUcOCoC5c0HeOAT5ix9m98zKiXLc' \
+  -H 'dnt: 1' \
+  -H 'domainname;' \
+  -H 'envi-data-source: SAAQIS_ENVISTA' \
+  -H 'origin: https://saaqis.environment.gov.za' \
+  -H 'pragma: no-cache' \
+  -H 'referer: https://saaqis.environment.gov.za/' \
+  -H 'sec-ch-ua: "Not A(Brand";v="99", "Google Chrome";v="121", "Chromium";v="121"' \
+  -H 'sec-ch-ua-mobile: ?0' \
+  -H 'sec-ch-ua-platform: "macOS"' \
+  -H 'sec-fetch-dest: empty' \
+  -H 'sec-fetch-mode: cors' \
+  -H 'sec-fetch-site: same-site' \
+  -H 'sec-gpc: 1' \
+  -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36' \
+  -H 'x-requestverificationtoken: bpDKkVnfQ8bgG159kuknJXr9GvkzplWNAB18bKodU7O5oAJn0nQ1Q3rGyAsAydvMo1LM0EB6sCmOF9uGTrMeyFRcYyehUA03ZJbvLij_oBI1' \
+  --compressed
+
+
+  [
+    {
+        "regionId": 0,
+        "name": "None",
+        "stations": []
+    },
+    {
+        "regionId": 1,
+        "name": "Mpumalanga",
+        "stations": [
+            {
+                "stationId": 363,
+                "name": "Eskom-Wilge",
+                "shortName": "Wilge",
+                "stationsTag": "(null)",
+                "location": {
+                    "latitude": -25.975444444,
+                    "longitude": 28.985611
+                },
+                "timebase": 1,
+                "active": true,
+                "owner": "Eskom",
+                "ownerId": 6,
+                "regionId": 1,
+                "monitors": [
+                    {
+                        "channelId": 1,
+                        "name": "Amb Pressure",
+                        "alias": null,
+                        "active": false,
+                        "typeId": 71,
+                        "pollutantId": 36,
+                        "units": "mBar",
+                        "unitID": 40,
+                        "description": null,
+                        "mapView": true,
+                        "isIndex": false,
+                        "PollutantCategory": 2,
+                        "NumericFormat": "5.0",
+                        "LowRange": 0.0,
+                        "HighRange": 100.0,
+                        "state": 1,
+                        "PctValid": 75,
+                        "MonitorTitle": "tl_BP",
+                        "MON_StartDate": "10/17/2023 2:57:58 PM",
+                        "MON_EndDate": "12/31/9999 11:59:59 PM"
+                    },
+                    {
+                        "channelId": 2,
+                        "name": "Amb RelHum",
+                        "alias": null,
+                        "active": false,
+                        "typeId": 69,
+                        "pollutantId": 18,
+                        "units": "%",
+                        "unitID": 1,
+                        "description": null,
+                        "mapView": true,
+                        "isIndex": false,
+                        "PollutantCategory": 2,
+                        "NumericFormat": "5.2",
+                        "LowRange": 0.0,
+                        "HighRange": 100.0,
+                        "state": 1,
+                        "PctValid": 75,
+                        "MonitorTitle": "tl_RH",
+                        "MON_StartDate": "10/17/2023 2:57:58 PM",
+                        "MON_EndDate": "12/31/9999 11:59:59 PM"
+                    },
+
+
+curl 'https://saaqis.environment.gov.za/report/MultiStationTable' \
+  -H 'authority: saaqis.environment.gov.za' \
+  -H 'accept: */*' \
+  -H 'accept-language: en-GB,en-US;q=0.9,en;q=0.8' \
+  -H 'content-type: application/json; charset=UTF-8' \
+  -H 'cookie: ASP.NET_SessionId=vldu0doftifewm5f1wrubrme; __RequestVerificationToken=u6thajdYfxMhX6czeh1L60HP3r_pGsGLqyXPwpBxYVuXLGbHqLEs0vyA0TX4kv3xHD9JcuP4cLxxWZvvVzwCG1V1F8H6VrUjuxWw7-qaMhg1; __FormVerificationToken=bpDKkVnfQ8bgG159kuknJXr9GvkzplWNAB18bKodU7O5oAJn0nQ1Q3rGyAsAydvMo1LM0EB6sCmOF9uGTrMeyFRcYyehUA03ZJbvLij_oBI1; X-Access-Token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1bmlxdWVfbmFtZSI6Ikd1ZXN0IiwibmJmIjoxNzEwNTE4MjMzLCJleHAiOjE3MTA1MjE4MzMsImlhdCI6MTcxMDUxODIzM30.ESillaQmk8cJBuUFUcOCoC5c0HeOAT5ix9m98zKiXLc' \
+  -H 'dnt: 1' \
+  -H 'origin: https://saaqis.environment.gov.za' \
+  -H 'referer: https://saaqis.environment.gov.za/' \
+  -H 'sec-ch-ua: "Not A(Brand";v="99", "Google Chrome";v="121", "Chromium";v="121"' \
+  -H 'sec-ch-ua-mobile: ?0' \
+  -H 'sec-ch-ua-platform: "macOS"' \
+  -H 'sec-fetch-dest: empty' \
+  -H 'sec-fetch-mode: cors' \
+  -H 'sec-fetch-site: same-origin' \
+  -H 'sec-gpc: 1' \
+  -H 'user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36' \
+  -H 'x-requested-with: XMLHttpRequest' \
+  -H 'x-requestverificationtoken: bpDKkVnfQ8bgG159kuknJXr9GvkzplWNAB18bKodU7O5oAJn0nQ1Q3rGyAsAydvMo1LM0EB6sCmOF9uGTrMeyFRcYyehUA03ZJbvLij_oBI1' \
+  --data-raw '{"m_ReportConfig":{"reportName":"station report","reportType":"Average","actualReportType":"Average","startDate":"14/03/2024 00:01","endDate":"15/03/2024 00:00","startDateAbsolute":"14/03/2024 00:01","endDateAbsolute":"15/03/2024 00:00","fromTb":60,"toTb":60,"MonitorsChannels":[1,7,8,9,23,25,27,28,29,31],"StationId":73,"monitorChannelsByStationId":{"73":[1,7,8,9,23,25,27,28,29,31]},"monitorChannelsByStationId[0].Key":"73","monitorChannelsByStationId[0].Value":[1,7,8,9,23,25,27,28,29,31]},"reportConfig":{"reportName":"station report","reportType":"Average","actualReportType":"Average","startDate":"14/03/2024 00:01","endDate":"15/03/2024 00:00","startDateAbsolute":"14/03/2024 00:01","endDateAbsolute":"15/03/2024 00:00","fromTb":60,"toTb":60,"MonitorsChannels":[1,7,8,9,23,25,27,28,29,31],"StationId":73,"monitorChannelsByStationId":{"73":[1,7,8,9,23,25,27,28,29,31]},"monitorChannelsByStationId[0].Key":"73","monitorChannelsByStationId[0].Value":[1,7,8,9,23,25,27,28,29,31]},"InPopUp":true,"isSummaryOnBottomTable":true}' \
+  --compressed

data/south_african_air_quality_index.gemspec

@@ -22,17 +22,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~> 0.20"
-  spec.add_dependency "active_attr", "~> 0.15"
+  spec.add_dependency "httparty", "~> 0.21.0"
+  spec.add_dependency "active_attr", "~> 0.16.0"
+  # spec.add_dependency "jwt", "~> 2.8.1"
+  spec.add_dependency "nokogiri", "~> 1.16.3"
 
   # Development dependancies
-  spec.add_development_dependency "bundler", "~> 2.3.5"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-focus", "~> 1.1.2"
-  spec.add_development_dependency "minitest-reporters", "~> 1.4.2"
-  spec.add_development_dependency "timecop", "~> 0.9.1"
-  spec.add_development_dependency "mocha", "~> 1.11.2"
-  spec.add_development_dependency "pry", "~> 0.14.1"
-  spec.add_development_dependency "webmock", "~> 3.8.3"
+  spec.add_development_dependency "rake", "~> 13.1.0"
+  spec.add_development_dependency "minitest", "~> 5.22.3"
+  spec.add_development_dependency "minitest-focus", "~> 1.4.0"
+  spec.add_development_dependency "minitest-reporters", "~> 1.6.1"
+  spec.add_development_dependency "timecop", "~> 0.9.8"
+  spec.add_development_dependency "mocha", "~> 2.1.0"
+  spec.add_development_dependency "pry", "~> 0.14.2"
+  spec.add_development_dependency "webmock", "~> 3.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: south_african_air_quality_index
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - trex22
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,154 +16,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :development
+        version: 1.16.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 1.16.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.22.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.22.3
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.23.0
 description: A client for using the South African Air Quality Index API in Ruby. This
   is an unofficial project.
 email:
@@ -173,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A client for using the South African Air Quality Index API in Ruby.