truenorth 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c44289ec6c12de5f8262c64c09d6fa0880ffbad055a652a746730bd67870d5
-  data.tar.gz: 2cac3facaf4f7d30bfefb26fddf82961ade02d2793ddfd9794ddbbbc1200c523
+  metadata.gz: 947c02ebdef94353524d6b1c62e4be1283aed2a296f1712257a1d2b183b241d9
+  data.tar.gz: 670aa44189ee7935e117d9a4b5936a4441caaf7c8618734b43683667f6bf99d0
 SHA512:
-  metadata.gz: ccd4397aeb191711b34979df7a952572d5840cdaf6d8966359bd08fc3e8dcc1e42f3a1b35c880913ff718bbbb678705091eaf3188a93fc5145bcad0578e6f908
-  data.tar.gz: dc6948684f2077bb93934f38e682b0dfc20b213277eb9d3d0858d68964a149f8c7261b7f5b1ff5c31bd9cc1326daf5b2c13401e56c407afa508650608219f46b
+  metadata.gz: ab5f4ce7a698a3419d1278d64f50cff501960508b47d2d176e3ce845c22ad0329de6256a545354a8046535eda31e710f554faf81c0df62789155fcebeaac9bf8
+  data.tar.gz: 51808fa039dcdf6c7a49eff96da6554ae7ad3de6193f8d1ddac191d51a49d73cab491862fad094d746c7d06a2cf532ffa3e8e32817daae33cb7d1797cd0fa510

data/lib/truenorth/cli.rb

@@ -2,6 +2,8 @@
 
 require 'thor'
 require 'date'
+require 'tty-table'
+require 'io/console'
 require_relative '../truenorth'
 
 module Truenorth
@@ -107,11 +109,7 @@ module Truenorth
         if results.empty?
           say 'No reservations found.', :yellow
         else
-          say "\nYour reservations:", :green
-          results.each do |res|
-            parts = [res[:date], res[:time], res[:activity], res[:court], res[:member]].compact
-            say "  #{parts.join(' - ')}"
-          end
+          display_reservations_table(results)
         end
       end
     rescue Error => e
@@ -119,15 +117,41 @@ module Truenorth
       exit 1
     end
 
-    desc 'cancel RESERVATION_ID', 'Cancel a reservation'
+    desc 'cancel INDEX', 'Cancel a reservation by index (from reservations list)'
     option :dry_run, type: :boolean, aliases: '-n', desc: 'Test without actually canceling'
-    def cancel(reservation_id)
+    def cancel(index)
       client = Client.new
 
-      say "Canceling reservation #{reservation_id}...", :cyan
-      client.cancel(reservation_id, dry_run: options[:dry_run])
+      say 'Fetching reservations...', :cyan
+      results = client.reservations
+
+      idx = index.to_i - 1
+      if idx < 0 || idx >= results.length
+        say "Invalid index. Must be between 1 and #{results.length}", :red
+        exit 1
+      end
+
+      reservation = results[idx]
+      unless reservation[:cancel_id]
+        say 'This reservation cannot be cancelled (no cancel button found)', :red
+        exit 1
+      end
+
+      say "\nCancelling:", :cyan
+      say "  #{format_reservation_line(reservation)}"
 
-      say 'Reservation canceled.', :green
+      result = client.cancel(reservation[:cancel_id], dry_run: options[:dry_run])
+
+      if result[:success]
+        if result[:dry_run]
+          say "\nDry run successful - would cancel this reservation", :yellow
+        else
+          say "\n✓ Reservation cancelled!", :green
+        end
+      else
+        say "\nFailed: #{result[:error]}", :red
+        exit 1
+      end
     rescue Error => e
       say "Error: #{e.message}", :red
       exit 1
@@ -164,6 +188,89 @@ module Truenorth
 
     private
 
+    def display_reservations_table(results)
+      # Get terminal width
+      term_width = begin
+                     IO.console.winsize[1]
+                   rescue StandardError
+                     80
+                   end
+
+      # Prepare table data
+      rows = results.each_with_index.map do |res, idx|
+        [
+          (idx + 1).to_s,
+          format_compact_date(res[:date]),
+          format_compact_time(res[:time]),
+          truncate_text(res[:activity] || '', 25),
+          truncate_text(res[:member] || '', 15)
+        ]
+      end
+
+      # Create table
+      table = TTY::Table.new(
+        header: ['#', 'Date', 'Time', 'Activity', 'Member'],
+        rows: rows
+      )
+
+      # Render with auto-width based on terminal
+      renderer = if term_width < 100
+                   :basic
+                 else
+                   :unicode
+                 end
+
+      puts table.render(renderer, padding: [0, 1])
+    end
+
+    def format_reservation_line(res)
+      "#{format_compact_date(res[:date])} #{format_compact_time(res[:time])} - #{res[:activity]} - #{res[:member]}"
+    end
+
+    def format_compact_date(date_str)
+      # Convert "02/11/2026" to "02-11"
+      return '' unless date_str
+
+      date = Date.strptime(date_str, '%m/%d/%Y')
+      date.strftime('%m-%d')
+    rescue StandardError
+      date_str
+    end
+
+    def format_compact_time(time_str)
+      # Convert "09:00 AM - 09:45 AM" to "09:00 (45min)"
+      return '' unless time_str
+
+      times = time_str.scan(/(\d{1,2}):(\d{2})\s*([AP]M)/)
+      return time_str if times.length < 2
+
+      start_h, start_m, start_period = times[0]
+      end_h, end_m, end_period = times[1]
+
+      # Convert to 24h format for calculation
+      start_24h = start_h.to_i
+      start_24h += 12 if start_period == 'PM' && start_24h != 12
+      start_24h = 0 if start_period == 'AM' && start_24h == 12
+
+      end_24h = end_h.to_i
+      end_24h += 12 if end_period == 'PM' && end_24h != 12
+      end_24h = 0 if end_period == 'AM' && end_24h == 12
+
+      # Calculate duration in minutes
+      duration = (end_24h * 60 + end_m.to_i) - (start_24h * 60 + start_m.to_i)
+
+      "#{start_h.rjust(2, '0')}:#{start_m} (#{duration}min)"
+    rescue StandardError
+      time_str
+    end
+
+    def truncate_text(text, max_length)
+      return '' unless text
+      return text if text.length <= max_length
+
+      "#{text[0...max_length - 1]}…"
+    end
+
     def parse_date(date_str)
       return Date.today if date_str.nil? || date_str.empty?
 

