opening_hours_converter 1.13.17 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84de92905d530dba2e826eea1a88045fb521cf5a24803f9f0b040574ae05ea4
-  data.tar.gz: a464fcc26ebe69fcd7cf8f88cfa992eea87c2c35453710e6f32b407a101c567b
+  metadata.gz: 5a2ed9352795f7d666eb4869913debe946bf716477736bce0a692656de42adb4
+  data.tar.gz: ac9cc5e9c97d5a34752d4eb9a87b400de4fa79f345ed3feaf342d2eb79e4ba9d
 SHA512:
-  metadata.gz: f287f0439e502deeac6fc574085526fdf83fb188412287ba025a87b948902ceaeaba3191e3300f866e76baa8530e9ca80150561e4f3ec3cab11c1de930f9b7d4
-  data.tar.gz: 28548d677e6e763fa1dbf676b8b7f5fd4f6e2c0f045276a8594231b51ecf7665dfebd7b4ff9683e414ca1d41ad180bdc8548b981b91262b1dc7faf7a12a913c5
+  metadata.gz: e101cbe8cca800b452a573349b9058f5569a2a94c7bbbf46f9beb49223b6a5f9655bbe05510f0a2f3be5a87e1d84e948d67d6a433829879e89f3e05e9806fc46
+  data.tar.gz: 268214fc3bb1c51242ba19441ab5772c7bf8ae1f16f7d8855aa477acac568984aca9b097ca39da3326c8d90cdf95aa8416aeab76d6b7a05e5f4318bf16f6af18

data/lib/opening_hours_converter/opening_hours_builder.rb

@@ -67,7 +67,7 @@ module OpeningHoursConverter
           rule_index = 0
 
           while !oh_rule_added && rule_index < rules.length
-            if rules[rule_index].same_time?(oh_rule) && !rules[rule_index].equals(oh_rule) && rules[rule_index].comment == oh_rule.comment
+            if rules[rule_index].mergeable?(oh_rule) && rules[rule_index].same_time?(oh_rule) && !rules[rule_index].equals(oh_rule) && rules[rule_index].comment == oh_rule.comment && rules[rule_index].comment != "off" && oh_rule.comment != "off"
               begin
                 for date_id in 0...oh_rule.date.length
                   rules[rule_index].add_date(oh_rule.date[date_id])

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -403,11 +403,11 @@ module OpeningHoursConverter
 
     def get_month(wrs)
       single_month = wrs.gsub(/\:$/, '').split('-')
-      month_from = OSM_MONTHS.find_index(single_month[0]) + 1
+      month_from = OSM_MONTHS.find_index(single_month[0].capitalize) + 1
       raise ArgumentError, "Invalid month : #{single_month[0]}" if month_from < 1
 
       if single_month.length > 1
-        month_to = OSM_MONTHS.find_index(single_month[1]) + 1
+        month_to = OSM_MONTHS.find_index(single_month[1].capitalize) + 1
         raise ArgumentError, "Invalid month : #{single_month[1]}" if month_to < 1
       else
         month_to = month_from
@@ -435,13 +435,13 @@ module OpeningHoursConverter
       single_month = wrs.gsub(/\:$/, '').split('-')
 
       month_from = single_month[0].split(' ')
-      month_from = { day: month_from[1].to_i, month: OSM_MONTHS.find_index(month_from[0]) + 1 }
+      month_from = { day: month_from[1].to_i, month: OSM_MONTHS.find_index(month_from[0].capitalize) + 1 }
       raise ArgumentError, "Invalid month : #{month_from.inspect}" if month_from[:month] < 1
 
       if single_month.length > 1
         month_to = single_month[1].split(' ')
         month_to = if month_to.length > 1
-                     { day: month_to[1].to_i, month: OSM_MONTHS.find_index(month_to[0]) + 1 }
+                     { day: month_to[1].to_i, month: OSM_MONTHS.find_index(month_to[0].capitalize) + 1 }
                    else
                      { day: month_to[0].to_i, month: month_from[:month] }
                    end
@@ -456,16 +456,16 @@ module OpeningHoursConverter
     def get_year_month(wrs)
       single_year_month = wrs.gsub(/\:$/, '').split('-')
       year_month_from = single_year_month[0].split(' ')
-      year_month_from = { month: OSM_MONTHS.find_index(year_month_from[1]) + 1, year: year_month_from[0].to_i }
+      year_month_from = { month: OSM_MONTHS.find_index(year_month_from[1].capitalize) + 1, year: year_month_from[0].to_i }
       if year_month_from.empty?
         raise ArgumentError, "Invalid year_month : #{year_month_from.inspect}"
       end
       if single_year_month.length > 1
         year_month_to = single_year_month[1].split(' ')
         if year_month_to.length == 2
-          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[1]) + 1, year: year_month_to[0].to_i }
+          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[1].capitalize) + 1, year: year_month_to[0].to_i }
         elsif year_month_to.length == 1
-          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[0]) + 1, year: year_month_from[:year] }
+          year_month_to = { month: OSM_MONTHS.find_index(year_month_to[0].capitalize) + 1, year: year_month_from[:year] }
         end
         raise ArgumentError, "Invalid year_month : #{year_month_to.inspect}" if year_month_to.empty?
       else
@@ -489,7 +489,7 @@ module OpeningHoursConverter
       single_year_month_day = wrs.gsub(/\:$/, '').split('-')
       year_month_day_from = single_year_month_day[0].split(' ')
       year_month_day_from = { day: year_month_day_from[2].to_i,
-                              month: OSM_MONTHS.find_index(year_month_day_from[1]) + 1,
+                              month: OSM_MONTHS.find_index(year_month_day_from[1].capitalize) + 1,
                               year: year_month_day_from[0].to_i }
       if year_month_day_from.empty?
         raise ArgumentError, "Invalid year_month_day : #{year_month_day_from.inspect}"
@@ -498,11 +498,11 @@ module OpeningHoursConverter
         year_month_day_to = single_year_month_day[1].split(' ')
         if year_month_day_to.length == 3
           year_month_day_to = { day: year_month_day_to[2].to_i,
-                                month: OSM_MONTHS.find_index(year_month_day_to[1]) + 1,
+                                month: OSM_MONTHS.find_index(year_month_day_to[1].capitalize) + 1,
                                 year: year_month_day_to[0].to_i }
         elsif year_month_day_to.length == 2
           year_month_day_to = { day: year_month_day_to[1].to_i,
-                                month: OSM_MONTHS.find_index(year_month_day_to[0]) + 1,
+                                month: OSM_MONTHS.find_index(year_month_day_to[0].capitalize) + 1,
                                 year: year_month_day_from[:year] }
         elsif year_month_day_to.length == 1
           year_month_day_to = { day: year_month_day_to[0].to_i,
@@ -532,12 +532,12 @@ module OpeningHoursConverter
         if days.length == 2
           from = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+            month: OSM_MONTHS.find_index(wr[0...3].capitalize) + 1,
             day: days[0]
           }
           to = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+            month: OSM_MONTHS.find_index(wr[0...3].capitalize) + 1,
             day: days[1]
           }
           { from_day: from, to_day: to }
@@ -564,24 +564,24 @@ module OpeningHoursConverter
           end_day = end_month_day[4...end_month_day.length]&.to_i
 
           from = {
-            month: OSM_MONTHS.find_index(start_month) + 1,
+            month: OSM_MONTHS.find_index(start_month.capitalize) + 1,
             day: start_day || 1
           }
           to = {
-            month: OSM_MONTHS.find_index(end_month) + 1,
-            day: end_day || MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
+            month: OSM_MONTHS.find_index(end_month.capitalize) + 1,
+            day: end_day || MONTH_END_DAY[OSM_MONTHS.find_index(end_month.capitalize)]
           }
         else
           month = wr[0...3]
           day = wr[4...wr.length]&.to_i
 
           from = {
-            month: OSM_MONTHS.find_index(month) + 1,
+            month: OSM_MONTHS.find_index(month.capitalize) + 1,
             day: day || 1
           }
           to = {
-            month: OSM_MONTHS.find_index(month) + 1,
-            day: day || MONTH_END_DAY[OSM_MONTHS.find_index(month)]
+            month: OSM_MONTHS.find_index(month.capitalize) + 1,
+            day: day || MONTH_END_DAY[OSM_MONTHS.find_index(month.capitalize)]
           }
         end
 
@@ -598,24 +598,24 @@ module OpeningHoursConverter
           start_month, end_month = wr.split('-')
           from = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(start_month) + 1,
+            month: OSM_MONTHS.find_index(start_month.capitalize) + 1,
             day: 1
           }
           to = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(end_month) + 1,
-            day: MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
+            month: OSM_MONTHS.find_index(end_month.capitalize) + 1,
+            day: MONTH_END_DAY[OSM_MONTHS.find_index(end_month.capitalize)]
           }
         else
           from = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
+            month: OSM_MONTHS.find_index(wr[0...3].capitalize) + 1,
             day: 1
           }
           to = {
             year: year.to_i,
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
-            day: MONTH_END_DAY[OSM_MONTHS.find_index(wr[0...3])]
+            month: OSM_MONTHS.find_index(wr[0...3].capitalize) + 1,
+            day: MONTH_END_DAY[OSM_MONTHS.find_index(wr[0...3].capitalize)]
           }
         end
         { from_day: from, to_day: to }
@@ -657,9 +657,9 @@ module OpeningHoursConverter
         elsif !(@regex_handler.week_day_regex =~ wd).nil?
           single_weekday = wd.split('-')
 
-          wd_from = OSM_DAYS.find_index(single_weekday[0])
+          wd_from = OSM_DAYS.find_index(single_weekday[0].capitalize)
           wd_to = if single_weekday.length > 1
-                    OSM_DAYS.find_index(single_weekday[1])
+                    OSM_DAYS.find_index(single_weekday[1].capitalize)
                   else
                     wd_from
                   end
@@ -670,8 +670,8 @@ module OpeningHoursConverter
           from, to = wd[0...wd.index('[')].split('-')
           index = wd[wd.index('[') + 1...wd.index(']')]
 
-          wd_from = OSM_DAYS.find_index(from)
-          wd_to = OSM_DAYS.find_index(to)
+          wd_from = OSM_DAYS.find_index(from.capitalize)
+          wd_to = OSM_DAYS.find_index(to.capitalize)
 
           weekdays << { from: wd_from, to: wd_from, index: index.to_i }
         else

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -294,6 +294,17 @@ module OpeningHoursConverter
       end
     end
 
+    def mergeable?(o)
+      if o.nil? || o.date.length != @date.length
+        true
+      else
+        @date.each_with_index do |d, i|
+          return false if (d.wide_interval.start&.dig(:year) != o.date[i].wide_interval.start&.dig(:year)) && d.wide_interval.type != o.date[i].wide_interval.type
+        end
+        true
+      end
+    end
+
     def equals(o)
       return false unless o.instance_of?(OpeningHoursConverter::OpeningHoursRule)
       (same_time?(o) && same_date?(o))

data/lib/opening_hours_converter/regex_handler.rb

@@ -317,7 +317,7 @@ module OpeningHoursConverter
 
     def compile(string)
       @compile ||= {}
-      @compile[string] ||= Regexp.compile(string)
+      @compile[string] ||= Regexp.compile(string, Regexp::IGNORECASE)
     end
 
     def escape(string)

data/lib/opening_hours_converter/token.rb

@@ -23,15 +23,15 @@ module OpeningHoursConverter
     end
 
     def weekday?
-      string? && OSM_DAYS.any? { |day| day == @value }
+      string? && OSM_DAYS.any? { |day| day.downcase == @value.downcase }
     end
 
     def month?
-      string? && OSM_MONTHS.any? { |day| day == @value }
+      string? && OSM_MONTHS.any? { |day| day.downcase == @value.downcase }
     end
 
     def week?
-      string? && @value == 'week'
+      string? && @value.downcase == 'week'
     end
 
     def week_index?

data/lib/opening_hours_converter/wide_interval.rb

@@ -519,7 +519,7 @@ module OpeningHoursConverter
       if self_to_day.is_a?(Array)
         if o_to_day.is_a?(Array)
           return false unless o_to_day.length == self_to_day.length
-          return self_to_day.all? do |self_day|
+          return self.start == o.start && self_to_day.all? do |self_day|
             o_to_day.any? do |o_day|
               self_day.equals(o_day)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.17
+  version: 1.14.1
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json