opening_hours_converter 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702767227bb2f956ceddf4f0ca6c99352c6e1fea
-  data.tar.gz: fa9efab32584b5cea03ccf9ffb94c143eefb91db
+  metadata.gz: f8e4e03653c0ff37b313eebc544293f0a94f8e64
+  data.tar.gz: d5d03ad9394c9fad99f378f5709c79bf511bcd0d
 SHA512:
-  metadata.gz: 9beee7a6b16b7427d968435b79cba79b420802e17419cd3265b97860ccfe18d726816b5feb969e9f8e7bb20e5c2349315490ae69f32966b83ae593ee49494429
-  data.tar.gz: e2faf52f40999e498772067bd5893a6986a2e90f9250b73eb65c0fd7ababbb7e93b9d4a51b8898cdb9b6a2c598dc84981e80cbe8e58eddc80077854124a6c345
+  metadata.gz: d3c40e4249a5d4ad180fc57f0a570278d12154b572332de6c623c442f70304fa8670ebe2079bd707d4597a213692f959f67a33d702034f7cd782a74e8ba74914
+  data.tar.gz: 6637cfb3f4a33c807247cf7589ce2da1f43bca1848e816e4af10ca88b8f8c26ad526d3f5a3767d367b7bc5a9422fba756542a6fb1219bf4f2b37502efcec9e81

data/lib/opening_hours_converter/iterator.rb

