opening_hours_converter 1.14.2 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a4dff7e35eca094060900cf6a0062c57a9a2e5c56bed81e3989d8758a7e7a30
-  data.tar.gz: a2221f771abd53d104b043cac1fab9928f734ba666a84494e63599ba053dee49
+  metadata.gz: 966920734465a1aba46b5fc5b6f9f602a83b449ea5fbb58ed5b214563a133c6f
+  data.tar.gz: 5d14a3271546a90beaabfb6a1078a701b4df0feb517fef87585a146350f3e902
 SHA512:
-  metadata.gz: 893fa9f68831242e10c5e819b9a1097fb8269c3bb2526dfe33bb5024c4f20012b9fe8252d7ed30efa02e7e7a0ec46a8d92971f8de62370a1b2307cb4dd7cbe5c
-  data.tar.gz: 398d37c9a90d1656ef6cd4e872e17bf22bb579fabd73291996a38e06d41f8cfb838488a5bae9ce655b528e414edc9135d5c76e82aa0df247359aca980c75bf21
+  metadata.gz: 2ace5c1a41d14870876f1211d2a0a64958f16010972f3cb8864f9b0d7422dd66907dff6925c77f2c534d1707600e6ed9a26ef7b55033530ede1e3964b90ceac9
+  data.tar.gz: '04856da4b58bf95bd6feddf81d1576ef79441179d708b9ed0ecac73d0e6db97aa3998606f1ed7c49fbfec3607001dd157275c6e76c5bd9500617b9e01a8f4337'

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -322,7 +322,7 @@ module OpeningHoursConverter
     end
 
     def get_year_week_with_modifier(wrs)
-      year, weeks = wrs.split(' week ')
+      year, weeks = wrs.split(/ week /i)
       years = year.split('-')
 
       indexes = weeks.split(',').map { |week_index|
@@ -338,7 +338,15 @@ module OpeningHoursConverter
         else
           week_index.to_i
         end
-      }
+      }.sort_by do |index|
+        if index.is_a?(Integer)
+          index
+        elsif index.is_a?(Hash)
+          index[:from]
+        else
+          0
+        end
+      end
 
       { year_from: years[0].to_i, week_indexes: indexes }.tap do |hsh|
         hsh[:year_to] = years.length > 1 ? years[1].to_i : nil
@@ -346,7 +354,7 @@ module OpeningHoursConverter
     end
 
     def get_year_week(wrs)
-      year, weeks = wrs.split(' week ')
+      year, weeks = wrs.split(/ week /i)
       # does not handle 2018,2019
       years = year.split('-')
       # does not handle week 1,2,3
@@ -365,7 +373,7 @@ module OpeningHoursConverter
     end
 
     def get_week_with_modifier(wrs)
-      weeks = wrs.gsub('week ', '').split(',')
+      weeks = wrs.gsub(/week /i, '').split(',')
 
       indexes = weeks.map { |week_index|
         if week_index.include?('-')
@@ -386,7 +394,7 @@ module OpeningHoursConverter
     end
 
     def get_week(wrs)
-      weeks = wrs.gsub('week ', '').split(',')
+      weeks = wrs.gsub(/week /i, '').split(',')
 
       indexes = weeks.map { |week_index|
         if week_index.include?('-')

data/lib/opening_hours_converter/opening_hours_rule.rb

@@ -299,7 +299,7 @@ module OpeningHoursConverter
         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
+          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 || (d.wide_interval.type == "week" && o.date[i].wide_interval.type == "week" && d.wide_interval.indexes != o.date[i].wide_interval.indexes)
         end
         true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.4
 platform: ruby
 authors:
-- Ziserman Martin
+- Publidata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Datetime range to opening hours, opening hours to datetime range