opening_hours_converter 1.7.20 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f84dd0e31e985cbb8d0e31d6b2da2dc54c4667555daf22277e31fa26fe72e3c
-  data.tar.gz: 0aa24ec1f8b071578f592bd330725d8c18e27fa4a2869af82e75f41f332c3c49
+  metadata.gz: 50b769d524ea032bea248de2b6dded3bfd944f3f3402f4213ef160075f4c68e6
+  data.tar.gz: 64ca508b6a8d07c9354e22c3371a1a51d77452eba94d2d5826f133ce26591e37
 SHA512:
-  metadata.gz: 5b029e0e307dad79447d7834a674d0555b5b8a9690aa23ca9b4d1763ef4d1379184a822d97051a15963eb97c8d3a8fef9955de708dad2bfeb0d42951c143ec85
-  data.tar.gz: 27a803a86bf8d3affc16ae04c554b837038c0b03c96cc68b1a37bc2808450f14c5e65bf90c8a858e009134973f3df45b16bb58defc595c3d01b0e8c1ba0ca1d2
+  metadata.gz: 2a86e27cd5699f95e1bd25559b22df74255f3efffbf9b7b5b4a1227a4a95bb80bf69f0249c9a76a283b9ae05697cb33aceafc47eec63477ffa95c8544274790e
+  data.tar.gz: 320f7a39295e8a9c29cf33f002e3cf03436a9b91d027320af3ce96114f8dbf9899a08b30b2e95fd2c6d423d6f1a68d8c516c5aa07bda2c58155b9323728415e2

data/lib/opening_hours_converter/date_range.rb

@@ -2,11 +2,11 @@ module OpeningHoursConverter
   class DateRange
     attr_accessor :wide_interval, :typical, :comment
 
-    def initialize(w=nil)
+    def initialize(wide_interval = nil)
       @wide_interval = nil
       @typical = nil
-      @comment = ""
-      update_range(w)
+      @comment = ''
+      update_range(wide_interval)
     end
 
     def defines_typical_day?
@@ -17,24 +17,24 @@ module OpeningHoursConverter
       @typical.instance_of?(OpeningHoursConverter::Week)
     end
 
-    def update_range(wide)
-      @wide_interval = !wide.nil? ? wide : OpeningHoursConverter::WideInterval.new.always
+    def update_range(wide_interval)
+      @wide_interval = !wide_interval.nil? ? wide_interval : OpeningHoursConverter::WideInterval.new.always
 
-      if @typical.nil?
-        case @wide_interval.type
-        when "day"
-          if @wide_interval.end.nil?
-            @typical = OpeningHoursConverter::Day.new
-          else
-            @typical = OpeningHoursConverter::Week.new
-          end
-        else
-          @typical = OpeningHoursConverter::Week.new
-        end
-      end
+      return unless @typical.nil?
+
+      @typical = case @wide_interval.type
+                 when 'day'
+                   if @wide_interval.end.nil?
+                     OpeningHoursConverter::Day.new
+                   else
+                     OpeningHoursConverter::Week.new
+                   end
+                 else
+                   OpeningHoursConverter::Week.new
+                 end
     end
 
-    def add_comment(comment="")
+    def add_comment(comment = '')
       @comment += comment if comment
     end
 
@@ -47,8 +47,7 @@ module OpeningHoursConverter
     end
 
     def is_holiday?
-      result = false
-      result = @wide_interval.type == "holiday"
+      result = @wide_interval.type == 'holiday'
       if !result
         @typical.intervals.each do |i|
           if !i.nil?

data/lib/opening_hours_converter/day.rb

@@ -13,60 +13,46 @@ module OpeningHoursConverter
       minute_array = Array.new(MINUTES_MAX + 1, false)
 
       @intervals.each do |interval|
-        if !interval.nil?
-          start_minute = nil
-          end_minute = nil
-          off = interval.is_off
-
-          if off
-            start_minute = 0
-            end_minute = MINUTES_MAX
-          elsif interval.day_start == interval.day_end || interval.day_end == DAYS_MAX && interval.end == MINUTES_MAX
-            start_minute = interval.start
-            end_minute = interval.end
-          elsif interval.day_end == interval.day_start + 1 && interval.end == 0
-            start_minute = interval.start
-            end_minute = MINUTES_MAX
-          end
-
-          unless start_minute.nil? && end_minute.nil?
-            for minute in start_minute..end_minute
-              minute_array[minute] = off ? "off" : true
-            end
-          else
-            raise "Invalid interval #{interval.inspect}"
-          end
+        next if interval.nil?
+
+        off, start_minute, end_minute = handle_interval(interval)
+
+        raise "Invalid interval #{interval.inspect}" if start_minute.nil? && end_minute.nil?
+
+        (start_minute..end_minute).step do |minute|
+          minute_array[minute] = off ? 'off' : true
         end
       end
 
       minute_array
     end
 
-    def get_intervals(clean=false)
+    def handle_interval(interval)
+      off = interval.is_off
+
+      if off
+        start_minute = 0
+        end_minute = MINUTES_MAX
+      elsif interval.single_day? || interval.max?
+        start_minute = interval.start
+        end_minute = interval.end
+      elsif interval.single_day_end_at_midnight?
+        start_minute = interval.start
+        end_minute = MINUTES_MAX
+      end
+
+      [off, start_minute, end_minute]
+    end
+
+    def get_intervals(clean = false)
       if clean
         minute_array = get_as_minute_array
         intervals = []
         minute_start = -1
-        minute_end = nil
         off = false
 
         minute_array.each_with_index do |minute, i|
-          if i == 0 && minute
-            off = true if minute == "off"
-            minute_start = i
-          elsif i == minute_array.length - 1 && minute
-            intervals << OpeningHoursConverter::Interval.new(0, minute_start, 0, i - 1, off)
-            minute_start = -1
-            off = false
-          else
-            if minute && minute_start < 0
-              minute_start = i
-            elsif !minute && minute_start >= 0
-              intervals << OpeningHoursConverter::Interval.new(0, minute_start, 0, i - 1, off)
-              minute_start = -1
-              off = false
-            end
-          end
+          off, minute_start, intervals = handle_minute(minute, off, minute_start, intervals, i, minute_array)
         end
         intervals
       else
@@ -74,9 +60,29 @@ module OpeningHoursConverter
       end
     end
 
+    def handle_minute(minute, off, minute_start, intervals, i, minute_array)
+      if minute
+        if i == 0
+          off = true if minute == 'off'
+          minute_start = i
+        elsif minute_start < 0
+          minute_start = i
+        elsif i == minute_array.length - 1
+          intervals << OpeningHoursConverter::Interval.new(0, minute_start, 0, i - 1, off)
+          minute_start = -1
+          off = false
+        end
+      elsif minute_start >= 0
+        intervals << OpeningHoursConverter::Interval.new(0, minute_start, 0, i - 1, off)
+        minute_start = -1
+        off = false
+      end
+      [off, minute_start, intervals]
+    end
+
     def add_interval(interval)
       @intervals << interval
-      return @intervals.length - 1
+      @intervals.length - 1
     end
 
     def edit_interval(id, interval)

data/lib/opening_hours_converter/interval.rb

@@ -6,7 +6,6 @@ module OpeningHoursConverter
     attr_reader :day_start, :day_end, :start, :end, :is_off
 
     def initialize(day_start, min_start, day_end=0, min_end=0, is_off=false)
-
       @day_start = day_start
       @day_end = day_end
       @start = min_start
@@ -18,5 +17,17 @@ module OpeningHoursConverter
         @end = MINUTES_MAX
       end
     end
+
+    def single_day?
+      @day_start == @day_end
+    end
+
+    def max?
+      @day_end == DAYS_MAX && @end == MINUTES_MAX
+    end
+
+    def single_day_end_at_midnight?
+      @day_end == @day_start + 1 && @end == 0
+    end
   end
 end

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -77,10 +77,10 @@ module OpeningHoursConverter
                     oh_rule_added = true
                   rescue Exception => e
                     puts e
-                    if oh_rule.date[0].wide_type == "holiday" && oh_rule.date[0].wide.get_time_selector == "PH"
+                    if oh_rule.date[0].wide_interval.type == "holiday" && oh_rule.date[0].wide_interval.get_time_selector == "PH"
                       rules[rule_index].add_ph_weekday
                       oh_rule_added = true
-                    elsif rules[rule_index].date[0].wide_type == "holiday" && rules[rule_index].date[0].wide.get_time_selector == "PH"
+                    elsif rules[rule_index].date[0].wide_interval.type == "holiday" && rules[rule_index].date[0].wide_interval.get_time_selector == "PH"
                       oh_rule.add_ph_weekday
                       rules[rule_index] = oh_rule
                       oh_rule_added = true
@@ -110,7 +110,7 @@ module OpeningHoursConverter
                 oh_rule_over = OpeningHoursConverter::OpeningHoursRule.new
 
                 oh_rule.date.each do |date|
-                  oh_rule_over.add_date(OpeningHoursConverter::OpeningHoursDate.new(date.wide, date.wide_type, date.weekdays_over))
+                  oh_rule_over.add_date(OpeningHoursConverter::OpeningHoursDate.new(date.wide_interval, date.weekdays_over))
                 end
                 oh_rule_over.add_time(OpeningHoursConverter::OpeningHoursTime.new)
                 oh_rules << oh_rule_over
@@ -141,7 +141,7 @@ module OpeningHoursConverter
       date_range = OpeningHoursConverter::DateRange.new(OpeningHoursConverter::WideInterval.new.holiday("PH", start_year, end_year))
 
       rule = OpeningHoursConverter::OpeningHoursRule.new
-      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, date_range.wide_interval.type, [-1])
+      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, [-1])
       rule.add_date(date)
       rule.is_defined_off = true
 
@@ -165,7 +165,7 @@ module OpeningHoursConverter
         end
       end
       rule = OpeningHoursConverter::OpeningHoursRule.new
-      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, date_range.wide_interval.type, [-1])
+      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, [-1])
       rule.add_date(date)
 
       date_range.typical.intervals.each do |interval|
@@ -183,7 +183,7 @@ module OpeningHoursConverter
       intervals = date_range.typical.get_intervals(true)
 
       rule = OpeningHoursConverter::OpeningHoursRule.new
-      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, date_range.wide_interval.type, [-1])
+      date = OpeningHoursConverter::OpeningHoursDate.new(date_range.wide_interval, [-1])
       rule.add_date(date)
 
       intervals.each do |interval|
@@ -200,7 +200,7 @@ module OpeningHoursConverter
       result = []
 
       intervals = date_range.typical.get_intervals(true)
-      days = create_time_intervals(date_range.wide_interval, date_range.wide_interval.type, intervals)
+      days = create_time_intervals(date_range.wide_interval, intervals)
 
       days_status = Array.new(OSM_DAYS.length, 0)
 
@@ -259,7 +259,6 @@ module OpeningHoursConverter
       intervals = date_range.typical.get_intervals_diff(general_date_range.typical)
       days = create_time_intervals(
         date_range.wide_interval,
-        date_range.wide_interval.type,
         intervals[:open])
 
 
@@ -359,11 +358,11 @@ module OpeningHoursConverter
       return result
     end
 
-    def create_time_intervals(wide_interval, type, intervals)
+    def create_time_intervals(wide_interval, intervals)
       days = []
       for i in 0...7
         days << OpeningHoursConverter::OpeningHoursRule.new
-        days[i].add_date(OpeningHoursConverter::OpeningHoursDate.new(wide_interval, type, [ i ]))
+        days[i].add_date(OpeningHoursConverter::OpeningHoursDate.new(wide_interval, [ i ]))
       end
 
       intervals.each do |interval|

data/lib/opening_hours_converter/opening_hours_date.rb

@@ -4,15 +4,14 @@ module OpeningHoursConverter
   class OpeningHoursDate
     include Constants
     attr_accessor :weekdays, :weekdays_over
-    attr_reader :wide_type, :wide
+    attr_reader :wide_interval
 
-    def initialize(wide, wide_type, weekdays)
-      if wide.nil? || wide_type.nil? || weekdays.nil?
+    def initialize(wide_interval, weekdays)
+      if wide_interval.nil? || weekdays.nil? || !wide_interval.is_a?(OpeningHoursConverter::WideInterval)
         raise ArgumentError
       end
 
-      @wide = wide
-      @wide_type = wide_type
+      @wide_interval = wide_interval
       @weekdays = weekdays.sort
       @weekdays_over = []
     end
@@ -122,7 +121,7 @@ module OpeningHoursConverter
     end
 
     def same_kind_as?(date)
