opening_hours_converter 1.3.11 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ef423c9764ac700a75b88c7378b364f188eb51
-  data.tar.gz: d585222584c77e64591b4b9b39fea3599f1a604f
+  metadata.gz: 4f468692db741b2e791f1d07c77e3bec3e33834d
+  data.tar.gz: bfca0d4c43a2289e81e86ca6e61da95a8cae06e6
 SHA512:
-  metadata.gz: 19e9ee8257e85d7357eec971f4d73ae810822161754892525ee5ca92c8e62caa20b6fa845fc377221c16773d0185bfc8587d0262ee7eeafce3b4ee130d467ce4
-  data.tar.gz: 91f7c17c74e2214ecb32b100e6c8f95449aa4ece19738a074c040c2dd678588c065bc0151e8f8fcd85f5f13de0ca5c3de79c54c79ccd77fd3662eb54c887d7f7
+  metadata.gz: 4b5fd9166b85dca915151fd37f76e8bbe5f232e6be53521befbf9f84c3b8e14f17152a07362ee21340cf3d929e61f703967672a0cb6e3ae31e0c4d08a68d6781
+  data.tar.gz: 711baa863a46bfa94dc5d842df3e0a3b699ff50e4229c9182214d1fd8b0c309f0f08350b12b4eea9677dcf2d0a6cb4f896170d76a15c24fe344805f986df16dd

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -248,7 +248,7 @@ module OpeningHoursConverter
 
             for t_id in 0...times.length
               if rule_modifier == "closed" || rule_modifier == "off"
-                remove_interval(dr_obj.typical, weekdays[wd_id], times[t_id])
+                remove_interval(dr_obj, weekdays[wd_id], times[t_id])
               else
                 add_interval(dr_obj.typical, weekdays[wd_id], times[t_id])
               end
@@ -436,17 +436,21 @@ module OpeningHoursConverter
       { weekdays: weekdays, holidays: holidays }
     end
 
-    def remove_interval(typical, weekdays, times)
-      if weekdays[:from] <= weekdays[:to]
-        for wd in weekdays[:from]..weekdays[:to]
-          typical.remove_intervals_during_day(wd)
-        end
+    def remove_interval(date_range, weekdays, times)
+      if date_range.typical.instance_of?(OpeningHoursConverter::Day)
+        date_range.typical.clear_intervals
       else
-        for wd in weekdays[:from]..6
-          typical.remove_intervals_during_day(wd)
-        end
-        for wd in 0..weekdays[:to]
-          typical.remove_intervals_during_day(wd)
+        if weekdays[:from] <= weekdays[:to]
+          for wd in weekdays[:from]..weekdays[:to]
+            date_range.typical.remove_intervals_during_day(wd)
+          end
+        else
+          for wd in weekdays[:from]..6
+            date_range.typical.remove_intervals_during_day(wd)
+          end
+          for wd in 0..weekdays[:to]
+            date_range.typical.remove_intervals_during_day(wd)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
 platform: ruby
 authors:
 - Ziserman Martin