hizuke 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d343b5de1fbff044ba0cb10fdd1d9b23d5bd478abd7188583993e43f09e9ea1
-  data.tar.gz: d9a3b6746cf3da6dc60837a4e831bf2de0f510c69f62b8a11708293ff614d596
+  metadata.gz: 064d7574f7151fdf7695b789dd4812f38c6becb6226b7bda807d0339dc0fc8e1
+  data.tar.gz: 48c23cc779ae564bc3625176f7af74ebb2c0b33a7f4f67cea5098851c35de2e0
 SHA512:
-  metadata.gz: 77caa4db90322b19a37da5e82b875b88a00656675e17746962f4f305ca4365c7990855bbdd1241abfe5419efdd66da01f0a06caeaf5821514c07e9eaea54d0bf
-  data.tar.gz: d10748679690b857877d2bbcc33168499ee2f2459d37f7662b04b98570d266f09254bf96989fdb80b61aaf4a217a11517e57c79cb0623cde364b7b3699890b05
+  metadata.gz: 22380b935099c93601a9ac54837e4378935037d653e5ee557c1fc7cdd31098245fbb3bc4c3e5c6623c431fdb9f54138fb3445dbe18e9197721caf6d082c25e16
+  data.tar.gz: e00e4fe32d48188761db0f070d55bddf9bd31915f2a4336c2846704aaf4286f1b1e7c132070029a39afa558a264b1badc1734934c47f9d059334a9f06d809416

data/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.2] - 2025-04-23
+
+### Added
+- Support for additional date keywords:
+  - "next week" / "nextweek"
+  - "next month" / "nextmonth"
+  - "next year" / "nextyear"
+  - "this weekend" / "thisweekend"
+- Enhanced parsing to support compound date expressions with spaces
+
 ## [0.0.1] - 2025-04-12
 
 ### Added

data/README.md

@@ -41,9 +41,29 @@ puts result.date  # => <Date: 2023-03-31> (represents today's date)
 result = Hizuke.parse("call mom yesterday")
 puts result.text  # => "call mom"
 puts result.date  # => <Date: 2023-03-30> (represents yesterday's date)
