opening_hours_converter 1.13.14 → 1.13.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00159189d902d1f186853f6ec21e6547f519a4aa287f1345207726c407544c73'
-  data.tar.gz: 811ea32145a84b1d223ed273eb24ce3780f93cbacd968444eaec97c7c8761792
+  metadata.gz: f84de92905d530dba2e826eea1a88045fb521cf5a24803f9f0b040574ae05ea4
+  data.tar.gz: a464fcc26ebe69fcd7cf8f88cfa992eea87c2c35453710e6f32b407a101c567b
 SHA512:
-  metadata.gz: f551d277daa96358792f80c6535a170155d27c6e030466ba7e834882f4b7cb1c8e7397af72e64ee6e22c5dfe3dd92426041ce7c133234e3afd69d6826c21cfbc
-  data.tar.gz: 4eb66cd74374778dd58727d3e77d1c6293e878f6d1621d262636895f212bc92deee4e0b62e966df37c2b64f9cd37961e86d1cbef0cb917d0740f3c19609ab746
+  metadata.gz: f287f0439e502deeac6fc574085526fdf83fb188412287ba025a87b948902ceaeaba3191e3300f866e76baa8530e9ca80150561e4f3ec3cab11c1de930f9b7d4
+  data.tar.gz: 28548d677e6e763fa1dbf676b8b7f5fd4f6e2c0f045276a8594231b51ecf7665dfebd7b4ff9683e414ca1d41ad180bdc8548b981b91262b1dc7faf7a12a913c5

data/lib/opening_hours_converter/iterator.rb

@@ -68,8 +68,20 @@ module OpeningHoursConverter
       is_ph = false
       year = nil
       year_ph = nil
-      date_ranges.each do |dr|
-        is_ph = true if dr.is_holiday?
+      date_ranges.each do |date_range|
+        is_ph = true if date_range.is_holiday?
+      end
+
+      date_ranges = date_ranges.flat_map do |date_range|
+        if date_range.wide_interval.type == 'week' # Generate date range list from week syntax
+          date_range.wide_interval.to_day.map do |day|
+            day_range = date_range.dup
+            day_range.update_range(day)
+            day_range
+          end
+        else
+          date_range
+        end
       end
 
       date_ranges_array = get_iterator(date_ranges)
@@ -82,6 +94,7 @@ module OpeningHoursConverter
               year = day.year
               year_ph = PublicHoliday.ph_for_year(year)
             end
+
             date_ranges[index].typical.intervals.each do |i|
               next unless !i.nil? && !i.is_off
 

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -48,7 +48,7 @@ module OpeningHoursConverter
         end
 
         # get state and time associated with weekdays
-        while @current_token >= 0 && (is_rule_modifier?(tokens[@current_token]) || is_time?(tokens[@current_token]))
+        while @current_token >= 0 && (is_rule_modifier?(tokens[@current_token]) || is_time?(tokens[@current_token])) || is_weekday?(tokens[@current_token])
           if is_rule_modifier?(tokens[@current_token])
             local_modifier = tokens[@current_token].downcase
             @current_token -= 1
@@ -72,6 +72,11 @@ module OpeningHoursConverter
               local_times.concat get_times(time_selector)
               @current_token -= 1
             end
+
+            if local_times.empty?
+              local_times.concat get_times("00:00-23:59")
+            end
+
             begin
               weekday_selector = tokens[@current_token]
               weekdays_and_holidays = get_weekdays(weekday_selector)
@@ -125,13 +130,12 @@ module OpeningHoursConverter
             elsif !(@regex_handler.week_regex =~ wide_range_selector).nil?
               weeks << get_week(wide_range_selector)
             else
+
               raise ParseError, "Unsupported selector #{wide_range_selector}"
             end
           end
         end
 
-        raise ParseError, 'Unreadable string' if @current_token == tokens.length - 1
-
         # puts "weekdays : #{weekdays}"
         # puts "weeks : #{weeks}"
         # puts "months : #{months}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.14
+  version: 1.13.17
 platform: ruby
 authors:
 - Ziserman Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,7 +100,7 @@ homepage: https://github.com/Publidata/opening_hours_converter
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Datetime range to opening hours, opening hours to datetime range
 test_files: []