emeals 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a2ca2974e3a5de77a5e8d5223fce6c7edbda70a3
4
- data.tar.gz: a5c7e5b51181b5fef5a28390519e4048d21862b3
3
+ metadata.gz: 197cd3889d5a971bcabba83b6f1515980ce7db85
4
+ data.tar.gz: 9903d717b03b80b62b49fd7071a374f9b07c28fd
5
5
  SHA512:
6
- metadata.gz: c82784dbada386ed2fc80352864c0d5c92b1112bbb13bb0c43eeb766b93b05c3a7d82f5983512a43fe2619aa4f5e2e92e1035a2cdbc134bd871bd18a5846e372
7
- data.tar.gz: 265d9d04f9dd1695b751b72228fc4a65f8664494d62b5d1f3e1af0a8f86b559597a1c5d220f76f6ac0cccdbc262a6903ffe0183fd6a93abce753c7a7a25f8c76
6
+ metadata.gz: 9af8620e15528c20773123e88eda59c675963fa2d6bdeabe226af559375284d7a154c6abd3676d1f0a6917dd1d536d72d9c3386b94ca2ea4d2eaa39fab65e502
7
+ data.tar.gz: 2f8cc632e55831141339c4f84f57c56a813d532a3ccb38004bc81dfd056fec70fb0033ba1dbb5c4e0c78eeafbadbb8b453e8d3631b17477dd90511df79b94b6a
@@ -36,8 +36,9 @@ class Emeals::MealParser
36
36
  end
37
37
 
38
38
  def parse
39
- entree_name = side_name = flags = times = nil
39
+ entree_name = side_name = flags = nil
40
40
  names = entree_ingredients = side_ingredients = []
41
+ times = {}
41
42
  parse_state = :header
42
43
  entree_instructions = []
43
44
  side_instructions = []
@@ -46,7 +47,7 @@ class Emeals::MealParser
46
47
  when :header
47
48
  flags, parse_state = parse_flags(line)
48
49
  when :names
49
- entree_name, side_name, names, parse_state = parse_names(line, names)
50
+ entree_name, side_name, names, entree_ingredients, parse_state = parse_names(line, names)
50
51
  when :times
51
52
  times, parse_state = parse_times(line)
52
53
  when :entree_ingredients
@@ -94,9 +95,12 @@ class Emeals::MealParser
94
95
  def parse_names(line, names)
95
96
  if line =~ /Prep Cook Total/
96
97
  entree_name, side_name = separate_entree_and_side_names(names)
97
- [entree_name, side_name, nil, :times]
98
+ [entree_name, side_name, nil, [], :times]
99
+ elsif line =~ /^#{NUMBER_PATTERN}/
100
+ entree_name, side_name = separate_entree_and_side_names(names)
101
+ [entree_name, side_name, nil, *parse_entree_ingredients(line, [])]
98
102
  else
99
- [nil, nil, names + [line], :names]
103
+ [nil, nil, names + [line], [], :names]
100
104
  end
101
105
  end
102
106
 
@@ -1,3 +1,3 @@
1
1
  module Emeals
2
- VERSION = "0.1.1"
2
+ VERSION = "0.1.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: emeals
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Moriarity
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-21 00:00:00.000000000 Z
11
+ date: 2013-07-22 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: A client for interpreting eMeals menus.
14
14
  email: