opening_hours_converter 1.4.17 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669c41a41232c2ec313fc364e29d48fa5eb12dc7
-  data.tar.gz: 1152ac197152568691c9d49cc1090e19d71b0537
+  metadata.gz: ac95f6b36e6b0c6062f5ef420f45dd8ad6ff34de
+  data.tar.gz: b059dce0398318ca355cdc9a183f10cc65255ed7
 SHA512:
-  metadata.gz: 296912ab3c446e5203b8dd6c3698e654dbc310dc4046c81607e99b4fe84dc2e6316f445a1e8f35ad2eed5569fa989fd8eb40ee191e6a0aa2ede2bbe6ea7e12b5
-  data.tar.gz: 0b23783a4444834f48d4ddc0292def520ba2f9254186a6bda0def62b91c330cd2b964bc4f974c3fbbfc149e40bb68dc85fef927ea51762893c645122eb1d98f5
+  metadata.gz: c10976b2002f9a3fe7a20db89bec0c4cb992538dede16feb2cbd56f43634a1339d8fc116cb859dca0e8a615d084fd211c5f6c773b4cc6fa6605edb34e0dbaf6e
+  data.tar.gz: fdacc54c5108c114a086b4c0f69887920ddbcd745d1b8f3c3431953556bc41cf91a53c93bcc7a5b760e3e4cd10af0e9e4d76e8a2371e1562710713fa4b59f279

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -108,13 +108,9 @@ module OpeningHoursConverter
       result = ""
 
       if rules.length == 0
-
         date_ranges.each do |dr|
-          if dr.wide_interval.type != "always"
-            result += "#{dr.wide_interval.get_time_selector} off"
-          end
+          result += "#{dr.wide_interval.get_time_selector} off"
         end
-
       else
         rules.each_with_index do |rule, rule_index|
           if rule_index > 0
@@ -124,7 +120,7 @@ module OpeningHoursConverter
         end
       end
 
-      return result
+      return result.strip
     end
 
     def build_holiday(date_range)
@@ -161,16 +157,10 @@ 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]
-      sunday24 = time_intervals[1]
-      days = time_intervals[2]
-
-      days = night_monday_sunday(days, monday0, sunday24)
+      intervals = date_range.typical.get_intervals(true)
 
+      days = create_time_intervals(date_range.wide_interval, date_range.wide_interval.type, intervals)
 
       days_status = Array.new(OSM_DAYS.length, 0)
 
@@ -224,21 +214,18 @@ module OpeningHoursConverter
     def build_week_diff(date_range, general_date_range)
       intervals = date_range.typical.get_intervals_diff(general_date_range.typical)
 
-      time_intervals = create_time_intervals(
+      time_intervals =
+      days = create_time_intervals(
         date_range.wide_interval,
         date_range.wide_interval.type,
         intervals[:open])
-      monday0 = time_intervals[0]
-      sunday24 = time_intervals[1]
-      days = time_intervals[2]
+
       intervals[:closed].each do |interval|
         for i in interval.day_start..interval.day_end do
           days[i].add_time(OpeningHoursConverter::OpeningHoursTime.new)
         end
       end
 
-      days = night_monday_sunday(days, monday0, sunday24)
-
       days_status = Array.new(OSM_DAYS.length, 0)
       result = []
 
@@ -329,9 +316,6 @@ module OpeningHoursConverter
     end
 
     def create_time_intervals(wide_interval, type, intervals)
-      monday0 = -1
-      sunday24 = -1
-
       days = []
       for i in 0...7
         days << OpeningHoursConverter::OpeningHoursRule.new
@@ -340,22 +324,12 @@ module OpeningHoursConverter
 
       intervals.each do |interval|
         if !interval.nil?
-          if interval.day_start == DAYS_MAX && interval.day_end == DAYS_MAX && interval.end == MINUTES_MAX
-            sunday24 = interval.start
-          end
-          if interval.day_start == 0 && interval.day_end == 0 && interval.start == 0
-            monday0 = interval.end
-          end
           begin
             if interval.day_start == interval.day_end
               days[interval.day_start].add_time(OpeningHoursConverter::OpeningHoursTime.new(interval.start, interval.end))
             elsif interval.day_end - interval.day_start == 1
-              if interval.start > interval.end
-                days[interval.day_start].add_time(OpeningHoursConverter::OpeningHoursTime.new(interval.start, interval.end))
-              else
-                days[interval.day_start].add_time(OpeningHoursConverter::OpeningHoursTime.new(interval.start, MINUTES_MAX))
-                days[interval.day_end].add_time(OpeningHoursConverter::OpeningHoursTime.new(0, interval.end))
-              end
+              days[interval.day_start].add_time(OpeningHoursConverter::OpeningHoursTime.new(interval.start, MINUTES_MAX))
+              days[interval.day_end].add_time(OpeningHoursConverter::OpeningHoursTime.new(0, interval.end))
             else
               for j in interval.day_start..interval.day_end
                 if j == interval.day_start
@@ -373,17 +347,6 @@ module OpeningHoursConverter
         end
       end
 
-      return [ monday0, sunday24, days ]
-    end
-
-    def night_monday_sunday(days, monday0, sunday24)
-      if monday0 >= 0 && sunday24 >= 0 && monday0 < sunday24
-        days[0].time.sort! { |a, b| a.start <=> b.start }
-        days[6].time.sort! { |a, b| a.start <=> b.start }
-
-        days[6].time[days[6].time.length - 1] = OpeningHoursConverter::OpeningHoursTime.new(sunday24, monday0)
-        days[0].time.shift
-      end
       return days
     end
   end

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -178,6 +178,7 @@ module OpeningHoursConverter
           date_ranges << OpeningHoursConverter::WideInterval.new.always
         end
 
+
         if weekdays.length > 0 && holidays.length > 0
           weekdays << {from: -2, to: -2}
           holidays = []
@@ -536,7 +537,7 @@ module OpeningHoursConverter
         if wd < 6
           typical.add_interval(OpeningHoursConverter::Interval.new(wd, times[:from], wd+1, times[:to]))
         else
-          typical.add_interval(OpeningHoursConverter::Interval.new(wd, times[:from], wd+1, 24*60))
+          typical.add_interval(OpeningHoursConverter::Interval.new(wd, times[:from], wd, 24*60))
           typical.add_interval(OpeningHoursConverter::Interval.new(0, 0, 0, times[:to]))
         end
       end

data/lib/opening_hours_converter/wide_interval.rb

@@ -53,21 +53,52 @@ module OpeningHoursConverter
       case @type
       when "day"
         if !@end.nil?
-          result = "toutes les semaines du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]}"
-          if @start[:month] != @end[:month]
-            result += " au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]}"
+          if @start[:year] && !@end[:year] || @start[:year] && @start[:year] == @end[:year]
+            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
+          elsif @start[:year] && @end[:year] && @start[:year] != @end[:year]
+            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
+          elsif @start[:month] != @end[:month]
+            result = "du #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} au #{@end[:day]} #{IRL_MONTHS[@end[:month] - 1]}"
+          else
+            result = "le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]}"
           end
         else
-          result = "le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]}"
+          result = "le #{@start[:day]} #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year] ? @start[:year] : ""}"
         end
       when "month"
         if !@end.nil?
-          result = "toutes les semaines de #{IRL_MONTHS[@start[:month] - 1]} à #{IRL_MONTHS[@endd[:month] - 1]}"
+          if @start[:year] && !@end[:year] || @start[:year] && @start[:year] == @end[:year]
+            result = "de #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@start[:year]}"
+          elsif @start[:year] && @end[:year] && @start[:year] != @end[:year]
+            result = "de #{IRL_MONTHS[@start[:month] - 1]} #{@start[:year]} à #{IRL_MONTHS[@end[:month] - 1]} #{@end[:year]}"
+          else
+            result = "de #{IRL_MONTHS[@start[:month] - 1]} à #{IRL_MONTHS[@end[:month] - 1]}"
+          end
+        else
+          result = "#{IRL_MONTHS[@start[:month] - 1]}#{@start[:year] ? " #{@start[:year]}" : ""}"
+        end
+      when "year"
+        if !@end.nil?
+          result = "de #{@start[:year]} à #{@end[:year]}"
         else
-          result = "toutes les semaines de #{IRL_MONTHS[@start[:month] - 1]}"
+          result = "#{@start[:year]}"
+        end
+      when "holiday"
+        if !@end.nil?
+          if !@start[:year]
+            result = "jours fériés"
+          else
+            result = "les jours fériés de #{@start[:year]} à #{@end[:year]}"
+          end
+        else
+          if !@start[:year]
+            result = "jours fériés"
+          else
+            result = "les jours fériés de #{@start[:year]}"
+          end
         end
       when "always"
-        result = "toutes les semaines"
+        result = "tout le temps"
       end
       return result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.5.0
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json