opening_hours_converter 1.14.0 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1840d4011474e210bb2248979afc8850829c4eab62b0cb2036a670a70ded1265
-  data.tar.gz: 0710a806e7ac90d3b61d83bd9281acb1c56546aabb504d8b4961f5eeb05ca1b4
+  metadata.gz: 7a4dff7e35eca094060900cf6a0062c57a9a2e5c56bed81e3989d8758a7e7a30
+  data.tar.gz: a2221f771abd53d104b043cac1fab9928f734ba666a84494e63599ba053dee49
 SHA512:
-  metadata.gz: 5160c41e2242e1489b1daddecef9068c3218d9726b7f6c0871176d323796035df2b1d491018b13506e88bbf33212df6549063a5ed81559ad645ac5e59a579962
-  data.tar.gz: 6e3c009bfb86cfda6a516ee4c86b49cc165211ee323981b20d74b778938249cb88a436601517659a4b17c8d4bc26119dec0e171ef94c6685094a9d8ee407ba6f
+  metadata.gz: 893fa9f68831242e10c5e819b9a1097fb8269c3bb2526dfe33bb5024c4f20012b9fe8252d7ed30efa02e7e7a0ec46a8d92971f8de62370a1b2307cb4dd7cbe5c
+  data.tar.gz: 398d37c9a90d1656ef6cd4e872e17bf22bb579fabd73291996a38e06d41f8cfb838488a5bae9ce655b528e414edc9135d5c76e82aa0df247359aca980c75bf21

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -67,7 +67,7 @@ module OpeningHoursConverter
           rule_index = 0
 
           while !oh_rule_added && rule_index < rules.length
-            if rules[rule_index].same_time?(oh_rule) && !rules[rule_index].equals(oh_rule) && rules[rule_index].comment == oh_rule.comment
+            if rules[rule_index].mergeable?(oh_rule) && rules[rule_index].same_time?(oh_rule) && !rules[rule_index].equals(oh_rule) && rules[rule_index].comment == oh_rule.comment && rules[rule_index].comment != "off" && oh_rule.comment != "off"
               begin
                 for date_id in 0...oh_rule.date.length
                   rules[rule_index].add_date(oh_rule.date[date_id])

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -294,6 +294,17 @@ module OpeningHoursConverter
       end
     end
 
+    def mergeable?(o)
+      if o.nil? || o.date.length != @date.length
+        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
+        end
+        true
+      end
+    end
+
     def equals(o)
       return false unless o.instance_of?(OpeningHoursConverter::OpeningHoursRule)
       (same_time?(o) && same_date?(o))

data/lib/opening_hours_converter/tokens_handler.rb

@@ -67,6 +67,12 @@ module OpeningHoursConverter
           next
         end
 
+        if current_token.colon?
+          # catches "Dec: "
+          @index += 1
+          next
+        end
+
         raise ParseError, "can't read current token #{current_token}"
       end
     end

data/lib/opening_hours_converter/wide_interval.rb

@@ -519,7 +519,7 @@ module OpeningHoursConverter
       if self_to_day.is_a?(Array)
         if o_to_day.is_a?(Array)
           return false unless o_to_day.length == self_to_day.length
-          return self_to_day.all? do |self_day|
+          return self.start == o.start && self_to_day.all? do |self_day|
             o_to_day.any? do |o_day|
               self_day.equals(o_day)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.2
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json