beer_recipe 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0274207975de94cb136bd8ede50212079c49fffb
-  data.tar.gz: e79e0f6a9fa1a10fa50c0f6ac93b17f298264c9c
+  metadata.gz: 40c81b35807a30b9416ebafbcdd7ac37406c1f59
+  data.tar.gz: 95ebf28d71688df5b73211de49f46364c7bb51b0
 SHA512:
-  metadata.gz: 43e266ccd63eb887abd9b76617609ceebf3c435d002e6db2547a48fa209d21d00f2eaad5758f7b7c9c7f21568b8fa7b5151374c3f302252f1a9e20f849397f52
-  data.tar.gz: 54d86c3c5e50dab7138b038a553c6ed89663c9d8c2079aa9cb765b2981ce64715ff6687b39170bfe9136f65dcc19d216b093bf24050ee99a4492d8e500fbe92a
+  metadata.gz: ac17a5778a5de1c1fb95d32c13b11355a98edcd632f1624eadb4bfa100aa45c11a757c86a23350e9e1c7d1a3f303352e2d4cd16d451c0fb85484cae64779ee88
+  data.tar.gz: a45c0c6ac75ce3d7e6dd02482147515184eb9847ac701566e2f3f2486c7e97a59f4169d28641c549008b6e66fd557ae6dc99f753b3d0aa65b6350c81f7ab834d

data/lib/beer_recipe/hop_wrapper.rb

@@ -14,7 +14,11 @@ class BeerRecipe::HopWrapper < BeerRecipe::Wrapper
   end
 
   def ibu
-    @ibu ||= BeerRecipe::Formula.new.tinseth(@recipe.batch_size, @record.time, @recipe.og, @record.alpha, amount)
+    @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
   end
 
   def dryhop?

data/lib/beer_recipe/mash_step_wrapper.rb

@@ -1,4 +1,20 @@
 class BeerRecipe::Mash_stepWrapper < BeerRecipe::Wrapper
+  def step_temp
+    super || 0
+  end
+
+  def ramp_time
+    super || 0
+  end
+
+  def step_time
+    super || 0
+  end
+
+  def infuse_amount
+    super || 0
+  end
+
   def formatted_step_temp
     "#{'%.0f' % step_temp}"
   end

data/lib/beer_recipe/mash_wrapper.rb

@@ -12,7 +12,7 @@ class BeerRecipe::MashWrapper < BeerRecipe::Wrapper
   end
 
   def total_mash_time
-    steps.map { |s| s.step_time }.reduce :+
+    steps.map { |s| s.step_time || 0 }.reduce :+ || 0
   end
 end
 

data/lib/beer_recipe/misc_wrapper.rb

@@ -6,7 +6,7 @@ class BeerRecipe::MiscWrapper < BeerRecipe::Wrapper
   end
 
   def days?
-    time > DAY
+    !blank?(time) && time > DAY
   end
 
   def large_amount?
@@ -31,7 +31,8 @@ class BeerRecipe::MiscWrapper < BeerRecipe::Wrapper
   end
 
   def formatted_time
-    t = if days?
+    return "" if blank?(time)
+    if days?
       "#{'%.0f' % (time / DAY)}"
     else
       "#{'%.0f' % time}"

data/lib/beer_recipe/recipe_wrapper.rb

@@ -10,6 +10,10 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     @record
   end
 
+  def date
+    recipe.date || nil
+  end
+
   def get_binding
     binding
   end
@@ -30,20 +34,32 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     @mash ||= BeerRecipe::MashWrapper.new(recipe.mash, self)
   end
 
-  def has_final_values?
-    og > 0 && fg > 0 && abv > 0
-  end
-
   def file_name
     I18n.transliterate(name.downcase.gsub(/\s+/, '_')).gsub(/[^a-z0-9_]/, '')
   end
 
+  def has_final_values?
+    og > 0 && fg > 0 && abv > 0
+  end
+
   def style_code
     "#{recipe.style.category_number} #{recipe.style.style_letter}"
   end
 
+  def batch_size
+    recipe.batch_size || 0
+  end
+
+  def og
+    recipe.og || 0
+  end
+
+  def fg
+    recipe.fg || 0
+  end
+
   def abv
-    @abv ||= BeerRecipe::Formula.new.sg_to_abv(recipe.og, recipe.fg)
+    @abv ||= BeerRecipe::Formula.new.sg_to_abv(og, fg)
   end
 
   def ibu
@@ -116,6 +132,10 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
     @hop_weight
   end
 
+  def boil_time
+    recipe.boil_time || 0
+  end
+
   def total_time
     boil_time + mash.total_mash_time
   end
@@ -142,7 +162,11 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   end
 
   def real_extract
-    @real_extract ||= BeerRecipe::Formula.new.real_extract(og, fg)
+    @real_extract ||= if og > 0 && fg > 0
+      BeerRecipe::Formula.new.real_extract(og, fg)
+    else
+      0
+    end
   end
 end
 

data/lib/beer_recipe/version.rb

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

data/lib/beer_recipe/wrapper.rb

@@ -16,6 +16,10 @@ class BeerRecipe::Wrapper
     "format_#{record_type}".to_sym
   end
 
+  def blank?(obj)
+    obj.nil? || (obj.respond_to?(:empty?) && obj.empty?)
+  end
+
   def self.set(recipe, set)
     set.map { |record| self.wrap(record, recipe) }
   end

data/lib/beer_recipe/yeast_wrapper.rb

@@ -1,9 +1,11 @@
 class BeerRecipe::YeastWrapper < BeerRecipe::Wrapper
   def formatted_attenuation
+    return "" if blank?(attenuation)
    "#{'%.0f' % attenuation}%"
   end
 
   def formatted_temperatures
+    return "" if blank?(min_temperature) || blank?(max_temperature)
     "#{'%.0f' % min_temperature}°C - #{'%.0f' % max_temperature}°C"
   end
 end

metadata

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