food_ingredient_parser 1.0.0.pre.4 → 1.0.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b180a987ae477627cd2046f967d54eeb160fc7ab
-  data.tar.gz: '0981287cb5348c58a5fc2e0fda39c470a0b10746'
+  metadata.gz: 8725e4ed3763020de6b46cad6709ce05aca0b77f
+  data.tar.gz: fedb82af99346e8db38a3beaca5914ab44be197a
 SHA512:
-  metadata.gz: e11033d79eff439544d71c789981361c98192d767687148cca73e02308f288aac474b84f8ffe1b2a08901df481e4a7c03c162bbcc8ed6f5c030b48f12e4ebb61
-  data.tar.gz: a44018d0bc1c77d7907e5fa31cf5fe7e919c2e20bf5480b07bbd0de33ff2e6aec4a2a7981b8a22906c574f9140bede380cc87a7917fc84a0f6685190d26925c7
+  metadata.gz: 114feb403f87140f2eccc21860c9a75aff4cff3583f3046f9815299f90dc6374c73b3b9ee60d682c3a9f91b2803ab3fc6c934f3255716986a494fbb51c9e5564
+  data.tar.gz: 8f94825d627ab8068fb3dfd6c20f61a20fc8612f06ec6a760d33e46def103ca11497e364d9e3a7c4720647794e644a7253ba6e226d984801a55e089a5961b753

data/README.md

@@ -124,11 +124,19 @@ puts parsed.to_html
 ```
 
 ```html
-<span class='name'>Saus</span> (<span class='amount'>10%</span>
-<span class='name'>tomaat</span><span class='mark'>*</span>,
-<span class='name'>zout</span>). <span class='note'>* = bio</span>
+<span class='depth0'>
+  <span class='name'>Saus</span> (
+  <span class='contains depth1'>
+    <span class='amount'>10%</span> <span class='name'>tomaat</span><span class='mark'>*</span>,
+    <span class='name'>zout</span>
+  </span>)
+</span>.
+<span class='note'>* = bio</span>
 ```
 
+For an example of an interactive editor, see [examples/editor.rb](examples/editor.rb).
+
+![editor example screenshot](examples/editor-screenshot.png)
 
 ## Test data
 
@@ -136,4 +144,3 @@ puts parsed.to_html
 real-world ingredient lists found on the Dutch market. Each line contains one ingredient
 list (newlines are encoded as `\n`, empty lines and those starting with `#` are ignored).
 Currently almost three quarter is recognized and parsed. We aim to reach at least 90%.
-

data/food_ingredient_parser.gemspec

@@ -4,7 +4,7 @@ require 'food_ingredient_parser/version'
 Gem::Specification.new do |s|
   s.name             = 'food_ingredient_parser'
   s.version          = FoodIngredientParser::VERSION
-  s.date             = '2018-09-05'
+  s.date             = FoodIngredientParser::VERSION_DATE
   s.summary          = 'Parser for ingredient lists found on food products.'
   s.authors          = ['wvengen']
   s.email            = ['dev-ruby@willem.engen.nl']

data/lib/food_ingredient_parser/to_html.rb

@@ -18,7 +18,7 @@ module FoodIngredientParser::ToHtml
 
   private
 
-  def node_to_html(node, cls=nil)
+  def node_to_html(node, cls=nil, depth=0)
     el_cls = {}               # map of node instances to class names for contained elements
     terminal = node.terminal? # whether to look at children elements or not
 
@@ -30,12 +30,21 @@ module FoodIngredientParser::ToHtml
     elsif node.is_a?(FoodIngredientParser::Grammar::IngredientNode)
       el_cls[node.name] = "name" if node.respond_to?(:name)
       el_cls[node.mark] = "mark" if node.respond_to?(:mark)
+      if node.respond_to?(:contains)
+        el_cls[node.contains] = "contains depth#{depth}"
+        depth += 1
+      end
+    elsif node.is_a?(FoodIngredientParser::Grammar::RootNode)
+      if node.respond_to?(:contains)
+        el_cls[node.contains] = "depth#{depth}"
+        depth += 1
+      end
     end
 
     val = if terminal
       CGI.escapeHTML(node.text_value)
     else
-      node.elements.map {|el| node_to_html(el, el_cls[el]) }.join("")
+      node.elements.map {|el| node_to_html(el, el_cls[el], depth) }.join("")
     end
 
     cls ? "<span class='#{cls}'>#{val}</span>" : val

data/lib/food_ingredient_parser/version.rb

@@ -1,3 +1,4 @@
 module FoodIngredientParser
-  VERSION = '1.0.0.pre.4'
+  VERSION      = '1.0.0.pre.5'
+  VERSION_DATE = '2018-09-07'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: food_ingredient_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.4
+  version: 1.0.0.pre.5
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop