opening_hours_converter 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465d1cc6f9092fed1e703f663c5187158f02a06b
-  data.tar.gz: bc1d15874e701120b046c9777dec296cba72b9df
+  metadata.gz: 4642911e8df98a01cfc414042dce0cc11e8c8908
+  data.tar.gz: 1b5ba34eba12a1a9fc8bcd9d9ab4cb4874898b01
 SHA512:
-  metadata.gz: e3b3bd1455b19ba88527389a1b2339d38f612034af48d8538cdc7378378634f053b97f56fd18114d2560e27cb2038964da1efd6adac2c1bb7e6e684b3da493f6
-  data.tar.gz: f1cfd805b490d4c1fcce52f637dddaa2678fba503179724ecb3d2cb7dd30e57c04ec71a0adb0bfcf5778fb4f70a8c4603dfca1b96416fadc3f3cb2d02394cfde
+  metadata.gz: 711db0af55afe9cab83cd7feb520a89c053887fd42e8cf1600204bdfb8b0d25c8c96af9dec8a4c7462bef5d0605677b555d0be9629d303bf7d7158fe622209a5
+  data.tar.gz: 8be38120b5040d1f285a31a1f35f17c9a7133d0314b82aedae2a68cf03f3ce4f51739ed8fb946f0b2be8622b28227bad169baba2782f3387be2c3b76b266a063

data/lib/opening_hours_converter.rb

@@ -4,6 +4,7 @@ module OpeningHoursConverter
   require_relative './opening_hours_converter/day'
   require_relative './opening_hours_converter/week'
   require_relative './opening_hours_converter/year'
+  require_relative './opening_hours_converter/public_holiday'
   require_relative './opening_hours_converter/interval'
   require_relative './opening_hours_converter/iterator'
   require_relative './opening_hours_converter/opening_hours_builder'

data/lib/opening_hours_converter/constants.rb

@@ -19,5 +19,6 @@ module OpeningHoursConverter
     MINUTES_MAX = 1440
     DAYS_MAX = 6
     YEAR_DAYS_MAX = 365
+    PH_WEEKDAY = -2
   end
 end

data/lib/opening_hours_converter/date_range.rb

@@ -28,7 +28,7 @@ module OpeningHoursConverter
           else
             @typical = OpeningHoursConverter::Week.new
           end
-        when "week", "month", "year", "always"
+        else
           @typical = OpeningHoursConverter::Week.new
         end
       end
@@ -45,5 +45,16 @@ module OpeningHoursConverter
     def is_general_for?(date_range)
       defines_typical_day? == date_range.defines_typical_day? && @wide_interval.contains?(date_range.wide_interval) && @comment == date_range.comment
     end
+
+    def is_holiday?
+      result = false
+      result = @wide_interval.type == "holiday"
+      if !result
+        @typical.intervals.each do |i|
+          result = true if i.day_start == -2 && i.day_end == -2
+        end
+      end
+      result
+    end
   end
 end

data/lib/opening_hours_converter/interval.rb

@@ -3,7 +3,7 @@ require 'opening_hours_converter/constants'
 module OpeningHoursConverter
   class Interval
     include Constants
-    attr_accessor :day_start, :day_end, :start, :end
+    attr_reader :day_start, :day_end, :start, :end
 
     def initialize(day_start, min_start, day_end=0, min_end=0)
       @day_start = day_start

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -10,9 +10,18 @@ module OpeningHoursConverter
       oh_rule_added = nil
       range_general = nil
       range_general_for = nil
+      day_ph = false
 
       date_ranges.each_with_index do |date_range, date_range_index|
+
         if !date_range.nil?
+          date_range.typical.intervals.each_with_index do |interval, interval_id|
+            if interval&.day_start == -2 && interval&.day_start == interval&.day_end
+              date_range.typical.remove_interval(interval_id)
+              day_ph = true
+            end
+          end
+
           range_general = nil
           range_general_for = nil
           range_general_id = date_range_index - 1
@@ -28,8 +37,11 @@ module OpeningHoursConverter
             end
             range_general_id -= 1
           end
+
           if date_range_index == 0 || range_general.nil?
-            if date_range.defines_typical_week?
+            if date_range.wide_interval.type == "holiday"
+              oh_rules = build_holiday(date_range)
+            elsif date_range.defines_typical_week?
               if !range_general_for.nil?
                 oh_rules = build_week_diff(date_range, date_ranges[range_general_for])
               else
@@ -56,12 +68,24 @@ module OpeningHoursConverter
                     oh_rule_added = true
                   rescue Exception => e
                     puts e
-                    rule_index += 1
+                    if oh_rule.date[0].wide_type == "holiday" && oh_rule.date[0].wide.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"
+                      oh_rule.add_ph_weekday
+                      rules[rule_index] = oh_rule
+                      oh_rule_added = true
+                    else
+                      rule_index += 1
+                    end
                   end
                 else
                   rule_index+=1
                 end
+              end
 
+              if day_ph
+                oh_rule.add_ph_weekday
               end
 
               if !oh_rule_added
@@ -81,7 +105,6 @@ module OpeningHoursConverter
           end
         end
       end
-      # binding.pry
 
       result = ""
       rules.each_with_index do |rule, rule_index|
@@ -94,6 +117,22 @@ module OpeningHoursConverter
       return result
     end
 
+    def build_holiday(date_range)
+      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])
+      rule.add_date(date)
+
+      intervals.each do |interval|
+        if !interval.nil?
+          rule.add_time(OpeningHoursConverter::OpeningHoursTime.new(interval.start, interval.end))
+        end
+      end
+
+      return [ rule ]
+    end
+
     def build_day(date_range)
       intervals = date_range.typical.get_intervals(true)
 
@@ -113,6 +152,7 @@ module OpeningHoursConverter
     def build_week(date_range)
       result = []
       intervals = date_range.typical.get_intervals(true)
+
       time_intervals = create_time_intervals(date_range.wide_interval, date_range.wide_interval.type, intervals)
 
       monday0 = time_intervals[0]

data/lib/opening_hours_converter/opening_hours_date.rb

@@ -3,7 +3,8 @@ require 'opening_hours_converter/constants'
 module OpeningHoursConverter
   class OpeningHoursDate
     include Constants
-    attr_accessor :wide_type, :wide, :weekdays, :weekdays_over
+    attr_accessor :weekdays, :weekdays_over
+    attr_reader :wide_type, :wide
 
     def initialize(wide, wide_type, weekdays)
       if wide.nil? || wide_type.nil? || weekdays.nil?
@@ -20,6 +21,12 @@ module OpeningHoursConverter
       result = ""
       wd = @weekdays.concat(@weekdays_over).sort.uniq
 
+      if wd.length > 0 && wd[0] == PH_WEEKDAY
+        result = "PH"
+        wd.shift
+      end
+
+
       if wd.length > 0 && wd.include?(6) && wd.include?(0) && (wd.include?(5) || wd.include?(1))
         start_we = 6
         i = wd.length - 2
@@ -103,6 +110,10 @@ module OpeningHoursConverter
       end
     end
 
+    def add_ph_weekday
+      add_weekday(PH_WEEKDAY)
+    end
+
     def add_overwritten_weekday(weekday)
       unless @weekdays_over.include?(weekday) && @weekdays_over.include?(weekday)
         @weekdays_over << weekday

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -3,7 +3,6 @@ require 'opening_hours_converter/constants'
 module OpeningHoursConverter
   class OpeningHoursParser
     include Constants
-    attr_accessor :RGX_RULE_MODIFIER, :RGX_WEEK_KEY, :RGX_WEEK_VAL, :RGX_MONTH, :RGX_MONTHDAY, :RGX_TIME, :RGX_WEEKDAY, :RGX_HOLIDAY, :RGX_WD
     def initialize
       @RGX_RULE_MODIFIER = /^(open|closed|off)$/i
       @RGX_WEEK_KEY = /^week$/
@@ -11,10 +10,11 @@ module OpeningHoursConverter
       @RGX_MONTH = /^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)(\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec))?\:?$/
       @RGX_MONTHDAY = /^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01])(\-((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) )?([012]?[0-9]|3[01]))?\:?$/
       @RGX_TIME = /^((([01]?[0-9]|2[01234])\:[012345][0-9](\-([01]?[0-9]|2[01234])\:[012345][0-9])?(,([01]?[0-9]|2[01234])\:[012345][0-9](\-([01]?[0-9]|2[01234])\:[012345][0-9])?)*)|(24\/7))$/
-      @RGX_WEEKDAY = /^(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH|SH|easter))(,(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH|SH|easter)))*$/
+      @RGX_WEEKDAY = /^(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH))(,(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH)))*$/
       @RGX_HOLIDAY = /^(PH|SH|easter)$/
       @RGX_WD = /^(Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?$/
       @RGX_YEAR = /^(\d{4})(\-(\d{4}))?$/
+      @RGX_YEAR_PH = /^(\d{4})( PH|(\-(\d{4}) PH))\:?$/
       @RGX_YEAR_MONTH_DAY = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01])(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) )?([012]?[0-9]|3[01]))?\:?$/
       @RGX_YEAR_MONTH = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)))?\:?$/
       @RGX_COMMENT = /^\"[^\"]*\"$/
