ingreedy 0.0.0 → 0.0.1

data/lib/ingreedy.rb

@@ -1,13 +1,13 @@
 path = File.expand_path(File.join(File.dirname(__FILE__), 'ingreedy'))
 
-require File.join(path, 'unit_parser')
+require File.join(path, 'ingreedy_parser')
 
 module Ingreedy
   class << self
     def parse(query)
-      h = UnitParser.new(query)
-      h.parse
-      h
+      parser = IngreedyParser.new(query)
+      parser.parse
+      parser
     end
   end
 end

data/lib/ingreedy/{unit_parser.rb → ingreedy_parser.rb}

@@ -1,9 +1,9 @@
-class UnitParser
+class IngreedyParser
 
-  attr_reader :amount, :unit, :ingredient
+  attr_reader :amount, :unit, :ingredient, :query
 
   def initialize(query)
-    @query = query.downcase
+    @query = query
   end
 
   def parse
@@ -16,7 +16,7 @@ class UnitParser
       (?<container_size> \(\g<container_amount>\s\g<container_unit>\)) {0}
       (?<unit_and_ingredient> .+ ) {0}
 
-      (\g<amount>\s)?(\g<fraction>\s)?(\g<container_size>\s)?\g<unit_and_ingredient>
+      (\g<amount>\s?)?(\g<fraction>\s)?(\g<container_size>\s)?\g<unit_and_ingredient>
     }x
     results = ingreedy_regex.match(@query)
 

data/lib/ingreedy/version.rb

@@ -1,4 +1,4 @@
 module Ingreedy
-  VERSION = '0.0.0'
+  VERSION = '0.0.1'
 end
 

metadata

@@ -2,7 +2,7 @@
 name: ingreedy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Ian C. Anderson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 -04:00
+date: 2011-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +24,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ingreedy/unit_parser.rb
+- lib/ingreedy/ingreedy_parser.rb
 - lib/ingreedy/version.rb
 - lib/ingreedy.rb
 has_rdoc: true