opening_hours_converter 1.13.14 → 1.13.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/opening_hours_converter/iterator.rb +15 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz: '
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '0285111a830dec3522015740cb47bd369ae2b380e98d61cdf7b1cb5f28bc63ee'
|
|
4
|
+
data.tar.gz: c5a861db86278d886e244b48079eaf1e82cac515a96adffc1585c7b5df380c2a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 45727f1c510fd1411d3731a0dee6dc7e20cb352b35aeaafe4caea3293f23dbb29d7e3e83263f41e75f4d7621aaddc7e00179da6986379398b96f3730d64844c5
|
|
7
|
+
data.tar.gz: 70d2591cf15c348db93be5fb90fc6362c6ed4c6373918af3dbfd680cab23b8e8a301dbaaeb6caec8727c9fd256498fc0b8428822d00aa44747d96c27f411a6eb
|
|
@@ -68,8 +68,20 @@ module OpeningHoursConverter
|
|
|
68
68
|
is_ph = false
|
|
69
69
|
year = nil
|
|
70
70
|
year_ph = nil
|
|
71
|
-
date_ranges.each do |
|
|
72
|
-
is_ph = true if
|
|
71
|
+
date_ranges.each do |date_range|
|
|
72
|
+
is_ph = true if date_range.is_holiday?
|
|
73
|
+
end
|
|
74
|
+
|
|
75
|
+
date_ranges = date_ranges.flat_map do |date_range|
|
|
76
|
+
if date_range.wide_interval.type == 'week' # Generate date range list from week syntax
|
|
77
|
+
date_range.wide_interval.to_day.map do |day|
|
|
78
|
+
day_range = date_range.dup
|
|
79
|
+
day_range.update_range(day)
|
|
80
|
+
day_range
|
|
81
|
+
end
|
|
82
|
+
else
|
|
83
|
+
date_range
|
|
84
|
+
end
|
|
73
85
|
end
|
|
74
86
|
|
|
75
87
|
date_ranges_array = get_iterator(date_ranges)
|
|
@@ -82,6 +94,7 @@ module OpeningHoursConverter
|
|
|
82
94
|
year = day.year
|
|
83
95
|
year_ph = PublicHoliday.ph_for_year(year)
|
|
84
96
|
end
|
|
97
|
+
|
|
85
98
|
date_ranges[index].typical.intervals.each do |i|
|
|
86
99
|
next unless !i.nil? && !i.is_off
|
|
87
100
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: opening_hours_converter
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.13.
|
|
4
|
+
version: 1.13.15
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ziserman Martin
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-09-
|
|
11
|
+
date: 2020-09-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: json
|