@@ -71,18 +71,20 @@ module OpeningHoursConverter
 
         # get weekdays selector
         weekdays = []
+        holidays = []
         if time_selector == "24/7"
           weekdays << {from: 0, to: 6}
-        elsif current_token >= 0 && is_weekday?(tokens[current_token])
+        elsif current_token >= 0 && is_weekday?(tokens[current_token]) && (@RGX_YEAR_PH =~ "#{tokens[current_token-1]} #{tokens[current_token]}").nil?
           weekday_selector = tokens[current_token]
-          weekdays = get_weekdays(weekday_selector)
+          weekdays_and_holidays = get_weekdays(weekday_selector)
+          weekdays = weekdays_and_holidays[:weekdays]
+          holidays = weekdays_and_holidays[:holidays]
           current_token -= 1
         end
 
         months = []
         years = []
         if current_token >= 0
-
           wide_range_selector = tokens[0]
           for i in 1..current_token
             wide_range_selector += " #{tokens[i]}"
@@ -97,6 +99,8 @@ module OpeningHoursConverter
                 years << get_year_month(wrs)
               elsif !(@RGX_MONTHDAY =~ wrs).nil?
                 months << get_month_day(wrs)
+              elsif !(@RGX_YEAR_PH =~ wrs).nil?
+                holidays << get_year_holiday(wrs)
               elsif !(@RGX_MONTH =~ wrs).nil?
                 months << get_month(wrs)
               elsif !(@RGX_YEAR =~ wrs).nil?
@@ -116,7 +120,6 @@ module OpeningHoursConverter
         # puts "times : #{times}"
         # puts "years : #{years}"
         # puts "rule_modifier : #{rule_modifier}"
-
         date_ranges = []
         if months.length > 0
           months.each do |month|
@@ -137,6 +140,14 @@ module OpeningHoursConverter
               date_ranges << date_range
             end
           end
+        elsif holidays.length > 0 && weekdays.length == 0
+          holidays.each do |holiday|
+            if holiday == "PH"
+              date_ranges << WideInterval.new.holiday(holiday)
+            elsif holiday[:holiday] == "PH"
+              date_ranges << WideInterval.new.holiday(holiday[:holiday], holiday[:start], holiday[:end])
+            end
+          end
         elsif years.length > 0
           years.each do |year|
             if !year[:from_day].nil?
@@ -166,10 +177,13 @@ module OpeningHoursConverter
           date_ranges << OpeningHoursConverter::WideInterval.new.always
         end
 
+        if weekdays.length > 0 && holidays.length > 0
+          weekdays << {from: -2, to: -2}
+          holidays = []
+        end
         if weekdays.length == 0
           weekdays << {from: 0, to: OSM_DAYS.length - 1}
         end
-
         if times.length == 0
           times << {from: 0, to: 24*60}
         end
@@ -239,8 +253,6 @@ module OpeningHoursConverter
                 add_interval(dr_obj.typical, weekdays[wd_id], times[t_id])
               end
             end
-
-
           end
         end
       end
@@ -328,6 +340,17 @@ module OpeningHoursConverter
       { from_month: year_month_from, to_month: year_month_to }
     end
 
+    def get_year_holiday(wrs)
+      single_year = wrs.gsub(/\:$/, '').split('-')
+      if single_year.length == 1
+        return { holiday: single_year[0].split(' ')[1], start: single_year[0].split(' ')[0] }
+      elsif single_year.length == 2
+        return { holiday: single_year[1].split(' ')[1], start: single_year[0], end: single_year[1].split(' ')[0] }
+      else
+        raise ArgumentError, "Invalid year_holiday : #{wrs.inspect}"
+      end
+    end
+
     def get_year_month_day(wrs)
       single_year_month_day = wrs.gsub(/\:$/, '').split('-')
       year_month_day_from = single_year_month_day[0].split(' ')
@@ -385,6 +408,7 @@ module OpeningHoursConverter
     end
 
     def get_weekdays(weekday_selector)
+      holidays = []
       weekdays = []
       wd_from = nil
       wd_to = nil
@@ -392,8 +416,10 @@ module OpeningHoursConverter
       weekday_selector = weekday_selector.split(',')
       weekday_selector.each do |wd|
         if !(@RGX_HOLIDAY =~ wd).nil?
+          holidays << wd
         elsif !(@RGX_WD =~ wd).nil?
           single_weekday = wd.split('-')
+
           wd_from = OSM_DAYS.find_index(single_weekday[0])
           if single_weekday.length > 1
             wd_to = OSM_DAYS.find_index(single_weekday[1])
@@ -407,7 +433,7 @@ module OpeningHoursConverter
         end
       end
 
-      weekdays
+      { weekdays: weekdays, holidays: holidays }
     end
 
     def remove_interval(typical, weekdays, times)
@@ -496,6 +522,9 @@ module OpeningHoursConverter
     def is_comment?(token)
       !(@RGX_COMMENT =~ token).nil?
     end
+    def is_holiday?(token)
+      !(@RGX_HOLIDAY =~ token).nil?
+    end
     def is_rule_modifier?(token)
       !(@RGX_RULE_MODIFIER =~ token).nil?
     end

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -13,7 +13,15 @@ module OpeningHoursConverter
 
     def get
       result = ""
-      if @date.length > 0
+      if @date.length == 1 && @date[0].wide_type == "holiday"
+        if !@date[0].wide.start[:year].nil?
+          result += @date[0].wide.start[:year]
+        end
+        if !@date[0].wide.end.nil?
+          result += "-#{@date[0].wide.end[:year]}"
+        end
+        result += " PH"
+      elsif @date.length > 0
         result += get_wide_selector
       end
 
@@ -23,10 +31,9 @@ module OpeningHoursConverter
           result += " #{wd}"
         end
       end
-
       if @time.length > 0
         result += " "
-        @time.each_with_index do |t, i|
+        @time.uniq.each_with_index do |t, i|
           if (i > 0)
             result += ","
           end
@@ -265,6 +272,12 @@ module OpeningHoursConverter
       end
     end
 
+    def add_ph_weekday
+      @date.each do |d|
+        d.add_ph_weekday
+      end
+    end
+
     def add_overwritten_weekday(weekday)
       @date.each do |d|
         d.add_overwritten_weekday(weekday)
@@ -285,11 +298,17 @@ module OpeningHoursConverter
       end
     end
 
+    def include_time?(time)
+      @time.each do |t|
+        return true if t.start == time.start && t.end == time.end
+      end
+      return false
+    end
+
     def add_time(time)
-      if (@time.length == 0 || @time[0].get != "off") && !@time.include?(time)
+
+      if (@time.length == 0 || @time[0].get != "off") && !include_time?(time)
         @time << time
-      else
-        raise ArgumentError, "This time can't be added to this rule"
       end
     end
 

data/lib/opening_hours_converter/opening_hours_time.rb

@@ -1,6 +1,6 @@
 module OpeningHoursConverter
   class OpeningHoursTime
-    attr_accessor :start, :end
+    attr_reader :start, :end
 
     def initialize(minute_start=nil, minute_end=nil)
       @start = minute_start

data/lib/opening_hours_converter/wide_interval.rb

@@ -35,6 +35,11 @@ module OpeningHoursConverter
         if !@end.nil?
           result += "-#{@end[:year]}"
         end
+      when "holiday"
+        result = "#{@start[:year].nil? ? "" : "#{@start[:year]} "}PH"
+        if !@end.nil?
+          result = "#{@start[:year]}#{@start[:year] == @end[:year] ? "" : "-#{@end[:year]}"} PH"
+        end
       when "always"
         result = ""
       else
@@ -122,6 +127,18 @@ module OpeningHoursConverter
       self
     end
 
+    def holiday(holiday, start_year=nil, end_year=nil)
+      if holiday.nil? || holiday != "PH"
+        raise(ArgumentError, "holiday is required and can only be PH")
+      end
+      @start = { holiday: holiday, year: start_year }
+      unless end_year.nil? || end_year == start_year
+        @end = { holiday: holiday, year: end_year }
+      end
+      @type = "holiday"
+      self
+    end
+
     def always
       @start = nil
       @end = nil
@@ -244,6 +261,10 @@ module OpeningHoursConverter
     def equals(o)
       return false unless o.instance_of?(OpeningHoursConverter::WideInterval)
       return @type == "always" if o.type == "always"
+      if @type == "holiday"
+        return (o.type == "holiday" && (@start[:year] == o.start[:year]) &&
+          (@end.nil? && o.end.nil? || (@end && o.end && @end[:year] == o.end[:year])))
+      end
       return false if @type == "always"
       self_to_day = to_day
       o_to_day = o.to_day

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Datetime range to openinghours, openinghours to datetime range. Very
   strongly inspired by yohours.