truenorth 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebf93538d8d794249ddcb8f4ddb2832eba001e6758d275c4ea59af595777d50e
-  data.tar.gz: e857b71120bf6c327fb83284ad901472656e12f0df542abd75223a953c6ea202
+  metadata.gz: 8d89d28373a48164f8f6cf1f93672dd70d4f8aaf8035ae40bdc144fe76a8d6be
+  data.tar.gz: 266756fa35b43d17ad657bb11ab46d0411c63da6620bf630594a08ac7f4d5226
 SHA512:
-  metadata.gz: c4b4e536e26ee506d3ee57b1cc9f186f9696c2f10ae61ab834e4dd40999d36381f1aa01b03096c1eb118ab92c720bef71d1b74f07c18c37fd6050545d13b67ad
-  data.tar.gz: '0619e6eb3fcb0220aebdcc6bb13f60c452d157c6e772dbd63596981c0dc4b6fed5cdbd8acf16a3c00916b853791875020651a0a3c5fe326fa8115a93fae5ab76'
+  metadata.gz: e1c0d586aa1b9146bedb498c81036d1446f23a9f6ee92cae1d14887007227196986e4ed245511cd39a58375729fa55831174f1536721f5d57a39ca8db03983bb
+  data.tar.gz: a764f05fe8325d6457f03467ba1c3a169b9422b8bbaa8d2030264a0f8bf5bcacda0e346fd913c0d415880f26d1f6dde03c6ef3fd58525c80e8e5ef2153b862c3

data/lib/truenorth/client.rb

@@ -110,17 +110,24 @@ module Truenorth
       response = get(BOOKING_PATH)
       html = Nokogiri::HTML(response.body)
 
-      # Check if we need to change activity type first
+      # Navigate to the requested date first if needed
+      current_date = html.at_css('input[name*="sheetDate"]')&.[]('value')
+      requested_date = date.strftime('%m/%d/%Y')
       activity_id = ACTIVITIES[activity.to_s.downcase] || '5'
+
+      if current_date != requested_date
+        log "Navigating from #{current_date} to #{requested_date}"
+        html = change_date(html, requested_date, activity_id)
+      end
+
+      # Then change activity type - this should now return slots for the correct date
       current_activity = html.at_css('input[name*="activityId"]')&.[]('value')
 
       if current_activity && current_activity != activity_id
-        # Need to change activity via AJAX
+        log "Changing activity from #{current_activity} to #{activity_id}"
         html = change_activity(html, activity_id)
       end
 
-      # TODO: Handle date navigation if needed
-
       slots = parse_slots(html)
       log "Found #{slots.count} available time slots"
 
@@ -132,6 +139,7 @@ module Truenorth
       }
     end
 
+
     # Book a slot
     def book(time, date: Date.today, court: nil, activity: 'squash', dry_run: false)
       ensure_logged_in!
@@ -409,17 +417,58 @@ module Truenorth
     def parse_slots(html)
       slots = {}
 
-      html.css('td.slot.open').each do |td|
-        div = td.at_css('div[data-start-time]')
-        next unless div
-        next if td['class']&.include?('reserved')
+      # Find ALL slots with data-start-time
+      html.css('td.slot div[data-start-time]').each do |div|
+        td = div.parent
+        while td && td.name != 'td'
+          td = td.parent
+        end
+        next unless td
 
-        start_time = div['data-start-time']
-        area_id = div['data-area-id']
-        court_name = COURTS[area_id] || "Court #{area_id}"
+        classes = td['class'].to_s
+
+        # Skip definitively unavailable slots
+        next if classes.include?('reserved')
+        next if classes.include?('restrict')
+        next if classes.include?('blocked')
+
+        # Include ANY slot that's marked as "open", even if it has past-time
+        # The website shows past-time slots for future dates as bookable
+        if classes.include?('open')
+          start_time = div['data-start-time']
+          area_id = div['data-area-id']
+          court_name = COURTS[area_id] || "Court #{area_id}"
+
+          slots[start_time] ||= []
+          slots[start_time] << court_name unless slots[start_time].include?(court_name)
+        end
+      end
+
+      # If we found very few slots, be more aggressive
+      if slots.length < 10
+        log "Found only #{slots.length} slots with strict parsing, trying relaxed parsing..."
+
+        # Try including ALL non-reserved slots
+        html.css('td.slot div[data-start-time]').each do |div|
+          td = div.parent
+          while td && td.name != 'td'
+            td = td.parent
+          end
+          next unless td
+
+          classes = td['class'].to_s
+          # Only skip if explicitly reserved/restricted/blocked
+          next if classes.include?('reserved') && !classes.include?('open')
+          next if classes.include?('restrict')
+          next if classes.include?('blocked')
 
