food_ingredient_parser 1.0.0.pre.2 → 1.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34aa98a295bf0f28f09aa2e97dff773c37779543
-  data.tar.gz: 4e998bc1799ab44bca0326c2ee5ef6509de21e82
+  metadata.gz: d687958a818bdfe88bfa30bce9ff2a87db5073fe
+  data.tar.gz: 69c9e1547c02635b305003e16a62666fb9fc4c68
 SHA512:
-  metadata.gz: 282db6dd3f5b59aac5cddfa390dd5d5c482418e37e8e2cb6850c2c787ff857bedceac630fa0799f484b983acc70ca84ec82f4df89e0b9eb4e6ac1525e132101e
-  data.tar.gz: 82a1b55c8efab72d7df708f6cc5fbfe175743853bae255a485c5214135de5bfbd4c58f464b538ccb6cda209adc3faac2b65cc1d8740ecc0baa75cef347153d4e
+  metadata.gz: afed94a75e31892e5e80f5b84b3d920634a670fe7dd061a611f2fcbc5adf8ebe294a6709f17a7c2c0fcafc3c6fc12f36c5aff93ce6b1936947fd2984fc393a0c
+  data.tar.gz: a3d81d578349e279f8630b661b26693c008321b5ed1b2fc76872e8de8175c2258afe744e7ca70eb192a4a65357c3995157e776584d0ca3bb1d23c44a6f4173d8

data/food_ingredient_parser.gemspec

@@ -4,7 +4,7 @@ require 'food_ingredient_parser/version'
 Gem::Specification.new do |s|
   s.name             = 'food_ingredient_parser'
   s.version          = FoodIngredientParser::VERSION
-  s.date             = '2018-08-09'
+  s.date             = '2018-08-31'
   s.summary          = 'Parser for ingredient lists found on food products.'
   s.authors          = ['wvengen']
   s.email            = ['dev-ruby@willem.engen.nl']

data/lib/food_ingredient_parser/grammar/common.treetop

@@ -2,7 +2,7 @@ module FoodIngredientParser::Grammar
   grammar Common
 
     rule ws
-      " " / "\t"
+      !newline [[:space:]]
     end
 
     rule newline
@@ -12,11 +12,10 @@ module FoodIngredientParser::Grammar
     rule char
       [[:alnum:]] /
       fraction /
-      [-/\'’+=_{}&] /
+      [-/\`'´’+=_{}&] /
       [®] /
       [¿?] /                         # weird characters turning up in names (e.g. encoding issues)
       [₁₂₃₄₅₆₇₈₉]                    # can occur with vitamins
-      #[A-Za-z0-9] / [-\'+/=?;!*#@$_%] / [#xC0-#xD6] / [#xD8-#xF6] / [#xF8-#x2FF] / [#x370-#x37D] / [#x37F-#x1FFF] / [#x200C-#x200D] / [#x2070-#x218F] / [#x2C00-#x2FEF] / [#x3001-#xD7FF] / [#xF900-#xFDCF] / [#xFDF0-#xFFFD] / [#x10000-#xEFFFF]
     end
 
     rule mark
@@ -130,7 +129,8 @@ module FoodIngredientParser::Grammar
         'ijzeroxiden'i ws+ and ws+ 'hydroxiden'i /
         char+ 'sap'i ws+ and ws+ 'overige vruchtensappen'i /
         char* 'sap'i ( ws+ 'uit concentraat'i / ws+ 'uit sapconcentraat'i )? ws+ and ws+ 'vruchten'i? 'puree'i /
-        ( 'vit.'i / 'vitamine'i / 'vitamin' ) ws+ [a-zA-Z] [0-9]* ws+ and ws+ [a-zA-Z] [0-9]*
+        ( 'vit.'i / 'vitamine'i / 'vitamin' ) ws+ [a-zA-Z] [0-9]* ws+ and ws+ [a-zA-Z] [0-9]* /
+        ( 'ijzer'i / 'chroom'i / 'koper'i ) ws* '(' 'I'+ ')' ws* [[:alnum:]]+
       )
       '.'? ![[:alpha:]]
     end

data/lib/food_ingredient_parser/grammar/root.treetop

@@ -40,7 +40,7 @@ module FoodIngredientParser::Grammar
     end
 
     rule root_mark_sentences_in_list
-      ( ( ws* [,.] / ws ) ws* root_mark_sentence_in_list )+
+      ( ( ws* [,.;] / ws ) ws* root_mark_sentence_in_list )+
     end
 
     rule root_mark_sentence_in_list

data/lib/food_ingredient_parser/version.rb

@@ -1,3 +1,3 @@
 module FoodIngredientParser
-  VERSION = '1.0.0.pre.2'
+  VERSION = '1.0.0.pre.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: food_ingredient_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.2
+  version: 1.0.0.pre.3
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop