timet 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5bbd4564baa142a2bf20160bdd2499f8df24ce2357eb03b8f1d05a26341fac5
-  data.tar.gz: 2fe4c7eb71ab3ff20dc4691caf0bbfad9441e7cf3b1414caaf89ac7571ed4592
+  metadata.gz: 488c0136f2b11a62046a2f507b054d346a5def75dc3a32609ea51872bb411e6b
+  data.tar.gz: c28bbe32a4558ab6755e438ba7c5a53f879d6c036ae68706782b62d8ca26133c
 SHA512:
-  metadata.gz: c7d324fe2b3f0aa476caa77cb44414206f6f7c723d47c78a8b9ffd5f5d1319d994520dee9c044d4cb145a2528abf00427c9198a122fefd3e0c85eeff3dcdb5ea
-  data.tar.gz: d9a91d46ef64f42d03d2dcc8356338d4fb27f9f81a7bce5ebc100b008476083239b1b7dbdfe599187e3b2f545ea55211f87b347e5a86a7a864d6d39d3b20e5b3
+  metadata.gz: d1e74dfa8e0d6fdacf0fd8c458ade7667e2f2722376aea9307a5dab7b68b6a0a561b475432cf666564ba6664c18b6f80f94aed0bd88c3f6703ead36aa5d1cf84
+  data.tar.gz: 70608773c6f504e38637b7d4b2d71a852d7ed20c5679170c082d302748e1e3e6e4be2d1d4b909ce49e2ae45052dc3ac2cd02ba9a51106aba723211d3efa3c66a

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## [1.5.7] - 2025-05-16
+
+**Improvements:**
+
+- Extracted collision checks in [`ValidationEditHelper`](lib/timet/validation_edit_helper.rb) into dedicated private methods (`check_collision_with_previous_item`, `check_collision_with_next_item`).
+- Enhanced time collision validation in [`ValidationEditHelper`](lib/timet/validation_edit_helper.rb): renamed `validate_collision` to `validate_time_collisions`, added a `field` argument for specific checks ('start'/'end'), implemented distinct collision logic, and updated `perform_validation` to use the new method for both fields.
+- Improved time validation logic structure by extracting `determine_start_base_date_time` and `determine_end_base_date_time` from `determine_base_date_time`, and introducing `validate_time_order` to centralize start/end time order validation.
+- Centralized datetime creation by introducing `create_datetime_from_components` in [`TimeHelper`](lib/timet/time_helper.rb).
+- Improved time validation and determination logic in [`TimeValidationHelper`](lib/timet/time_validation_helper.rb) and [`ValidationEditHelper`](lib/timet/validation_edit_helper.rb): refactored `determine_base_date_time` to use a `case` statement, extracted `validate_time_difference` for 24-hour difference validation, and removed the unused `time_str` parameter from `determine_and_create_datetime`.
+- Centralized time validation logic to the new [`TimeValidationHelper`](lib/timet/time_validation_helper.rb) module, moving relevant methods from [`ValidationEditHelper`](lib/timet/validation_edit_edit_helper.rb).
+- Refactored time validation and item data helpers by moving time validation logic to [`TimeUpdateHelper`](lib/timet/time_update_helper.rb) and item data fetching methods to [`ItemDataHelper`](lib/timet/item_data_helper.rb).
+- Extracted time parsing, base date determination, datetime creation, end time adjustment, and validation logic into dedicated private methods in [`lib/timet/validation_edit_helper.rb`](lib/timet/validation_edit_helper.rb).
+- Improved time validation and editing logic in [`ValidationEditHelper`](lib/timet/validation_edit_helper.rb): anchored end time date to start time date, handled end time on the next day, enforced < 24 hour duration, and preserved original time on empty input.
+- Centralized utility methods into a new [`Timet::Utils`](lib/timet/utils.rb) module.
+- Improved [`WeekInfo`](lib/timet/week_info.rb) initialization to accept a `Date` object and display string, and refactored its responsibilities for clarity and Reek compliance.
+- Improved [`TimeBlockChart`](lib/timet/time_block_chart.rb) readability by replacing magic numbers with constants and ensuring chronological date order in `print_blocks`.
+- Refactored [`TimeBlockChart`](lib/timet/time_block_chart.rb) for clarity and Reek compliance, moving separator printing responsibility and the `CHAR_MAPPING` constant to appropriate locations/helpers.
+- Refactored database initialization logic in [`Timet::Application`](lib/timet/application.rb) for clarity and testability, encapsulating `initialize_database` within a `no_commands` block.
+- Updated gem dependencies, including `aws-sdk-s3`, `icalendar`, `rubocop`, and `rubocop-rspec`.
+
+**Bug Fixes:**
+
+- Corrected `perform_validation` in [`ValidationEditHelper`](lib/timet/validation_edit_helper.rb) to accept and utilize the `item` object for correct context in collision checks.
+- Modified `create_new_datetime` to derive date components from the parsed time component, allowing users to specify a full date and time for 'start' or 'end' fields.
+- Fixed a bug in [`WeekInfo#format_and_print_date_info`](lib/timet/week_info.rb) where weekend days were incorrectly checked using "Sa" and "Su".
+- Handled empty `@time_block` in [`TimeBlockChart#initialize`](lib/timet/time_block_chart.rb) to prevent errors.
+
 ## [1.5.6] - 2025-04-07
 
 **Improvements:**

