opening_hours_converter 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b1ec5df06c6fa350ef3f78ca1efdbb6af0216480eec1e7129904dac1f65b8e
-  data.tar.gz: 9d901bd13d924eaa2a8443ee0f32275f03f11ba177e58f97f9ff859f343e1f9b
+  metadata.gz: 684e901a145245d2884ed3cb350d887385efc2b39cc8402e2251216f3a49ff9d
+  data.tar.gz: a51144324b7af7a323b25a6634c8f8e5e3edcfcdbeb12ca1ad2b50ac3d830488
 SHA512:
-  metadata.gz: 04f05233c1e51890dc7cfc5afe399545de551f5ed6df678a2f5d1ecdfa7d20e5834c33178c32611ce4e47cd5f5f1c40f965b88fd85a589b30965eef6a2d81c35
-  data.tar.gz: 46038f7958a837a89f9e25663a11a947eceed03394a63f11e7ce8d4d15bfe57aca8f33709df66360172001686a3a356d75cae194708f2a2b7c7da4baa11c134f
+  metadata.gz: ef452a46a37394b827a8e8c36e7ecfb1b2d40cc3d8da4461730a933c81aea679ed4ddc40d486563c7fa37834899d4d385786b9792ac850f3c14c369bbdcc5e68
+  data.tar.gz: d3db0f40cee5804148039f76a662de2ff4696f7986365f9875007899a6f2ff733d845e1682f0c890c74cb0a9c6618e3776825036695cdcb32ea55d0862d2ed55

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -27,6 +27,7 @@ module OpeningHoursConverter
       @RGX_YEAR_WEEK = /^(\d{4})(\-(\d{4}))? week ([01234]?[0-9]|5[0123])(\-([01234]?[0-9]|5[0123]))?(, ?([01234]?[0-9]|5[0123])(\-([01234]?[0-9]|5[0123]))?)*\:?$/
       @RGX_YEAR_WEEK_WITH_MODIFIER = /^(\d{4})(\-(\d{4}))? week ([01234]?[0-9]|5[0123])(\-([01234]?[0-9]|5[0123])(\/[1-9])?)?(, ?([01234]?[0-9]|5[0123])(\-([01234]?[0-9]|5[0123])(\/[1-9])?)?)*$/
       @RGX_YEAR_MONTH_DAY = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01])(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) )?([012]?[0-9]|3[01]))?\:?$/
+      @RGX_YEAR_MULTI_MONTH_DAY = /^(\d{4}) ((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01]),?)*?$/
       @RGX_YEAR_MONTH = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)))?\:?$/
       @RGX_COMMENT = /^\"[^\"]*\"$/
     end
@@ -130,6 +131,8 @@ module OpeningHoursConverter
               months << get_month(wide_range_selector)
             elsif !(@RGX_YEAR =~ wide_range_selector).nil?
               years << get_year(wide_range_selector)
+            elsif !(@RGX_YEAR_MULTI_MONTH_DAY =~ wide_range_selector).nil?
+              months += get_year_multi_month_day(wide_range_selector)
             elsif !(@RGX_YEAR_WEEK_WITH_MODIFIER =~ wide_range_selector).nil?
               weeks << get_year_week_with_modifier(wide_range_selector)
             elsif !(@RGX_YEAR_WEEK =~ wide_range_selector).nil?
@@ -512,6 +515,20 @@ module OpeningHoursConverter
       { from_day: year_month_day_from, to_day: year_month_day_to }
     end
 
+    def get_year_multi_month_day(wrs)
+      year = wrs[0...4]
+      wrs = wrs[5..wrs.length]
+
+      wrs.split(',').map do |wr|
+        from = {
+          year: year.to_i,
+          month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+          day: wr[4...wr.length].to_i
+        }
+        { from_day: from, to_day: from }
+      end
+    end
+
     def get_times(time_selector)
       times = []
       from = nil
@@ -791,6 +808,9 @@ module OpeningHoursConverter
     def is_year_week_with_modifier?(token)
       !(@RGX_YEAR_WEEK_WITH_MODIFIER =~ token).nil?
     end
+    def is_year_multi_month_day?(token)
+      !(@RGX_YEAR_MULTI_MONTH_DAY =~ token).nil?
+    end
   end
 end
 

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -168,6 +168,7 @@ module OpeningHoursConverter
             end
         end
         str_result += local_str
+        local_str = ''
       else
         result.each do |selector, intervals|
           if selector == 'always'
@@ -215,6 +216,7 @@ module OpeningHoursConverter
                 local_str += "#{local_str.length > 5 ? ',' : ''}#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}-#{selector} #{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day] + 1 < 10 ? "0#{interval[:end][:day] + 1}" : interval[:end][:day] + 1}"
               end
               str_result += "#{!str_result.empty? ? ',' : ''}#{local_str}"
+              local_str = ''
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json