toilet_tracker 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd32c62afad4d76b2c46dc4747fd6140c458dd7d5d7ee63d1d4c562761087f2
-  data.tar.gz: dc38bc38cd7f5610a6fde62c861e9e38d0c46908f2703098f775ffad8f32ae71
+  metadata.gz: 4e179c9943225797758be0ca803a1dcde9ee9f7b98ee7466d74cb208a49040b8
+  data.tar.gz: ea5b5ab8fb0e4da1ca4a8e7e48575bc72a9a967769c375e52e11dcfab3dd4801
 SHA512:
-  metadata.gz: 7f347d353402c1b4c3189ac6fabc9098b03c32caf6c04d729e17320e07693778ff81c698540f47923d24f585f189b02bdb913cc940f89dae98cb3d475c312da6
-  data.tar.gz: 7ff87b8075a25a879a96bcdb6c903e03d09419c45e1285b669a48f9184f6995852be152e1cdf98c46c08933e37515898d21818b29fc24dc5d3c3f4dc066ef1e1
+  metadata.gz: 33081c85110a522542ae3c50209cbe5a1d302bb34bb513bc4c6118daaabf0093673e37695a7200818ed77d5e37bd725e22074a7898cd82f63df9518c105beaf9
+  data.tar.gz: 0ebf346d3c2afde44224885c4879bad74e1d29203c7c2f567fc573fbc989e48eee71f613257707df3e4b4359a861356111cd1e2395f9035d573259de6d0579c8

data/.rubocop.yml

@@ -1,37 +1,2 @@
-AllCops:
-  NewCops: enable
-  SuggestExtensions: false
-
-# Disable metrics cops for now
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-# Disable documentation requirement
-Style/Documentation:
-  Enabled: false
-
-# Increase line length limit or disable
-Layout/LineLength:
-  Max: 200
-
-# Disable remaining Lint cops that need manual fixes
-Lint/DuplicateBranch:
-  Enabled: false
-
-Lint/UnreachableLoop:
-  Enabled: false
+inherit_gem:
+  rubocop-rails-omakase: rubocop.yml

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 ## [Unreleased]
 
+## [0.2.1] - 2025-12-18
+
+### Changed
+- Update activesupport to 8.1.1 (from 8.0.2.1)
+- Update rubyzip to 3.2.2 (from 3.0.1)
+- Update rake to 13.3.1 (from 13.3.0)
+- Update rspec to 3.13.2 (from 3.13.1)
+- Update overcommit to 0.68.0 (from 0.67.1)
+- Relax version constraints for activesupport and rubyzip
+
+## [0.2.0] - 2025-12-18
+
+### Added
+- Metadata emoji support for both 💩 and 🚽 commands
+- Format: `[command emoji] [metadata emojis...] [shift/timezone] [time]`
+- Metadata stored as array of individual emoji strings
+- New `metadata` field on `PoopEventResult` and `ToiletShiftResult`
+- `BaseParser#parse_metadata` and `#metadata_emoji?` helper methods
+- Comprehensive test suite for metadata parsing (28 new tests)
+
+### Changed
+- All regex patterns updated to capture optional metadata group
+- Result objects now include `metadata: []` by default (backward compatible)
+
+## [0.1.1] - 2025-12-18
+
+### Added
+- Fractional timezone shift support (`+5:30` → 5.5 hours)
+- Time-only patterns for events and settings (`💩 14:30`, `🚽 +5:30 14:30`)
+- Timezone-to-shift conversion (returns calculated shift instead of timezone name)
+- New regex patterns with example comments for clarity
+
+### Changed
+- `Configuration#valid_shift?` now accepts Float values
+- `TimezoneService#calculate_shift` returns Float for fractional hours
+- Replaced StandardRB with RuboCop Omakase for linting
+
 ## [0.1.0] - 2025-06-26
 
 - Initial release

data/PARSING_SPEC.md

@@ -20,6 +20,24 @@ All WhatsApp messages follow this format:
 - **Functional Shifts**: Applied to event timestamps (patterns 1, 2, 5)
 - **Decorative Shifts**: For statistics only, do not affect timestamps (patterns 7, 9)
 
+### Metadata Emojis
+Both 💩 and 🚽 commands support optional metadata emojis placed between the command emoji and the time/shift specifications. Metadata emojis are stored as an array and can be used for additional categorization or tagging of events.
+
+**Format**: `[command emoji] [metadata emojis...] [shift/timezone] [time]`
+
+**Examples**:
+- `💩 🩸` → Event with metadata `["🩸"]`
+- `💩 🩸💧🔥` → Event with metadata `["🩸", "💧", "🔥"]`
+- `💩 🩸 +2` → Event with metadata `["🩸"]` and shift `+2`
+- `🚽 ✈️🌍 +5:30` → Setting with metadata `["✈️", "🌍"]` and shift `+5:30`
+
+**Behavior**:
+- Metadata is any emoji placed after the command emoji but before time specs
+- Emojis are extracted as individual grapheme clusters (supports complex emojis)
+- Command emojis (💩, 🚽) are excluded from metadata
+- Stored as an array of strings in result objects
+- Does not affect parsing of shifts, timezones, or times
+
 ## Supported Parsing Patterns
 
 ### WhatsApp Message Format
@@ -262,8 +280,9 @@ When timezone shifts are set retroactively:
   type: :shift_set | :shift_set_at_time | :timezone_set,
   status: :ok | :alert | :error,
   message: Core::Message,
-  shift: Integer,
+  shift: Integer | Float,
   effective_time: Time,
+  metadata: Array<String>,
   error_details: String | nil
 }
 ```
@@ -275,9 +294,10 @@ When timezone shifts are set retroactively:
         :event_in_timezone | :event_in_timezone_at_time,
   status: :ok | :alert | :error,
   message: Core::Message,
-  shift: Integer | nil,
+  shift: Integer | Float | nil,
   poop_time: Time,
   timezone: String | nil,
+  metadata: Array<String>,
   error_details: String | nil
 }
 ```
@@ -342,6 +362,16 @@ When timezone shifts are set retroactively:
 [02/01/25, 15:00:00] Bob: 💩 PST 2025-01-02 12:00:00
 ```
 
+### Valid Examples with Metadata
+```
+[01/01/25, 08:30:00] Alice: 💩 🩸                    # metadata: ["🩸"]
+[01/01/25, 10:00:00] Alice: 💩 🩸💧 +2               # metadata: ["🩸", "💧"], shift: 2
+[01/01/25, 12:00:00] Alice: 💩 🧱 14:30              # metadata: ["🧱"], time: 14:30
+[01/01/25, 14:00:00] Alice: 💩 🔥 +2 2025-01-01 13:00  # metadata + shift + time
+[02/01/25, 09:00:00] Bob: 🚽 ✈️ +5:30                # metadata: ["✈️"], shift: 5.5
+[02/01/25, 10:00:00] Bob: 🚽 🏠✈️ Europe/Rome        # metadata: ["🏠", "✈️"], timezone
+```
+
 ### Invalid Examples
 ```
 [01/01/25, 10:00:00] Alice: 🚽 +25        # Exceeds max_shift_hours

data/README.md

@@ -16,7 +16,7 @@ A modern Ruby gem for parsing WhatsApp messages containing toilet tracking data
 ## Requirements
 
 - **Ruby 3.4+** - Uses modern Ruby features for optimal performance
-- **StandardRB** - Zero-configuration linting and formatting
+- **RuboCop Omakase** - Opinionated Ruby styling from the Rails team
 
 ## Installation
 
@@ -186,11 +186,11 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 # Run tests
 bundle exec rspec
 
-# Check code style (StandardRB)
-bundle exec standardrb
+# Check code style (RuboCop)
+bundle exec rubocop
 
 # Auto-fix style issues
-bundle exec standardrb --fix
+bundle exec rubocop -a
 
 # Install gem locally
 bundle exec rake install
@@ -198,7 +198,7 @@ bundle exec rake install
 
 ### Code Quality
 
-This project uses **StandardRB** for zero-configuration Ruby linting and formatting. StandardRB eliminates style debates by providing an opinionated, unconfigurable set of rules.
+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

data/exe/toilet_tracker

@@ -95,7 +95,7 @@ module ToiletTracker
 
         when :manual_entry
           message = prompt.ask('Enter WhatsApp message:')
-          results = ToiletTracker.parse_lines([message])
+          results = ToiletTracker.parse_lines([ message ])
           handle_interactive_results(results, prompt)
 
         when :exit
@@ -103,7 +103,7 @@ module ToiletTracker
           break
         end
 
-        prompt.keypress('Press any key to continue...', keys: [:return])
+        prompt.keypress('Press any key to continue...', keys: [ :return ])
       end
     end
 
@@ -177,7 +177,7 @@ module ToiletTracker
       when 'csv'
         require 'csv'
         CSV.open(filename, 'w') do |csv|
-          csv << ['Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content']
+          csv << [ 'Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content' ]
           filter_results(results).each do |result|
             next unless result
 
@@ -199,7 +199,7 @@ module ToiletTracker
           if filtered_results.empty?
             file.puts 'No results found.'
           else
-            headers = ['Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content']
+            headers = [ 'Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content' ]
             rows = filtered_results.filter_map do |result|
               next unless result
 
@@ -216,7 +216,7 @@ module ToiletTracker
 
             # Calculate column widths
             widths = headers.map.with_index do |header, i|
-              [header.length, *rows.map { |row| row[i].to_s.length }].max
+              [ header.length, *rows.map { |row| row[i].to_s.length } ].max
             end
 
             # Write header
@@ -296,7 +296,7 @@ module ToiletTracker
 
     def output_csv(results)
       CSV($stdout) do |csv|
-        csv << ['Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content']
+        csv << [ 'Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content' ]
 
         results.each do |result|
           next unless result
@@ -318,7 +318,7 @@ module ToiletTracker
     def output_table(results)
       return puts 'No results found.' if results.empty?
 
-      headers = ['Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content']
+      headers = [ 'Type', 'Status', 'Sender', 'Message Time', 'Event Time', 'Shift', 'Content' ]
       rows = results.filter_map do |result|
         next unless result
 
@@ -335,7 +335,7 @@ module ToiletTracker
 
       # Calculate column widths
       widths = headers.map.with_index do |header, i|
-        [header.length, *rows.map { |row| row[i].to_s.length }].max
+        [ header.length, *rows.map { |row| row[i].to_s.length } ].max
       end
 
       # Print header

data/lib/toilet_tracker/configuration.rb

@@ -1,30 +1,53 @@
 # frozen_string_literal: true
 
-require 'active_support/time'
+require "active_support/time"
 
 module ToiletTracker
   class Configuration
     attr_accessor :default_timezone, :max_shift_hours, :message_patterns, :date_formats
 
     def initialize
-      @default_timezone = 'UTC'
+      @default_timezone = "UTC"
       @max_shift_hours = 12
+      # Capture group 1 is always metadata emojis, subsequent groups are pattern-specific
       @message_patterns = {
-        shift_set: /🚽\s*([+-]?\d+)$/,
-        shift_set_at_time: /🚽\s*([+-]?\d+)\s+(.+)$/,
-        timezone_set: %r{🚽\s*([A-Za-z_/][A-Za-z0-9_/+-]*)$},
-        event_now: /💩$/,
-        event_now_shifted: /💩\s*([+-]?\d+)$/,
-        event_at_time: %r{💩\s*(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
-        event_at_time_shifted: %r{💩\s*([+-]?\d+)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)},
-        event_in_timezone: %r{💩\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s*$},
-        event_in_timezone_at_time: %r{💩\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$}
+        # 💩 🩸 14:30
+        event_at_time_only: /💩\s*([^+\-\dA-Za-z\s]*)\s*(\d{1,2}:\d{2})$/,
+        # 💩 🩸 +5 14:30, 💩 🩸 +5:30 14:30
+        event_at_time_only_shifted: /💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
+        # 💩 🩸 Asia/Kolkata 14:30
+        event_in_timezone_at_time_only: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
+        # 🚽 📍 +5 14:30, 🚽 📍 +5:30 14:30
+        shift_set_at_time_only: /🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
+        # 🚽 📍 Asia/Kolkata 14:30
+        timezone_set_at_time_only: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
+        # 🚽 📍 +2, 🚽 📍 -3, 🚽 📍 +5:30
+        shift_set: /🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)$/,
+        # 🚽 📍 +2 2025-01-15 14:30, 🚽 📍 +5:30 2025-01-15 14:30
+        shift_set_at_time: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 🚽 📍 Europe/Rome, 🚽 📍 PST
+        timezone_set: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)$},
+        # 🚽 📍 Asia/Kolkata 2025-01-15 14:30
+        timezone_set_at_time: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩, 💩 🩸
+        event_now: /💩\s*([^+\-\dA-Za-z\s]*)$/,
+        # 💩 🩸 +2, 💩 🩸 -1, 💩 🩸 +5:30
+        event_now_shifted: /💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)$/,
+        # 💩 🩸 2025-01-15 14:30
+        event_at_time: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩 🩸 +2 2025-01-15 14:30, 💩 🩸 +5:30 2025-01-15 14:30
+        event_at_time_shifted: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩 🩸 Europe/Rome, 💩 🩸 PST
+        event_in_timezone: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s*$},
+        # 💩 🩸 Asia/Kolkata 2025-01-15 14:30
+        event_in_timezone_at_time: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$}
       }
       @date_formats = [
-        '%Y-%m-%d %H:%M:%S',
-        '%Y-%m-%d %H:%M',
-        '%Y/%m/%d %H:%M:%S',
-        '%Y/%m/%d %H:%M'
+        "%Y-%m-%d %H:%M:%S",
+        "%Y-%m-%d %H:%M",
+        "%Y/%m/%d %H:%M:%S",
+        "%Y/%m/%d %H:%M",
+        "%H:%M"
       ]
     end
 
@@ -34,7 +57,7 @@ module ToiletTracker
     end
 
     def valid_shift?(shift)
-      shift.is_a?(Integer) && shift.abs <= max_shift_hours
+      (shift.is_a?(Integer) || shift.is_a?(Float)) && shift.abs <= max_shift_hours
     end
 
     def whatsapp_message_pattern
@@ -42,7 +65,7 @@ module ToiletTracker
     end
 
     def edited_message_suffix
-      '‎<This message was edited>'
+      "‎<This message was edited>"
     end
   end
 

data/lib/toilet_tracker/core/message.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'active_support/core_ext/time'
+require "time"
+require "active_support/core_ext/time"
 
 module ToiletTracker
   module Core
     Message = Data.define(:timestamp, :sender, :content) do
       def initialize(timestamp:, sender:, content:)
         parsed_timestamp = case timestamp
-                           when Time, ActiveSupport::TimeWithZone
+        when Time, ActiveSupport::TimeWithZone
                              timestamp
-                           when String
+        when String
                              Time.parse(timestamp)
-                           else
+        else
                              raise ArgumentError, "Invalid timestamp type: #{timestamp.class}"
-                           end
+        end
 
         super(
           timestamp: parsed_timestamp,

data/lib/toilet_tracker/core/parse_result.rb

@@ -22,15 +22,15 @@ module ToiletTracker
     end
 
     # Result for toilet shift settings
-    ToiletShiftResult = Data.define(:type, :status, :message, :shift, :effective_time, :error_details) do
-      def initialize(type:, status:, message:, shift: nil, effective_time: nil, error_details: nil)
+    ToiletShiftResult = Data.define(:type, :status, :message, :shift, :effective_time, :metadata, :error_details) do
+      def initialize(type:, status:, message:, shift: nil, effective_time: nil, metadata: [], error_details: nil)
         super
       end
     end
 
     # Result for poop events
-    PoopEventResult = Data.define(:type, :status, :message, :shift, :poop_time, :timezone, :error_details) do
-      def initialize(type:, status:, message:, shift: nil, poop_time: nil, timezone: nil, error_details: nil)
+    PoopEventResult = Data.define(:type, :status, :message, :shift, :poop_time, :timezone, :metadata, :error_details) do
+      def initialize(type:, status:, message:, shift: nil, poop_time: nil, timezone: nil, metadata: [], error_details: nil)
         super
       end
     end

data/lib/toilet_tracker/parsers/base_parser.rb

@@ -10,23 +10,29 @@ module ToiletTracker
       end
 
       def parse(input)
-        raise NotImplementedError, 'Subclasses must implement #parse'
+        raise NotImplementedError, "Subclasses must implement #parse"
       end
 
       def valid?(input)
-        raise NotImplementedError, 'Subclasses must implement #valid?'
+        raise NotImplementedError, "Subclasses must implement #valid?"
       end
 
       protected
 
       def clean_content(content)
-        content.to_s.gsub(config.edited_message_suffix, '').strip
+        content.to_s.gsub(config.edited_message_suffix, "").strip
       end
 
       def parse_shift(shift_string)
         return nil if shift_string.nil? || shift_string.empty?
 
-        shift = Integer(shift_string)
+        # Check if shift contains colon format (e.g., "+5:30", "-3:45")
+        shift = if shift_string.match?(/^[+-]?\d+:\d{2}$/)
+          parse_fractional_shift(shift_string)
+        else
+          Integer(shift_string)
+        end
+
         raise Core::InvalidShift, shift_string unless config.valid_shift?(shift)
 
         shift
@@ -34,26 +40,78 @@ module ToiletTracker
         raise Core::InvalidShift, shift_string
       end
 
-      def parse_datetime(datetime_string)
+      # "+5:30" -> 5.5, "-3:45" -> -3.75, "+5:00" -> 5 (integer)
+      def parse_fractional_shift(shift_string)
+        match = shift_string.match(/^([+-])?(\d+):(\d{2})$/)
+        raise ArgumentError, "Invalid shift format: #{shift_string}" unless match
+
+        sign = (match[1] == "-") ? -1 : 1
+        hours = match[2].to_i
+        minutes = match[3].to_i
+
+        raise ArgumentError, "Invalid minutes: #{minutes}" if minutes > 59
+
+        decimal = hours + minutes / 60.0
+        minutes.zero? ? sign * hours : sign * decimal
+      end
+
+      def parse_datetime(datetime_string, reference_message = nil)
         return nil if datetime_string.nil? || datetime_string.empty?
 
+        time_only_result = try_parse_time_only(datetime_string, reference_message)
+        return time_only_result if time_only_result
+
         config.date_formats.each do |format|
+          next if format == "%H:%M"
           return config.default_timezone_object.strptime(datetime_string, format)
         rescue ArgumentError
           next
         end
 
-        # Fallback to timezone-aware parse
         config.default_timezone_object.parse(datetime_string)
       rescue ArgumentError
         raise Core::InvalidDateTime, datetime_string
       end
 
+      def try_parse_time_only(datetime_string, reference_message)
+        return nil unless reference_message
+        return nil unless datetime_string.match?(/^\d{1,2}:\d{2}$/)
+
+        parsed_time = Time.strptime(datetime_string, "%H:%M")
+        date_part = reference_message.timestamp.to_date
+
+        config.default_timezone_object.local(
+          date_part.year,
+          date_part.month,
+          date_part.day,
+          parsed_time.hour,
+          parsed_time.min,
+          0
+        )
+      rescue ArgumentError
+        nil
+      end
+
       def determine_status(event_time, message_time)
         return :error unless event_time && message_time
 
         time_diff = (message_time - event_time).abs
-        time_diff > 30.days ? :alert : :ok
+        (time_diff > 30.days) ? :alert : :ok
+      end
+
+      def parse_metadata(metadata_string)
+        return [] if metadata_string.nil? || metadata_string.strip.empty?
+
+        metadata_string.grapheme_clusters
+          .reject { |char| char.match?(/\s/) }
+          .select { |char| metadata_emoji?(char) }
+      end
+
+      def metadata_emoji?(char)
+        return false if char.match?(/\A[\p{ASCII}]\z/)
+        return false if %w[💩 🚽].include?(char)
+
+        char.match?(/\p{Emoji}/) && !char.match?(/\A\d\z/)
       end
     end
   end

data/lib/toilet_tracker/parsers/message_parser.rb

@@ -3,17 +3,20 @@
 module ToiletTracker
   module Parsers
     class MessageParser < BaseParser
+      attr_accessor :current_message
+
       def parse(message)
-        return Core::Result.failure(ArgumentError.new('Message required')) unless message.is_a?(Core::Message)
-        return Core::Result.failure(ArgumentError.new('Invalid message')) unless message.valid?
+        return Core::Result.failure(ArgumentError.new("Message required")) unless message.is_a?(Core::Message)
+        return Core::Result.failure(ArgumentError.new("Invalid message")) unless message.valid?
 
+        @current_message = message
         content = message.content.strip
 
-        # Try to match patterns
         matched_result = try_pattern_matching(content, message)
+        @current_message = nil
         return matched_result if matched_result
 
-        # Handle unmatched emoji content
+        @current_message = nil
         handle_unmatched_content(content)
       end
 
@@ -43,8 +46,8 @@ module ToiletTracker
       end
 
       def handle_unmatched_content(content)
-        if content.include?('🚽') || content.include?('💩')
-          error = Core::InvalidMessageFormat.new(content, 'valid emoji pattern')
+        if content.include?("🚽") || content.include?("💩")
+          error = Core::InvalidMessageFormat.new(content, "valid emoji pattern")
           return Core::Result.failure(error)
         end
 
@@ -53,32 +56,47 @@ module ToiletTracker
       end
 
       def parse_by_type(type, match, message)
-        case type
-        when :shift_set, :shift_set_at_time, :timezone_set
-          parse_toilet_type(type, match, message)
+        mapped_type = map_time_only_pattern(type)
+
+        case mapped_type
+        when :shift_set, :shift_set_at_time
+          parse_toilet_type(mapped_type, match, message)
+        when :timezone_set
+          parse_toilet_timezone(match, message)
+        when :timezone_set_at_time
+          parse_toilet_timezone_with_time(match, message)
         when :event_now, :event_now_shifted, :event_at_time, :event_at_time_shifted,
              :event_in_timezone, :event_in_timezone_at_time
-          parse_poop_type(type, match, message)
+          parse_poop_type(mapped_type, match, message)
         else
           raise Core::ParseError, "Unknown message type: #{type}"
         end
       end
 
+      def map_time_only_pattern(type)
+        case type
+        when :event_at_time_only then :event_at_time
+        when :event_at_time_only_shifted then :event_at_time_shifted
+        when :event_in_timezone_at_time_only then :event_in_timezone_at_time
+        when :shift_set_at_time_only then :shift_set_at_time
+        when :timezone_set_at_time_only then :timezone_set_at_time
+        else type
+        end
+      end
+
       def parse_toilet_type(type, match, message)
         case type
         when :shift_set
           parse_toilet_shift(match, message)
         when :shift_set_at_time
           parse_toilet_shift_with_time(match, message)
-        when :timezone_set
-          parse_toilet_timezone(match, message)
         end
       end
 
       def parse_poop_type(type, match, message)
         case type
         when :event_now
-          parse_poop_live(message)
+          parse_poop_live(match, message)
         when :event_now_shifted
           parse_poop_live_shift(match, message)
         when :event_at_time
@@ -93,20 +111,23 @@ module ToiletTracker
       end
 
       def parse_toilet_shift(match, message)
-        shift = parse_shift(match[1])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
 
         Core::ToiletShiftResult.new(
           type: :shift_set,
           status: :ok,
           message: message,
           shift: shift,
-          effective_time: message.timestamp
+          effective_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_toilet_shift_with_time(match, message)
-        shift = parse_shift(match[1])
-        effective_time = parse_datetime(match[2])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
+        effective_time = parse_datetime(match[3], @current_message)
 
         status = determine_status(effective_time, message.timestamp)
 
@@ -115,45 +136,84 @@ module ToiletTracker
           status: status,
           message: message,
           shift: shift,
-          effective_time: effective_time
+          effective_time: effective_time,
+          metadata: metadata
         )
       end
 
       def parse_toilet_timezone(match, message)
-        timezone_str = match[1]
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
+        shift = calculate_shift_from_timezone(timezone_str)
 
-        Core::TimezoneResult.new(
+        Core::ToiletShiftResult.new(
           type: :timezone_set,
           status: :ok,
           message: message,
-          timezone: timezone_str
+          shift: shift,
+          effective_time: message.timestamp,
+          metadata: metadata
         )
       end
 
-      def parse_poop_live(message)
+      def parse_toilet_timezone_with_time(match, message)
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
+        datetime_str = match[3]
+
+        effective_time = parse_datetime(datetime_str, @current_message)
+        status = determine_status(effective_time, message.timestamp)
+        shift = calculate_shift_from_timezone(timezone_str)
+
+        Core::ToiletShiftResult.new(
+          type: :timezone_set_at_time,
+          status: status,
+          message: message,
+          shift: shift,
+          effective_time: effective_time,
+          metadata: metadata
+        )
+      end
+
+      def calculate_shift_from_timezone(timezone_str)
+        tz_object = ActiveSupport::TimeZone[timezone_str]
+        raise Core::InvalidTimezone, timezone_str unless tz_object
+
+        default_tz = config.default_timezone_object
+        shift = (tz_object.utc_offset - default_tz.utc_offset) / 3600.0
+        (shift == shift.to_i) ? shift.to_i : shift
+      end
+
+      def parse_poop_live(match, message)
+        metadata = parse_metadata(match[1])
+
         Core::PoopEventResult.new(
           type: :event_now,
           status: :ok,
           message: message,
           shift: 0,
-          poop_time: message.timestamp
+          poop_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_poop_live_shift(match, message)
-        shift = parse_shift(match[1])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
 
         Core::PoopEventResult.new(
           type: :event_now_shifted,
           status: :ok,
           message: message,
           shift: shift,
-          poop_time: message.timestamp
+          poop_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_poop_past(match, message)
-        poop_time = parse_datetime(match[1])
+        metadata = parse_metadata(match[1])
+        poop_time = parse_datetime(match[2], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -161,13 +221,15 @@ module ToiletTracker
           status: status,
           message: message,
           shift: 0,
-          poop_time: poop_time
+          poop_time: poop_time,
+          metadata: metadata
         )
       end
 
       def parse_poop_past_with_shift(match, message)
-        shift = parse_shift(match[1])
-        poop_time = parse_datetime(match[2])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
+        poop_time = parse_datetime(match[3], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -175,25 +237,29 @@ module ToiletTracker
           status: status,
           message: message,
           shift: shift,
-          poop_time: poop_time
+          poop_time: poop_time,
+          metadata: metadata
         )
       end
 
       def parse_poop_timezone(match, message)
-        timezone_str = match[1]
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
 
         Core::PoopEventResult.new(
           type: :event_in_timezone,
           status: :ok,
           message: message,
           poop_time: message.timestamp,
-          timezone: timezone_str
+          timezone: timezone_str,
+          metadata: metadata
         )
       end
 
       def parse_poop_timezone_with_time(match, message)
-        timezone_str = match[1]
-        poop_time = parse_datetime(match[2])
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
+        poop_time = parse_datetime(match[3], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -201,7 +267,8 @@ module ToiletTracker
           status: status,
           message: message,
           poop_time: poop_time,
-          timezone: timezone_str
+          timezone: timezone_str,
+          metadata: metadata
         )
       end
     end

data/lib/toilet_tracker/parsers/whatsapp_parser.rb

@@ -24,11 +24,11 @@ module ToiletTracker
       private
 
       def failure_for_invalid_format(line)
-        Core::Result.failure(Core::InvalidMessageFormat.new(line, 'WhatsApp format'))
+        Core::Result.failure(Core::InvalidMessageFormat.new(line, "WhatsApp format"))
       end
 
       def failure_for_invalid_sender(line)
-        Core::Result.failure(Core::InvalidMessageFormat.new(line, 'Empty sender'))
+        Core::Result.failure(Core::InvalidMessageFormat.new(line, "Empty sender"))
       end
 
       def build_message_from_match(match)
@@ -46,16 +46,16 @@ module ToiletTracker
         datetime_string = "#{day}/#{month}/#{full_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, "%d/%m/%Y %H:%M:%S")
       rescue ArgumentError => e
         raise Core::InvalidDateTime, "#{day}/#{month}/#{year} #{time}: #{e.message}"
       end
 
       def clean_content(content)
-        return '' if content.nil?
+        return "" if content.nil?
 
         # Remove the "This message was edited" suffix
-        content.gsub(config.edited_message_suffix, '').strip
+        content.gsub(config.edited_message_suffix, "").strip
       end
     end
   end

data/lib/toilet_tracker/services/shift_service.rb

@@ -9,7 +9,7 @@ module ToiletTracker
 
       def initialize(timezone_service = TimezoneService.new)
         @timezone_service = timezone_service
-        @user_shifts = Hash.new { |h, k| h[k] = [default_shift_entry] }
+        @user_shifts = Hash.new { |h, k| h[k] = [ default_shift_entry ] }
       end
 
       def set_shift(user, shift, effective_time = Time.current, timezone = nil)
@@ -65,7 +65,7 @@ module ToiletTracker
       end
 
       def clear_history(user)
-        @user_shifts[user] = [default_shift_entry]
+        @user_shifts[user] = [ default_shift_entry ]
       end
 
       def clear_all_history

data/lib/toilet_tracker/services/timezone_service.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/time'
+require "active_support/time"
 
 module ToiletTracker
   module Services
@@ -15,11 +15,11 @@ module ToiletTracker
         from_zone = resolve_timezone(from_timezone)
         to_zone = resolve_timezone(to_timezone)
 
-        # Calculate offset difference in hours
         from_offset = from_zone.at(at_time).utc_offset
         to_offset = to_zone.at(at_time).utc_offset
 
-        (to_offset - from_offset) / 3600
+        shift = (to_offset - from_offset) / 3600.0
+        (shift == shift.to_i) ? shift.to_i : shift
       end
 
       def apply_shift(time, shift_hours)
@@ -82,7 +82,7 @@ module ToiletTracker
       end
 
       def sample_times
-        [Time.current, Time.current + 6.months]
+        [ Time.current, Time.current + 6.months ]
       end
 
       def add_zone_to_map(map, abbr, zone)

data/lib/toilet_tracker/utils/zip_handler.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'zip'
-require 'tempfile'
+require "zip"
+require "tempfile"
 
 module ToiletTracker
   module Utils
@@ -15,7 +15,7 @@ module ToiletTracker
       end
 
       def self.zip_file?(file_path)
-        File.extname(file_path).downcase == '.zip'
+        File.extname(file_path).downcase == ".zip"
       end
 
       def initialize(zip_path)
@@ -26,14 +26,14 @@ module ToiletTracker
       def extract_chat_file
         chat_entries = find_chat_entries
 
-        raise ChatFileNotFoundError, 'No _chat.txt file found in zip archive' if chat_entries.empty?
+        raise ChatFileNotFoundError, "No _chat.txt file found in zip archive" if chat_entries.empty?
 
         chat_entry = if chat_entries.size > 1
                        # If multiple _chat.txt files, prefer the one in root or with shortest path
-                       chat_entries.min_by { |entry| entry.name.count('/') }
-                     else
+                       chat_entries.min_by { |entry| entry.name.count("/") }
+        else
                        chat_entries.first
-                     end
+        end
 
         extract_to_tempfile(chat_entry)
       end
@@ -64,7 +64,7 @@ module ToiletTracker
       end
 
       def extract_to_tempfile(entry)
-        temp_file = Tempfile.new(['chat_export', '.txt'])
+        temp_file = Tempfile.new([ "chat_export", ".txt" ])
 
         begin
           Zip::File.open(@zip_path) do |_zip|

data/lib/toilet_tracker/version.rb

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

data/lib/toilet_tracker.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'active_support/time'
+require "active_support/time"
 
-require_relative 'toilet_tracker/version'
-require_relative 'toilet_tracker/configuration'
-require_relative 'toilet_tracker/core/errors'
-require_relative 'toilet_tracker/core/message'
-require_relative 'toilet_tracker/core/result'
-require_relative 'toilet_tracker/core/parse_result'
-require_relative 'toilet_tracker/parsers/base_parser'
-require_relative 'toilet_tracker/parsers/whatsapp_parser'
-require_relative 'toilet_tracker/parsers/message_parser'
-require_relative 'toilet_tracker/services/timezone_service'
-require_relative 'toilet_tracker/services/shift_service'
-require_relative 'toilet_tracker/services/analysis_service'
-require_relative 'toilet_tracker/utils/zip_handler'
+require_relative "toilet_tracker/version"
+require_relative "toilet_tracker/configuration"
+require_relative "toilet_tracker/core/errors"
+require_relative "toilet_tracker/core/message"
+require_relative "toilet_tracker/core/result"
+require_relative "toilet_tracker/core/parse_result"
+require_relative "toilet_tracker/parsers/base_parser"
+require_relative "toilet_tracker/parsers/whatsapp_parser"
+require_relative "toilet_tracker/parsers/message_parser"
+require_relative "toilet_tracker/services/timezone_service"
+require_relative "toilet_tracker/services/shift_service"
+require_relative "toilet_tracker/services/analysis_service"
+require_relative "toilet_tracker/utils/zip_handler"
 
 module ToiletTracker
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toilet_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - NetherSoul
@@ -13,16 +13,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -41,16 +47,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +118,6 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt

data/.standard.yml

@@ -1,2 +0,0 @@
-ruby_version: 3.4
-fix: true