opening_hours_converter 1.6.5 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7620943b112f4e05e8e88a5aba3e54ad9e82cf92
-  data.tar.gz: 909f4a789f28ae86c17cd09abbdcf2b66b39dac2
+  metadata.gz: 8dde0e88ef73e434363226fda08f86a3c90f64ff
+  data.tar.gz: e1dcb8effef3ea9ffad5034bf8783bede0fa40c3
 SHA512:
-  metadata.gz: e279574b1c77844b7d3cc20da4141bb14c5a4e34d61d2b78bd7de239bed0e7695a9a5353c33a9b3ac3e8882cfdec2b6172eaea62b0e34a3b34db539256741da2
-  data.tar.gz: d3f5e5e8f9313cce07f64d822415eb21db34806ec900c2b448b25f147d96661a0b2cd53592727add1267e8158f871ddc2f24d4311aa9f8b8b616358744af47bd
+  metadata.gz: 870f6a0df3790e759e36c911542b4144f10a76503a22474299c3db448eac75f0abe3611edd276aa25e6d9764294b0f6b82ffe57376f787f127b8006393492559
+  data.tar.gz: dbb28223d2991e3e8cf7c94b986f483f40e56e20d15880539adb228a3e2764497bebd721239eee3d6ca01157ecc77d51b6d9387a8461987d0a51e0f8e2f4c61a

data/lib/opening_hours_converter/wide_interval.rb

@@ -233,22 +233,189 @@ module OpeningHoursConverter
       return result
     end
 
-    def has_superior_or_equal_start_day?(my, o)
+    def touch?(o)
+      return true if contains?(o)
+      return true if o.type == "always" || @type == "always"
+      result = false
+      if self.equals(o)
+        result = true
+      else
+        my = to_day
+        o = o.to_day
+
+        result = ((my_start_is_before_o_end?(my, o) && my_start_is_after_o_start?(my, o)) ||
+          (my_end_is_before_o_end?(my, o) && my_end_is_after_o_start?(my, o))) ||
+          ((my_start_is_before_o_end?(o, my) && my_start_is_after_o_start?(o, my)) ||
+            (my_end_is_before_o_end?(o, my) && my_end_is_after_o_start?(o, my)))
+      end
+      return result
+    end
+
+    def my_start_is_after_o_start?(my, o)
       result = false
       if has_start_year?(o) && has_start_year?(my)
-        result = o.start[:year] > my.start[:year] || (o.start[:year] == my.start[:year] && has_superior_start_month?(my, o))
+        result = o.start[:year] < my.start[:year] || (o.start[:year] == my.start[:year] &&
+          my_start_day_is_after_o_start_day?(my, o))
       elsif !has_start_year?(o) && !has_start_year?(my)
-        result = has_superior_start_month?(my, o)
+        result = my_start_day_is_after_o_start_day?(my, o)
+      end
+      result
+    end
+
+    def my_start_is_before_o_start?(my, o)
+      result = false
+      if has_start_year?(o) && has_start_year?(my)
+        result = o.start[:year] > my.start[:year] || (o.start[:year] == my.start[:year] &&
+          my_start_day_is_before_o_start_day?(my, o))
+      elsif !has_start_year?(o) && !has_start_year?(my)
+        result = my_start_day_is_before_o_start_day?(my, o)
       end
       result
     end
 