-        slots[start_time] ||= []
-        slots[start_time] << court_name
+          start_time = div['data-start-time']
+          area_id = div['data-area-id']
+          court_name = COURTS[area_id] || "Court #{area_id}"
+
+          slots[start_time] ||= []
+          slots[start_time] << court_name unless slots[start_time].include?(court_name)
+        end
       end
 
       slots
@@ -544,6 +593,58 @@ module Truenorth
       Nokogiri::HTML(result[:body])
     end
 
+    def change_date(html, date_str, activity_id = nil)
+      # Extract what we can from the HTML
+      form_id = extract_form_id(html)
+      view_state = extract_view_state(html)
+
+      # Build minimal form data manually to avoid extraction issues
+      form_data = build_minimal_form_data(html, form_id, activity_id)
+
+      result = change_date_ajax(form_id, view_state, date_str, form_data)
+      return html unless result[:success]
+
+      # Parse the AJAX response
+      ajax_body = result[:body]
+      cdata_content = ajax_body.scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n")
+
+      if !cdata_content.empty? && cdata_content.include?('slot')
+        Nokogiri::HTML(cdata_content)
+      else
+        html
+      end
+    end
+
+    def build_minimal_form_data(html, form_id, activity_id)
+      # Build the minimum required form data from scratch
+      # Only extract the fields we absolutely need
+      data = {}
+
+      # Try to find the form
+      form = html.at_css("form[id='#{form_id}']")
+      return data unless form
+
+      # Extract only the essential hidden fields
+      form.css('input[type="hidden"]').each do |input|
+        name = input['name']
+        value = input['value']
+        next unless name
+
+        # Only keep fields that belong to our form
+        if name.to_s.start_with?(form_id)
+          data[name] = value || ''
+        end
+      end
+
+      # Override activity ID if provided
+      if activity_id
+        data["#{form_id}:activityId"] = activity_id.to_s
+        data["#{form_id}:j_idt51_input"] = activity_id.to_s
+      end
+
+      data
+    end
+
     def extract_view_state(html)
       html.at_css('input[name="javax.faces.ViewState"]')&.[]('value')
     end
@@ -629,6 +730,39 @@ module Truenorth
       end
     end
 
+    def change_date_ajax(form_id, view_state, date_str, form_data)
+      return { success: false, error: 'No form_id' } unless form_id
+
+      date_picker = "#{form_id}:j_idt57"
+      ajax_url = build_ajax_url
+      encoded_url = URI.encode_www_form_component(ajax_url)
+
+      # Use form_data as-is (already built correctly by build_minimal_form_data)
+      # Just add our date values and AJAX control parameters
+      form_data = form_data.dup
+      form_data["#{form_id}:sheetDate"] = date_str
+      form_data["#{form_id}:j_idt57_input"] = date_str
+
+      form_data.merge!(
+        'javax.faces.partial.ajax' => 'true',
+        'javax.faces.source' => date_picker,
+        'javax.faces.partial.execute' => date_picker,
+        'javax.faces.partial.render' => form_id,
+        'javax.faces.behavior.event' => 'dateSelect',
+        'javax.faces.partial.event' => 'dateSelect',
+        form_id => form_id,
+        'javax.faces.encodedURL' => encoded_url,
+        'javax.faces.ViewState' => view_state
+      )
+
+      response = post_ajax(ajax_url, form_data)
+      if response.is_a?(Net::HTTPSuccess)
+        { success: true, view_state: extract_view_state_from_ajax(response.body), body: response.body }
+      else
+        { success: false, error: "HTTP #{response.code}" }
+      end
+    end
+
     def select_slot_ajax(form_id, view_state, slot, components, form_fields)
       source_id = components['showReservationScreen'] || "#{form_id}:j_idt146"
       ajax_url = build_ajax_url

data/lib/truenorth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truenorth
-  VERSION = '0.2.8'
+  VERSION = '0.3.0'
 end

data/truenorth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.2.8'
+  spec.version       = '0.3.0'
   spec.authors       = ['usiegj00']
   spec.email         = ['112138+usiegj00@users.noreply.github.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truenorth
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - usiegj00