opening_hours_converter 1.13.8 → 1.13.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 246bb142155bcbb71be257921ab532cab3db6a7a266e141d63d8a5a7ddd45ddc
-  data.tar.gz: 625fda5fdacbd0d87010df460b46113de0307c9fdbf3b646f66863c8d958f909
+  metadata.gz: e29118b6122f0fc757389c3ce244c801abea8f3122d335ab6263f6bce8666d3c
+  data.tar.gz: 6aae2c87f2b7a50c9bb7545d3f2d25f923bd367519c175abb56bcb8a88e19656
 SHA512:
-  metadata.gz: 363ac0c2e07547bbcb68524bfd9c77e5e751062576baf4af0a8ba593e10fb2c24066d8e10a2b6f86516547fc6f394372e87bedc42dec1682be3bc0ba645cf374
-  data.tar.gz: f386100e7b74a1eaeebac6eb9c15a88255f7e6f9769e6b5a57a4f8afa4e19904ba7ee232bd4a923ffa3ddbcb5c269c1d471fce23620dbd1f0bc52ef03e266d80
+  metadata.gz: 5c7d01fc34eefa92f860a35f5bd6dab8f5916b64fd29aa07cb1b9a472a9b383a18d6c5eb96a2e74c29a1a0e2f593e449ac2852a0f095226dc8cf27715567cbe0
+  data.tar.gz: '09790d8bd019f108e65714b546a62d8c82d706d17289f1a90eb616b1d68e9472c545470d33ca784c3fc6662e4d8337762abeb1a4476bbd38cb0dbd1038e2f1b0'

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -107,7 +107,7 @@ module OpeningHoursConverter
             elsif !(@regex_handler.month_day_regex =~ wide_range_selector).nil?
               months << get_month_day(wide_range_selector)
             elsif !(@regex_handler.month_regex =~ wide_range_selector).nil?
-              months << get_month(wide_range_selector)
+              months += get_month(wide_range_selector)
             elsif !(@regex_handler.year_regex =~ wide_range_selector).nil?
               years << get_year(wide_range_selector)
             elsif !(@regex_handler.multi_month_regex =~ wide_range_selector).nil?
@@ -408,7 +408,23 @@ module OpeningHoursConverter
       else
         month_to = month_from
       end
-      { from: month_from, to: month_to }
+
+      if month_from > month_to
+        [
+          {
+            from: month_from,
+            to: 12
+          },
+          {
+            from: 1,
+            to: month_to
+          }
+        ]
+      else
+        [
+          { from: month_from, to: month_to }
+        ]
+      end
     end
 
     def get_month_day(wrs)
@@ -429,6 +445,7 @@ module OpeningHoursConverter
       else
         month_to = nil
       end
+
       { from_day: month_from, to_day: month_to }
     end
 
@@ -500,9 +517,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 =~ /^#{@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
@@ -531,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

@@ -163,6 +163,7 @@ module OpeningHoursConverter
         line(
           year + space +
           potential_list(
+            potential(year + space) +
             month +
             group(
               space, potential_range(month_day)
@@ -177,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

data/lib/opening_hours_converter/wide_interval.rb

@@ -53,25 +53,25 @@ module OpeningHoursConverter
       when 'day'
         if !@end.nil?
           if @start[:year] && !@end[:year] || @start[:year] && @start[:year] == @end[:year]
-            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
+            result = "Du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
           elsif @start[:year] && @end[:year] && @start[:year] != @end[:year]
-            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
+            result = "Du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
           elsif @start[:month] != @end[:month]
-            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]}"
+            result = "Du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]}"
           else
-            result = "le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]}"
+            result = "Le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]}"
           end
         else
-          result = "le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year] || ''}"
+          result = "Le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year] || ''}"
         end
       when 'month'
         if !@end.nil?
           if @start[:year] && !@end[:year] || @start[:year] && @start[:year] == @end[:year]
-            result = "de #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
+            result = "De #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
           elsif @start[:year] && @end[:year] && @start[:year] != @end[:year]
-            result = "de #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
+            result = "De #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
           else
-            result = "de #{IRL_MONTHS[@start[:month] - 1]} à #{IRL_MONTHS[@end[:month] - 1]}"
+            result = "De #{IRL_MONTHS[@start[:month] - 1]} à #{IRL_MONTHS[@end[:month] - 1]}"
           end
         else
           result = "#{IRL_MONTHS[@start[:month] - 1]}#{@start[:year] ? " #{@start[:year]}" : ''}"
@@ -85,17 +85,17 @@ module OpeningHoursConverter
       when 'holiday'
         result = if !@end.nil?
                    if !@start[:year]
-                     'jours fériés'
+                     'Jours fériés'
                    else
-                     "les jours fériés de #{@start[:year]} à #{@end[:year]}"
+                     "Les jours fériés de #{@start[:year]} à #{@end[:year]}"
                    end
                  elsif !@start[:year]
-                   'jours fériés'
+                   'Jours fériés'
                  else
-                   "les jours fériés de #{@start[:year]}"
+                   "Les jours fériés de #{@start[:year]}"
                  end
       when 'always'
-        result = 'tout le temps'
+        result = 'Toute l\'année'
       end
       result
     end

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.13
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-07-01 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