opening_hours_converter 1.7.19 → 1.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeaea66e8c4dc56c2789ffe800537d732ed77db3f2af9680d674d65d854333a0
-  data.tar.gz: 3184691bb45258453cf39e72daa97bf15e395b180889426071c04739f678cfec
+  metadata.gz: 6f84dd0e31e985cbb8d0e31d6b2da2dc54c4667555daf22277e31fa26fe72e3c
+  data.tar.gz: 0aa24ec1f8b071578f592bd330725d8c18e27fa4a2869af82e75f41f332c3c49
 SHA512:
-  metadata.gz: 76c0cdfb4243a7c5d98a0e028842f9ff476449aaed4e16b0bfb6772be554ebe4462cc60c15a7a408dd7483b5c007d59d167df1b9ba2704305c006a4aacfb1b6b
-  data.tar.gz: 201014a6ce2df90e339ab482787410c448e6303327a660af330b0424a11557c62096ea76b557a2858a1c883ee79aba04e61a6c4aa1ae54e91e03dfe22d3b06a5
+  metadata.gz: 5b029e0e307dad79447d7834a674d0555b5b8a9690aa23ca9b4d1763ef4d1379184a822d97051a15963eb97c8d3a8fef9955de708dad2bfeb0d42951c143ec85
+  data.tar.gz: 27a803a86bf8d3affc16ae04c554b837038c0b03c96cc68b1a37bc2808450f14c5e65bf90c8a858e009134973f3df45b16bb58defc595c3d01b0e8c1ba0ca1d2

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -120,18 +120,14 @@ module OpeningHoursConverter
         end
       end
 
+
       result = ""
       if rules.length == 0
         date_ranges.each do |dr|
           result += "#{dr.wide_interval.get_time_selector} off"
         end
       else
-        rules.each_with_index do |rule, rule_index|
-          if rule_index > 0
-            result += "; "
-          end
-          result += rule.get
-        end
+        result += rules.map(&:get).join('; ')
       end
 
       return result.strip

data/lib/opening_hours_converter/week.rb

@@ -18,63 +18,18 @@ module OpeningHoursConverter
             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
+              set_minute_array_for_interval(interval, minute_array, start_minute, end_minute, day)
             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
-              end
+              set_minute_array_for_interval(interval, minute_array, start_minute, end_minute, day)
             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
+              set_minute_array_for_interval(interval, minute_array, start_minute, end_minute, day)
             end
           end
         end
@@ -83,6 +38,25 @@ module OpeningHoursConverter
       minute_array
     end
 
+    def set_minute_array_for_interval(interval, minute_array, start_minute, end_minute, day)
+      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
+
     def get_intervals(clean=false)
       if clean
         minute_array = get_as_minute_array
@@ -166,7 +140,7 @@ module OpeningHoursConverter
               if day_start >= 0 && self_minutes_array[d][m]
                 intervals[:open] << OpeningHoursConverter::Interval.new(day_start, min_start, d, m, off)
               end
-            #  other days and minutes
+            # other days and minutes
             else
               # new interval
               if self_minutes_array[d][m] && day_start < 0

metadata

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