opening_hours_converter 1.14.3 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c9f39ea1892679f76822561dd11b33f185549cea33c1d270a02fa7ac097660
-  data.tar.gz: 852c01645d72c6f7d694315565796c72909e9a7d6a1338fcf8d478ea9dde02b4
+  metadata.gz: 6e2dd9ba463b1a9d5099d0aaff9d0e45ac2b64e9fe5d6c389f59a08536ae0db3
+  data.tar.gz: 908adadadb685f46a8f6350bde2270686fe5748646be7ce7aded1a1e98419e33
 SHA512:
-  metadata.gz: 5807378ab97473627243d9037baeaef40cd8c25851756b791c1abc81f7bf21e6066581afe33524b58085e224cfeeac24a4b1b2c54cd67d21abc0233cd8d783b0
-  data.tar.gz: fba5e0c27e71cd9e7d27d189db972b022d92e70d89fc47cf236fd6de58c9db86f970e181d6c54da72d42f01fd830a1f5250f54fc3a61dfa5a900760b17101ea5
+  metadata.gz: 0f2af7c3534b1d2c41f54e5ea2beb1db7361ae56d30a555cc220db0d192673cbcc27bd060a15aed7b42853a1d007f18cd66e0bb3a7cde12d09e4cbf384d9cdd7
+  data.tar.gz: eff0acc84f452cfa90512ca11e4e0c527a4222475ddb3feae7e442881c40fe590707a22c1b98a33fdecbc88e422d3fd5d84d1e71a8a2fefb5c89922d0a9dd52e

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -338,7 +338,15 @@ module OpeningHoursConverter
         else
           week_index.to_i
         end
-      }
+      }.sort_by do |index|
+        if index.is_a?(Integer)
+          index
+        elsif index.is_a?(Hash)
+          index[:from]
+        else
+          0
+        end
+      end
 
       { year_from: years[0].to_i, week_indexes: indexes }.tap do |hsh|
         hsh[:year_to] = years.length > 1 ? years[1].to_i : nil

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -283,6 +283,7 @@ module OpeningHoursConverter
       end
     end
 
+
     def same_date?(o)
       if o.nil? || o.date.length != @date.length
         false
@@ -295,12 +296,23 @@ module OpeningHoursConverter
     end
 
     def mergeable?(o)
-      if o.nil? || o.date.length != @date.length
+      return true if o.nil?
+
+      if o.date.length != @date.length
+        if @date.any? { |date| date.wide_interval.type == "week" }
+          indexes = (@date + o.date).map do |date|
+            date.wide_interval.indexes
+          end.uniq
+
+          return false if indexes.length > 1
+        end
+
         true
       else
         @date.each_with_index do |d, i|
-          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
+          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)
         end
+
         true
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.5
 platform: ruby
 authors:
-- Ziserman Martin
+- Publidata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json