data/lib/timet/application.rb

@@ -49,21 +49,27 @@ module Timet
 
     BUCKET = 'timet'
 
+    def initialize(*args)
+      super
+      config = args[2] || {} # Third argument is the config hash
+      initialize_database(config)
+    end
+
+    # Initializes the database connection based on the provided options.
+    #
+    # This method determines how to initialize the database connection based on the options provided.
+    # It supports injecting a database instance for testing, using a fallback for RSpec, and initializing
+    # a production database based on valid command arguments.
+    #
+    # @param options [Hash] A hash of options that may include a :database key for injecting a database instance.
+    # @option options [Database] :database An instance of the Database class to be used directly.
+    # @option options [Hash] :current_command The current command being executed, used to validate production
+    #   database initialization.
+    #
+    # @return [void] This method does not return a value; it initializes the `@db` instance variable.
+    #
+    # @raise [SystemExit] If invalid arguments are provided for production database initialization.
     no_commands do
-      # Initializes the database connection based on the provided options.
-      #
-      # This method determines how to initialize the database connection based on the options provided.
-      # It supports injecting a database instance for testing, using a fallback for RSpec, and initializing
-      # a production database based on valid command arguments.
-      #
-      # @param options [Hash] A hash of options that may include a :database key for injecting a database instance.
-      # @option options [Database] :database An instance of the Database class to be used directly.
-      # @option options [Hash] :current_command The current command being executed, used to validate production
-      #   database initialization.
-      #
-      # @return [void] This method does not return a value; it initializes the `@db` instance variable.
-      #
-      # @raise [SystemExit] If invalid arguments are provided for production database initialization.
       def initialize_database(options)
         db_from_options = options[:database]
 
@@ -86,12 +92,6 @@ module Timet
       end
     end
 
-    def initialize(*args)
-      super
-      options = args[2] || {} # Third argument is the options hash
-      initialize_database(options)
-    end
-
     desc "start [tag] --notes='' --pomodoro=[min]",
          'Start time tracking for a task labeled with the provided [tag], notes and "pomodoro time"
         in minutes (optional).

data/lib/timet/block_char_helper.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Timet
+  #
+  # The BlockCharHelper module provides a utility method for getting the block character
+  # based on a given value.
+  #
+  module BlockCharHelper
+    # Character mapping for different time ranges
+    CHAR_MAPPING = {
+      0..120 => '_',
+      121..450 => ' ',
+      451..900 => '▂',
+      901..1350 => '▃',
+      1351..1800 => '▄',
+      1801..2250 => '▅',
+      2251..2700 => '▆',
+      2701..3150 => '▇',
+      3151..3600 => '█'
+    }.freeze
+
+    # Gets the block character for a given value
+    #
+    # @param [Integer, nil] value The value
+    # @return [String] The block character
+    def self.get_block_char(value)
+      return ' ' unless value
+
+      mapping = CHAR_MAPPING.find { |range, _| range.include?(value) }
+      mapping ? mapping.last : ' '
+    end
+  end
+end

data/lib/timet/item_data_helper.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Timet
+  # Helper methods for fetching item data.
+  module ItemDataHelper
+    module_function
+
+    # Fetches the start time of a tracking item.
+    #
+    # @param item [Array] The tracking item.
+    #
+    # @return [Integer] The start time in epoch format.
+    #
+    # @example Fetch the start time of a tracking item
+    #   fetch_item_start(item)
+    def fetch_item_start(item)
+      item[Timet::Application::FIELD_INDEX['start']]
+    end
+
+    # Fetches the end time of a tracking item.
+    #
+    # @param item [Array] The tracking item.
+    #
+    # @return [Integer] The end time in epoch format.
+    #
+    # @example Fetch the end time of a tracking item
+    #   fetch_item_end(item)
+    def fetch_item_end(item)
+      item[Timet::Application::FIELD_INDEX['end']] || TimeHelper.current_timestamp
+    end
+
+    # Fetches the end time of the tracking item before the current one.
+    #
+    # @param db [Timet::Database] The database instance.
+    # @param id [Integer] The ID of the current tracking item.
+    # @param item_start [Integer] The start time of the current tracking item.
+    #
+    # @return [Integer] The end time of the previous tracking item in epoch format.
+    #
+    # @example Fetch the end time of the previous tracking item
+    #   fetch_item_before_end(db, 1, 1633072800)
+    def fetch_item_before_end(db, id, item_start)
+      db.find_item(id - 1)&.dig(Timet::Application::FIELD_INDEX['end']) || item_start
+    end
+
+    # Fetches the start time of the tracking item after the current one.
+    #
+    # @param db [Timet::Database] The database instance.
+    # @param id [Integer] The ID of the current tracking item.
+    #
+    # @return [Integer] The start time of the next tracking item in epoch format.
+    #
+    # @example Fetch the start time of the next tracking item
+    #   fetch_item_after_start(db, id)
+    def fetch_item_after_start(db, id)
+      db.find_item(id + 1)&.dig(Timet::Application::FIELD_INDEX['start']) || TimeHelper.current_timestamp
+    end
+  end
+end

data/lib/timet/table.rb

@@ -2,6 +2,7 @@
 
 # require_relative 'color_codes'
 require 'timet/time_report_helper'
+require_relative 'utils'
 module Timet
   # This class is responsible for formatting the output of the `timet` application.
   # It provides methods for formatting the table header, separators, and rows.
@@ -123,7 +124,7 @@ module Timet
 
       block_hour = TimeHelper.count_seconds_per_hour_block(start_time, end_time, tag)
       date_line = TimeHelper.timestamp_to_date(start_time)
-      time_block[date_line] = add_hashes(time_block[date_line], block_hour)
+      time_block[date_line] = Timet::Utils.add_hashes(time_block[date_line], block_hour)
       time_block
     end
 

data/lib/timet/time_block_chart.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative 'week_info'
+require_relative 'block_char_helper'
+
 module Timet
   #
   # The TimeBlockChart class is responsible for generating and printing a visual representation
@@ -18,22 +21,18 @@ module Timet
   # @attr_reader [Integer] start_hour The starting hour of the time block
   # @attr_reader [Integer] end_hour The ending hour of the time block
   class TimeBlockChart
-    # Character mapping for different time ranges
-    CHAR_MAPPING = {
-      0..120 => '_',
-      121..450 => '▁',
-      451..900 => '▂',
-      901..1350 => '▃',
-      1351..1800 => '▄',
-      1801..2250 => '▅',
-      2251..2700 => '▆',
-      2701..3150 => '▇',
-      3151..3600 => '█'
-    }.freeze
-
     # Separator character for the chart
     SEPARATOR_CHAR = '░'
 
+    # Width of the date/week string content (e.g., "02 2023-10-01 Fri")
+    DATE_WEEK_CONTENT_WIDTH = 17
+
+    # Width of the '┆- ' part after the date/week string
+    DATE_WEEK_BORDER_WIDTH = 3
+
+    # Width of the total hours column including the border
+    TOTAL_HOURS_COLUMN_WIDTH = 4
+
     # Initializes a new TimeBlockChart instance.
     #
     # This method sets up the time block chart by processing the time entries from the provided table
@@ -50,8 +49,13 @@ module Timet
     # @see Table#process_time_entries
     def initialize(table)
       @time_block = table.process_time_entries(display: false)
