opening_hours_converter 1.13.5 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f54fd5ddf40e3463f208523f3e4df1583a28157b1b4102c5c972e44b45f6789c
-  data.tar.gz: 63e8c1117bd05c79e58144815c89235f0ec8088b817a78e45f25feaf62dcf0f3
+  metadata.gz: '08d64cb65cb3b261526debe5bbac2139dc2d18ccfea137eeceaddb5c221a7a09'
+  data.tar.gz: a6553952b6ea0c7d3f0e87f916a315c7ab9f022bb5c8cb58accae49a32f8d283
 SHA512:
-  metadata.gz: 8a4ad268e1c8c0f8e2e12bcf8b523eab79c59a910b41ce2c1c6c7f052359b34e9ecee1f63c541191104bd605a2efafc9637e9169804e5046b92339d14d623f18
-  data.tar.gz: 26114741c15bc0f79f9722526e7f2acbb91fa9baecb00d8bbf9b4b90a03d8b6a2dd956937bc4b989f27273c4142afa1351fef338a26bb7f63db4db9cdf0d7025
+  metadata.gz: 7467758597633280c3863cead517d31fa18ad63dbaf8fca05d5236da2d63001e360ba3ade52f054774436da8e14787fd02e5af330007cebeebc152a96359732e
+  data.tar.gz: 348168fd8f07315a942162d8313736f8237a196e4fdc84ed150812d0751aa83344c0740fa5330ef59b5499bd6857793ed001625e1c4f56c020c0d28a60138104

data/lib/opening_hours_converter/week_index.rb

@@ -6,6 +6,20 @@ module OpeningHoursConverter
     include Constants
     extend Utils
 
+    def self.weeks_from_index(array_of_indexes, year = Time.now.year)
+      array_of_indexes.flat_map do |index_or_range|
+        if index_or_range.is_a?(Hash)
+          index_or_range[:from].step(index_or_range[:to], index_or_range[:modifier]).map do |index|
+            week_from_index(index, year)
+          end
+        elsif index_or_range.is_a?(Integer)
+          week_from_index(index_or_range, year)
+        else
+          raise ArgumentError, "#{index_or_range} in #{array_of_indexes} is neither an integer nor a Hash"
+        end
+      end
+    end
+
     def self.week_from_index(index, year = Time.now.year)
       raise unless index >= 1
 

data/lib/opening_hours_converter/year.rb

@@ -230,8 +230,7 @@ module OpeningHoursConverter
         for year in (DateTime.now.year)..(DateTime.now.year + 1)
           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)
+            WeekIndex.weeks_from_index(wide_interval.indexes, year).each do |interval|
               (interval[:from]..interval[:to]).each do |day|
                 years[year][day.month - 1][day.day - 1] = true
               end
@@ -373,8 +372,7 @@ module OpeningHoursConverter
         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)
+        WeekIndex.weeks_from_index(wide_interval.indexes, year).each do |interval|
           (interval[:from]..interval[:to]).each do |day|
             years[year][day.month - 1][day.day - 1] = true
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.6
 platform: ruby
 authors:
 - Ziserman Martin