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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 34aa98a295bf0f28f09aa2e97dff773c37779543
4
- data.tar.gz: 4e998bc1799ab44bca0326c2ee5ef6509de21e82
3
+ metadata.gz: d687958a818bdfe88bfa30bce9ff2a87db5073fe
4
+ data.tar.gz: 69c9e1547c02635b305003e16a62666fb9fc4c68
5
5
  SHA512:
6
- metadata.gz: 282db6dd3f5b59aac5cddfa390dd5d5c482418e37e8e2cb6850c2c787ff857bedceac630fa0799f484b983acc70ca84ec82f4df89e0b9eb4e6ac1525e132101e
7
- data.tar.gz: 82a1b55c8efab72d7df708f6cc5fbfe175743853bae255a485c5214135de5bfbd4c58f464b538ccb6cda209adc3faac2b65cc1d8740ecc0baa75cef347153d4e
6
+ metadata.gz: afed94a75e31892e5e80f5b84b3d920634a670fe7dd061a611f2fcbc5adf8ebe294a6709f17a7c2c0fcafc3c6fc12f36c5aff93ce6b1936947fd2984fc393a0c
7
+ data.tar.gz: a3d81d578349e279f8630b661b26693c008321b5ed1b2fc76872e8de8175c2258afe744e7ca70eb192a4a65357c3995157e776584d0ca3bb1d23c44a6f4173d8
@@ -4,7 +4,7 @@ require 'food_ingredient_parser/version'
4
4
  Gem::Specification.new do |s|
5
5
  s.name = 'food_ingredient_parser'
6
6
  s.version = FoodIngredientParser::VERSION
7
- s.date = '2018-08-09'
7
+ s.date = '2018-08-31'
8
8
  s.summary = 'Parser for ingredient lists found on food products.'
9
9
  s.authors = ['wvengen']
10
10
  s.email = ['dev-ruby@willem.engen.nl']
@@ -2,7 +2,7 @@ module FoodIngredientParser::Grammar
2
2
  grammar Common
3
3
 
4
4
  rule ws
5
- " " / "\t"
5
+ !newline [[:space:]]
6
6
  end
7
7
 
8
8
  rule newline
@@ -12,11 +12,10 @@ module FoodIngredientParser::Grammar
12
12
  rule char
13
13
  [[:alnum:]] /
14
14
  fraction /
15
- [-/\'’+=_{}&] /
15
+ [-/\`'´’+=_{}&] /
16
16
  [®] /
17
17
  [¿?] / # weird characters turning up in names (e.g. encoding issues)
18
18
  [₁₂₃₄₅₆₇₈₉] # can occur with vitamins
19
- #[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]
20
19
  end
21
20
 
22
21
  rule mark
@@ -130,7 +129,8 @@ module FoodIngredientParser::Grammar
130
129
  'ijzeroxiden'i ws+ and ws+ 'hydroxiden'i /
131
130
  char+ 'sap'i ws+ and ws+ 'overige vruchtensappen'i /
132
131
  char* 'sap'i ( ws+ 'uit concentraat'i / ws+ 'uit sapconcentraat'i )? ws+ and ws+ 'vruchten'i? 'puree'i /
133
- ( 'vit.'i / 'vitamine'i / 'vitamin' ) ws+ [a-zA-Z] [0-9]* ws+ and ws+ [a-zA-Z] [0-9]*
132
+ ( 'vit.'i / 'vitamine'i / 'vitamin' ) ws+ [a-zA-Z] [0-9]* ws+ and ws+ [a-zA-Z] [0-9]* /
133
+ ( 'ijzer'i / 'chroom'i / 'koper'i ) ws* '(' 'I'+ ')' ws* [[:alnum:]]+
134
134
  )
135
135
  '.'? ![[:alpha:]]
136
136
  end
@@ -40,7 +40,7 @@ module FoodIngredientParser::Grammar
40
40
  end
41
41
 
42
42
  rule root_mark_sentences_in_list
43
- ( ( ws* [,.] / ws ) ws* root_mark_sentence_in_list )+
43
+ ( ( ws* [,.;] / ws ) ws* root_mark_sentence_in_list )+
44
44
  end
45
45
 
46
46
  rule root_mark_sentence_in_list
@@ -1,3 +1,3 @@
1
1
  module FoodIngredientParser
2
- VERSION = '1.0.0.pre.2'
2
+ VERSION = '1.0.0.pre.3'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: food_ingredient_parser
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.pre.2
4
+ version: 1.0.0.pre.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - wvengen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-09 00:00:00.000000000 Z
11
+ date: 2018-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: treetop