-      @wide_type == date.wide_type && date.same_weekdays?(@weekdays)
+      @wide_interval.type == date.wide_interval.type && date.same_weekdays?(@weekdays)
     end
 
     def same_weekdays?(weekdays)
@@ -130,7 +129,7 @@ module OpeningHoursConverter
     end
 
     def equals(o)
-      o.instance_of?(OpeningHoursConverter::OpeningHoursDate) && @wide_type == o.wide_type && @wide == o.wide && o.same_weekdays?(@weekdays)
+      o.instance_of?(OpeningHoursConverter::OpeningHoursDate) && @wide_interval.type == o.wide_interval.type && @wide_interval.equals(o.wide_interval) && o.same_weekdays?(@weekdays)
     end
   end
 end

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -53,14 +53,14 @@ module OpeningHoursConverter
     end
 
     def get_wide_selector
-      if @date.length == 1 && @date[0].wide.type == "holiday"
-        if @date[0].wide.start[:year].nil?
+      if @date.length == 1 && @date[0].wide_interval.type == "holiday"
+        if @date[0].wide_interval.start[:year].nil?
           return "PH"
         else
-          if @date[0].wide.end && @date[0].wide.end[:year]
-            return "#{@date[0].wide.start[:year]}-#{@date[0].wide.end[:year]} PH"
+          if @date[0].wide_interval.end && @date[0].wide_interval.end[:year]
+            return "#{@date[0].wide_interval.start[:year]}-#{@date[0].wide_interval.end[:year]} PH"
           else
-            return "#{@date[0].wide.start[:year]} PH"
+            return "#{@date[0].wide_interval.start[:year]} PH"
           end
         end
       end
@@ -269,7 +269,7 @@ module OpeningHoursConverter
         return false
       else
         @date.each_with_index do |d, i|
-          return false if !d.wide.equals(o.date[i].wide)
+          return false if !d.wide_interval.equals(o.date[i].wide_interval)
         end
         return true
       end

data/lib/opening_hours_converter/wide_interval.rb

@@ -520,7 +520,6 @@ module OpeningHoursConverter
             end
           end
         else
-          # binding.pry
           if in_day.start[:month] == in_day.end[:month]
             days_count += in_day.end[:day] - in_day.start[:day] + 1
           elsif in_day.start[:month] > in_day.end[:month]

data/lib/opening_hours_converter/year.rb

@@ -82,25 +82,25 @@ module OpeningHoursConverter
     def self.build_day_array_from_dates(dates, get_iterator=false)
       years = {}
       dates.each do |date|
-        if !date.wide.start.nil? && !date.wide.start[:year].nil?
-          if date.wide.end.nil? || date.wide.end[:year].nil? || date.wide.start[:year] == date.wide.end[:year]
-            if !years[date.wide.start[:year]].nil?
-              years = process_single_year(date.wide, years)
+        if !date.wide_interval.start.nil? && !date.wide_interval.start[:year].nil?
+          if date.wide_interval.end.nil? || date.wide_interval.end[:year].nil? || date.wide_interval.start[:year] == date.wide_interval.end[:year]
+            if !years[date.wide_interval.start[:year]].nil?
+              years = process_single_year(date.wide_interval, years)
             else
-              years[date.wide.start[:year]] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
-              years = process_single_year(date.wide, years)
+              years[date.wide_interval.start[:year]] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+              years = process_single_year(date.wide_interval, years)
             end
           else
-            for year in date.wide.start[:year]..date.wide.end[:year]
+            for year in date.wide_interval.start[:year]..date.wide_interval.end[:year]
               years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
             end
-            process_multiple_years(date.wide, years)
+            process_multiple_years(date.wide_interval, years)
           end
         else
           unless get_iterator
             years["always"] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
           end
-          years = process_always(date.wide, years, get_iterator)
+          years = process_always(date.wide_interval, years, get_iterator)
         end
       end
       years
@@ -209,7 +209,7 @@ module OpeningHoursConverter
                 years[year][wide_interval.start[:month]-1][i] = true
               end
             else
-              for month in wide_interval.start[:month]-1..date.wide.end[:month]-1
+              for month in wide_interval.start[:month]-1..date.wide_interval.end[:month]-1
                 years[year][month].each_with_index do |day, i|
                   years[year][month][i] = true
                 end

metadata

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