food_ingredient_parser 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb4cb55b3d5c41f02171e031fd11cc996cf2e8df9f074aa163efdff58baa6b0
-  data.tar.gz: 63dc1b52a15e6f70114cca9ed5d8a585a1f475d70131e4852310cf8755558dca
+  metadata.gz: 890abbbcdfd6531b7ad33fa89eeb00d25e6069b60c6c741c3495f838b3e7d8a8
+  data.tar.gz: 24b50c3ec559983fa228aa27274213047635b07ce74aa82e8617548c60376ae4
 SHA512:
-  metadata.gz: 1cebae488578f1e00f8d905f34d39cef653cdcb4922d26878687afb3463ae3c24ca6592a6f19ac482b5a2f08e95feef342c9631da69acb99feea4e1a81269057
-  data.tar.gz: a7c8b98a5c3fd3aee8962e8f31cd9a0ede791e8d7c7193bfbb1ba2524be057bd7b38499973cd6ab6fea58020161ba6f8615dc5eef2191a87d45afec4662fa264
+  metadata.gz: 758d0c351607a416fe801eb2ca839c831e6e996a39d528ffbc233b5dd15f895da6dc56adb79209d0736f25ece1217d3bcf696e395c80a038e70dc674d0669ef8
+  data.tar.gz: 5a36027d26908085f56e6e976dcb992cc422225830e99befed59e32475516f5fe5c642e9db27e28f47466a17519c25e46f1f8c601385432e55680089deac0c9d

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

@@ -13,5 +13,13 @@ module FoodIngredientParser::Strict::Grammar
       )
     end
 
+    rule ingredient_nocol
+      ws*
+      (
+        ingredient_nested ( ws* and ws+ ingredient )? /
+        ingredient_simple_with_amount
+      )
+    end
+
   end
 end

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

@@ -14,6 +14,14 @@ module FoodIngredientParser::Strict::Grammar
       contains:( ingredient_coloned_simple_with_amount_and_nest ( ws* '/'+ ws* ingredient_coloned_simple_with_amount_and_nest )* ) <ListNode>
     end
 
+    rule ingredient_coloned_semicol
+      ing:ingredient_simple ws* ':' post:( ws* '}' )? ws* contains:( ingredient_coloned_semicol_inner_list ) ';' <NestedIngredientNode>
+    end
+
+    rule ingredient_coloned_semicol_inner_list
+      contains:( ingredient_coloned_simple_with_amount_and_nest ( ws* ',' ws* ingredient_coloned_simple_with_amount_and_nest )* ) <ListNode>
+    end
+
     # @see IngredientSimple#ingredient_simple
     rule ingredient_coloned_simple
       name:( ingredient_coloned_word ( ws+ !amount ingredient_coloned_word )* ) ws? mark:mark <IngredientNode> /

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

@@ -2,8 +2,10 @@ module FoodIngredientParser::Strict::Grammar
   grammar List
     include Common
     include Ingredient
+    include IngredientColoned
 
     rule list
+      list_coloned_semicol /
       contains:(ingredient ( ws* '|' ws* ingredient )+ ( ws+ and ws+ ingredient )? )      <ListNode> /
       contains:(ingredient ( ws* ';' ws* ingredient )+ ( ws+ and ws+ ingredient )? )      <ListNode> /
       contains:(ingredient ( ws* ',' ws* ingredient )+ ( ws+ and ws+ ingredient )? )      <ListNode> /
@@ -12,5 +14,13 @@ module FoodIngredientParser::Strict::Grammar
       contains:(ingredient_simple_e_number ( ws* dash ws* ingredient_simple_e_number )+ ) <ListNode> /
       contains:(ingredient ( ws+ and ws+ ingredient )? )                                  <ListNode>
     end
+
+    rule list_coloned_semicol
+       contains:(
+        ( (ingredient_nocol ws* ',' ws*)* ws* ingredient_coloned_semicol )+
+        ( ws* ingredient_nocol (ws* ',' ws* ingredient_nocol)* )?
+        ( ws+ and ws+ ingredient_nocol )?
+      ) <ListNode>
+    end
   end
 end

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

@@ -17,9 +17,10 @@ module FoodIngredientParser::Strict::Grammar
     end
 
     rule list_coloned_inner_list
+      contains:( ingredient ( ws* ',' ws* ingredient )+ ( ws+ and ws+ ingredient )? )      <ListNode> /
       contains:( ingredient_simple_e_number ( ws* '/'  ws* ingredient_simple_e_number )+ ) <ListNode> /
       contains:( ingredient_simple_e_number ( ws* dash ws* ingredient_simple_e_number )+ ) <ListNode> /
-      contains:( ingredient ( ws* ',' ws* ingredient )* ) <ListNode>
+      contains:( ingredient ( ws+ and ws+ ingredient )? )                                  <ListNode>
     end
 
     rule list_coloned_ingredient

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

@@ -8,7 +8,7 @@ module FoodIngredientParser::Strict::Grammar
     rule root
       '"'?
       root_prefix? ws*
-      contains:( list_newlined / list_coloned / list )
+      contains:( list_newlined / list_coloned_semicol / list_coloned / list )
       notes:(
         root_mark_sentences_in_list? ws*
         ( ( [.;] ws* newline* / [.;]?  ws* newline+ ) ws* root_sentences? ws* )?

data/lib/food_ingredient_parser/version.rb

@@ -1,4 +1,4 @@
 module FoodIngredientParser
-  VERSION      = '1.3.0'
-  VERSION_DATE = '2024-06-13'
+  VERSION      = '1.4.0'
+  VERSION_DATE = '2024-06-19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: food_ingredient_parser
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop