opening_hours_converter 1.13.15 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0285111a830dec3522015740cb47bd369ae2b380e98d61cdf7b1cb5f28bc63ee'
-  data.tar.gz: c5a861db86278d886e244b48079eaf1e82cac515a96adffc1585c7b5df380c2a
+  metadata.gz: 1840d4011474e210bb2248979afc8850829c4eab62b0cb2036a670a70ded1265
+  data.tar.gz: 0710a806e7ac90d3b61d83bd9281acb1c56546aabb504d8b4961f5eeb05ca1b4
 SHA512:
-  metadata.gz: 45727f1c510fd1411d3731a0dee6dc7e20cb352b35aeaafe4caea3293f23dbb29d7e3e83263f41e75f4d7621aaddc7e00179da6986379398b96f3730d64844c5
-  data.tar.gz: 70d2591cf15c348db93be5fb90fc6362c6ed4c6373918af3dbfd680cab23b8e8a301dbaaeb6caec8727c9fd256498fc0b8428822d00aa44747d96c27f411a6eb
+  metadata.gz: 5160c41e2242e1489b1daddecef9068c3218d9726b7f6c0871176d323796035df2b1d491018b13506e88bbf33212df6549063a5ed81559ad645ac5e59a579962
+  data.tar.gz: 6e3c009bfb86cfda6a516ee4c86b49cc165211ee323981b20d74b778938249cb88a436601517659a4b17c8d4bc26119dec0e171ef94c6685094a9d8ee407ba6f

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -48,7 +48,7 @@ module OpeningHoursConverter
         end
 
         # get state and time associated with weekdays
-        while @current_token >= 0 && (is_rule_modifier?(tokens[@current_token]) || is_time?(tokens[@current_token]))
+        while @current_token >= 0 && (is_rule_modifier?(tokens[@current_token]) || is_time?(tokens[@current_token])) || is_weekday?(tokens[@current_token])
           if is_rule_modifier?(tokens[@current_token])
             local_modifier = tokens[@current_token].downcase
             @current_token -= 1
@@ -72,6 +72,11 @@ module OpeningHoursConverter
               local_times.concat get_times(time_selector)
               @current_token -= 1
             end
+
+            if local_times.empty?
+              local_times.concat get_times("00:00-23:59")
+            end
+
             begin
               weekday_selector = tokens[@current_token]
               weekdays_and_holidays = get_weekdays(weekday_selector)
@@ -125,13 +130,12 @@ module OpeningHoursConverter
             elsif !(@regex_handler.week_regex =~ wide_range_selector).nil?
               weeks << get_week(wide_range_selector)
             else
+
               raise ParseError, "Unsupported selector #{wide_range_selector}"
             end
           end
         end
 
-        raise ParseError, 'Unreadable string' if @current_token == tokens.length - 1
-
         # puts "weekdays : #{weekdays}"
         # puts "weeks : #{weeks}"
         # puts "months : #{months}"
@@ -399,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
@@ -431,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
@@ -452,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
@@ -485,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}"
@@ -494,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,
@@ -528,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 }
@@ -560,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
 
@@ -594,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 }
@@ -653,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
@@ -666,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/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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.15
+  version: 1.14.0
 platform: ruby
 authors:
 - Ziserman Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,7 +100,7 @@ homepage: https://github.com/Publidata/opening_hours_converter
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Datetime range to opening hours, opening hours to datetime range
 test_files: []