opening_hours_converter 1.17.0 → 1.17.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/opening_hours_converter/opening_hours_rule.rb +12 -8
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6f70ce419dfddf5bc7f0ab1e7664578c13e2e22825dbde71614db3221d381eb9
|
|
4
|
+
data.tar.gz: 1b9a4d92489948a7d8ba03a5c0887063b3db5fcc7359c0648829e7e67459c9b9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1c2e74b142261d6edf229427dd267cfb2b7e67de3db8f2137a9ac8c92fd4df6f17c253a792a2b2b8072528f48e4b4c3f2482abaac589fd5085c8fea924e7868
|
|
7
|
+
data.tar.gz: d69ac57744b20bdb256e98cee020a52fb51cf7ccf1d6fb12ad388e93e6c309bf5ba8e80201720235ba3071ae7fa0fcf9d026b0f7b54ced0a854eab0bcab5ddba
|
|
@@ -124,7 +124,11 @@ module OpeningHoursConverter
|
|
|
124
124
|
month_start = -1
|
|
125
125
|
day_start = -1
|
|
126
126
|
elsif !day_bool && year_start >= 0
|
|
127
|
-
|
|
127
|
+
# A run left open on Dec 31 (the next year is in the array) and
|
|
128
|
+
# closed on Jan 1 ended on Dec 31 of the year before, not of this
|
|
129
|
+
# one: "2025 Dec 31" merged with "2026 May 13" must not come out
|
|
130
|
+
# as "2025 Dec 31-2026 Dec 31".
|
|
131
|
+
end_year = day == 0 && month == 0 ? year - 1 : year
|
|
128
132
|
|
|
129
133
|
end_res = if day == 0
|
|
130
134
|
if month == 0
|
|
@@ -136,15 +140,15 @@ module OpeningHoursConverter
|
|
|
136
140
|
{ day: day - 1, month: month }
|
|
137
141
|
end
|
|
138
142
|
|
|
139
|
-
if year_start ==
|
|
140
|
-
result[
|
|
141
|
-
result[
|
|
143
|
+
if year_start == end_year
|
|
144
|
+
result[end_year] ||= []
|
|
145
|
+
result[end_year] << { start: { day: day_start, month: month_start }, end: end_res }
|
|
142
146
|
else
|
|
143
147
|
result['multi_year'] ||= {}
|
|
144
|
-
result['multi_year']["#{year_start}-#{
|
|
145
|
-
end_res[:year] =
|
|
146
|
-
result['multi_year']["#{year_start}-#{
|
|
147
|
-
|
|
148
|
+
result['multi_year']["#{year_start}-#{end_year}"] ||= []
|
|
149
|
+
end_res[:year] = end_year
|
|
150
|
+
result['multi_year']["#{year_start}-#{end_year}"] << { start: { day: day_start, month: month_start, year: year_start },
|
|
151
|
+
end: end_res }
|
|
148
152
|
end
|
|
149
153
|
year_start = -1
|
|
150
154
|
month_start = -1
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: opening_hours_converter
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.17.
|
|
4
|
+
version: 1.17.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Publidata
|
|
8
8
|
bindir: bin
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date:
|
|
10
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: json
|
|
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
114
114
|
- !ruby/object:Gem::Version
|
|
115
115
|
version: '0'
|
|
116
116
|
requirements: []
|
|
117
|
-
rubygems_version: 3.6.
|
|
117
|
+
rubygems_version: 3.6.9
|
|
118
118
|
specification_version: 4
|
|
119
119
|
summary: Datetime range to opening hours, opening hours to datetime range
|
|
120
120
|
test_files: []
|