opening_hours_converter 1.13.7 → 1.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323387cf1e5e01948cf29e1e2a8f0037b3b70c827ac5d20e7fd68e557e87ad22
-  data.tar.gz: 83f7ca5fa616cb1d53fe156512689540d36624b34988e79cf335f959b6dfc156
+  metadata.gz: 6f7598eeb7cb6738f017cf1a785eb5afddcc90717575a5a489d3c4d797579988
+  data.tar.gz: 7ec00410febbdb1faa8c801dc23d1ab826a5d36035a449bfcd5df96475391ae0
 SHA512:
-  metadata.gz: d89ba9be9286a35eec8eb7b0424be359cf080e303a561241ddfe35ee68702bf48cd70f74a0bfe3c6eaa219b70f6ae27b254490a0ce1de3c61218e91c9fc0a1a5
-  data.tar.gz: ab7e7d65a6b9bde071d9030cc3e8d7c8ffcc9cd6280c5e36d3182c0345722ef27a3d37ebc0ab67054a12effb08ae361713f85ee062232158b751ba5501f45e8d
+  metadata.gz: 39efeed6fd42120adb95e32505c5654bc8ddea7471d612aea2f1051856b20dcdda5bced0678374c09f9c9f9c922dab8c3b755719fba6610d84b8bb1c40c7c9c1
+  data.tar.gz: b5d8e74cb8320c6d97a6690a8969bc5fafebef332c14885712321c37a49265c676eec278c9727497df0695fad7f0b52afda0e1118cf8415166c27dd796864661

data/lib/opening_hours_converter.rb

@@ -1,7 +1,7 @@
 module OpeningHoursConverter
   require 'date'
   require_relative './opening_hours_converter/utils'
-  require_relative './opening_hours_converter/errors.rb'
+  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/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?
@@ -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)
@@ -429,6 +445,7 @@ module OpeningHoursConverter
       else
         month_to = nil
       end
+
       { from_day: month_from, to_day: month_to }
     end
 
@@ -500,9 +517,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
@@ -531,25 +551,36 @@ module OpeningHoursConverter
     def get_multi_month(wrs)
       wrs.split(',').map do |wr|
         if wr.include?('-')
-          start_month, end_month = wr.split('-')
+          start_month_day, end_month_day = wr.split('-')
+
+          start_month = start_month_day[0...3]
+          start_day = start_month_day[4...start_month_day.length]&.to_i
+
+          end_month = end_month_day[0...3]
+          end_day = end_month_day[4...end_month_day.length]&.to_i
+
           from = {
             month: OSM_MONTHS.find_index(start_month) + 1,
-            day: 1
+            day: start_day || 1
           }
           to = {
             month: OSM_MONTHS.find_index(end_month) + 1,
-            day: MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
+            day: end_day || MONTH_END_DAY[OSM_MONTHS.find_index(end_month)]
           }
         else
+          month = wr[0...3]
+          day = wr[4...wr.length]&.to_i
+
           from = {
-            month: OSM_MONTHS.find_index(wr[0...3]) + 1,
-            day: 1
+            month: OSM_MONTHS.find_index(month) + 1,
+            day: day || 1
           }
           to = {
-            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(month) + 1,
+            day: day || MONTH_END_DAY[OSM_MONTHS.find_index(month)]
           }
         end
+
         { from_day: from, to_day: to }
       end
     end

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)
@@ -177,7 +178,20 @@ module OpeningHoursConverter
     end
 
     def multi_month_regex
-      compile(line(potential_list(potential_range(month))))
+      compile(
+        line(
+          potential_list(
+            potential_range(
+              month +
+              potential(
+                group(
+                  space, potential_range(month_day)
+                )
+              )
+            )
+          )
+        )
+      )
     end
 
     def week_value_regex

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.7
+  version: 1.13.12
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-06-25 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: []