opening_hours_converter 1.13.8 → 1.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 246bb142155bcbb71be257921ab532cab3db6a7a266e141d63d8a5a7ddd45ddc
-  data.tar.gz: 625fda5fdacbd0d87010df460b46113de0307c9fdbf3b646f66863c8d958f909
+  metadata.gz: 934c7bb88ac5fcf73e4a213c82f7f84fea36cb88c68534cb409d14ff2272df0b
+  data.tar.gz: cdfa07abc240fb6399605108f5ab6cf3fefd75b19e08590c230fa2e1983c28df
 SHA512:
-  metadata.gz: 363ac0c2e07547bbcb68524bfd9c77e5e751062576baf4af0a8ba593e10fb2c24066d8e10a2b6f86516547fc6f394372e87bedc42dec1682be3bc0ba645cf374
-  data.tar.gz: f386100e7b74a1eaeebac6eb9c15a88255f7e6f9769e6b5a57a4f8afa4e19904ba7ee232bd4a923ffa3ddbcb5c269c1d471fce23620dbd1f0bc52ef03e266d80
+  metadata.gz: 8524fbb0d76e45c5e0173f7df2c0a31b17edbeddd501c9c476de7171a6e20463962ed049e04b3562cc9cd0f471dee65f2c679f97c96657750b77c8c9f4e1a155
+  data.tar.gz: 5f09e6388c2b64b7b9e0ae0887b30226d98af045d4b9c43294ceb3dc34a5ecf4a092e16a644923aadba30ba52dc7e7f7e319804b7825c55ba75fde403f687363

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -500,9 +500,12 @@ module OpeningHoursConverter
 
     def get_year_multi_month_day(wrs)
       year = wrs[0...4]
-      wrs = wrs[5..wrs.length]
 
-      wrs.split(',').map do |wr|
+      wrs.split(',').map.with_index do |wr|
+        if wr.start_with?(/#{@regex_handler.year}/)
+          year = wr[0...4]
+          wr = wr[5...wr.length]
+        end
         month = wr[0...3]
         days = wr[4...wr.length].split('-').reject { |e| e == '' }.map(&:to_i)
         if days.length == 2

data/lib/opening_hours_converter/regex_handler.rb

@@ -163,6 +163,7 @@ module OpeningHoursConverter
         line(
           year + space +
           potential_list(
+            potential(year + space) +
             month +
             group(
               space, potential_range(month_day)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.8
+  version: 1.13.9
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Datetime range to opening hours, opening hours to datetime range