opening_hours_converter 1.7.18 → 1.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6608fab419a381eb17a49872e38d1d13d0e612ecfecfa4f30e87935e37356659
-  data.tar.gz: f3e3321ce3346626776e418d488132d817c8bc640042ecbe45cd6a650421e672
+  metadata.gz: aeaea66e8c4dc56c2789ffe800537d732ed77db3f2af9680d674d65d854333a0
+  data.tar.gz: 3184691bb45258453cf39e72daa97bf15e395b180889426071c04739f678cfec
 SHA512:
-  metadata.gz: 01c5239d36117dcd08f31e4592b8f633117b874cdb52186b81428325702086fc38db70fe49c336def54e7e9cbc6933ffa6a9fa39102f42e69d93a7ebf19e0c82
-  data.tar.gz: e303a0c434d536e916c9282403ba6fe8a26cf1cff9b6e1769c12e1c4bbe40ba3864f90660ad0cd6404d22a363fccc4b7fa7b2dc0a22e17d10e28c051f601534e
+  metadata.gz: 76c0cdfb4243a7c5d98a0e028842f9ff476449aaed4e16b0bfb6772be554ebe4462cc60c15a7a408dd7483b5c007d59d167df1b9ba2704305c006a4aacfb1b6b
+  data.tar.gz: 201014a6ce2df90e339ab482787410c448e6303327a660af330b0424a11557c62096ea76b557a2858a1c883ee79aba04e61a6c4aa1ae54e91e03dfe22d3b06a5

data/lib/opening_hours_converter/week.rb

@@ -14,22 +14,65 @@ module OpeningHoursConverter
 
       @intervals.each do |interval|
         if !interval.nil?
-          for day in interval.day_start..interval.day_end
-            start_minute = (day == interval.day_start) ? interval.start : 0
-            end_minute = (day == interval.day_end) ? interval.end : MINUTES_MAX
-            if interval.is_off
-              if start_minute && end_minute
-                for minute in 0..MINUTES_MAX
-                  minute_array[day][minute] = "off"
+          if interval.day_start > interval.day_end
+            for day in 0..interval.day_end
+              start_minute = 0
+              end_minute = (day == interval.day_end) ? interval.end : MINUTES_MAX
+              if interval.is_off
+                if start_minute && end_minute
+                  for minute in 0..MINUTES_MAX
+                    minute_array[day][minute] = "off"
+                  end
+                end
+              else
+                if start_minute && end_minute
+                  if minute_array[day][0] == "off"
+                    minute_array[day] = Array.new(MINUTES_MAX + 1, false)
+                  end
+                  for minute in start_minute..end_minute
+                    minute_array[day][minute] = true
+                  end
                 end
               end
-            else
-              if start_minute && end_minute
-                if minute_array[day][0] == "off"
-                  minute_array[day] = Array.new(MINUTES_MAX + 1, false)
+            end
+            for day in interval.day_start..6
+              start_minute = (day == interval.day_start) ? interval.start : 0
+              end_minute = MINUTES_MAX
+              if interval.is_off
+                if start_minute && end_minute
+                  for minute in 0..MINUTES_MAX
+                    minute_array[day][minute] = "off"
+                  end
+                end
+              else
+                if start_minute && end_minute
+                  if minute_array[day][0] == "off"
+                    minute_array[day] = Array.new(MINUTES_MAX + 1, false)
+                  end
+                  for minute in start_minute..end_minute
+                    minute_array[day][minute] = true
+                  end
                 end
-                for minute in start_minute..end_minute
-                  minute_array[day][minute] = true
+              end
+            end
+          else
+            for day in interval.day_start..interval.day_end
+              start_minute = (day == interval.day_start) ? interval.start : 0
+              end_minute = (day == interval.day_end) ? interval.end : MINUTES_MAX
+              if interval.is_off
+                if start_minute && end_minute
+                  for minute in 0..MINUTES_MAX
+                    minute_array[day][minute] = "off"
+                  end
+                end
+              else
+                if start_minute && end_minute
+                  if minute_array[day][0] == "off"
+                    minute_array[day] = Array.new(MINUTES_MAX + 1, false)
+                  end
+                  for minute in start_minute..end_minute
+                    minute_array[day][minute] = true
+                  end
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.7.18
+  version: 1.7.19
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json