food_ingredient_parser 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c478a080e36c8f48ee3dbd6e9978eadec3758a4b0ab6fab571e18f103ed6bf0
-  data.tar.gz: aa078366f72ab03d038d497c908a3ad92f5816f37d3f0308fa64e81680905dea
+  metadata.gz: 890abbbcdfd6531b7ad33fa89eeb00d25e6069b60c6c741c3495f838b3e7d8a8
+  data.tar.gz: 24b50c3ec559983fa228aa27274213047635b07ce74aa82e8617548c60376ae4
 SHA512:
-  metadata.gz: d8acbd71e431958a72350e6fd1d3e5e8d21db8ee53525c53a08bbe2c564734fca9601ac0fdc33d9737695f292bc7cd6da898721f02f68ca8f87175c5b276c709
-  data.tar.gz: f261a1537a6e903d55b36dc91c0a1c302893d7a092a83afb8598730c87142d041fdaf86540918697f297f5024461082e5e56594df64f603f56f4b22148c7c9fd
+  metadata.gz: 758d0c351607a416fe801eb2ca839c831e6e996a39d528ffbc233b5dd15f895da6dc56adb79209d0736f25ece1217d3bcf696e395c80a038e70dc674d0669ef8
+  data.tar.gz: 5a36027d26908085f56e6e976dcb992cc422225830e99befed59e32475516f5fe5c642e9db27e28f47466a17519c25e46f1f8c601385432e55680089deac0c9d

data/lib/food_ingredient_parser/loose/node.rb

@@ -5,7 +5,7 @@ module FoodIngredientParser::Loose
   class Node
     include ToHtml
 
-    attr_accessor :name, :mark, :amount, :contains, :notes
+    attr_accessor :name_parts, :mark, :amount, :contains, :notes
     attr_reader :input, :interval, :auto_close
 
     def initialize(input, interval, auto_close: false)
@@ -14,7 +14,8 @@ module FoodIngredientParser::Loose
       @auto_close = auto_close
       @contains = []
       @notes = []
-      @name = @mark = @amount = nil
+      @name_parts = []
+      @mark = @amount = nil
     end
 
     def ends(index)
@@ -31,7 +32,8 @@ module FoodIngredientParser::Loose
 
     def to_h
       r = {}
-      r[:name] = name.text_value.strip if name && name.text_value.strip != ''
+      _name = name
+      r[:name] = _name if _name
       r[:marks] = [mark.text_value.strip] if mark
       r[:amount] = amount.text_value.strip if amount
       r[:contains] = contains.map(&:to_h).reject {|c| c == {} } if contains.any?
@@ -39,6 +41,11 @@ module FoodIngredientParser::Loose
       r
     end
 
+    def name
+      strings = name_parts.map {|n| n.text_value.strip }.reject {|n| n == nil || n == '' }
+      return strings.any? ? strings.join(" ") : nil
+    end
+
     def inspect(indent="", variant="")
       inspect_self(indent, variant) +
       inspect_children(indent)
