ingreedy 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 452f17ed3a15ae973346ea074ee682bf173d1663
-  data.tar.gz: 6face6a2f60f6506160d815c69cd0546107fb787
+  metadata.gz: 7c24a989bf96f54f8190d1b6fd568a8e8c143954
+  data.tar.gz: cf1c0034a35aac3dfa9ee7c9ac4914756349591e
 SHA512:
-  metadata.gz: acdc3c1f4f4c135188c9c92e4a83441d569539f4a9b0af31cdfd08e8ca653ce81689dff985d72814d8b71f10f59b4d1eb936cf46f6d35e99aeb1a0b31cc42275
-  data.tar.gz: b0801f2d7eb26f02eb14cd615102b00dfe5eb695ed03f3b53dd32bf2f62c2df1cc70ae5cebcd552634403de39dc94c3d859d1271b31ba8f3930ad77d03668421
+  metadata.gz: 5941276bb95a4068ab44a4cf41923cf7b1f2ad2d243badeea3ffaacd8d3cb0601a10f29a32c33634c9dfb81c3f400db6d3a90ef16369ac7526607d9703356a9d
+  data.tar.gz: 94055cb4fa3134feec302d5a741161ac9f365eb03c52c80b5de40d540e4919f9cf8cc0b23adc1e513d3abd30b9945b3315b46628ec6666b36522c85217af76ec

data/.travis.yml

@@ -6,4 +6,10 @@ rvm:
   - 2.2.3
   - 2.3.0
   - ruby-head
-  - jruby-head
+  - jruby-1.7.20
+  - jruby-9.0.5.0
+matrix:
+  allow_failures:
+  - rvm: ruby-head
+  - rvm: jruby-1.7.20
+  - rvm: jruby-9.0.5.0

data/README.md

@@ -30,6 +30,27 @@ print result.ingredient
   #=> "sucre"
 ```
 
+### Handling amounts
+
+By default, Ingreedy will convert all amounts to a rational number:
+
+```ruby
+result = Ingreedy.parse("1 1/2 cups flour")
+print result.amount
+  #=> 3/2
+```
+
+However, setting `Ingreedy.preverse_amounts = true`, will allow amounts
+to be detected and returned as originally input:
+
+```ruby
+Ingreedy.preserve_amounts = true
+
+result = Ingreedy.parse("1 1/2 cups flour")
+print result.amount
+  #=> 1 1/2
+```
+
 [Live demo](http://hangryingreedytest.herokuapp.com/)
 
 # Pieces of Flair

data/lib/ingreedy.rb

@@ -7,12 +7,8 @@ require File.join(path, "dictionary_collection")
 module Ingreedy
   ParseFailed = Class.new(StandardError)
 
-  def self.locale
-    @locale ||= nil
-  end
-
-  def self.locale=(locale)
-    @locale = locale
+  class << self
+    attr_accessor :locale, :preserve_amounts
   end
 
   def self.parse(query)

data/lib/ingreedy/dictionaries/en.yml

@@ -59,26 +59,36 @@
     - "gr."
     - "gram"
     - "grams"
+    - "gramme"
+    - "grammes"
   :kilogram:
     - "kg"
     - "kg."
     - "kilogram"
     - "kilograms"
+    - "kilogramme"
+    - "kilogrammes"
   :liter:
     - "l"
     - "l."
     - "liter"
     - "liters"
+    - "litre"
+    - "litres"
   :milligram:
     - "mg"
     - "mg."
     - "milligram"
     - "milligrams"
+    - "milligramme"
+    - "milligrammes"
   :milliliter:
     - "ml"
     - "ml."
     - "milliliter"
     - "milliliters"
+    - "millilitre"
+    - "millilitres"
   :pinch:
     - "pinch"
     - "pinches"
@@ -132,6 +142,6 @@
   sixty: 60
   seventy: 70
   eighty: 80
-  ninety: 9
+  ninety: 90
 :prepositions:
   - "of"

data/lib/ingreedy/rationalizer.rb

@@ -12,37 +12,43 @@ module Ingreedy
     end
 
     def rationalize
-      if @word
-        result = rationalize_word
-      elsif @fraction
-        result = rationalize_fraction
-        if @integer
-          result += @integer.to_i
-        end
-      elsif @integer
-        result = @integer.to_r
-      elsif @float
-        result = @float.tr(",", ".").to_r
+      if Ingreedy.preserve_amounts
+        (normalized_word || compound_fraction || @float || @integer)
+      else
+        (normalized_word || rationalized_fraction || rationalized_float || @integer).to_r
       end
-
-      result
     end
 
     private
 
-    def rationalize_fraction
-      vulgar_fractions.each do |char, amount|
-        @fraction.gsub!(char, amount.to_s)
+    def normalized_word
+      return unless @word
+      Ingreedy.dictionaries.current.numbers[@word.downcase]
+    end
+
+    def normalized_fraction
+      @fraction.tap do |fraction|
+        Ingreedy.dictionaries.current.vulgar_fractions.each do |char, amount|
+          fraction.gsub!(char, amount.to_s)
+        end
       end
-      @fraction.to_r
     end
 
-    def vulgar_fractions
-      Ingreedy.dictionaries.current.vulgar_fractions
+    def rationalized_fraction
+      return unless @fraction
+      result = normalized_fraction
+      result = result.to_r + @integer.to_i
+      result
     end
 
-    def rationalize_word
-      Ingreedy.dictionaries.current.numbers[@word.downcase]
+    def compound_fraction
+      return unless @fraction
+      "#{@integer} #{normalized_fraction}".strip
+    end
+
+    def rationalized_float
+      return unless @float
+      @float.tr(",", ".")
     end
   end
 end

data/lib/ingreedy/version.rb

@@ -1,3 +1,3 @@
 module Ingreedy
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/ingreedy_spec.rb

@@ -41,6 +41,32 @@ describe Ingreedy, "amount parsing" do
   end
 end
 
+describe Ingreedy, "amount parsing preserving original value" do
+  around do |example|
+    Ingreedy.preserve_amounts = true
+    example.run
+    Ingreedy.preserve_amounts = false
+  end
+
+  {
+    "1 cup flour" => "1",
+    "2 cups flour" => "2",
+    "1 1/2 cups flour" => "1 1/2",
+    "¼ cups flour" => "1/4",
+    "1 ½ cups flour" => "1 1/2",
+    "1½ cups flour" => "1 1/2",
+    "1.0 cup flour" => "1.0",
+    "1.5 cups flour" => "1.5",
+    "1,5 cups flour" => "1,5",
+    "1/2 cups flour" => "1/2",
+    ".25 cups flour" => ".25",
+  }.each do |query, expected|
+    it "parses the correct amount" do
+      expect(Ingreedy.parse(query).amount).to eq(expected)
+    end
+  end
+end
+
 describe Ingreedy, "english units" do
   context "abbreviated" do
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ingreedy
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Ian C. Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Recipe parser