+
+# Parse text with next week's date
+result = Hizuke.parse("team meeting next week")
+puts result.text  # => "team meeting"
+puts result.date  # => <Date: 2023-04-04> (represents the next Monday)
+
+# Parse text with next month's date
+result = Hizuke.parse("vacation next month")
+puts result.text  # => "vacation"
+puts result.date  # => <Date: 2023-05-01> (represents the first day of the next month)
+
+# Parse text with next year's date
+result = Hizuke.parse("conference next year")
+puts result.text  # => "conference"
+puts result.date  # => <Date: 2024-01-01> (represents the first day of the next year)
+
+# Parse text with this weekend's date
+result = Hizuke.parse("hiking this weekend")
+puts result.text  # => "hiking"
+puts result.date  # => <Date: 2023-04-01> (represents the next Saturday)
 ```
 
-The parser is case-insensitive and can handle date references located anywhere in the text.
+The parser is case-insensitive and can handle date references located anywhere in the text. It also supports date references with or without spaces (e.g., "nextweek" or "next week").
 
 ## Supported Date Keywords
 
@@ -52,6 +72,10 @@ Currently, the following English date keywords are supported:
 - `yesterday` - returns yesterday's date
 - `today` - returns today's date
 - `tomorrow` - returns tomorrow's date
+- `next week` / `nextweek` - returns the date of the next Monday
+- `next month` / `nextmonth` - returns the first day of the next month
+- `next year` / `nextyear` - returns the first day of the next year
+- `this weekend` / `thisweekend` - returns the date of the upcoming Saturday (or today if it's already the weekend)
 
 ## Development
 

data/lib/hizuke/parser.rb

@@ -19,7 +19,15 @@ module Hizuke
     DATE_KEYWORDS = {
       "yesterday" => -1,
       "today" => 0,
-      "tomorrow" => 1
+      "tomorrow" => 1,
+      "nextweek" => :next_week,
+      "next week" => :next_week,
+      "nextmonth" => :next_month,
+      "next month" => :next_month,
+      "nextyear" => :next_year,
+      "next year" => :next_year,
+      "thisweekend" => :this_weekend,
+      "this weekend" => :this_weekend
     }.freeze
 
     # Parse text containing time references and extract both
@@ -41,18 +49,46 @@ module Hizuke
       # Check if text is nil or empty
       raise ParseError, "Input text cannot be nil or empty" if text.nil? || text.empty?
 
-      # Split the text into words
+      # Try to find compound date expressions (like "next week")
+      compound_matches = {}
+      
+      DATE_KEYWORDS.keys.select { |k| k.include?(" ") }.each do |compound_key|
+        if text.downcase.include?(compound_key)
+          start_idx = text.downcase.index(compound_key)
+          end_idx = start_idx + compound_key.length - 1
+          compound_matches[compound_key] = [start_idx, end_idx]
+        end
+      end
+
+      # If we found compound matches, handle them specially
+      unless compound_matches.empty?
+        # Use the first match (in case there are multiple)
+        match_key, indices = compound_matches.min_by { |_, v| v[0] }
+        
+        # Calculate date based on the keyword
+        date_value = DATE_KEYWORDS[match_key]
+        date = calculate_date(date_value)
+        
+        # Remove the date expression from the text
+        clean_text = text.dup
+        clean_text.slice!(indices[0]..indices[1])
+        clean_text = clean_text.strip
+        
+        return Result.new(clean_text, date)
+      end
+
+      # Split the text into words (for single-word date references)
       words = text.split
 
       # Find the first date keyword
       date_word_index = nil
-      date_offset = nil
+      date_value = nil
 
       words.each_with_index do |word, index|
         clean_word = word.downcase.gsub(/[^a-z]/, '')
         if DATE_KEYWORDS.key?(clean_word)
           date_word_index = index
-          date_offset = DATE_KEYWORDS[clean_word]
+          date_value = DATE_KEYWORDS[clean_word]
           break
         end
       end
@@ -62,7 +98,7 @@ module Hizuke
       end
 
       # Calculate the date based on the keyword
-      date = Date.today + date_offset
+      date = calculate_date(date_value)
 
       # Create the clean text by removing the date keyword
       clean_words = words.dup
@@ -71,5 +107,34 @@ module Hizuke
 
       Result.new(clean_text, date)
     end
+
+    private
+
+    # Calculate the date based on the keyword value
+    def calculate_date(date_value)
+      if date_value.is_a?(Integer)
+        Date.today + date_value
+      elsif date_value == :next_week
+        # Find next Monday
+        days_until_monday = (1 - Date.today.wday) % 7
+        # If today is Monday, we want next Monday, not today
+        days_until_monday = 7 if days_until_monday == 0
+        Date.today + days_until_monday
+      elsif date_value == :next_month
+        # Return the first day of the next month
+        next_month = Date.today >> 1
+        Date.new(next_month.year, next_month.month, 1)
+      elsif date_value == :next_year
+        # Return the first day of the next year
+        next_year = Date.today.year + 1
+        Date.new(next_year, 1, 1)
+      elsif date_value == :this_weekend
+        # Calculate days until Saturday
+        days_until_saturday = (6 - Date.today.wday) % 7
+        # If today is Saturday or Sunday, we're already on the weekend
+        days_until_saturday = 0 if days_until_saturday == 0 || days_until_saturday == 6
+        Date.today + days_until_saturday
+      end
+    end
   end
 end 

data/lib/hizuke/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hizuke
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hizuke
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Juraj Maťaše
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-11 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,8 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.21'
-description: Parse dates from text containing keywords like 'yesterday', 'today',
-  and 'tomorrow'
+description: Hizuke is a lightweight utility that extracts dates from text by recognizing
+  common time expressions. It cleans the original text and returns both the parsed
+  date and the text without the date reference.
 email:
 - juraj@hey.com
 executables: []
@@ -94,5 +95,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: A simple date parser for text containing time references
+summary: A simple date parser for natural language time references
 test_files: []