opening_hours_converter 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad603db02faa52b0e6eb478f9415a9c940cce5af
-  data.tar.gz: 948bc5f9c27a7f4314a8b224bb7b31136d58bdf6
+  metadata.gz: bce24802ab57a64088af5dc7a47f8e53d6519327
+  data.tar.gz: 972e5ce2b13d003e67b28ac3fd3488ef03ba8345
 SHA512:
-  metadata.gz: 7de99c3ad711ee3258c722bd53da1be3916e9dbeca3bdce926faca9b1c3d1f0970a29d45a6bd5131c5f8a11bd63a625b3a0493652746b94f03cf3fc7bc2acb86
-  data.tar.gz: c3b593c79b4d15f81933ba63ba7a31610c713241108034cb8e0263d8c9f0156c7b2038ffb85685764e65d7c1277b0b87280d71732ffdad51b1af95424cdb9344
+  metadata.gz: 266073e42c9902ef00136bb8b75946561602a6be1e1ad66994a7e1bc4a7739c515d0021579107ae4ca1dd16976af02b79518fb28c89da42af103783c095badc1
+  data.tar.gz: fb3d198d80dad15a141491d1d09d6f19ba500495680c99d929ff4fe8fd157ae5c58b706df0fba82bce35ce5272384be1ed9fae00b4f7e4a85b0b851e3ed979b4

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -1,5 +1,6 @@
 require 'opening_hours_converter/constants'
 require 'json'
+require 'pry-byebug'
 
 module OpeningHoursConverter
   class OpeningHoursParser

data/lib/opening_hours_converter/wide_interval.rb

@@ -377,7 +377,7 @@ module OpeningHoursConverter
     end
 
     def my_end_day_is_after_o_start_day?(my, o)
-      if !o.end.nil?
+      if !my.end.nil?
         (o.start[:month] < my.end[:month] ||
           (o.start[:month] == my.end[:month] &&
             o.start[:day] <= my.end[:day]))
@@ -389,7 +389,7 @@ module OpeningHoursConverter
     end
 
     def my_end_day_is_before_o_start_day?(my, o)
-      if !o.end.nil?
+      if !my.end.nil?
         (o.start[:month] < my.end[:month] ||
           (o.start[:month] == my.end[:month] &&
             o.start[:day] <= my.end[:day]))
@@ -410,7 +410,7 @@ module OpeningHoursConverter
       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)
+      elsif !has_start_year?(my)
         result = has_superior_start_month?(my, o)
       end
       result
@@ -422,13 +422,13 @@ module OpeningHoursConverter
       if !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] && has_inferior_end_month?(my, o))
-        elsif !has_end_year?(o) && !has_end_year?(my)
+        elsif !has_end_year?(my)
           result = has_inferior_end_month?(my, o)
         end
       else
         if has_start_year?(o) && has_end_year?(my)
           result = o.start[:year] < my.end[:year] || (o.start[:year] == my.end[:year] && has_inferior_end_month?(my, o))
-        elsif !has_start_year?(o) && !has_end_year?(my)
+        elsif !has_end_year?(my)
           result = has_inferior_end_month?(my, o)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json