opening_hours_converter 1.7.11 → 1.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a8e73ad9012ab3267d43f5825d9f2d1beec2fc
-  data.tar.gz: 2bc1dd20aebfdf21cb537b8dcabcb780165589a6
+  metadata.gz: 5ab2dbbd4139cffd6168ebff0c58c44d7d281d6b
+  data.tar.gz: ce505f3caa8ab41b7753b2442cd548962a9c3dd8
 SHA512:
-  metadata.gz: 6d6f759e671bc857c7bef5eced393156b5e144e2c169a566895acf902cc91a26ae0c83cf52f848e18c9949f11b3acd65037c8b0428d0d13317891509d058fa15
-  data.tar.gz: e6789c2e0752eb5fab2195cf47f208098f0790eeb52c4ff2609e75c688368057bad42937426dc2b81a9ea54731cf4c3d166cc43cc68aecb429b8b75233f6c9ee
+  metadata.gz: cdfb270d1c926836fb87ca3e3eb547914742a92abcb3ac10049482593f3ec06e40d629e2a1bf8f88a641cd5c7da79943530cc284ec6478df06779e89b779718d
+  data.tar.gz: 78a04fbf46aa03e66958f78cb0e815de6c1bc6b7bd0db5e1129508c3e7b944eec0fbba473bef3b153337817fb6aa6d3a902c54fab7f8ad75f9a77601f68c4b1a

data/lib/opening_hours_converter/iterator.rb

@@ -10,6 +10,7 @@ module OpeningHoursConverter
 
       date_ranges.each do |date_range|
         years = OpeningHoursConverter::Year.build_day_array_from_date_range(date_range, true)
+
         result = []
 
         year_start = -1
@@ -69,8 +70,6 @@ module OpeningHoursConverter
       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|
@@ -90,7 +89,6 @@ module OpeningHoursConverter
           end
         end
       end
-
       datetime_result.sort {|a,b| a[:start] <=> b[:start]}
 
     end
@@ -135,6 +133,7 @@ module OpeningHoursConverter
     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

data/lib/opening_hours_converter/public_holiday.rb

@@ -89,20 +89,20 @@ module OpeningHoursConverter
 
     def self.ph_for_year(year=Time.now.year)
       ph = []
-      ph << new_year
-      ph << good_friday
-      ph << easter
-      ph << easter_monday
-      ph << work_day
-      ph << victory
-      ph << rise
-      ph << pentecote
-      ph << pentecote_monday
-      ph << bastille_day
-      ph << assomption
-      ph << toussaint
-      ph << armistice
-      ph << christmas
+      ph << new_year(year)
+      ph << good_friday(year)
+      ph << easter(year)
+      ph << easter_monday(year)
+      ph << work_day(year)
+      ph << victory(year)
+      ph << rise(year)
+      ph << pentecote(year)
+      ph << pentecote_monday(year)
+      ph << bastille_day(year)
+      ph << assomption(year)
+      ph << toussaint(year)
+      ph << armistice(year)
+      ph << christmas(year)
       ph.sort
     end
 

data/lib/opening_hours_converter/year.rb

@@ -6,25 +6,22 @@ module OpeningHoursConverter
 
     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)
+        if !date_range.wide_interval.start.nil? && !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
-            remove_holiday!(date_range)
-
-            years = process_always_holiday(date_range.wide_interval, years)
+            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
       end
       if !date_range.wide_interval.start.nil? && !date_range.wide_interval.start[:year].nil?
@@ -51,7 +48,7 @@ module OpeningHoursConverter
     end
 
     def self.process_holidays(wide_interval, years)
-      if !wide_interval.end[:year].nil?
+      if !wide_interval.end.nil? && !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|
@@ -78,7 +75,7 @@ module OpeningHoursConverter
 
     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
+        date_range.typical.remove_interval(interval_index) if interval.day_start == -2 && interval.day_end == -2
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json