opening_hours_converter 1.13.13 → 1.13.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e29118b6122f0fc757389c3ce244c801abea8f3122d335ab6263f6bce8666d3c
-  data.tar.gz: 6aae2c87f2b7a50c9bb7545d3f2d25f923bd367519c175abb56bcb8a88e19656
+  metadata.gz: 126d84dc400e0d1a210158d8cf895e6fc6dafabaa6416bab76d19dd57f6bca09
+  data.tar.gz: ea518a29469f84000cc7e125019d35ca97301298e80653372b40d6c7d96a6050
 SHA512:
-  metadata.gz: 5c7d01fc34eefa92f860a35f5bd6dab8f5916b64fd29aa07cb1b9a472a9b383a18d6c5eb96a2e74c29a1a0e2f593e449ac2852a0f095226dc8cf27715567cbe0
-  data.tar.gz: '09790d8bd019f108e65714b546a62d8c82d706d17289f1a90eb616b1d68e9472c545470d33ca784c3fc6662e4d8337762abeb1a4476bbd38cb0dbd1038e2f1b0'
+  metadata.gz: 6b3bcdd4fc3f18da1548a87a4e830f707305be50f627e8980a19dd62bcfc84557bc98d5c2689d6f1d41b48695403d11f186995a9d521655b62d5afce99b47524
+  data.tar.gz: 8afaf0fcaeee00d501274e88320e70590c9f688bb3a8b7d463cf5374d48fb9cc8a25ae8be04772c2487c481aa2cd2f2ab8e080c7cd147edc1df83fa64db39176

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

@@ -130,8 +130,6 @@ module OpeningHoursConverter
           end
         end
 
-        raise ParseError, 'Unreadable string' if @current_token == tokens.length - 1
-
         # puts "weekdays : #{weekdays}"
         # puts "weeks : #{weeks}"
         # puts "months : #{months}"

data/lib/opening_hours_converter/tokens_handler.rb

@@ -286,7 +286,7 @@ module OpeningHoursConverter
               break
             end
 
-            if current_token.hyphen? || current_token.weekday_modifier?
+            if current_token.hyphen? || current_token.comma? || current_token.weekday_modifier?
               value, made_from, type = add_current_token_to(value, type, made_from)
               next
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.13
+  version: 1.13.16
 platform: ruby
 authors:
 - Ziserman Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2022-06-24 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: []