beer_recipe 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c81b35807a30b9416ebafbcdd7ac37406c1f59
-  data.tar.gz: 95ebf28d71688df5b73211de49f46364c7bb51b0
+  metadata.gz: 1cefcead7d8f4e76d6a069508409014f4997cf20
+  data.tar.gz: 2c349c9cf66a2324d196800b1c92d97083ec8135
 SHA512:
-  metadata.gz: ac17a5778a5de1c1fb95d32c13b11355a98edcd632f1624eadb4bfa100aa45c11a757c86a23350e9e1c7d1a3f303352e2d4cd16d451c0fb85484cae64779ee88
-  data.tar.gz: a45c0c6ac75ce3d7e6dd02482147515184eb9847ac701566e2f3f2486c7e97a59f4169d28641c549008b6e66fd557ae6dc99f753b3d0aa65b6350c81f7ab834d
+  metadata.gz: f0bef2eb48ca75899c49e65bdc6f87129f2ed6913939e67d99278200bc9d8440736c3f89f3914430c7e33cd75bda508f9c070d1b0f25a13bb9ad01609f0a45b2
+  data.tar.gz: 91af2b3727f40e189558f6a6acf5ba0a9f0c88c99091fea1768905eaf0ab7794d1acffc09803042cae2ed0597fc1cec3d60011dacb8d102bb120e20f0112d009

data/lib/beer_recipe/fermentable_wrapper.rb

@@ -23,6 +23,22 @@ class BeerRecipe::FermentableWrapper < BeerRecipe::Wrapper
     @mcu ||= BeerRecipe::Formula.new.mcu(amount, color_srm, @recipe.batch_size)
   end
 
+  def ibu
+    if bitter_extract?
+      amount_in_pounds * ibu_gal_per_lb / @recipe.gallons
+    else
+      0
+    end
+  end
+
+  def bitter_extract?
+    !ibu_gal_per_lb.nil?
+  end
+
+  def amount_in_pounds
+    amount * 2.20462
+  end
+
   def color_class
     c = color_srm.to_i
     if c > 40

data/lib/beer_recipe/formula.rb

@@ -65,7 +65,7 @@ module BeerRecipe
     end
 
     def mgl_added_alpha_acids(batch_size, alpha, amount)
-      (alpha * amount * 1000) / batch_size
+      (alpha * amount) / batch_size
     end
   end
 end

data/lib/beer_recipe/hop_wrapper.rb

@@ -14,15 +14,47 @@ class BeerRecipe::HopWrapper < BeerRecipe::Wrapper
   end
 
   def ibu
-    @ibu ||= if @recipe.has_final_values? && @recipe.batch_size > 0 && amount > 0 && @record.time > 0
-               BeerRecipe::Formula.new.tinseth(@recipe.batch_size, @record.time, @recipe.og, @record.alpha, amount)
-             else
-               0
-             end
+    @ibu ||= calculate_ibu
+  end
+
+  def calculate_ibu
+    # TODO: Use recipe boil time for first wort/mash
+    # TODO: Use calculated_og if og missing.
+    if has_needed_ibu_values? && contributes_bitterness?
+      ibu = BeerRecipe::Formula.new.tinseth(@recipe.batch_size, @record.time, @recipe.og, @record.alpha, amount)
+      ibu = adjust_bitterness(ibu)
+      ibu
+    else
+      0
+    end
+  end
+
+  def adjust_bitterness(ibu)
+    if @record.form == 'Pellet'
+      ibu *= 1.10
+    elsif @record.form == 'Plug'
+      ibu *= 1.02
+    end
+    if @record.use == 'Mash'
+      ibu *= 0.20
+    elsif @record.use == 'First Wort'
+      ibu *= 1.10
+    elsif @record.use == 'Aroma'
+      ibu *= 0.10
+    end
+    ibu
+  end
+
+  def contributes_bitterness?
+    !dryhop?
+  end
+
+  def has_needed_ibu_values?
+    @recipe.has_final_values? && @recipe.batch_size > 0 && amount > 0 && @record.time > 0
   end
 
   def dryhop?
-    @record.use == 'Dry Hop'
+    @record.use == 'Dry Hop' || @record.time > 320
   end
 
   def boil_time

data/lib/beer_recipe/misc_wrapper.rb

@@ -26,7 +26,7 @@ class BeerRecipe::MiscWrapper < BeerRecipe::Wrapper
     if large_amount?
       "#{'%.0f' % amount}"
     else
-      "#{'%.0f' % (1000 * amount)}"
+      "#{'%.2f' % (1000 * amount)}"
     end
   end
 

data/lib/beer_recipe/recipe_wrapper.rb

@@ -50,6 +50,10 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     recipe.batch_size || 0
   end
 
+  def gallons
+    batch_size * 0.264172
+  end
+
   def og
     recipe.og || 0
   end
@@ -68,6 +72,9 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     hops.select { |h| h.use == 'Boil' }.each do |hop|
       @ibu += hop.ibu
     end
+    bitter_extracts.each do |f|
+      @ibu += f.ibu
+    end
     @ibu
   end
 
@@ -75,6 +82,10 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     fermentables.select { |f| f.type == 'Grain' }
   end
 
+  def bitter_extracts
+    fermentables.select { |f| f.bitter_extract? }
+  end
+
   def color
     color_srm
   end

data/lib/beer_recipe/version.rb

@@ -1,3 +1,3 @@
 module BeerRecipe
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beer_recipe
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Olle Johansson