opening_hours_converter 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9c36ae7cf29f7c3cc90f3fa56a1b24f3294b9201356bb3c7cecf5319857343
-  data.tar.gz: 34079e2a3f1dbb735d5e07f9aab3a62d726cf0f7f88de29e86235a73462c5a4a
+  metadata.gz: e8c4565d4b2ec3935fb6ca2b3e79375d9bf3a673b10227b4555bfea65e1b6af8
+  data.tar.gz: 3b783952f44dfe2eebb2af35f395d9882c56e88e95286ce7f06b8622a9c48e00
 SHA512:
-  metadata.gz: 68a659bdff345013b1c2e00df196725024792536e87b92b586c46e286f2bb8baab856d2c91564feb22c6d0969f26a1a5f781adf42e7d8f78659e3b1ef008e6e0
-  data.tar.gz: 8f977df19ce9fe13547f5215320b1a699ee1bf40a6b2e804865b9b9aba15e8dbe74eb5ac3c0f608f76010b6768b381c0f09fa537247be8fd31c78a611eb9a10a
+  metadata.gz: b3f1610f8e8ce1d8ec8aad0fb2d6c6cf55262b7a12711f3fe6eed54272f7c7faf2ae71da24dd7adec516478015884a46edf04c0ee174d8739e25106cae88b6da
+  data.tar.gz: 63e8f01a0f42038315aef4054bcc9060def0b3cb98f269f40d767ef36abf946d06708e037b7f57217a7ba8c92993498075013e218cb4bc3ea3d2f0837552909b

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -27,7 +27,8 @@ 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_MULTI_MONTH_DAY = /^(\d{4}) ((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)( ([012]?[0-9]|3[01])(-([012]?[0-9]|3[01]))?)?,? ?)*?$/
+      @RGX_YEAR_MULTI_MONTH = /^(\d{4}) ((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec),? ?)*?$/
       @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
@@ -131,6 +132,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 =~ wide_range_selector).nil?
+              months += get_year_multi_month(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?
@@ -519,13 +522,48 @@ module OpeningHoursConverter
       year = wrs[0...4]
       wrs = wrs[5..wrs.length]
 
+      wrs.split(',').map do |wr|
+        month = wr[0...3]
+        days = wr[4...wr.length].split('-').reject { |e| e == '' }.map(&:to_i)
+        if days.length == 2
+          from = {
+            year: year.to_i,
+            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+            day: days[0]
+          }
+          to = {
+            year: year.to_i,
+            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+            day: days[1]
+          }
+          { from_day: from, to_day: to }
+        else
+          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
+    end
+
+    def get_year_multi_month(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
+          day: 1
+        }
+        to = {
+          year: year.to_i,
+          month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+          day: MONTH_END_DAY[OSM_MONTHS.find_index(wr[0...3])]
         }
-        { from_day: from, to_day: from }
+        { from_day: from, to_day: to }
       end
     end
 

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -172,30 +172,23 @@ module OpeningHoursConverter
       else
         result.each do |selector, intervals|
           if selector == 'always'
-            if end_before_start?(intervals)
-              end_interval = intervals.select { |interval| interval[:start][:day] == 0 && interval[:start][:month] == 0 }.first
-              start_interval = intervals.select { |interval| interval[:end][:day] == 30 && interval[:end][:month] == 11 }.first
+            intervals.each do |interval|
               str_result += ',' if !str_result.empty?
-              str_result += "#{OSM_MONTHS[start_interval[:start][:month]]} #{start_interval[:start][:day] + 1 < 10 ? "0#{start_interval[:start][:day] + 1}" : start_interval[:start][:day] + 1}-#{OSM_MONTHS[end_interval[:end][:month]]} #{end_interval[:end][:day] + 1 < 10 ? "0#{end_interval[:end][:day] + 1}" : end_interval[:end][:day] + 1}"
-            else
-              intervals.each do |interval|
-                str_result += ',' if !str_result.empty?
-                if is_full_year?(interval)
-                elsif starts_year?(interval) && ends_year?(interval)
-                  str_result += "#{interval[:start][:year]}-#{interval[:end][:year]}"
-                elsif is_full_month?(interval)
-                  str_result += (OSM_MONTHS[interval[:start][:month]]).to_s
-                elsif is_same_month?(interval)
-                  if is_same_day?(interval)
-                    str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}"
-                  else
-                    str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}-#{interval[:end][:day] + 1 < 10 ? "0#{interval[:end][:day] + 1}" : interval[:end][:day] + 1}"
-                  end
-                elsif starts_month?(interval) && ends_month?(interval)
-                  str_result += "#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
+              if is_full_year?(interval)
+              elsif starts_year?(interval) && ends_year?(interval)
+                str_result += "#{interval[:start][:year]}-#{interval[:end][:year]}"
+              elsif is_full_month?(interval)
+                str_result += (OSM_MONTHS[interval[:start][:month]]).to_s
+              elsif is_same_month?(interval)
+                if is_same_day?(interval)
+                  str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}"
                 else
-                  str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}-#{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day] + 1 < 10 ? "0#{interval[:end][:day] + 1}" : interval[:end][:day] + 1}"
+                  str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}-#{interval[:end][:day] + 1 < 10 ? "0#{interval[:end][:day] + 1}" : interval[:end][:day] + 1}"
                 end
+              elsif starts_month?(interval) && ends_month?(interval)
+                str_result += "#{OSM_MONTHS[interval[:start][:month]]}-#{OSM_MONTHS[interval[:end][:month]]}"
+              else
+                str_result += "#{OSM_MONTHS[interval[:start][:month]]} #{interval[:start][:day] + 1 < 10 ? "0#{interval[:start][:day] + 1}" : interval[:start][:day] + 1}-#{OSM_MONTHS[interval[:end][:month]]} #{interval[:end][:day] + 1 < 10 ? "0#{interval[:end][:day] + 1}" : interval[:end][:day] + 1}"
               end
             end
           elsif selector == 'multi_year'
@@ -232,15 +225,7 @@ module OpeningHoursConverter
       str_result.strip
     end
 
-    def end_before_start?(intervals)
-      intervals.length == 2 &&
-      intervals.one? { |interval| interval[:start][:day] == 0 && interval[:start][:month] == 0 } &&
-      intervals.one? { |interval| interval[:end][:day] == 30 && interval[:end][:month] == 11 }
-    end
-
     def is_only_week_interval?(r)
-      return false if r == {}
-
       r.all? do |year, intervals|
         intervals.all? do |interval|
           is_week_interval?(interval)

metadata

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