opening_hours_converter 1.7.12 → 1.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ab2dbbd4139cffd6168ebff0c58c44d7d281d6b
-  data.tar.gz: ce505f3caa8ab41b7753b2442cd548962a9c3dd8
+  metadata.gz: 30b75efae1d2074a90198d343b7d48bd98e0b5b2
+  data.tar.gz: e54c64bfec49c98b6bf1efba450b8414e293866b
 SHA512:
-  metadata.gz: cdfb270d1c926836fb87ca3e3eb547914742a92abcb3ac10049482593f3ec06e40d629e2a1bf8f88a641cd5c7da79943530cc284ec6478df06779e89b779718d
-  data.tar.gz: 78a04fbf46aa03e66958f78cb0e815de6c1bc6b7bd0db5e1129508c3e7b944eec0fbba473bef3b153337817fb6aa6d3a902c54fab7f8ad75f9a77601f68c4b1a
+  metadata.gz: b37b12e0c001ef29dcf4bd301fc4421198b4909a209235a72c09c9b4f92b47fd540a1ab5a5a2da8339dd5da958123d4e670b2f61659bdd93985fecfcf0af7a97
+  data.tar.gz: 98e04d292316f92a63d7e56f782d6447b54ede78aab84c502b8785622e6a1c01bdee15048b1b4feca7016ccabc95a874538e9cb35c345497b7b93472e16d879e

data/lib/opening_hours_converter/iterator.rb

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

@@ -11,14 +11,19 @@ module OpeningHoursConverter
       range_general = nil
       range_general_for = nil
       day_ph = false
+      off_day_ph = false
 
       date_ranges.each_with_index do |date_range, date_range_index|
         if !date_range.nil?
           if date_range.typical.intervals.length != 1
             date_range.typical.intervals.each_with_index do |interval, interval_id|
               if interval&.day_start == -2 && interval&.day_start == interval&.day_end
+                if interval.is_off
+                  off_day_ph = true
+                else
+                  day_ph = true
+                end
                 date_range.typical.remove_interval(interval_id)
-                day_ph = true
               end
             end
           end
@@ -52,6 +57,8 @@ module OpeningHoursConverter
               oh_rules = build_day(date_range)
             end
 
+
+
             oh_rules.each_with_index do |rule, i|
               oh_rules[i].add_comment(date_range.comment)
             end
@@ -90,6 +97,10 @@ module OpeningHoursConverter
                 oh_rule.add_ph_weekday
               end
 
+              if off_day_ph
+                rules += build_off_holiday(date_range)
+              end
+
               if !oh_rule_added
                 rules << oh_rule
               end
@@ -125,6 +136,21 @@ module OpeningHoursConverter
       return result.strip
     end
 
+    def build_off_holiday(date_range)
+
+      start_year = date_range.wide_interval.start&.key?(:year) ? date_range.wide_interval.start[:year] : date_range.wide_interval.start
+      end_year = date_range.wide_interval.end&.key?(:year) ? date_range.wide_interval.end[:year] : date_range.wide_interval.end
+
+      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])
+      rule.add_date(date)
+      rule.is_defined_off = true
+
+      return [ rule ]
+    end
+
     def build_holiday(date_range)
 
       start_year = date_range.wide_interval.start&.key?(:year) ? date_range.wide_interval.start[:year] : date_range.wide_interval.start

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -254,7 +254,7 @@ module OpeningHoursConverter
     end
 
     def same_time?(o)
-      if o.nil? || o.time.length != @time.length
+      if o.nil? || o.time.length != @time.length || @is_defined_off != o.is_defined_off
         return false
       else
         @time.each_with_index do |t, i|

metadata

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