emeals 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f64929d0e17e3a429aef954e2508bf354afb6c
-  data.tar.gz: 7811beff315cd7d5b8a06720f1b696611f4a1658
+  metadata.gz: a2ca2974e3a5de77a5e8d5223fce6c7edbda70a3
+  data.tar.gz: a5c7e5b51181b5fef5a28390519e4048d21862b3
 SHA512:
-  metadata.gz: ba0a4c7c3ea79ba9a535569d33b97ac40429341d4fa219f908e02a35dd068c8852469486d0537e87e2845f521abf33a14b15e0127da7a0dd75849bea44083e1f
-  data.tar.gz: 9056e857a31afc51ad2ac0429a26c6f70a3ed51566c7d0097b2dc560c36c3426632a4a0054546d63f949b7e2ac090223d3e3557cd691c9fbebac3729eae1f547
+  metadata.gz: c82784dbada386ed2fc80352864c0d5c92b1112bbb13bb0c43eeb766b93b05c3a7d82f5983512a43fe2619aa4f5e2e92e1035a2cdbc134bd871bd18a5846e372
+  data.tar.gz: 265d9d04f9dd1695b751b72228fc4a65f8664494d62b5d1f3e1af0a8f86b559597a1c5d220f76f6ac0cccdbc262a6903ffe0183fd6a93abce753c7a7a25f8c76

data/lib/emeals/dish.rb

@@ -31,6 +31,7 @@ class Emeals::Quantity
     case str
       when "\xC2\xBC"; '1/4'
       when "\xC2\xBD"; '1/2'
+      when "\xC2\xBE"; '3/4'
       else             str
     end.to_r
   end
@@ -44,7 +45,8 @@ class Emeals::Ingredient
     @description = description
   end
 
-  PARSE_REGEX = /((?:\d|\xC2\xBC|\xC2\xBD)+) (?:(#{Emeals::Quantity::UNITS_WITH_PLURALS.join("|")}) )?(.+)/
+  NUMBER_PATTERN = /\d|\xC2\xBC|\xC2\xBD|\xC2\xBE/
+  PARSE_REGEX = /((?:#{NUMBER_PATTERN})+) (?:(#{Emeals::Quantity::UNITS_WITH_PLURALS.join("|")}) )?(.+)/
 
   def self.parse(line)
     if line =~ PARSE_REGEX

data/lib/emeals/meal.rb

@@ -114,7 +114,7 @@ class Emeals::MealParser
   end
 
   def parse_side_ingredients(line, ingredients)
-    if line =~ /^[A-Z]/
+    if line =~ /^[A-Z]/ and not line =~ /^Zest/
       [ingredients, [line], :entree_instructions]
     else
       [find_ingredients(ingredients, line), nil, :side_ingredients]
@@ -137,13 +137,17 @@ class Emeals::MealParser
     end
   end
 
-  INGREDIENT_REGEX = /(?:\d|\xC2\xBC|\xC2\xBD)+ .+?(?=, (?:\d|\xC2\xBC|\xC2\xBD)+|$)/
+  NUMBER_PATTERN = Emeals::Ingredient::NUMBER_PATTERN
+  INGREDIENT_REGEX = /(?:#{NUMBER_PATTERN})+ .+?(?=, (?:#{NUMBER_PATTERN})+|$)/
 
   def find_ingredients(ingredients, line)
-    if line =~ /^\d|\xC2\xBC|\xC2\xBD/
+    if line =~ /^#{NUMBER_PATTERN}/
       ingredients + line.scan(INGREDIENT_REGEX).map do |match|
         Emeals::Ingredient.parse(match)
       end
+    elsif line =~/^Zest/
+      # Special case this
+      ingredients + [Emeals::Ingredient.new(1, nil, line)]
     else
       # TODO we shouldn't be modifying this in-place
       ingredients.last.description << " #{line}"

data/lib/emeals/version.rb

@@ -1,3 +1,3 @@
 module Emeals
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emeals
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Moriarity