opening_hours_converter 1.13.6 → 1.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d64cb65cb3b261526debe5bbac2139dc2d18ccfea137eeceaddb5c221a7a09'
-  data.tar.gz: a6553952b6ea0c7d3f0e87f916a315c7ab9f022bb5c8cb58accae49a32f8d283
+  metadata.gz: 429a62958899aeaee2bc229201b32db3f8e5c71ba3de00b35979f8d7f600051e
+  data.tar.gz: 7f408d609dc038324dc31edfe72d306321e3cf87cb3fe6889524777a576c6865
 SHA512:
-  metadata.gz: 7467758597633280c3863cead517d31fa18ad63dbaf8fca05d5236da2d63001e360ba3ade52f054774436da8e14787fd02e5af330007cebeebc152a96359732e
-  data.tar.gz: 348168fd8f07315a942162d8313736f8237a196e4fdc84ed150812d0751aa83344c0740fa5330ef59b5499bd6857793ed001625e1c4f56c020c0d28a60138104
+  metadata.gz: 7cbfcce4281b812116366f14d4ae9f28b421182d462373dcd40366cf7e95a4da71479e6d8809ebf230b2143d89d654213406686254e7de98e4bc3564d0f3ac9c
+  data.tar.gz: 6e54d189cccf398a083e2283cffe41591ec3519a67dad77d92c8901504cf6284183a9e73b3b6e65c382c9a7a8c22916c9ad46467a9fdd462e8506888c52616dc

data/lib/opening_hours_converter.rb

@@ -1,6 +1,7 @@
 module OpeningHoursConverter
   require 'date'
   require_relative './opening_hours_converter/utils'
+  require_relative './opening_hours_converter/errors'
   require_relative './opening_hours_converter/regex_handler'
   require_relative './opening_hours_converter/date_range'
   require_relative './opening_hours_converter/token'

data/lib/opening_hours_converter/day.rb

@@ -17,7 +17,7 @@ module OpeningHoursConverter
 
         off, start_minute, end_minute = handle_interval(interval)
 
-        raise "Invalid interval #{interval.inspect}" if start_minute.nil? && end_minute.nil?
+        raise ParseError, "Invalid interval #{interval.inspect}" if start_minute.nil? && end_minute.nil?
 
         (start_minute..end_minute).step do |minute|
           minute_array[minute] = off ? 'off' : true

data/lib/opening_hours_converter/errors.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Unable to parse Opening Hours String
+class OpeningHoursConverter::ParseError < StandardError; end

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -107,7 +107,7 @@ module OpeningHoursConverter
             elsif !(@regex_handler.month_day_regex =~ wide_range_selector).nil?
               months << get_month_day(wide_range_selector)
             elsif !(@regex_handler.month_regex =~ wide_range_selector).nil?
-              months << get_month(wide_range_selector)
+              months += get_month(wide_range_selector)
             elsif !(@regex_handler.year_regex =~ wide_range_selector).nil?
               years << get_year(wide_range_selector)
             elsif !(@regex_handler.multi_month_regex =~ wide_range_selector).nil?
@@ -125,12 +125,12 @@ module OpeningHoursConverter
             elsif !(@regex_handler.week_regex =~ wide_range_selector).nil?
               weeks << get_week(wide_range_selector)
             else
-              raise ArgumentError, "Unsupported selector #{wide_range_selector}"
+              raise ParseError, "Unsupported selector #{wide_range_selector}"
             end
           end
         end
 
-        raise ArgumentError, 'Unreadable string' if @current_token == tokens.length - 1
+        raise ParseError, 'Unreadable string' if @current_token == tokens.length - 1
 
         # puts "weekdays : #{weekdays}"
         # puts "weeks : #{weeks}"
@@ -408,7 +408,23 @@ module OpeningHoursConverter
       else
         month_to = month_from
       end
-      { from: month_from, to: month_to }
+
+      if month_from > month_to
+        [
+          {
+            from: month_from,
+            to: 12
+          },
+          {
+            from: 1,
+            to: month_to
+          }
+        ]
+      else
+        [
+          { from: month_from, to: month_to }
+        ]
+      end
     end
 
     def get_month_day(wrs)
@@ -500,9 +516,12 @@ module OpeningHoursConverter
 
     def get_year_multi_month_day(wrs)
       year = wrs[0...4]
-      wrs = wrs[5..wrs.length]
 
-      wrs.split(',').map do |wr|
+      wrs.split(',').map.with_index do |wr|
+        if wr =~ /^#{@regex_handler.year}/
+          year = wr[0...4]
+          wr = wr[5...wr.length]
+        end
         month = wr[0...3]
         days = wr[4...wr.length].split('-').reject { |e| e == '' }.map(&:to_i)
         if days.length == 2

data/lib/opening_hours_converter/regex_handler.rb

@@ -163,6 +163,7 @@ module OpeningHoursConverter
         line(
           year + space +
           potential_list(
+            potential(year + space) +
             month +
             group(
               space, potential_range(month_day)
@@ -205,7 +206,7 @@ module OpeningHoursConverter
     end
 
     def int_range(max)
-      raise 'too high' if max > 99
+      raise ArgumentError, 'too high' if max > 99
 
       base = max / 10
 

data/lib/opening_hours_converter/token.rb

@@ -14,6 +14,10 @@ module OpeningHoursConverter
       @made_from = made_from
     end
 
+    def to_s
+      "Token(value: #{@value}, type: #{@type}, start_index: #{@start_index})"
+    end
+
     def year?
       integer? && @value.length == 4
     end

data/lib/opening_hours_converter/tokenizer.rb

@@ -18,7 +18,7 @@ module OpeningHoursConverter
     def tokenize
       counter = 0
       while @index < @opening_hours_string.length
-        raise 'ups' if counter > 200
+        raise ParseError if counter > 200
         skip_white_spaces
         @tokens << handle_string if string?
 

data/lib/opening_hours_converter/tokens_handler.rb

@@ -67,7 +67,7 @@ module OpeningHoursConverter
           next
         end
 
-        raise "can't read current token #{current_token}"
+        raise ParseError, "can't read current token #{current_token}"
       end
     end
 
@@ -105,7 +105,7 @@ module OpeningHoursConverter
             value, made_from, type = add_current_token_to(value, type, made_from)
             next
           end
-          raise "you can\'t have two years with just space between them previous token: #{previous_token}, current token: #{current_token}"
+          raise ParseError, "you can\'t have two years with just space between them previous token: #{previous_token}, current token: #{current_token}"
         end
 
         if current_token.string?
@@ -309,23 +309,23 @@ module OpeningHoursConverter
       made_from = [current_token]
       @index += 1
 
-      raise unless current_token.colon?
+      raise ParseError unless current_token.colon?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
-      raise unless current_token.time?
+      raise ParseError unless current_token.time?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
-      raise unless current_token.hyphen?
+      raise ParseError unless current_token.hyphen?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
       # second part of time range
-      raise unless current_token.time?
+      raise ParseError unless current_token.time?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
-      raise unless current_token.colon?
+      raise ParseError unless current_token.colon?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
-      raise unless current_token.time?
+      raise ParseError unless current_token.time?
       value, made_from, type = add_current_token_to(value, type, made_from)
 
       token(value, type, start_index, made_from)

data/lib/opening_hours_converter/week_index.rb

@@ -6,22 +6,8 @@ module OpeningHoursConverter
     include Constants
     extend Utils
 
-    def self.weeks_from_index(array_of_indexes, year = Time.now.year)
-      array_of_indexes.flat_map do |index_or_range|
-        if index_or_range.is_a?(Hash)
-          index_or_range[:from].step(index_or_range[:to], index_or_range[:modifier]).map do |index|
-            week_from_index(index, year)
-          end
-        elsif index_or_range.is_a?(Integer)
-          week_from_index(index_or_range, year)
-        else
-          raise ArgumentError, "#{index_or_range} in #{array_of_indexes} is neither an integer nor a Hash"
-        end
-      end
-    end
-
     def self.week_from_index(index, year = Time.now.year)
-      raise unless index >= 1
+      raise ArgumentError unless index >= 1
 
       week = first_week(year)
       offset = (index - 1) * 7
@@ -106,7 +92,7 @@ module OpeningHoursConverter
           first_day_of_the_week = first_day_of_month - first_wday_of_month
           first_day_of_the_week + wday + (n - 1) * 7
         end
-      raise 'Out of bound' unless date.month == month
+      raise ArgumentError, 'Out of bound' unless date.month == month
 
       date
     end
@@ -133,7 +119,7 @@ module OpeningHoursConverter
           first_day_of_the_week = last_day_of_month - last_wday_of_month
           first_day_of_the_week + wday
         end
-      raise 'Out of bound' unless date.month == month
+      raise ArgumentError, 'Out of bound' unless date.month == month
 
       date
     end

data/lib/opening_hours_converter/year.rb

@@ -24,7 +24,6 @@ module OpeningHoursConverter
           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?
         if date_range.wide_interval.end.nil? || date_range.wide_interval.end[:year].nil? || date_range.wide_interval.start[:year] == date_range.wide_interval.end[:year]
           if !years[date_range.wide_interval.start[:year]].nil?
@@ -228,14 +227,7 @@ module OpeningHoursConverter
         end
       else
         for year in (DateTime.now.year)..(DateTime.now.year + 1)
-          if wide_interval.type == 'week'
-            years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
-            WeekIndex.weeks_from_index(wide_interval.indexes, year).each do |interval|
-              (interval[:from]..interval[:to]).each do |day|
-                years[year][day.month - 1][day.day - 1] = true
-              end
-            end
-          elsif wide_interval.start.nil?
+          if wide_interval.start.nil?
             years[year] = Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { true } }
           elsif !wide_interval.start[:day].nil?
             years[year] ||= Array.new(OSM_MONTHS.length) { |i| Array.new(MONTH_END_DAY[i]) { false } }
@@ -370,13 +362,6 @@ module OpeningHoursConverter
             end
           end
         end
-      elsif wide_interval.type == "week"
-        year = wide_interval.start&.dig(:year) || Time.now.year # can't process weeks with undefined year
-        WeekIndex.weeks_from_index(wide_interval.indexes, year).each do |interval|
-          (interval[:from]..interval[:to]).each do |day|
-            years[year][day.month - 1][day.day - 1] = true
-          end
-        end
       elsif wide_interval.type == "day"
         if wide_interval.end.nil? || !wide_interval.end.nil? && wide_interval.start[:month] == wide_interval.end[:month]
           if wide_interval.end.nil? || !wide_interval.end.nil? && wide_interval.start[:day] == wide_interval.end[:day]

data/readme.md

@@ -0,0 +1,40 @@
+# Opening Hours Converter
+
+![](https://github.com/Publidata/opening_hours_converter/workflows/CI/badge.svg)
+
+OpenStreetMap Opening Hours to Date & Date to Opening Hours
+
+See [Wiki](https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification) for OpenStreetMap Opening Hours specification.
+
+# Installation
+
+```
+gem install opening_hours_converter
+```
+
+## Usage
+
+```ruby
+require 'opening_hours_converter'
+
+parsed_oh = OpeningHoursConverter::OpeningHoursParser.new.parse('Mo 10:00-12:00')
+oh_string = OpeningHoursConverter::OpeningHoursBuilder.new.build(parsed_oh)
+```
+
+## Test
+
+Install the dependencies with:
+
+```
+bundle install
+```
+
+Then run all the tests with:
+
+```
+rspec spec --format=documentation
+```
+
+## Credits
+
+Done with [YoHours](https://framagit.org/PanierAvide/YoHours) as inspiration and with constant help from the [Evaluation tool](http://openingh.openstreetmap.de/evaluation_tool/)/[repository](https://github.com/opening-hours/opening_hours.js).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.6
+  version: 1.13.11
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,8 +38,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Datetime range to openinghours, openinghours to datetime range. Very
-  strongly inspired by yohours.
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Datetime range to opening hours, opening hours to datetime range. Very
+  strongly inspired by YoHours.
 email: tech@publidata.io
 executables: []
 extensions: []
@@ -49,6 +77,7 @@ files:
 - lib/opening_hours_converter/constants.rb
 - lib/opening_hours_converter/date_range.rb
 - lib/opening_hours_converter/day.rb
+- lib/opening_hours_converter/errors.rb
 - lib/opening_hours_converter/interval.rb
 - lib/opening_hours_converter/iterator.rb
 - lib/opening_hours_converter/opening_hours_builder.rb
@@ -66,6 +95,7 @@ files:
 - lib/opening_hours_converter/week_index.rb
 - lib/opening_hours_converter/wide_interval.rb
 - lib/opening_hours_converter/year.rb
+- readme.md
 homepage: https://github.com/Publidata/opening_hours_converter
 licenses:
 - AGPL-3.0
@@ -85,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Datetime range to openinghours, openinghours to datetime range
+summary: Datetime range to opening hours, opening hours to datetime range
 test_files: []