opening_hours_converter 1.13.10 → 1.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4bac3ea827b78a2d9b0435edcb108ba971f5805c4e812a8672a17ef0890d947
-  data.tar.gz: b710b6cad6691f9d7e53f18fdf394d7d1b6f64e2abefd2cfad7b3b327c14cc07
+  metadata.gz: '0285111a830dec3522015740cb47bd369ae2b380e98d61cdf7b1cb5f28bc63ee'
+  data.tar.gz: c5a861db86278d886e244b48079eaf1e82cac515a96adffc1585c7b5df380c2a
 SHA512:
-  metadata.gz: ee691bff32b678833ffe4e20b844a1a4b4beae8a4c05d6d81db5728cab926b75a72062d28c26d7d73d27c04c7b6144419fd0e5e013b048029eeb2d154a57446b
-  data.tar.gz: 5a80b17aecae55f6da6f3a418f9a61d63c6aa8d3a062c3c93243d8239974d535074c2774b13b2456da90f022355eaa8eb40e251a71010a19db68a1f778338242
+  metadata.gz: 45727f1c510fd1411d3731a0dee6dc7e20cb352b35aeaafe4caea3293f23dbb29d7e3e83263f41e75f4d7621aaddc7e00179da6986379398b96f3730d64844c5
+  data.tar.gz: 70d2591cf15c348db93be5fb90fc6362c6ed4c6373918af3dbfd680cab23b8e8a301dbaaeb6caec8727c9fd256498fc0b8428822d00aa44747d96c27f411a6eb

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

@@ -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
 
@@ -534,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

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

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.10
+  version: 1.13.15
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json