@@ -0,0 +1,176 @@
+require 'opening_hours_converter/constants'
+require 'pry-nav'
+module OpeningHoursConverter
+  class Iterator
+    include Constants
+
+    def get_iterator(date_ranges)
+      date_ranges_array = []
+      years = nil
+
+      date_ranges.each do |date_range|
+        years = OpeningHoursConverter::Year.build_day_array_from_date_range(date_range, true)
+        result = []
+
+        year_start = -1
+        month_start = -1
+        day_start = -1
+
+        years.each do |year, months|
+          months.each_with_index do |month_array, month|
+            month_array.each_with_index do |day_bool, day|
+              if day_bool && year_start < 0
+                year_start = year
+                month_start = month
+                day_start = day
+              elsif day_bool && year_start >= 0 && month == 11 && day == 30 && years[year+1].nil?
+
+                result << { start: DateTime.new(year_start, month_start+1, day_start+1), end: DateTime.new(year, 12, 31)}
+
+                year_start = -1
+                month_start = -1
+                day_start = -1
+              elsif !day_bool && year_start >= 0
+                end_res = {}
+
+                if day == 0
+                  if month == 0
+                    end_res = DateTime.new(year-1, 12, 31)
+                  else
+                    end_res = DateTime.new(year, month, MONTH_END_DAY[month])
+                  end
+                else
+
+                  end_res = DateTime.new(year, month+1, day)
+                end
+
+                result << { start: DateTime.new(year_start, month_start+1, day_start+1), end: end_res }
+                year_start = -1
+                month_start = -1
+                day_start = -1
+              end
+            end
+          end
+        end
+
+        date_ranges_array << result
+      end
+
+
+      return date_ranges_array
+    end
+
+    def get_time_iterator(date_ranges)
+      # binding.pry
+      is_ph = false
+      year = nil
+      year_ph = nil
+      date_ranges.each do |dr|
+        is_ph = true if dr.is_holiday?
+      end
+      date_ranges_array = get_iterator(date_ranges)
+      datetime_result = []
+
+
+      date_ranges_array.each_with_index do |result, index|
+        result.each do |interval|
+          (interval[:start]..interval[:end]).each do |day|
+            if year != day.year && is_ph
+              year = day.year
+              year_ph = PublicHoliday.ph_for_year(year)
+            end
+            date_ranges[index].typical.intervals.each do |i|
+              if !i.nil?
+                if (i.day_start..i.day_end).include?(fix_datetime_wday(day.wday)) || (is_ph && year_ph.include?(Time.new(day.year, day.month, day.day)))
+                  itr = { start: Time.new(day.year, day.month, day.day, i.start/60, i.start%60),
+                    end: Time.new(day.year, day.month, day.day, i.end/60, i.end%60) }
+                  datetime_result << itr unless datetime_result.include?(itr)
+                end
+              end
+            end
+          end
+        end
+      end
+
+      datetime_result.sort {|a,b| a[:start] <=> b[:start]}
+
+    end
+
+    def get_datetime_iterator(date_ranges)
+      result = get_iterator(date_ranges)
+      datetime_result = []
+
+      date_ranges_array.each_with_index do |result, index|
+        result.each do |interval|
+          (interval[:start]..interval[:end]).each do |day|
+            date_ranges[index].typical.intervals.each do |i|
+              if (i.day_start..i.day_end).include?(fix_datetime_wday(day.wday))
+                datetime_result << { start: DateTime.new(day.year, day.month, day.day, i.start/60, i.start%60),
+                  end: DateTime.new(day.year, day.month, day.day, i.end/60, i.end%60) }
+              end
+            end
+          end
+        end
+      end
+
+      datetime_result.sort {|a,b| a[:start] <=> b[:start]}
+    end
+
+
+    def fix_datetime_wday(d)
+      d==0 ? 6 : d-1
+    end
+
+    # A partir d'une string OH et d'une DateTime (= now par défaut), renvoyer le current state (début / fin / commentaire)
+    def state(opening_hours_string, time=Time.now)
+      date_ranges = OpeningHoursConverter::OpeningHoursParser.new.parse(opening_hours_string)
+      ti = get_time_iterator(date_ranges)
+      ti.each do |interval|
+        return interval if interval[:start] <= time && interval[:end] >= time
+      end
+      return false
+    end
+
+    # A partir d'une string OH et d'une DateTime (= now par défaut), renvoyer le prochain state (début / fin / commentaire - nextState dans opening_hours.js) permettant d'afficher à l'utilisateur le prochain événement (ouverture/fermeture)
+    def next_state(opening_hours_string, time=Time.now)
+      date_ranges = OpeningHoursConverter::OpeningHoursParser.new.parse(opening_hours_string)
+      ti = get_time_iterator(date_ranges)
+      ti.each_with_index do |interval, index|
+        return {end: interval[:end]} if interval[:start] <= time && interval[:end] >= time
+        return {start: interval[:start]} if interval[:start] > time && ti[index-1][:end] <= time
+      end
+      return false
+    end
+
+
+    def next_period(opening_hours_string, time=Time.now)
+      date_ranges = OpeningHoursConverter::OpeningHoursParser.new.parse(opening_hours_string)
+      ti = get_time_iterator(date_ranges)
+      ti.each_with_index do |interval, index|
+        return ti[index+1] if interval[:start] <= time && interval[:end] >= time
+        return interval if interval[:start] > time && ti[index-1][:end] <= time
+      end
+      return false
+    end
+
+    # A partir d'une string OH et d'une DateTime (= now par défaut), déterminer cela correspond à une période d'ouverture : renvoyer un boolean.
+    def is_opened?(opening_hours_string, time=Time.now)
+      date_ranges = OpeningHoursConverter::OpeningHoursParser.new.parse(opening_hours_string)
+      ti = get_time_iterator(date_ranges)
+      ti.each do |interval|
+        return true if interval[:start] <= time && interval[:end] >= time
+      end
+      return false
+    end
+
+
+    def datetime_to_time(datetime)
+      Time.new(datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min, datetime.sec, datetime.zone)
+    end
+
+    def time_to_datetime(time)
+      DateTime.new(time.year, time.month, time.day, time.hour, time.min, time.sec, Rational(time.gmt_offset / 3600, 24))
+    end
+
+  end
+end

data/lib/opening_hours_converter/year.rb

@@ -0,0 +1,320 @@
+require 'opening_hours_converter/constants'
+
+module OpeningHoursConverter
+  class Year
+    include Constants
+
+    def self.build_day_array_from_date_range(date_range, get_iterator=false)
+      years = {}
+      if date_range.is_holiday? && get_iterator
+        if date_range.wide_interval.type == "holiday"
+          if !date_range.wide_interval.start[:year].nil?
+            if !date_range.wide_interval.end.nil?
+              for year in date_range.wide_interval.start[:year]..date_range.wide_interval.end[:year]
+                years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+              end
+              years = process_holidays(date_range.wide_interval, years)
+            else
+              years[date_range.wide_interval.start[:year]] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+              years = process_holidays(date_range.wide_interval, years)
+            end
+          else
+            remove_holiday!(date_range)
+
+            years = process_always_holiday(date_range.wide_interval, years)
+          end
+        else
+
+        end
+      end
+      if !date_range.wide_interval.start.nil? && !date_range.wide_interval.start[:year].nil?
+        if date_range.wide_interval.end.nil? || date_range.wide_interval.end[:year].nil? || date_range.wide_interval.start[:year] == date_range.wide_interval.end[:year]
+          if !years[date_range.wide_interval.start[:year]].nil?
+            years = process_single_year(date_range.wide_interval, years)
+          else
+            years[date_range.wide_interval.start[:year]] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+            years = process_single_year(date_range.wide_interval, years)
+          end
+        else
+          for year in date_range.wide_interval.start[:year]..date_range.wide_interval.end[:year]
+            years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+          end
+          process_multiple_years(date_range.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_range.wide_interval, years, get_iterator)
+      end
+      years
+    end
+
+    def self.process_holidays(wide_interval, years)
+      if !wide_interval.end[:year].nil?
+        holidays = {}
+        for year in wide_interval.start[:year]..wide_interval.end[:year]
+          PublicHoliday.ph_for_year(year).each do |ht|
+            years[year][ht.month-1][ht.day-1] = true
+          end
+        end
+      else
+        PublicHoliday.ph_for_year(wide_interval.start[:year]).each do |ht|
+          years[wide_interval.start[:year]][ht.month-1][ht.day-1] = true
+        end
+      end
+      years
+    end
+
+    def self.process_always_holiday(wide_interval, years)
+      for year in (DateTime.now.year - 1)..(DateTime.now.year + 5)
+        years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+        PublicHoliday.ph_for_year(year).each do |ht|
+          years[year][ht.month-1][ht.day-1] = true
+        end
+      end
+      years
+    end
+
+    def self.remove_holiday!(date_range)
+      date_range.typical.intervals.each_with_index do |interval, interval_index|
+        date_range.remove_interval(interval_index) if interval.day_start == -2 && interval.day_end == -2
+      end
+    end
+
+    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)
+            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)
+            end
+          else
+            for year in date.wide.start[:year]..date.wide.end[:year]
+              years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+            end
+            process_multiple_years(date.wide, 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)
+        end
+      end
+      years
+    end
+
+    def self.process_always(wide_interval, years, get_iterator=false)
+      if !get_iterator
+        if wide_interval.start.nil?
+          years["always"] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { true } }
+        elsif !wide_interval.start[:day].nil?
+          if wide_interval.end.nil? || (wide_interval.end[:month].nil? && wide_interval.end[:day].nil?) ||
+            (wide_interval.start[:month] == wide_interval.end[:month] && wide_interval.start[:day] == wide_interval.end[:day])
+            years["always"][wide_interval.start[:month]-1][wide_interval.start[:day]-1] = true
+          elsif wide_interval.start[:month] == wide_interval.end[:month]
+            for day in wide_interval.start[:day]-1..wide_interval.end[:day]-1
+              years["always"][wide_interval.start[:month]-1][day] = true
+            end
+          elsif wide_interval.start[:month] != wide_interval.end[:month]
+            for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+              if month == wide_interval.start[:month]-1
+                for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                  years["always"][month][day] = true
+                end
+              elsif month == wide_interval.end[:month]-1
+                for day in 0..wide_interval.end[:day]-1
+                  years["always"][month][day] = true
+                end
+              else
+                for day in 0...MONTH_END_DAY[month]
+                  years["always"][month][day] = true
+                end
+              end
+            end
+          end
+        elsif !wide_interval.start[:month].nil?
+          if wide_interval.end.nil? || wide_interval.end[:month].nil? || wide_interval.start[:month] == wide_interval.end[:month]
+            years["always"][wide_interval.start[:month]-1].each_with_index do |month, i|
+              years["always"][wide_interval.start[:month]-1][i] = true
+            end
+          else
+            for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+              years["always"][month].each_with_index do |day, i|
+                years["always"][month][i] = true
+              end
+            end
+          end
+        end
+      else
+        for year in (DateTime.now.year - 1)..(DateTime.now.year + 5)
+          if wide_interval.start.nil?
+            years[year] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { true } }
+          elsif !wide_interval.start[:day].nil?
+            years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
+            if wide_interval.end.nil? || (wide_interval.end[:month].nil? && wide_interval.end[:day].nil?) ||
+              (wide_interval.start[:month] == wide_interval.end[:month] && wide_interval.start[:day] == wide_interval.end[:day])
+              years[year][wide_interval.start[:month]-1][wide_interval.start[:day]-1] = true
+            elsif wide_interval.start[:month] == wide_interval.end[:month]
+              for day in wide_interval.start[:day]-1..wide_interval.end[:day]-1
+                years[year][wide_interval.start[:month]-1][day] = true
+              end
+            elsif wide_interval.start[:month] != wide_interval.end[:month]
+              for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+                if month == wide_interval.start[:month]-1
+                  for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                    years[year][month][day] = true
+                  end
+                elsif month == wide_interval.end[:month]-1
+                  for day in 0..wide_interval.end[:day]-1
+                    years[year][month][day] = true
+                  end
+                else
+                  for day in 0...MONTH_END_DAY[month]
+                    years[year][month][day] = true
+                  end
+                end
+              end
+            end
+          elsif !wide_interval.start[:month].nil?
+            if wide_interval.end.nil? || wide_interval.end[:month].nil? || wide_interval.start[:month] == wide_interval.end[:month]
+              years[year][wide_interval.start[:month]-1].each_with_index do |month, i|
+                years[year][wide_interval.start[:month]-1][i] = true
+              end
+            else
+              for month in wide_interval.start[:month]-1..date.wide.end[:month]-1
+                years[year][month].each_with_index do |day, i|
+                  years[year][month][i] = true
+                end
+              end
+            end
+          end
+        end
+      end
+      return years
+    end
+
+    def self.process_multiple_years(wide_interval, years)
+      if wide_interval.type == "year"
+        for year in wide_interval.start[:year]..wide_interval.end[:year]
+          years[year].each_with_index do |month,i|
+            month.each_with_index do |day,j|
+              years[year][i][j] = true
+            end
+          end
+        end
+      elsif wide_interval.type == "month"
+        for year in wide_interval.start[:year]..wide_interval.end[:year]
+          if year == wide_interval.start[:year]
+            for month in wide_interval.start[:month]-1..11
+              years[year][month].each_with_index do |day, i|
+                years[year][month][i] = true
+              end
+            end
+          elsif year == wide_interval.end[:year]
+            for month in 0..wide_interval.end[:month]-1
+              years[year][month].each_with_index do |day, i|
+                years[year][month][i] = true
+              end
+            end
+          else
+            for month in 0..11
+              years[year][month].each_with_index do |day, i|
+                years[year][month][i] = true
+              end
+            end
+          end
+        end
+      elsif wide_interval.type == "day"
+        for year in wide_interval.start[:year]..wide_interval.end[:year]
+          if year == wide_interval.start[:year]
+            for month in wide_interval.start[:month]-1..11
+              if month == wide_interval.start[:month]-1
+                for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                  years[year][month][day] = true
+                end
+              else
+                for day in 0...MONTH_END_DAY[month]
+                  years[year][month][day] = true
+                end
+              end
+            end
+          elsif year == wide_interval.end[:year]
+            for month in 0..wide_interval.end[:month]-1
+              if month == wide_interval.end[:month]-1
+                for day in 0..wide_interval.end[:day]-1
+                  years[year][month][day] = true
+                end
+              else
+                for day in 0...MONTH_END_DAY[month]
+                  years[year][month][day] = true
+                end
+              end
+            end
+          else
+            for month in 0..11
+              for day in 0...MONTH_END_DAY[month]
+                years[year][month][day] = true
+              end
+            end
+          end
+        end
+      end
+      return years
+    end
+
+    def self.process_single_year(wide_interval, years, always=false)
+      if wide_interval.type == "year"
+        years[wide_interval.start[:year]].each_with_index do |month,i|
+          month.each_with_index do |day,j|
+            years[wide_interval.start[:year]][i][j] = true
+          end
+        end
+      elsif wide_interval.type == "month"
+        if wide_interval.end.nil? || wide_interval.end[:month].nil? || wide_interval.start[:month] == wide_interval.end[:month]
+          years[wide_interval.start[:year]][wide_interval.start[:month]-1].each_with_index do |month, i|
+            years[wide_interval.start[:year]][wide_interval.start[:month]-1][i] = true
+          end
+        else
+          for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+            years[wide_interval.start[:year]][month].each_with_index do |day, i|
+              years[wide_interval.start[:year]][month][i] = true
+            end
+          end
+        end
+      elsif wide_interval.type == "day"
+        if wide_interval.start[:month] == wide_interval.end[:month] || wide_interval.end[:month].nil?
+          if wide_interval.start[:day] == wide_interval.end[:day]
+            years[wide_interval.start[:year]][wide_interval.start[:month]-1][wide_interval.start[:day]-1] = true
+          else
+            for day in wide_interval.start[:day]-1..wide_interval.end[:day]-1
+              years[wide_interval.start[:year]][wide_interval.start[:month]-1][day] = true
+            end
+          end
+        else
+          for month in wide_interval.start[:month]-1..wide_interval.end[:month]-1
+            if month == wide_interval.start[:month]-1
+              for day in wide_interval.start[:day]-1...MONTH_END_DAY[month]
+                years[wide_interval.start[:year]][month][day] = true
+              end
+            elsif month == wide_interval.end[:month]-1
+              for day in 0..wide_interval.end[:day]-1
+                years[wide_interval.start[:year]][month][day] = true
+              end
+            else
+              for day in 0...MONTH_END_DAY[month]
+                years[wide_interval.start[:year]][month][day] = true
+              end
+            end
+          end
+        end
+      end
+      return years
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ziserman Martin
@@ -22,6 +22,7 @@ files:
 - lib/opening_hours_converter/date_range.rb
 - lib/opening_hours_converter/day.rb
 - lib/opening_hours_converter/interval.rb
+- lib/opening_hours_converter/iterator.rb
 - lib/opening_hours_converter/opening_hours_builder.rb
 - lib/opening_hours_converter/opening_hours_date.rb
 - lib/opening_hours_converter/opening_hours_parser.rb
@@ -29,6 +30,7 @@ files:
 - lib/opening_hours_converter/opening_hours_time.rb
 - lib/opening_hours_converter/week.rb
 - lib/opening_hours_converter/wide_interval.rb
+- lib/opening_hours_converter/year.rb
 homepage: https://github.com/Publidata/opening_hours_converter
 licenses:
 - AGPL-3.0