toilet_tracker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e179c9943225797758be0ca803a1dcde9ee9f7b98ee7466d74cb208a49040b8
-  data.tar.gz: ea5b5ab8fb0e4da1ca4a8e7e48575bc72a9a967769c375e52e11dcfab3dd4801
+  metadata.gz: 4af948bef38e4c8911b60d3bdc887c38b11593d687841f950f0472c7b5748a51
+  data.tar.gz: 8ea58aabc73391c82395c7aaa91af3b369f6ad2c2d1d7ad0f513d02ef9976d7f
 SHA512:
-  metadata.gz: 33081c85110a522542ae3c50209cbe5a1d302bb34bb513bc4c6118daaabf0093673e37695a7200818ed77d5e37bd725e22074a7898cd82f63df9518c105beaf9
-  data.tar.gz: 0ebf346d3c2afde44224885c4879bad74e1d29203c7c2f567fc573fbc989e48eee71f613257707df3e4b4359a861356111cd1e2395f9035d573259de6d0579c8
+  metadata.gz: c11a69adeb79215f621857aa03782fd98518f7e36d2afa2e491f96e1b6f0d1ed94df24b3701a9282e680c01a7054450de894e9eecabf992b716c8c52949b0fd8
+  data.tar.gz: f0b54ca705f8b548225bcac1ac9d47803b27704a316b9b3a57414d9f5a9aa204eb7c231c88fcba1c87e10b0b801be70759467315b2f75cfca632778f91f5b6d8

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+## [0.2.2] - 2026-09-03
+
+### Fixed
+- Parse WhatsApp exports that use 4-digit years (`[02/01/2025, 23:27:21]`). The
+  message pattern required a 2-digit year, so current exports failed to parse
+  entirely: the only lines that matched were old-format timestamps quoted inside
+  message bodies, which produced a handful of events attributed to the quoted
+  sender. A 21,906-line export went from 3 parsed events to 13,996.
+- Stop prefixing the century onto years that already have one (`2025` no longer
+  becomes `202025`).
+
+### Added
+- Accept day and month without zero padding (`[2/1/2025, ...]`)
+- Accept timestamps without seconds (`[02/01/2025, 23:27]`), defaulting to `:00`
+
 ## [0.2.1] - 2025-12-18
 
 ### Changed

data/PARSING_SPEC.md

@@ -9,8 +9,10 @@ ToiletTracker is a Ruby gem that parses WhatsApp message exports to track toilet
 ### Message Structure
 All WhatsApp messages follow this format:
 ```
-[DD/MM/YY, HH:MM:SS] Sender: Content
+[DD/MM/YYYY, HH:MM:SS] Sender: Content
 ```
+Exports vary by platform and locale. The year may be 2 or 4 digits, the day and
+month may be zero-padded or not, and the seconds may be absent.
 
 ### Command Types
 - **🚽 (Settings)**: Configure timezone shifts and preferences
@@ -41,17 +43,24 @@ Both 💩 and 🚽 commands support optional metadata emojis placed between the
 ## Supported Parsing Patterns
 
 ### WhatsApp Message Format
-**Pattern**: `\[(?<day>\d{2})/(?<month>\d{2})/(?<year>\d{2}),\s*(?<time>\d{2}:\d{2}:\d{2})\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$`
+**Pattern**: `\[(?<day>\d{1,2})/(?<month>\d{1,2})/(?<year>\d{4}|\d{2}),\s*(?<time>\d{1,2}:\d{2}(?::\d{2})?)\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$`
 
 **Examples**:
+- `[01/01/2025, 12:00:00] Alice: 💩`
 - `[01/01/25, 12:00:00] Alice: 💩`
 - `[25/12/24, 23:59:59] Bob: 🚽 +2`
-- `[15/06/25, 14:30:15] Charlie: 💩 +1 2025-06-15 12:00:00`
+- `[15/06/2025, 14:30:15] Charlie: 💩 +1 2025-06-15 12:00:00`
+- `[2/1/2025, 9:05] Dave: 💩`
 
 **Behavior**:
-- Extracts day, month, year (2-digit), time, sender, content
+- Extracts day, month, year (2- or 4-digit), time, sender, content
 - Handles edited messages with suffix `‎<This message was edited>`
-- Year is converted to 20XX format (25 → 2025)
+- A 2-digit year is converted to 20XX format (25 → 2025); a 4-digit year is used as-is
+- Seconds are optional and default to 0 when absent
+- Day and month may be given with or without zero padding
+
+**Not supported**: 12-hour timestamps with an AM/PM suffix, and the Android
+export layout (`DD/MM/YYYY, HH:MM - Sender: Content`).
 
 ### 1. Shift Set (Functional)
 **Pattern**: `🚽\s*([+-]?\d+)$`

