food_ingredient_parser 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b65447c4e16dadb986f1422cc02449e7050858
-  data.tar.gz: 94842b54aa5701e384c6fc3e35a3b8d03ca9b978
+  metadata.gz: 8c80d036dbee183ed2fd1a8cc4e513e54318d142
+  data.tar.gz: 6cfcd29eacb9e99a9be9a66a90446f47f714ae4b
 SHA512:
-  metadata.gz: b91f77676d5edab883e89701f9b1a2e6659ad8ef655080314d0f23cedf9afc79b20cb1e3ae93504e17cda5dbd710501fb00b9b4cb581e2020d11671ca094b696
-  data.tar.gz: c2afb010c5b967dc411f52645231fb36465346aad0f937461bf1b51fa2e198afe60973570abff2d35cbc5f8b2c3d2fe4151ee90b70bc4e3ad33513648ab2e03c
+  metadata.gz: 75b1f91e5db6bcfcc24ad8eabe16b541663e5e344604c31b884ab1a5633c95dc045cdee2d384f5434f5143b778659cecd69917b9adb16e25341978380e486bcc
+  data.tar.gz: 7254cca971a558bda2ae6e996cc4d121fc5138f09d67c847bb44eec87421aeea39bf18a771137eb3b0b2bb734bed058a1d2347f815b9edc1b23e0b069d83a381

data/lib/food_ingredient_parser/loose/scanner.rb

@@ -4,19 +4,22 @@ module FoodIngredientParser::Loose
   class Scanner
 
     SEP_CHARS  = "|;,.".freeze
-    MARK_CHARS = "¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº⁽⁾†‡•°#^*".freeze
+    MARK_CHARS = "¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº⁽⁾†‡•°▪◊#^*".freeze
     PREFIX_RE  = /\A\s*(ingredients|contains|ingred[iï][eë]nt(en)?(declaratie)?|bevat|dit zit er\s?in|samenstelling|zutaten)\b\s*[:;.]?\s*/i.freeze
-    NOTE_RE    = /\A\b(dit product kan\b|deze verpakking kan\b|kan sporen\b.*?\bbevatten\b|voor allergenen\b|allergenen\b|E\s*=|gemaakt in\b|geproduceerd in\b|bevat mogelijk\b|kijk voor meer\b|allergie-info|in de fabriek\b|in dit bedrijf\b|voor [0-9,.]+ (g\.?|gr\.?|ram|ml).*\bis [0-9,.]+ (g\.?|gr\.?|ram|ml).*\bgebruikt\b)/i.freeze
+    NOTE_RE    = /\A\b(dit product kan\b|deze verpakking kan\b|kan sporen\b.*?\bbevatten\b|voor allergenen\b|allergenen\b|allergie[- ]informatie(\s*:|\b)|E\s*=|gemaakt in\b|geproduceerd in\b|bevat mogelijk\b|kijk voor meer\b|allergie-info|in de fabriek\b|in dit bedrijf\b|voor [0-9,.]+ (g\.?|gr\.?|ram|ml).*\bis [0-9,.]+ (g\.?|gr\.?|ram|ml).*\bgebruikt\b)/i.freeze
     # Keep in sync with +abbrev+ in the +Common+ grammar, plus relevant ones from the +Amount+ grammar.
     ABBREV_RE  = Regexp.union(
       /\A(
         N°\b |
         °C\b |
         (ijzer|chroom|koper)\s*\(I+\)\s*[[:alnum:]]+\b |
-        L\(\+\)-[[:alnum:]]+\b |
+        L\(\+\)[ -][[:alnum:]]+\b |
+        L\.\s+rhamnosus\b | L\.\s+acidophilus\b | L\.\s+casei\b | B\.\s+lactis | A\.\s+oryzae |
+        S\.\s+thermophilus\b | L\.\sbulgaricus\b |
+        T\.\s*aestivum\b(\s+vitt\.)? |
         type\s+"\d+" |
-        L\.\s+rhamnosus\b | L\.\s+acidophilus\b | L\.\s+casei\b | B\.\s+lactis | A\.\s+oryzae
-        E-e?\d{3}[a-z]?\s*\(i+\)
+        E-e?\d{3}[a-z]?\s*\(i+\) |
+        www\.[-_\/:%.A-Za-z0-9]+
       )/xi,
       *%w[
         a.o.p b.g.a b.o.b c.a c.i d.e d.m.v d.o.c d.o.p d.s e.a e.g e.u f.i.l f.o.s i.a

data/lib/food_ingredient_parser/strict/grammar/amount.treetop

@@ -38,6 +38,7 @@ module FoodIngredientParser::Strict::Grammar
     rule amount_simple_unit
       ( percent / ( ( 'procent' / 'percent' / 'gram'i / 'ml'i / 'mg'i / 'gr'i / 'g'i ) !char ) )
       ( ws 'vol'i ( !char / '.' ) )?
+      ( ws* '℮' )?
     end
   end
 end

data/lib/food_ingredient_parser/strict/grammar/common.treetop

@@ -12,7 +12,7 @@ module FoodIngredientParser::Strict::Grammar
     rule char
       !mark [[:alnum:]] /
       fraction /
-      [-/\`'´’+=_{}&] /
+      [-/\`'´‘’+=_{}&] /
       [®™] /
       [¿?] /                         # weird characters turning up in names (e.g. encoding issues)
       [₁₂₃₄₅₆₇₈₉]                    # can occur with vitamins
@@ -20,7 +20,7 @@ module FoodIngredientParser::Strict::Grammar
 
     rule mark
       # mark referencing a footnote
-      [¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº] '⁾'? / '⁽' [¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº] '⁾' / [†‡•°#^] / '*'+ / '(' ws* ( [†‡•°#^] / '*'+ ) ws* ')'
+      [¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº] '⁾'? / '⁽' [¹²³⁴⁵ᵃᵇᶜᵈᵉᶠᵍªº] '⁾' / [†‡•°▪◊#^] / '*'+ / '(' ws* ( [†‡•°▪◊#^] / '*'+ ) ws* ')'
     end
 
     rule digit
@@ -115,7 +115,8 @@ module FoodIngredientParser::Strict::Grammar
         'alc'i /   # alcohol
         'vol'i /   # volume
         'conc'i /  # concentration
-        'subsp'i   # subspecies
+        'subsp'i / # subspecies
+        'www.'i [-_\/:%.A-Za-z0-9]+
       )
       '.'? ![[:alpha:]]
     end
@@ -126,8 +127,10 @@ module FoodIngredientParser::Strict::Grammar
         'N°'i /
         '°C'i /
         ( 'ijzer'i / 'chroom'i / 'koper'i ) ws* '(' 'I'i+ ')' ws* [[:alnum:]]+ /
-        'L(+)-' [[:alnum:]]+ /
+        'L(+)' ('-' / ws) [[:alnum:]]+ /
         'L.' ws+ 'rhamnosus'i / 'L.' ws+ 'acidophilus'i / 'L.' ws+ 'casei' / 'B.'i ws+ 'lactis'i / 'A.'i ws+ 'oryzae'i /
+        'S.' ws+ 'thermophilus'i / 'L.' ws+ 'bulgaricus'i /
+        'T.' ws* 'aestivum'i (ws+ 'vitt.'i)? /
         'type'i ws+ '"' [0-9]+ '"' /
         e_number
       ) ![[:alpha:]]

data/lib/food_ingredient_parser/version.rb

@@ -1,4 +1,4 @@
 module FoodIngredientParser
-  VERSION      = '1.1.4'
-  VERSION_DATE = '2018-10-22'
+  VERSION      = '1.1.5'
+  VERSION_DATE = '2019-11-14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: food_ingredient_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop