food_ingredient_parser 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77503a77f269805d23ecb60a7b9d63401063e140
-  data.tar.gz: 412d0c6aab0924371677cb8e2a4201349f4684a8
+  metadata.gz: 64b65447c4e16dadb986f1422cc02449e7050858
+  data.tar.gz: 94842b54aa5701e384c6fc3e35a3b8d03ca9b978
 SHA512:
-  metadata.gz: 82ba24e9277917326348e769feda731b030a9f6477f811f067b1ff1377e784d206adc56407a607e5b3498ddbbfcc8751c7ef6b3583490f59fa56771bdd9f0a80
-  data.tar.gz: '0768160047a661cad810a4fda0c7922e03b039bd17f4aa7b2022722cb636080fa01690a731da8d088861c6981163803b41d2bd577093f4b0a91250d4fe68c03d'
+  metadata.gz: b91f77676d5edab883e89701f9b1a2e6659ad8ef655080314d0f23cedf9afc79b20cb1e3ae93504e17cda5dbd710501fb00b9b4cb581e2020d11671ca094b696
+  data.tar.gz: c2afb010c5b967dc411f52645231fb36465346aad0f937461bf1b51fa2e198afe60973570abff2d35cbc5f8b2c3d2fe4151ee90b70bc4e3ad33513648ab2e03c

data/lib/food_ingredient_parser/loose/transform/amount_from_name.treetop

@@ -5,8 +5,9 @@ module FoodIngredientParser::Loose::Transform
 
     rule amount_from_name
       # just amount, amount in front or at the end
-      ws* amount:amount ws+ name:(.*) /
-      ws* amount:amount ws* /
+      ws* amount:amount                ws+ name:(.*) /
+      ws* amount:amount_simple_percent ws* name:(.*) /
+      ws* amount:amount                ws* /
       ws* name:( !amount word ( ws+ !amount word )* )+ ws* amount:amount ws*
     end
   end

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

@@ -9,6 +9,10 @@ module FoodIngredientParser::Strict::Grammar
       amount:amount_simple                 <AmountNode>
     end
 
+    rule amount_simple_percent
+      amount:(amount_simple_number ws* percent) <AmountNode>
+    end
+
     rule amount_simple
       ( (
         'of which'i / 'at least'i / 'minimal'i / 'maximal'i / 'less than'i / 'more than'i /

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

@@ -10,7 +10,7 @@ module FoodIngredientParser::Strict::Grammar
     end
 
     rule char
-      [[:alnum:]] /
+      !mark [[:alnum:]] /
       fraction /
       [-/\`'´’+=_{}&] /
       [®™] /
@@ -51,6 +51,11 @@ module FoodIngredientParser::Strict::Grammar
       ( 'and' / 'en' / 'und' ) !char / '&'
     end
 
+    rule e_number
+      ( 'E'i '-'? [0-9] [0-9] [0-9] [[:alpha:]]? )
+      ![[:alnum:]] / ( ws* '(' 'i'i+ ')' ) # e.g. "E450 (iii)"
+    end
+
     rule abbrev
       # These are listed explicitely to avoid incorrect interpretations, and allow missing trailing dots.
       # To get an idea of what occurs (second one omits trailing dots):
@@ -124,7 +129,7 @@ module FoodIngredientParser::Strict::Grammar
         'L(+)-' [[:alnum:]]+ /
         'L.' ws+ 'rhamnosus'i / 'L.' ws+ 'acidophilus'i / 'L.' ws+ 'casei' / 'B.'i ws+ 'lactis'i / 'A.'i ws+ 'oryzae'i /
         'type'i ws+ '"' [0-9]+ '"' /
-        'E'i '-'? [0-9] [0-9] [0-9] [[:alpha:]]? ws* '(' 'i'i+ ')' # e.g. "E450 (iii)"
+        e_number
       ) ![[:alpha:]]
     end
   end

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

@@ -9,13 +9,14 @@ module FoodIngredientParser::Strict::Grammar
     end
 
     rule ingredient_simple_with_amount
-      pre:( '{' ws* )? amount:amount ws+ ing:ingredient_simple                   <IngredientNode> /
+      pre:( '{' ws* )? amount:amount                ws+ ing:ingredient_simple    <IngredientNode> /
+      pre:( '{' ws* )? amount:amount_simple_percent ws* ing:ingredient_simple    <IngredientNode> /
       ing:ingredient_simple ws* amount:amount post:( ws* '}' )? (ws? mark:mark)? <IngredientNode> /
       ing:ingredient_simple                                                      <IngredientNode>
     end
 
     rule ingredient_simple_e_number
-      name:( [Ee] [0-9] [0-9] [0-9] [a-zA-Z]? ) ![a-zA-Z0-9] <IngredientNode>
+      name:e_number <IngredientNode>
     end
 
   end

data/lib/food_ingredient_parser/version.rb

@@ -1,4 +1,4 @@
 module FoodIngredientParser
-  VERSION      = '1.1.3'
-  VERSION_DATE = '2018-10-12'
+  VERSION      = '1.1.4'
+  VERSION_DATE = '2018-10-22'
 end

metadata

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