-      @start_hour = @time_block.values.map(&:keys).flatten.uniq.min.to_i
-      @end_hour = @time_block.values.map(&:keys).flatten.uniq.max.to_i
+      hours = @time_block.values.map(&:keys).flatten.uniq
+      if hours.empty?
+        @start_hour = @end_hour = 0
+        return
+      end
+      @start_hour = hours.min.to_i
+      @end_hour   = hours.max.to_i
     end
 
     # Prints the time block chart.
@@ -59,13 +63,14 @@ module Timet
     # This method formats and prints the time block chart, including the header and the time blocks
     # for each entry. The chart is color-coded based on the provided color mapping for different tags.
     #
-    # @param table [Hash] The time block data to be displayed in the chart.
     # @param colors [Hash] A mapping of tags to colors, used to color-code the time blocks.
     # @return [void] This method does not return a value; it performs side effects such as printing the chart.
     #
     # @example Print a time block chart
+    #   # Assuming 'table' is an instance of Timet::Table
     #   chart = TimeBlockChart.new(table)
-    #   chart.print_time_block_chart(table, colors)
+    #   colors = { "work" => 0, "break" => 1 } # Example color mapping
+    #   chart.print_time_block_chart(colors)
     #
     # @note
     #   - The method first prints the header of the chart, which includes the time range.
@@ -74,9 +79,11 @@ module Timet
     #
     # @see #print_header
     # @see #print_blocks
-    def print_time_block_chart(table, colors)
+    def print_time_block_chart(colors)
+      return puts 'No time-block data to display.' if @no_data
+
       print_header
-      print_blocks(table, colors)
+      print_blocks(colors)
     end
 
     private
@@ -86,48 +93,64 @@ module Timet
     # @return [void]
     def print_header
       puts
-      print ' ' * 19
-      (@start_hour..@end_hour + 1).each { |hour| print format('%02d', hour).rjust(4) }
-      puts
-      puts '┌╴W ╴╴╴╴╴╴⏰╴╴╴╴╴╴┼'.gray + "#{'╴' * (@end_hour - @start_hour + 1) * 4}╴╴╴┼".gray
+      print_hours_row
+      # Dynamically build header using width constants
+      left = "┌#{'╴' * (DATE_WEEK_CONTENT_WIDTH - 11)}"
+      week = 'W'.center(DATE_WEEK_BORDER_WIDTH, '╴')
+      clock = '⏰'.center(DATE_WEEK_BORDER_WIDTH + 4, '╴')
+      hours_width = (@end_hour - @start_hour + 1) * 4
+      hours = '╴' * hours_width
+      right = "#{'╴' * (TOTAL_HOURS_COLUMN_WIDTH - 1)}┼"
+      header = left.gray + week.gray + clock.gray + '┼'.gray + hours.gray + right.gray
+      puts header
     end
 
-    # Prints the time blocks for each date in the time block data.
+    # Prints the hours row in the header.
     #
-    # This method iterates over the time block data, formats and prints the date information,
-    # prints the time blocks for each date using the provided color mapping, and calculates
-    # and prints the total hours for each day. It also prints a footer at the end.
+    # @return [void]
+    def print_hours_row
+      left_margin = DATE_WEEK_CONTENT_WIDTH + DATE_WEEK_BORDER_WIDTH - 1
+      print ' ' * left_margin
+      (@start_hour..@end_hour).each { |hour| print format('%02d', hour).rjust(4) }
+      puts
+    end
+
+    # Prints the main body of the time block chart, including date rows and corresponding time blocks.
     #
-    # @param table [Hash] The time block data containing the time entries for each date.
-    # @param colors [Hash] A mapping of tags to colors, used to color-code the time blocks.
-    # @return [void] This method does not return a value; it performs side effects such as printing
-    #   the time blocks and related information.
+    # This method iterates over each date present in the `@time_block` instance variable,
+    # which is expected to be a hash mapping date strings to hourly time block data.
+    # For each date, it:
+    #   1. Displays week and date information using `WeekInfo`.
+    #   2. Prints the visual time blocks for the hours of the day using `#print_time_blocks`.
+    #   3. Calculates and prints the total hours logged for that day using `#calculate_and_print_hours`.
+    # After processing all dates, it prints a chart footer using `#print_footer`.
     #
-    # @example Print time blocks
-    #   chart = TimeBlockChart.new(table)
-    #   chart.print_blocks(table, colors)
+    # @param colors [Hash] A mapping of tags to color indices. This is used by `#print_time_blocks`
+    #   to color-code the visual time blocks. Example: `{ "work" => 0, "break" => 1 }`
+    # @return [void] This method does not return a value; it prints directly to the console.
     #
     # @note
-    #   - The method skips processing if the `table` parameter is `nil`.
-    #   - For each date in the time block data, it formats and prints the date and day of the week.
-    #   - It prints the time blocks using the provided color mapping to visually distinguish
-    #     between different tags.
-    #   - It calculates and prints the total hours for each day.
-    #   - A footer is printed at the end to provide a visual separation.
+    #   - This is a private method, primarily called by `#print_time_block_chart`.
+    #   - It returns early if `@time_block` is `nil`. If `@time_block` is an empty hash,
+    #     no date-specific rows are printed, but the chart footer is still rendered.
+    #   - Relies on `@start_hour` and `@end_hour` instance variables being correctly set
+    #     during the `TimeBlockChart`'s initialization.
     #
-    # @see #format_and_print_date_info
+    # @see WeekInfo#format_and_print_date_info
     # @see #print_time_blocks
     # @see #calculate_and_print_hours
     # @see #print_footer
-    def print_blocks(table, colors)
-      return unless table
+    def print_blocks(colors)
+      return unless @time_block
 
       weeks = []
-      @time_block.each_key do |date_string|
-        date = Date.parse(date_string)
-        day = date.strftime('%a')[0..2]
+      @time_block.keys.sort.each do |date_string| # ISO-date strings sort naturally
+        date_object = Date.parse(date_string)
+        day = date_object.strftime('%a')[0..2]
 
-        format_and_print_date_info(date_string, day, weeks)
+        week_info = WeekInfo.new(date_object, date_string, weeks)
+        print_inter_week_separator if week_info.needs_inter_week_separator?
+        week_info.format_and_print_date_info(day)
 
         time_block_initial = @time_block[date_string]
         print_time_blocks(time_block_initial, colors)
@@ -148,62 +171,6 @@ module Timet
       puts
     end
 
-    # Formats and prints the date information
-    #
-    # @param [String] date_string The date string
-    # @param [String] day The day of the week
-    # @param [Array] weeks The list of weeks
-    # @return [void]
-    def format_and_print_date_info(date_string, day, weeks)
-      weekend = date_string
-      day = day.red if %w[Sa Su].include?(day)
-      weekend = weekend.red if %w[Sa Su].include?(day)
-
-      week = format_and_print_week(date_string, weeks)
-
-      print '┆'.gray + "#{week} #{weekend} #{day}" + '┆- '.gray
-    end
-
-    # Formats and prints the week information
-    #
-    # @param [String] date_string The date string
-    # @param [Array] weeks The list of weeks
-    # @return [String] The formatted week string
-    def format_and_print_week(date_string, weeks)
-      week, current_index = determine_week(date_string, weeks)
-      print_separator(week, current_index)
-      week
-    end
-
-    # Determines the week for a given date
-    #
-    # @param [String] date_string The date string
-    # @param [Array] weeks The list of weeks
-    # @return [Array] The week string and current index
-    def determine_week(date_string, weeks)
-      weeks << Date.parse(date_string).cweek
-      current_index = weeks.size - 1
-      current_week = weeks[current_index]
-      week = if current_week == weeks[current_index - 1] && current_index.positive?
-               '  '
-             else
-               format('%02d', current_week).to_s.underline
-             end
-      [week, current_index]
-    end
-
-    # Prints the separator line
-    #
-    # @param [String] week The week string
-    # @param [Integer] current_index The current index
-    # @return [void]
-    def print_separator(week, current_index)
-      return unless week != '  ' && current_index.positive?
-
-      sep = SEPARATOR_CHAR
-      puts "┆#{sep * 17}┼#{sep * (@end_hour - @start_hour + 1) * 4}#{sep * 3}┼#{sep * 4}".gray
-    end
-
     # Prints the footer of the chart
     #
     # @return [void]
@@ -234,7 +201,7 @@ module Timet
       formatted_hour = format('%02d', hour)
       hour_data = time_block_initial[formatted_hour]
       tag = hour_data&.last
-      [tag, get_block_char(hour_data&.first)]
+      [tag, BlockCharHelper.get_block_char(hour_data&.first)]
     end
 
     # Prints the colored block character
@@ -250,14 +217,21 @@ module Timet
       print colored_block.rjust(4)
     end
 
-    # Gets the block character for a given value
+    # Prints the separator line between different weeks in the chart.
     #
-    # @param [Integer, nil] value The value
-    # @return [String] The block character
-    def get_block_char(value)
-      return ' ' unless value
-
-      CHAR_MAPPING.find { |range, _| range.include?(value) }&.last || ' '
+    # @return [void]
+    def print_inter_week_separator
+      sep = SEPARATOR_CHAR
+      line_parts = [
+        '┆',
+        sep * DATE_WEEK_CONTENT_WIDTH,                # Date/Week column fill
+        '┼',
+        sep * (@end_hour - @start_hour + 1) * 4,      # Hour blocks column fill
+        sep * DATE_WEEK_BORDER_WIDTH,                 # Additional fill for hour blocks column
+        '┼',
+        sep * TOTAL_HOURS_COLUMN_WIDTH                # Total hours column fill
+      ]
+      puts line_parts.join.gray
     end
   end
 end

data/lib/timet/time_helper.rb

@@ -247,5 +247,22 @@ module Timet
     def self.beginning_of_day(time = Time.now)
       Time.new(time.year, time.month, time.day)
     end
+
+    # Creates a new datetime object.
+    #
+    # @param base_date_time [Time] The base date and time.
+    # @param parsed_time_component [Time] The parsed time component.
+    #
+    # @return [Time] The new datetime object.
+    def self.create_new_datetime(base_date_time, parsed_time_component)
+      Time.new(
+        base_date_time.year,
+        base_date_time.month,
+        base_date_time.day,
+        parsed_time_component.hour,
+        parsed_time_component.min,
+        parsed_time_component.sec
+      )
+    end
   end
 end

data/lib/timet/time_report.rb

@@ -81,16 +81,16 @@ module Timet
     #   - A time block chart is generated and printed using the `TimeBlockChart` class.
     #   - The tag distribution is calculated and displayed based on the unique colors assigned to tags.
     #
-    # @see #table
-    # @see #print_time_block_chart
-    # @see #tag_distribution
+    # @see Timet::Table#table For table generation.
+    # @see Timet::TimeBlockChart#print_time_block_chart For chart generation.
+    # @see #tag_distribution For tag statistics display.
     def display
       return puts 'No tracked time found for the specified filter.' if @items.empty?
 
       @table.table
       colors = @items.map { |x| x[3] }.uniq.each_with_index.to_h
       chart = TimeBlockChart.new(@table)
-      chart.print_time_block_chart(@table, colors)
+      chart.print_time_block_chart(colors)
       tag_distribution(colors)
     end
 
@@ -150,7 +150,7 @@ module Timet
     #   write_csv_rows(csv)
     def write_csv_rows(csv)
       items.each do |item|
-        csv << format_item(item)
+        csv << Timet::Utils.format_item(item)
       end
     end
 
@@ -166,10 +166,10 @@ module Timet
     #
     # @note The method filters the items based on the specified date range and tag.
     def filter_items(filter, tag)
-      if date_ranges.key?(filter)
-        start_date, end_date = date_ranges[filter]
+      if Timet::Utils.date_ranges.key?(filter)
+        start_date, end_date = Timet::Utils.date_ranges[filter]
         filter_by_date_range(start_date, end_date, tag)
-      elsif valid_date_format?(filter)
+      elsif Timet::Utils.valid_date_format?(filter)
         start_date, end_date = filter.split('..').map { |x| Date.parse(x) }
         filter_by_date_range(start_date, end_date, tag)
       else
@@ -226,7 +226,7 @@ module Timet
         return key if values.include?(filter)
       end
 
-      return filter if filter && valid_date_format?(filter)
+      return filter if filter && Timet::Utils.valid_date_format?(filter)
 
       'today'
     end