opening_hours_converter 1.14.4 → 1.14.5
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 +13 -1
- 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: 6e2dd9ba463b1a9d5099d0aaff9d0e45ac2b64e9fe5d6c389f59a08536ae0db3
|
|
4
|
+
data.tar.gz: 908adadadb685f46a8f6350bde2270686fe5748646be7ce7aded1a1e98419e33
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0f2af7c3534b1d2c41f54e5ea2beb1db7361ae56d30a555cc220db0d192673cbcc27bd060a15aed7b42853a1d007f18cd66e0bb3a7cde12d09e4cbf384d9cdd7
|
|
7
|
+
data.tar.gz: eff0acc84f452cfa90512ca11e4e0c527a4222475ddb3feae7e442881c40fe590707a22c1b98a33fdecbc88e422d3fd5d84d1e71a8a2fefb5c89922d0a9dd52e
|
|
@@ -283,6 +283,7 @@ module OpeningHoursConverter
|
|
|
283
283
|
end
|
|
284
284
|
end
|
|
285
285
|
|
|
286
|
+
|
|
286
287
|
def same_date?(o)
|
|
287
288
|
if o.nil? || o.date.length != @date.length
|
|
288
289
|
false
|
|
@@ -295,12 +296,23 @@ module OpeningHoursConverter
|
|
|
295
296
|
end
|
|
296
297
|
|
|
297
298
|
def mergeable?(o)
|
|
298
|
-
if o.nil?
|
|
299
|
+
return true if o.nil?
|
|
300
|
+
|
|
301
|
+
if o.date.length != @date.length
|
|
302
|
+
if @date.any? { |date| date.wide_interval.type == "week" }
|
|
303
|
+
indexes = (@date + o.date).map do |date|
|
|
304
|
+
date.wide_interval.indexes
|
|
305
|
+
end.uniq
|
|
306
|
+
|
|
307
|
+
return false if indexes.length > 1
|
|
308
|
+
end
|
|
309
|
+
|
|
299
310
|
true
|
|
300
311
|
else
|
|
301
312
|
@date.each_with_index do |d, i|
|
|
302
313
|
return false if (d.wide_interval.start&.dig(:year) != o.date[i].wide_interval.start&.dig(:year)) && d.wide_interval.type != o.date[i].wide_interval.type || (d.wide_interval.type == "week" && o.date[i].wide_interval.type == "week" && d.wide_interval.indexes != o.date[i].wide_interval.indexes)
|
|
303
314
|
end
|
|
315
|
+
|
|
304
316
|
true
|
|
305
317
|
end
|
|
306
318
|
end
|
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.14.
|
|
4
|
+
version: 1.14.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Publidata
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-11-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: json
|