+    def my_end_is_before_o_end?(my, o)
+      result = false
+      if !my.end.nil? && !o.end.nil?
+        if has_end_year?(o) && has_end_year?(my)
+          result = o.end[:year] > my.end[:year] || (o.end[:year] == my.end[:year] &&
+            my_end_day_is_before_o_end_day?(my, o))
+        elsif !has_end_year?(o) && !has_end_year?(my)
+          result = my_end_day_is_before_o_end_day?(my, o)
+        end
+      else
+        my_start_is_before_o_start?(my, o)
+      end
+      result
+    end
+
+    def my_start_is_before_o_end?(my, o)
+      result = false
+      if has_start_year?(o) && has_start_year?(my)
+        if o.end
+          result = o.end[:year] > my.start[:year] || (o.end[:year] == my.start[:year] &&
+            my_start_day_is_before_o_end_day?(my, o))
+        else
+          result = o.start[:year] > my.start[:year] || (o.start[:year] == my.start[:year] &&
+            my_start_day_is_before_o_end_day?(my, o))
+        end
+      elsif !has_start_year?(o) && !has_start_year?(my)
+        result = my_start_day_is_before_o_end_day?(my, o)
+      end
+      result
+    end
+
+    def my_end_is_after_o_start?(my, o)
+      result = false
+      if has_start_year?(o) && has_start_year?(my)
+        if my.end
+          result = o.start[:year] < my.end[:year] || (o.start[:year] == my.end[:year] &&
+            my_end_day_is_after_o_start_day?(my, o))
+        else
+          result = o.start[:year] < my.start[:year] || (o.start[:year] == my.start[:year] &&
+            my_end_day_is_after_o_start_day?(my, o))
+        end
+      elsif !has_start_year?(o) && !has_start_year?(my)
+        result = my_end_day_is_after_o_start_day?(my, o)
+      end
+      result
+    end
+
+    def my_start_day_is_after_o_start_day?(my, o)
+      (o.start[:month] < my.start[:month] ||
+        (o.start[:month] == my.start[:month] &&
+          o.start[:day] <= my.start[:day]))
+    end
+
+    def my_start_day_is_before_o_start_day?(my, o)
+      (o.start[:month] > my.start[:month] ||
+        (o.start[:month] == my.start[:month] &&
+          o.start[:day] >= my.start[:day]))
+    end
+
+    def my_start_day_is_before_o_end_day?(my, o)
+      if !o.end.nil?
+        (o.end[:month] > my.start[:month] ||
+          (o.end[:month] == my.start[:month] &&
+            o.end[:day] >= my.start[:day]))
+      else
+        (o.start[:month] > my.start[:month] ||
+          (o.start[:month] == my.start[:month] &&
+            o.start[:day] >= my.start[:day]))
+      end
+    end
+
+    def my_start_day_is_after_o_end_day?(my, o)
+      if !o.end.nil?
+        (o.end[:month] < my.start[:month] ||
+          (o.end[:month] == my.start[:month] &&
+            o.end[:day] <= my.start[:day]))
+      else
+        (o.start[:month] < my.start[:month] ||
+          (o.start[:month] == my.start[:month] &&
+            o.start[:day] <= my.start[:day]))
+      end
+    end
+
+    def my_end_day_is_before_o_end_day?(my, o)
+      if !o.end.nil? && !my.end.nil?
+        (o.end[:month] > my.end[:month] ||
+          (o.end[:month] == my.end[:month] &&
+            o.end[:day] >= my.end[:day]))
+      elsif o.end && my.end
+        (o.start[:month] > my.start[:month] ||
+          (o.start[:month] == my.start[:month] &&
+            o.start[:day] >= my.start[:day]))
+      elsif o.end
+        (o.end[:month] > my.start[:month] ||
+          (o.end[:month] == my.start[:month] &&
+            o.end[:day] >= my.start[:day]))
+      else
+        (o.start[:month] > my.end[:month] ||
+          (o.start[:month] == my.end[:month] &&
+            o.start[:day] >= my.end[:day]))
+      end
+    end
+
+    def my_end_day_is_after_o_start_day?(my, o)
+      if !o.end.nil?
+        (o.start[:month] < my.end[:month] ||
+          (o.start[:month] == my.end[:month] &&
+            o.start[:day] <= my.end[:day]))
+      else
+        (o.start[:month] < my.start[:month] ||
+          (o.start[:month] == my.start[:month] &&
+            o.start[:day] <= my.start[:day]))
+      end
+    end
+
+    def my_end_day_is_before_o_start_day?(my, o)
+      if !o.end.nil?
+        (o.start[:month] < my.end[:month] ||
+          (o.start[:month] == my.end[:month] &&
+            o.start[:day] <= my.end[:day]))
+      else
+        (o.start[:month] < my.start[:month] ||
+          (o.start[:month] == my.start[:month] &&
+            o.start[:day] <= my.start[:day]))
+      end
+    end
+
     def has_superior_start_month?(my, o)
       (o.start[:month] > my.start[:month] ||
         (o.start[:month] == my.start[:month] &&
           o.start[:day] >= my.start[:day]))
     end
 
+    def has_superior_or_equal_start_day?(my, o)
+      result = false
+      if has_start_year?(o) && has_start_year?(my)
+        result = o.start[:year] > my.start[:year] || (o.start[:year] == my.start[:year] && has_superior_start_month?(my, o))
+      elsif !has_start_year?(o) && !has_start_year?(my)
+        result = has_superior_start_month?(my, o)
+      end
+      result
+    end
+
     def has_inferior_or_equal_end_day?(my, o)
       result = false
       return false if my.end.nil?

metadata

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