beer_recipe 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e343ebd5dd90883f61380871711d71725d2fc3
-  data.tar.gz: b064a9d35839ef3fc97220ccbd07f60d2f1aa3f8
+  metadata.gz: b1c69aef39b81784e559ab44b4c5bd5b6a372971
+  data.tar.gz: 81c43a22d05f859b7ebf5c0f49e65c6123cd4532
 SHA512:
-  metadata.gz: 98d7349d9ba872c49a932a20e19df6ad1a83d3b375a80272bd4119bd1c4ce7b858c10d64fe96e362669bb83bd4ed9431e3b916f2c8ca1d7a7b6c67e717025352
-  data.tar.gz: 1887c8480321e2dd989a419ae3e2cfa334d3e3e5e71aa786dfc0899e0997caafc9e77292ba0461fc3a1885e1d3d28ce260d2e830c3a0cd3fedb61f085e07b64f
+  metadata.gz: eb7bb97935f5d937c226bf73fec7d5af7904b551f02fa01b08432dd024c0c21dbc253d8263fd622ed186dae27f0c92bfa0fd8d8673164e3ee640892c1549eec1
+  data.tar.gz: b98e1f9b232315b238f67ab508321064115de97f20ab950abae49cb49e3426ee266e9b903d0d35f549ba2e2558b6e2596db37c7794930e5245f824186112bfb2

data/lib/beer_recipe/mash_wrapper.rb

@@ -6,12 +6,14 @@ class BeerRecipe::MashWrapper < BeerRecipe::Wrapper
   end
 
   def steps
+    return [] if @record.nil?
     @steps ||= @record.mash_steps.map do |step|
       BeerRecipe::Wrapper.wrap(step, @recipe)
     end
   end
 
   def total_mash_time
+    return 0 if steps.empty?
     steps.map { |s| s.step_time || 0 }.reduce :+ || 0
   end
 end

data/lib/beer_recipe/recipe_wrapper.rb

@@ -1,8 +1,9 @@
 class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   SETS = %i(fermentables hops miscs waters yeasts)
 
-  def initialize(record, recipe=nil)
-    super
+  def initialize(record, actual_values: false)
+    super(record)
+    @actual_values = actual_values
     @sets = {}
   end
 
@@ -62,20 +63,40 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     strip_unit(recipe.est_fg)
   end
 
+  def actual_og
+    recipe.og
+  end
+
+  def actual_fg
+    recipe.fg
+  end
+
   def og
-    @og ||= estimated_og || recipe.og || 0
+    @og ||= @actual_values && actual_og > 0 ? actual_og : estimated_og || 0
   end
 
   def fg
-    @fg ||= estimated_fg || recipe.fg || 0
+    @fg ||= @actual_values && actual_fg > 0 ? actual_fg : estimated_fg || 0
+  end
+
+  def actual_abv
+    strip_unit(recipe.abv)
+  end
+
+  def estimated_abv
+    strip_unit(recipe.est_abv)
+  end
+
+  def calculated_abv
+    BeerRecipe::Formula.new.sg_to_abv(og, fg)
   end
 
   def abv
-    @abv ||= BeerRecipe::Formula.new.sg_to_abv(og, fg)
+    @abv ||= @actual_values && actual_abv > 0 ? actual_abv : estimated_abv || calculated_abv
   end
 
   def ibu
-    @ibu ||= strip_unit(recipe.ibu) || calculate_ibu
+    @ibu ||= @actual_values && calculated_ibu > 0 ? calculated_ibu : estimated_ibu
   end
 
   def strip_unit(value)
@@ -83,15 +104,21 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     value.gsub(/ \w+\Z/, '').to_f
   end
 
-  def calculate_ibu
-    ibu = 0
-    hops.each do |hop|
-      ibu += hop.ibu
-    end
-    bitter_extracts.each do |f|
-      ibu += f.ibu
+  def estimated_ibu
+    strip_unit(recipe.ibu)
+  end
+
+  def calculated_ibu
+    @calculated_ibu ||= begin
+      ibu = 0
+      hops.each do |hop|
+        ibu += hop.ibu
+      end
+      bitter_extracts.each do |f|
+        ibu += f.ibu
+      end
+      ibu
     end
-    ibu
   end
 
   def grains
@@ -102,8 +129,16 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     fermentables.select { |f| f.bitter_extract? }
   end
 
+  def estimated_color
+    strip_unit(recipe.est_color)
+  end
+
   def color
-    color_srm
+    @actual_values ? actual_color : estimated_color
+  end
+
+  def actual_color
+    color_ebc
   end
 
   def color_mcu
@@ -119,7 +154,7 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   end
 
   def color_ebc
-    @color_eb ||= BeerRecipe::Formula.new.srm_to_ebc(color_srm)
+    @color_ebc ||= BeerRecipe::Formula.new.srm_to_ebc(color_srm)
   end
 
   def color_class
@@ -138,7 +173,7 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   end
 
   def formatted_color
-    "#{'%.0f' % color_ebc} EBC"
+    "#{'%.0f' % color} EBC"
   end
 
   def total_grains
@@ -181,7 +216,15 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
 
   # Returns calories per liter
   def calories
-    @calories ||= if has_final_values?
+    @calories ||= @actual_values && calculated_calories > 0 ? calculated_calories : estimated_calories
+  end
+
+  def estimated_calories
+    strip_unit(recipe.calories)
+  end
+
+  def calculated_calories
+    if has_final_values?
       BeerRecipe::Formula.new.calories(serving_size, abv, og, fg)
     else
       0
@@ -189,7 +232,7 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   end
 
   def real_extract
-    @real_extract ||= if og > 0 && fg > 0
+    @real_extract ||= if has_final_values?
       BeerRecipe::Formula.new.real_extract(og, fg)
     else
       0

data/lib/beer_recipe/version.rb

@@ -1,3 +1,3 @@
 module BeerRecipe
-  VERSION = '0.4.11'
+  VERSION = '0.4.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beer_recipe
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Olle Johansson
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple Beer XML recipe formatter.