data/README.md

@@ -1,253 +1,106 @@
 # ToiletTracker
 
-A modern Ruby gem for parsing WhatsApp messages containing toilet tracking data using emoji-based commands. Built with clean architecture principles and comprehensive timezone support.
+[![CI](https://github.com/BrownOps/toilet_tracker/actions/workflows/main.yml/badge.svg)](https://github.com/BrownOps/toilet_tracker/actions/workflows/main.yml)
+[![Gem Version](https://img.shields.io/gem/v/toilet_tracker.svg)](https://rubygems.org/gems/toilet_tracker)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.txt)
+[![Ruby](https://img.shields.io/badge/ruby-%3E%3D%203.4-red.svg)](https://www.ruby-lang.org)
 
-## Features
-
-- 🚽 **Settings**: Set timezone shifts and preferences
-- 💩 **Event Tracking**: Log events with automatic timezone adjustments
-- ⏰ **Timezone Support**: Handle multiple timezones and retroactive shifts
-- 📊 **Multiple Output Formats**: JSON, CSV, and formatted tables
-- 🔧 **Thor CLI**: Interactive command-line interface with TTY::Prompt
-- 🧪 **Comprehensive Testing**: 77 tests with 96%+ coverage
-- 🏗️ **Clean Architecture**: Modular design with clear separation of concerns
-- 📋 **Statistics**: Detailed parsing statistics and error reporting
-
-## Requirements
+Track bowel movements through WhatsApp messages using simple emoji commands. Export your WhatsApp chat, run it through ToiletTracker, and get structured data with timezone support.
 
-- **Ruby 3.4+** - Uses modern Ruby features for optimal performance
-- **RuboCop Omakase** - Opinionated Ruby styling from the Rails team
+## Features
 
-## Installation
+- **No app needed** - Use WhatsApp, which you already have
+- **Travel-friendly** - Full timezone support for globetrotters
+- **Flexible input** - Log now, log past events, add metadata
+- **Multiple exports** - JSON, CSV, or formatted tables
+- **Privacy first** - Your data stays on your device
 
-Add this line to your application's Gemfile:
+## Why?
 
-```ruby
-gem 'toilet_tracker'
-```
+Tracking health data shouldn't require a dedicated app. WhatsApp is already on your phone, always synced, and easy to use. Just send a 💩 to a chat (or yourself) whenever nature calls, and this gem turns those messages into analyzable data.
 
-And then execute:
-
-```bash
-bundle install
-```
-
-Or install it yourself as:
+## Quick Start
 
 ```bash
 gem install toilet_tracker
 ```
 
-## Usage
-
-### Command Line Interface
-
-Process WhatsApp export files:
+Export your WhatsApp chat and run:
 
 ```bash
-# Basic usage
-toilet_tracker parse whatsapp_export.txt
-
-# Parse WhatsApp zip exports (automatically extracts _chat.txt)
 toilet_tracker parse whatsapp_export.zip
-
-# JSON output
-toilet_tracker parse --format json messages.txt
-
-# Custom timezone
-toilet_tracker parse --timezone "Europe/Rome" messages.txt
-
-# Show statistics
-toilet_tracker stats messages.txt
-
-# Interactive mode
-toilet_tracker interactive
-
-# Show version
-toilet_tracker version
-```
-
-### Ruby API
-
-```ruby
-require 'toilet_tracker'
-
-# Parse individual lines
-result = ToiletTracker.parse_line("[01/01/25, 12:00:00] Alice: 💩")
-puts result.type  # => :event_now
-
-# Parse multiple lines
-lines = [
-  "[01/01/25, 10:00:00] Alice: 🚽 +2",
-  "[01/01/25, 12:00:00] Alice: 💩"
-]
-results = ToiletTracker.parse_lines(lines)
-
-# Configure settings
-ToiletTracker.configure do |config|
-  config.default_timezone = "Europe/Rome"
-  config.max_shift_hours = 12
-end
 ```
 
-### Supported Message Formats
-
-#### 🚽 Settings (Functional - Affect Timestamps)
-- `🚽 +2` - Set timezone shift to +2 hours (immediate)
-- `🚽 -1` - Set timezone shift to -1 hour (immediate)
-- `🚽 +1 2025-01-15 14:30` - Set shift effective from specific time (retroactive)
-- `🚽 Europe/Rome` - Set timezone by name
-- `🚽 PST` - Set timezone by abbreviation
-
-#### 💩 Events
-
-**Functional Shifts (Affect Actual Times):**
-- `💩` - Log live event with current active shift
-- `💩 +1` - Log live event with +1 hour shift override
-- `💩 PST` - Log live event converted to PST timezone
-
-**Fixed Times (No Shift Applied):**
-- `💩 2025-01-15 14:30` - Log event at exact time specified
+## How It Works
 
-**Decorative Data (For Statistics Only):**
-- `💩 +2 2025-01-15 14:30` - Log event at 14:30 exactly, +2 shift stored for display
-- `💩 EST 2025-01-15 14:30` - Log event at 14:30 exactly, EST timezone stored for display
+Send emoji commands in any WhatsApp chat:
 
-> **Important**: In decorative patterns, the shift/timezone is stored for statistics but does NOT modify the actual poop timestamp.
+| Command | What it does |
+|---------|--------------|
+| `💩` | Log an event right now |
+| `💩 14:30` | Log an event at a specific time |
+| `🚽 +2` | Set your timezone offset to +2 hours |
+| `🚽 Europe/Rome` | Set timezone by name |
 
-### Configuration Options
+See the full [message specification](https://github.com/BrownOps/spec) for all supported formats.
 
-```ruby
-ToiletTracker.configure do |config|
-  # Default timezone for parsing timestamps
-  config.default_timezone = "UTC"
-
-  # Maximum allowed shift hours
-  config.max_shift_hours = 12
-
-  # Custom message patterns (advanced)
-  config.message_patterns[:custom] = /custom_pattern/
-
-  # Supported date formats
-  config.date_formats = ["%Y-%m-%d %H:%M:%S", "%Y/%m/%d %H:%M"]
-end
-```
-
-## Examples
+### Timezone Support
 
-### Basic Usage Scenarios
+Traveling? Just update your timezone:
 
-#### Setting Up Timezone Shifts
 ```
-[15/01/25, 10:00:00] Alice: 🚽 +2
-[15/01/25, 12:00:00] Alice: 💩
-# Result: Event logged at 14:00 (12:00 + 2 hours)
+🚽 +5:30          # Flying to India
+💩                 # Logged with +5:30 offset
+🚽 Europe/Rome    # Back home
+💩                 # Logged with Rome timezone
 ```
 
-#### Retroactive Timezone Adjustments  
-```
-[15/01/25, 10:00:00] Alice: 💩
-[15/01/25, 14:00:00] Alice: 🚽 +3 2025-01-15 09:00:00
-# Result: First event adjusted to 13:00 (10:00 + 3 hours)
-```
+### Metadata
 
-#### Decorative vs Functional Shifts
-```
-# Functional: Affects timestamp
-[15/01/25, 12:00:00] Alice: 💩 +2
-# Result: Event at 14:00 (12:00 + 2 hours)
-
-# Decorative: Only for statistics  
-[15/01/25, 12:00:00] Alice: 💩 +2 2025-01-15 10:00:00
-# Result: Event at exactly 10:00, +2 stored for display
-```
+Add extra context with additional emojis:
 
-#### Complex Multi-User Scenario
 ```
-[15/01/25, 09:00:00] Alice: 🚽 +2
-[15/01/25, 09:30:00] Bob: 🚽 Europe/Rome  
-[15/01/25, 10:00:00] Alice: 💩
-[15/01/25, 10:30:00] Bob: 💩
-[15/01/25, 11:00:00] Alice: 💩 +1
-[15/01/25, 11:30:00] Bob: 💩 EST 2025-01-15 08:00:00
+💩 🩸              # Flag something unusual
+💩 🧱              # Note the consistency
+💩 ☕ 🍕           # Track what you ate
 ```
 
-Results:
-- Alice's first event: 12:00 (10:00 + 2 hours active shift)
-- Bob's first event: ~11:30 (10:30 converted from UTC to Rome time)
-- Alice's override event: 12:00 (11:00 + 1 hour override)
-- Bob's decorative event: exactly 08:00 (EST is decorative only)
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run the following commands:
+## Output Formats
 
 ```bash
-# Run tests
-bundle exec rspec
-
-# Check code style (RuboCop)
-bundle exec rubocop
+# Table (default)
+toilet_tracker parse chat.zip
 
-# Auto-fix style issues
-bundle exec rubocop -a
+# JSON for further processing
+toilet_tracker parse --format json chat.zip
 
-# Install gem locally
-bundle exec rake install
+# CSV for spreadsheets
+toilet_tracker parse --format csv chat.zip
 ```
 
-### Code Quality
+## Ruby API
 
-This project uses **RuboCop Omakase** for opinionated Ruby linting and formatting. Omakase provides the Rails team's preferred styling rules.
-
-Key principles:
-- **Ruby 3.4+ features** - Modern syntax and performance optimizations
-- **KISS principle** - Keep code simple and readable
-- **Test-driven development** - Comprehensive RSpec test suite
-- **Clean architecture** - Clear separation of concerns
-
-### Creating a Release
-
-To release a new version:
-
-1. **Update the version** in `lib/toilet_tracker/version.rb`:
-   ```ruby
-   module ToiletTracker
-     VERSION = "1.2.3"
-   end
-   ```
-
-2. **Update CHANGELOG.md** with release notes (optional but recommended)
+```ruby
+require 'toilet_tracker'
 
-3. **Commit your changes**:
-   ```bash
-   git add -A
-   git commit -m "Bump version to 1.2.3"
-   ```
+# Parse a WhatsApp export
+results = ToiletTracker.parse_file("chat.txt")
 
-4. **Create and push a git tag**:
-   ```bash
-   git tag v1.2.3
-   git push origin main --tags
-   ```
+# Or parse individual messages
+result = ToiletTracker.parse_line("[01/01/2025, 12:00:00] Me: 💩")
+```
 
-5. **Automated Release Process**: The GitHub Actions workflow will automatically:
-   - Run tests and linting to validate the release
-   - Build the gem
-   - Publish to RubyGems.org (requires `RUBYGEMS_API_KEY` secret)
-   - Create a GitHub release with auto-generated changelog
-   - Upload the gem file as a release asset
+## Requirements
 
-**Note**: Ensure the `RUBYGEMS_API_KEY` secret is configured in your GitHub repository settings for automatic publishing to work.
+- Ruby 3.4+
 
-## Contributing
+## Development
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/toilet_tracker. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/toilet_tracker/blob/main/CODE_OF_CONDUCT.md).
+```bash
+bin/setup          # Install dependencies
+bundle exec rspec  # Run tests
+```
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the ToiletTracker project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/toilet_tracker/blob/main/CODE_OF_CONDUCT.md).
+MIT - see [LICENSE.txt](LICENSE.txt)

data/lib/toilet_tracker/configuration.rb

@@ -61,7 +61,9 @@ module ToiletTracker
     end
 
     def whatsapp_message_pattern
-      @whatsapp_message_pattern ||= %r{\[(?<day>\d{2})/(?<month>\d{2})/(?<year>\d{2}),\s*(?<time>\d{2}:\d{2}:\d{2})\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$}
+      # WhatsApp exports vary by platform and locale: years are either 2 or 4
+      # digits, day and month may be zero-padded or not, and seconds may be absent.
+      @whatsapp_message_pattern ||= %r{\[(?<day>\d{1,2})/(?<month>\d{1,2})/(?<year>\d{4}|\d{2}),\s*(?<time>\d{1,2}:\d{2}(?::\d{2})?)\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$}
     end
 
     def edited_message_suffix

data/lib/toilet_tracker/parsers/whatsapp_parser.rb

@@ -41,16 +41,23 @@ module ToiletTracker
       end
 
       def parse_whatsapp_timestamp(day, month, year, time)
-        # Convert YY to full year (assuming 2000s)
-        full_year = "20#{year}"
-        datetime_string = "#{day}/#{month}/#{full_year} #{time}"
+        datetime_string = "#{day}/#{month}/#{expand_year(year)} #{time}"
 
         # Parse in the default timezone
-        config.default_timezone_object.strptime(datetime_string, "%d/%m/%Y %H:%M:%S")
+        config.default_timezone_object.strptime(datetime_string, timestamp_format(time))
       rescue ArgumentError => e
         raise Core::InvalidDateTime, "#{day}/#{month}/#{year} #{time}: #{e.message}"
       end
 
+      # Convert YY to full year (assuming 2000s), leave YYYY untouched
+      def expand_year(year)
+        year.length == 2 ? "20#{year}" : year
+      end
+
+      def timestamp_format(time)
+        time.count(":") > 1 ? "%d/%m/%Y %H:%M:%S" : "%d/%m/%Y %H:%M"
+      end
+
       def clean_content(content)
         return "" if content.nil?
 

data/lib/toilet_tracker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ToiletTracker
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toilet_tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - NetherSoul
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Parse WhatsApp messages for toilet tracking with emoji-based commands
 test_files: []