@@ -47,7 +54,7 @@ module FoodIngredientParser::Loose
     def inspect_self(indent="", variant="")
       [
         indent + "Node#{variant} interval=#{@interval}",
-        name ? "name=#{name.text_value.strip.inspect}" : nil,
+        name ? "name=#{name.inspect}" : nil,
         mark ? "mark=#{mark.text_value.strip.inspect}" : nil,
         amount ? "amount=#{amount.text_value.strip.inspect}" : nil,
         auto_close ? "auto_close" : nil

data/lib/food_ingredient_parser/loose/scanner.rb

@@ -33,8 +33,9 @@ module FoodIngredientParser::Loose
 
     def initialize(s, index: 0)
       @s = s                           # input string
-      @i = index                       # current index in string
+      @i = index                       # current index in string, the iterator looks at this character
       @cur = nil                       # current node we're populating
+      @curifree = nil                  # last index in string for current node that we haven't added to a child node yet
       @ancestors = [Node.new(@s, @i)]  # nesting hierarchy
       @iterator = :beginning           # scan_iteration_<iterator> to use for parsing
       @dest = :contains                # append current node to this attribute on parent
@@ -79,6 +80,7 @@ module FoodIngredientParser::Loose
         # after bracket check for 'and' to not lose text
         if is_and_sep?(@i+1)
           @i += and_sep_len(@i+1)
+          @curifree = @i # don't include 'and' in cur name
           add_child
         end
       elsif is_notes_start?       # usually a dot marks the start of notes
@@ -147,7 +149,11 @@ module FoodIngredientParser::Loose
     end
 
     def cur
-      @cur ||= Node.new(@s, @i)
+      if !@cur
+        @cur ||= Node.new(@s, @i)
+        @curifree = @i
+      end
+      @cur
     end
 
     def is_sep?(chars: SEP_CHARS)
@@ -201,16 +207,19 @@ module FoodIngredientParser::Loose
       cur.ends(@i-1)
       parent.send(@dest) << cur
       @cur = nil
+      @curifree = nil
     end
 
     def open_parent(**options)
       name_until_here
       @ancestors << cur
       @cur = Node.new(@s, @i + 1, **options)
+      @curifree = @i + 1
     end
 
     def close_parent
       return unless @ancestors.count > 1
+      @curifree = @i + 1
       @cur = @ancestors.pop
       while @cur.auto_close
         add_child
@@ -227,15 +236,15 @@ module FoodIngredientParser::Loose
     end
 
     def name_until_here
-      cur.name ||= begin
-        i, j = cur.interval.first, @i - 1
-        i += mark_len(i) # skip any mark in front
-        # Set name if there is any. There is one corner-case that needs to be avoided when
-        # a nesting was opened without a name, which would set the name to the nesting text.
-        # In this case, the name starts with an open-nesting symbol, which should never happen.
-        if j >= i && !"([:".include?(@s[i])
-          Node.new(@s, i .. j)
-        end
+      return unless @curifree # no cur started yet
+      i, j = @curifree, @i - 1
+      i += mark_len(i) # skip any mark in front
+      # Set name if there is any. There is one corner-case that needs to be avoided when
+      # a nesting was opened without a name, which would set the name to the nesting text.
+      # In this case, the name starts with an open-nesting symbol, which should never happen.
+      if j >= i && !"([:".include?(@s[i])
+        cur.name_parts << Node.new(@s, i .. j)
+        @curifree = @i
       end
     end
 

data/lib/food_ingredient_parser/loose/transform/amount.rb

@@ -29,18 +29,26 @@ module FoodIngredientParser::Loose
 
       # Extract amount from name, if any.
       def transform_name(node = @node)
-        if !node.amount && parsed = parse_amount(node.name&.text_value)
-          offset = node.name.interval.first
+        if !node.amount
+          node.name_parts.each_with_index do |name, i|
+            parsed = parse_amount(name.text_value)
+            next unless parsed
+            offset = name.interval.first
 
-          amount = parsed.amount.amount
-          node.amount = Node.new(node.input, offset + amount.interval.first .. offset + amount.interval.last - 1)
+            amount = parsed.amount.amount
+            node.amount = Node.new(node.input, offset + amount.interval.first .. offset + amount.interval.last - 1)
 
-          name = parsed.respond_to?(:name) && parsed.name
-          if name && name.interval.count > 0
-            node.name = Node.new(node.input, offset + name.interval.first .. offset + name.interval.last - 1)
-          else
-            node.name = nil
+            name = parsed.respond_to?(:name) && parsed.name
+            node.name_parts[i] = if name && name.interval.count > 0
+              Node.new(node.input, offset + name.interval.first .. offset + name.interval.last - 1)
+            else
+              nil
+            end
+            # found an amount, stop looking in other parts
+            break
           end
+          # remove cleared name parts
+          node.name_parts.reject!(&:nil?)
         end
 
         # recursively transform contained nodes

data/lib/food_ingredient_parser/loose/transform/handle_missing_name.rb

@@ -42,7 +42,8 @@ module FoodIngredientParser::Loose
           # Apply recursively. Do it before processing to handle multiple depth levels of missing names.
           transform_children!(child) if child.contains.any?
 
-          if child.name.nil? || child.name.text_value.strip == ''
+          name = child.name
+          if name.nil? || name == ''
             # Name is empty, we need to do something.
             if prev
               # there is a previous ingredient: move children to new parent

data/lib/food_ingredient_parser/loose/transform/split_e_numbers.rb

@@ -29,21 +29,27 @@ module FoodIngredientParser::Loose
       def transform_node!(node)
         if node.contains.any?
           node.contains.each {|n| transform_node!(n) }
-        elsif node.name && m = MATCH_RE.match(node.name.text_value)
-          i = 0
-          while m = node.name.text_value.match(SPLIT_RE, i)
-            node.contains << new_node(node, i, m.begin(0)-1)
-            i = m.end(0)
+        else
+          node.name_parts.each_with_index do |name, name_index|
+            if m = MATCH_RE.match(name.text_value)
+              i = 0
+              while m = name.text_value.match(SPLIT_RE, i)
+                node.contains << new_node(name, i, m.begin(0)-1)
+                i = m.end(0)
+              end
+              node.contains << new_node(name, i, name.interval.last) if i <= name.interval.last
+              node.name_parts[name_index] = nil
+            end
           end
-          node.contains << new_node(node, i, node.name.interval.last) if i <= node.name.interval.last
-          node.name = nil
+          # remove cleared name parts
+          node.name_parts.reject!(&:nil?)
         end
       end
 
-      def new_node(node, begins, ends)
-        offset = node.name.interval.first
-        new_node = Node.new(node.input, offset + begins .. offset + ends)
-        new_node.name = Node.new(node.input, new_node.interval)
+      def new_node(name, begins, ends)
+        offset = name.interval.first
+        new_node = Node.new(name.input, offset + begins .. offset + ends)
+        new_node.name_parts = [Node.new(name.input, new_node.interval)]
         new_node
       end
     end

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,13 +2,25 @@ module FoodIngredientParser::Strict::Grammar
   grammar List
     include Common
     include Ingredient
+    include IngredientColoned
 
     rule list
-      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> /
-      contains:(ingredient ( ws* '.' ws* ingredient )+ ( ws+ and ws+ ingredient )? ) <ListNode> /
-      contains:(ingredient ( ws+ and ws+ ingredient )? )                             <ListNode>
+      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> /
+      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+ 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,8 +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.2.0'
-  VERSION_DATE = '2024-01-19'
+  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.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop