opening_hours_converter 1.13.11 → 1.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429a62958899aeaee2bc229201b32db3f8e5c71ba3de00b35979f8d7f600051e
-  data.tar.gz: 7f408d609dc038324dc31edfe72d306321e3cf87cb3fe6889524777a576c6865
+  metadata.gz: 6f7598eeb7cb6738f017cf1a785eb5afddcc90717575a5a489d3c4d797579988
+  data.tar.gz: 7ec00410febbdb1faa8c801dc23d1ab826a5d36035a449bfcd5df96475391ae0
 SHA512:
-  metadata.gz: 7cbfcce4281b812116366f14d4ae9f28b421182d462373dcd40366cf7e95a4da71479e6d8809ebf230b2143d89d654213406686254e7de98e4bc3564d0f3ac9c
-  data.tar.gz: 6e54d189cccf398a083e2283cffe41591ec3519a67dad77d92c8901504cf6284183a9e73b3b6e65c382c9a7a8c22916c9ad46467a9fdd462e8506888c52616dc
+  metadata.gz: 39efeed6fd42120adb95e32505c5654bc8ddea7471d612aea2f1051856b20dcdda5bced0678374c09f9c9f9c922dab8c3b755719fba6610d84b8bb1c40c7c9c1
+  data.tar.gz: b5d8e74cb8320c6d97a6690a8969bc5fafebef332c14885712321c37a49265c676eec278c9727497df0695fad7f0b52afda0e1118cf8415166c27dd796864661

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -445,6 +445,7 @@ module OpeningHoursConverter
       else
         month_to = nil
       end
+
       { from_day: month_from, to_day: month_to }
     end
 
@@ -550,25 +551,36 @@ module OpeningHoursConverter
     def get_multi_month(wrs)
       wrs.split(',').map do |wr|
         if wr.include?('-')
-          start_month, end_month = wr.split('-')
+          start_month_day, end_month_day = wr.split('-')
+
+          start_month = start_month_day[0...3]
+          start_day = start_month_day[4...start_month_day.length]&.to_i
+
+          end_month = end_month_day[0...3]
+          end_day = end_month_day[4...end_month_day.length]&.to_i
+
           from = {
             month: OSM_MONTHS.find_index(start_month) + 1,
-            day: 1
+            day: start_day || 1
           }
           to = {
             month: OSM_MONTHS.find_index(end_month) + 1,
-            day: MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
+            day: end_day || MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
           }
         else
+          month = wr[0...3]
+          day = wr[4...wr.length]&.to_i
+
           from = {
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
-            day: 1
+            month: OSM_MONTHS.find_index(month) + 1,
+            day: day || 1
           }
           to = {
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
-            day: MONTH_END_DAY[OSM_MONTHS.find_index(wr[0...3])]
+            month: OSM_MONTHS.find_index(month) + 1,
+            day: day || MONTH_END_DAY[OSM_MONTHS.find_index(month)]
           }
         end
+
         { from_day: from, to_day: to }
       end
     end

data/lib/opening_hours_converter/regex_handler.rb

@@ -178,7 +178,20 @@ module OpeningHoursConverter
     end
 
     def multi_month_regex
-      compile(line(potential_list(potential_range(month))))
+      compile(
+        line(
+          potential_list(
+            potential_range(
+              month +
+              potential(
+                group(
+                  space, potential_range(month_day)
+                )
+              )
+            )
+          )
+        )
+      )
     end
 
     def week_value_regex

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.11
+  version: 1.13.12
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json