opening_hours_converter 1.13.9 → 1.13.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 934c7bb88ac5fcf73e4a213c82f7f84fea36cb88c68534cb409d14ff2272df0b
-  data.tar.gz: cdfa07abc240fb6399605108f5ab6cf3fefd75b19e08590c230fa2e1983c28df
+  metadata.gz: '00159189d902d1f186853f6ec21e6547f519a4aa287f1345207726c407544c73'
+  data.tar.gz: 811ea32145a84b1d223ed273eb24ce3780f93cbacd968444eaec97c7c8761792
 SHA512:
-  metadata.gz: 8524fbb0d76e45c5e0173f7df2c0a31b17edbeddd501c9c476de7171a6e20463962ed049e04b3562cc9cd0f471dee65f2c679f97c96657750b77c8c9f4e1a155
-  data.tar.gz: 5f09e6388c2b64b7b9e0ae0887b30226d98af045d4b9c43294ceb3dc34a5ecf4a092e16a644923aadba30ba52dc7e7f7e319804b7825c55ba75fde403f687363
+  metadata.gz: f551d277daa96358792f80c6535a170155d27c6e030466ba7e834882f4b7cb1c8e7397af72e64ee6e22c5dfe3dd92426041ce7c133234e3afd69d6826c21cfbc
+  data.tar.gz: 4eb66cd74374778dd58727d3e77d1c6293e878f6d1621d262636895f212bc92deee4e0b62e966df37c2b64f9cd37961e86d1cbef0cb917d0740f3c19609ab746

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
 
@@ -502,7 +519,7 @@ module OpeningHoursConverter
       year = wrs[0...4]
 
       wrs.split(',').map.with_index do |wr|
-        if wr.start_with?(/#{@regex_handler.year}/)
+        if wr =~ /^#{@regex_handler.year}/
           year = wr[0...4]
           wr = wr[5...wr.length]
         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.9
+  version: 1.13.14
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json