opening_hours_converter 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 268e7ffab47efc4323b08abbc6fbea645ea6011de6c592c2fe77d96e180de001
-  data.tar.gz: 7f486e9379c76092e4a22cdfafb37d43fbf54fe21d137b743c041fda6d5d8f97
+  metadata.gz: a3aa4f100c0d94af234e082bb2bb80b023ae5abff4a1a6931243f8bd038c722c
+  data.tar.gz: 85e5efa4f22f7d9415a0f7f823a0cb1295d4b73e2949972d2a244c732f936b26
 SHA512:
-  metadata.gz: 27fe9fa2cebe6cddd4604aa0e82eedbdb997e8e7447a4289969a0e66a3318a1ca9331502a779009faea88226fa46a87056e08524db669f9a6fd5c8e2c424e94c
-  data.tar.gz: 4748eb3d65eda40b3017f64e196f35086869abb5e2c831f89b2aee5244bf892a029c8ed42263059ce6991537df034e9181d6fce22ca897058f65851f70bbd41b
+  metadata.gz: 1e59e894e699683857bdc242bb3d9225d94272ab23b97566a182f5278aff04a447b7a608a6bc5fd78bb25b9a0eb3d990d036361b3da9aa9208dfb67a741768eb
+  data.tar.gz: 2dda598800d025afe4a40363487efb07e6635cb5aebbd09b06640f7f24541619b2f5a02d24865f0bd7b2aa1235b27f9f7a9838e556aa87c405afbde212a5539d

data/lib/opening_hours_converter/tokens_handler.rb

@@ -427,16 +427,21 @@ module OpeningHoursConverter
     end
 
     def current_token_is_all_time?
-      current_token? &&
-
-      # check if current token is 24 or / or 7 in 24/7
-      current_token.integer? &&
-        previous_token? && previous_token.slash? && current_token.value == '7' ||
-        next_token? && next_token.slash? && current_token.value == '24' ||
+      return false unless current_token?
+      return false unless ['24', '7', '/'].include?(current_token.value)
+
+      if current_token.value == '24'
+        return false unless next_token? && next_token.slash?
+        return false unless !@unhandled_tokens[@index + 2].nil? && @unhandled_tokens[@index + 2].value == '7'
+      elsif current_token.slash?
+        return false unless previous_token? && previous_token.value == '24'
+        return false unless next_token? && next_token.value == '7'
+      else # current token is 7
+        return false unless previous_token? && previous_token.slash?
+        return false unless !@unhandled_tokens[@index - 2].nil? && @unhandled_tokens[@index - 2].value == '24'
+      end
 
-      current_token.slash? &&
-        previous_token? && previous_token.value == '24' &&
-        next_token? && next_token.value == '7'
+      true
     end
 
     def current_token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json