opening_hours_converter 1.13.4 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3aa4f100c0d94af234e082bb2bb80b023ae5abff4a1a6931243f8bd038c722c
-  data.tar.gz: 85e5efa4f22f7d9415a0f7f823a0cb1295d4b73e2949972d2a244c732f936b26
+  metadata.gz: f54fd5ddf40e3463f208523f3e4df1583a28157b1b4102c5c972e44b45f6789c
+  data.tar.gz: 63e8c1117bd05c79e58144815c89235f0ec8088b817a78e45f25feaf62dcf0f3
 SHA512:
-  metadata.gz: 1e59e894e699683857bdc242bb3d9225d94272ab23b97566a182f5278aff04a447b7a608a6bc5fd78bb25b9a0eb3d990d036361b3da9aa9208dfb67a741768eb
-  data.tar.gz: 2dda598800d025afe4a40363487efb07e6635cb5aebbd09b06640f7f24541619b2f5a02d24865f0bd7b2aa1235b27f9f7a9838e556aa87c405afbde212a5539d
+  metadata.gz: 8a4ad268e1c8c0f8e2e12bcf8b523eab79c59a910b41ce2c1c6c7f052359b34e9ecee1f63c541191104bd605a2efafc9637e9169804e5046b92339d14d623f18
+  data.tar.gz: 26114741c15bc0f79f9722526e7f2acbb91fa9baecb00d8bbf9b4b90a03d8b6a2dd956937bc4b989f27273c4142afa1351fef338a26bb7f63db4db9cdf0d7025

data/lib/opening_hours_converter/year.rb

@@ -24,6 +24,7 @@ module OpeningHoursConverter
           years = process_always_holiday(date_range.wide_interval, years)
         end
       end
+
       if !date_range.wide_interval.start.nil? && !date_range.wide_interval.start[:year].nil?
         if date_range.wide_interval.end.nil? || date_range.wide_interval.end[:year].nil? || date_range.wide_interval.start[:year] == date_range.wide_interval.end[:year]
           if !years[date_range.wide_interval.start[:year]].nil?
@@ -227,7 +228,15 @@ module OpeningHoursConverter
         end
       else
         for year in (DateTime.now.year)..(DateTime.now.year + 1)
-          if wide_interval.start.nil?
+          if wide_interval.type == 'week'
+            years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+            wide_interval.indexes.each do |week_index|
+              interval = WeekIndex.week_from_index(week_index, year)
+              (interval[:from]..interval[:to]).each do |day|
+                years[year][day.month - 1][day.day - 1] = true
+              end
+            end
+          elsif wide_interval.start.nil?
             years[year] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { true } }
           elsif !wide_interval.start[:day].nil?
             years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
@@ -362,6 +371,14 @@ module OpeningHoursConverter
             end
           end
         end
+      elsif wide_interval.type == "week"
+        year = wide_interval.start&.dig(:year) || Time.now.year # can't process weeks with undefined year
+        wide_interval.indexes.each do |week_index|
+          interval = WeekIndex.week_from_index(week_index, year)
+          (interval[:from]..interval[:to]).each do |day|
+            years[year][day.month - 1][day.day - 1] = true
+          end
+        end
       elsif wide_interval.type == "day"
         if wide_interval.end.nil? || !wide_interval.end.nil? && wide_interval.start[:month] == wide_interval.end[:month]
           if wide_interval.end.nil? || !wide_interval.end.nil? && wide_interval.start[:day] == wide_interval.end[:day]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.5
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json