data/lib/truenorth/client.rb

@@ -217,7 +217,7 @@ module Truenorth
       html.css('script').remove
 
       # Reservations are grouped by member in dt.ui-datalist-item elements
-      html.css('dt.ui-datalist-item').each do |member_section|
+      html.css('dt.ui-datalist-item').each_with_index do |member_section, member_idx|
         # Extract member name from the header
         # Format: "Siegel, Jonathan's Reservations (50)" or "My Reservations(5)"
         header_text = member_section.text.gsub(/\s+/, ' ').strip
@@ -229,7 +229,7 @@ module Truenorth
                       end
 
         # Now find all tables within this member section
-        member_section.css('table tbody tr').each do |row|
+        member_section.css('table tbody tr').each_with_index do |row, row_idx|
           cells = row.css('td')
           next if cells.length < 2
 
@@ -237,10 +237,17 @@ module Truenorth
           text_parts = cells.map { |cell| clean_cell_text(cell) }
           next if text_parts.all?(&:empty?)
 
+          # Find the cancel button link (title="Cancel Reservation")
+          cancel_link = row.at_css('a[title="Cancel Reservation"]')
+          cancel_id = cancel_link['id'] if cancel_link
+
           # Parse the reservation data
           reservation = parse_reservation_row(text_parts)
           if reservation && reservation[:date]
             reservation[:member] = member_name
+            reservation[:member_idx] = member_idx
+            reservation[:row_idx] = row_idx
+            reservation[:cancel_id] = cancel_id
             reservations << reservation
           end
         end
@@ -257,9 +264,56 @@ module Truenorth
     end
 
     # Cancel a reservation
+    # reservation_id is the cancel button ID from the reservation
     def cancel(reservation_id, dry_run: false)
       ensure_logged_in!
-      raise BookingError, 'Cancel not yet implemented'
+
+      log "\n=== CANCEL RESERVATION ==="
+      log "Cancel ID: #{reservation_id}"
+      log 'DRY RUN MODE' if dry_run
+
+      return { success: true, dry_run: true, message: 'Dry run - would cancel reservation' } if dry_run
+
+      # Get the reservations page to extract form state
+      response = get(RESERVATIONS_PATH)
+      html = Nokogiri::HTML(response.body)
+
+      view_state = extract_view_state(html)
+      form_id = '_memberReservations_WAR_northstarportlet_:reservationsForm'
+
+      raise BookingError, 'Could not extract view state' unless view_state
+
+      # Build the cancel AJAX request
+      ajax_url = "#{@base_url}#{RESERVATIONS_PATH}?p_p_id=memberReservations_WAR_northstarportlet" \
+                 '&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view' \
+                 '&p_p_cacheability=cacheLevelPage' \
+                 '&_memberReservations_WAR_northstarportlet__jsfBridgeAjax=true'
+
+      form_data = {
+        'javax.faces.partial.ajax' => 'true',
+        'javax.faces.source' => reservation_id,
+        'javax.faces.partial.execute' => '@all',
+        'javax.faces.partial.render' => form_id,
+        form_id => form_id,
+        'javax.faces.ViewState' => view_state,
+        reservation_id => reservation_id
+      }
+
+      response = post_ajax(ajax_url, form_data)
+
+      if response.is_a?(Net::HTTPSuccess)
+        # Check for success indicators in response
+        body = response.body
+        if body.include?('success') || body.include?('cancel') || body.length < 1000
+          log 'Cancellation successful'
+          { success: true, message: 'Reservation cancelled' }
+        else
+          log "Unexpected response: #{body[0..200]}"
+          { success: false, error: 'Unexpected response from server' }
+        end
+      else
+        { success: false, error: "HTTP #{response.code}" }
+      end
     end
 
     private
@@ -349,8 +403,9 @@ module Truenorth
       cell1 = text_parts[1]
 
       # Extract activity/event type and details
-      # Format: "Activities (Court 2 | Squash)" or "Events (Event Name | Category)"
-      activity_match = cell1.match(/(Activities|Events)\s+\(([^)]+)\)/)
+      # Format: "Activities (Court 2 | Squash)" or "Events (Event Name (time) | Category)"
+      # Use a greedy match that stops before the date pattern
+      activity_match = cell1.match(/(Activities|Events)\s+\((.+?)\)\s*\d{2}\/\d{2}\/\d{4}/)
       activity = nil
       court = nil
 

data/lib/truenorth/version.rb

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

data/truenorth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.1.2'
+  spec.version       = '0.2.0'
   spec.authors       = ['usiegj00']
   spec.email         = ['112138+usiegj00@users.noreply.github.com']
 
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'base64', '~> 0.2'
   spec.add_dependency 'nokogiri', '~> 1.15'
   spec.add_dependency 'thor', '~> 1.3'
+  spec.add_dependency 'tty-table', '~> 0.12'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truenorth
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - usiegj00
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement