opening_hours_converter 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55f6b611b6d6c7dee28596d842441e9201b69866
-  data.tar.gz: c20fa4d736826c39c4625ae2cac7a4497fa3ee24
+  metadata.gz: d0ad64a12cda6b180b7ab2a4a6d9e7aacf712b73
+  data.tar.gz: efb6a8c5930dc03ff1346813208df516b550ad38
 SHA512:
-  metadata.gz: ce5333e34fef43072928e868b3e66f92543acf80c5af99dc517dcb385b9d26597765cc18e4db60eeafca013b0bf927f365fedcf6144ed459d1bb36e95137ff29
-  data.tar.gz: 529acd00a440bdc7d3947cea333324a5f4a87acae235dfa1be4d811a1278a5cd29582b35f9d9961a297c4515e40a7fa35673dee3321330abc404511fbe83629a
+  metadata.gz: 82c5844c495b9489de4202439c2ffcb7d3fdd5bad1f7d8a8e49c4a56b1e466ea62a3676455f4608c5fe12bc5dacf0c8905635afec76cde44ec7490dd93d748eb
+  data.tar.gz: 35b64100a3ac4b10a194190f07ad64e6c9060a0fabae4a1048e23d6ec25dd48f5b93bfcf36a09fd8afdbef832cc453d130ae6ac87ea79d775a62e11038c00f91

data/lib/opening_hours_converter/opening_hours_parser.rb

@@ -15,6 +15,7 @@ module OpeningHoursConverter
       @RGX_WEEKDAY = /^(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH))(,(((Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?)|(PH)))*$/
       @RGX_HOLIDAY = /^(PH|SH|easter)$/
       @RGX_WD = /^(Mo|Tu|We|Th|Fr|Sa|Su)(\-(Mo|Tu|We|Th|Fr|Sa|Su))?$/
+      @RGX_DAY = /^([012]?[0-9]|3[01])(\-[012]?[0-9]|3[01])?$/
       @RGX_YEAR = /^(\d{4})(\-(\d{4}))?$/
       @RGX_YEAR_PH = /^(\d{4})( PH|(\-(\d{4}) PH))\:?$/
       @RGX_YEAR_MONTH_DAY = /^(\d{4}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ([012]?[0-9]|3[01])(\-((\d{4}) )?((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) )?([012]?[0-9]|3[01]))?\:?$/
@@ -579,31 +580,52 @@ module OpeningHoursConverter
     def tokenize(block)
       if block.split('"').length > 1
         comment = block.split('"')[1]
-        tokens = block.split('"')[0].split(/\s|,/)
-        tokens << "\"#{comment}\""
-        merge_weekdays_tokens(tokens)
+
+        groups = block.split('"')[0].split(',').map { |s| s.split(' ') }
+        groups[-1] << "\"#{comment}\""
+
+        merge_groups(groups)
       else
-        merge_weekdays_tokens(block.split(/\s|,/))
+        merge_groups(block.split(',').map { |s| s.split(' ') })
       end
     end
 
-    def merge_weekdays_tokens(tokens)
+    def merge_groups(groups)
       new_tokens = []
-      to_merge = []
-      tokens.each_with_index do |token, index|
-        if is_weekday?(token)
-          to_merge << token
-          if index == tokens.length - 1
-            new_tokens << to_merge.join(',')
+      weekday_merge = []
+      wide_interval_merge = []
+      merged_wide_interval = []
+      groups.each_with_index do |group, group_index|
+        if !wide_interval_merge.empty?
+          merged_wide_interval += [wide_interval_merge.join(' ')]
+          wide_interval_merge = []
+        end
+        group.each_with_index do |token, token_index|
+          if !wide_interval_merge.empty? && !is_part_of_wide_interval?(token)
+            merged_wide_interval += [wide_interval_merge.join(' ')]
+            wide_interval_merge = []
+            new_tokens << merged_wide_interval.join(',')
+          end
+          if is_weekday?(token)
+            weekday_merge << token
+            if token_index == group.length - 1 && group_index == groups.length - 1
+              new_tokens << weekday_merge.join(',')
+            end
+          elsif !weekday_merge.empty?
+            new_tokens << weekday_merge.join(',')
+            new_tokens << token
+            weekday_merge = []
+          elsif is_part_of_wide_interval?(token)
+            wide_interval_merge << token
+            if token_index == group.length - 1 && group_index == groups.length - 1
+              new_tokens << wide_interval_merge.join(',')
+            end
+          else
+            new_tokens << token
           end
-        elsif !to_merge.empty?
-          new_tokens << to_merge.join(',')
-          new_tokens << token
-          to_merge = []
-        else
-          new_tokens << token
         end
       end
+
       new_tokens
     end
 
@@ -612,6 +634,18 @@ module OpeningHoursConverter
       values[0].to_i * 60 + values[1].to_i
     end
 
+    def is_part_of_wide_interval?(string)
+      is_wide_interval = false
+      string.split('-').each do |str|
+        if ((!(@RGX_YEAR =~ str).nil? || !(@RGX_YEAR_MONTH =~ str).nil? || !(@RGX_YEAR_MONTH_DAY =~ str).nil? || !(@RGX_DAY =~ str).nil? || !(@RGX_MONTHDAY =~ str).nil? || !(@RGX_MONTH =~ str).nil?) && ((@RGX_TIME =~ str).nil? && (@RGX_WEEKDAY =~ str).nil?))
+          is_wide_interval = true
+        else
+          return false
+        end
+      end
+      is_wide_interval
+    end
+
     def is_comment?(token)
       !(@RGX_COMMENT =~ token).nil?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opening_hours_converter
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ziserman Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json