beer_recipe 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb89a375b81e9acad7770f2e994df045ad10c9f3
-  data.tar.gz: 63a0c37c7b5a1ec44c48cae060cd2db42ba297d6
+  metadata.gz: 0274207975de94cb136bd8ede50212079c49fffb
+  data.tar.gz: e79e0f6a9fa1a10fa50c0f6ac93b17f298264c9c
 SHA512:
-  metadata.gz: ac0dd8723e6b20cbe4538651695dd01694f08d7252d73e2d80f776cae2cfe3b11e6b6de7e7fc5e4d1af5423d4bf09f2d7f87fde131deab0770b3d32de4cae574
-  data.tar.gz: 48f5a867f24cc40b648921e330b0d04038d2df18142fbb3641e57bdd690c79e0afea55d90a311523def706803de570ea2a19a22bbb4ae96a2b7ac3f406773164
+  metadata.gz: 43e266ccd63eb887abd9b76617609ceebf3c435d002e6db2547a48fa209d21d00f2eaad5758f7b7c9c7f21568b8fa7b5151374c3f302252f1a9e20f849397f52
+  data.tar.gz: 54d86c3c5e50dab7138b038a553c6ed89663c9d8c2079aa9cb765b2981ce64715ff6687b39170bfe9136f65dcc19d216b093bf24050ee99a4492d8e500fbe92a

data/lib/beer_recipe/formula.rb

@@ -48,6 +48,25 @@ module BeerRecipe
       q = (-205.35 * (fg ** 2)) + (668.72 * fg) - 463.37
       (0.1808 * p) + (0.8192 * q)
     end
+
+    def tinseth(batch_size, boil_time, og, alpha, amount)
+      # Bigness factor = 1.65 * 0.000125^(wort gravity - 1)
+      # Boil Time factor = 1 - e^(-0.04 * time in mins) / 4.15
+      # Decimal Alpha Acid Utilization = Bigness Factor * Boil Time Factor
+      # mg/l of added alpha acids = (decimal AA rating * grams hops * 1000) / liters of wort
+      # IBUs = decimal alpha acid utilization * mg/l of added alpha acids
+      decimal_aa_rating = alpha / 100
+      bigness_factor = 1.65 * ( 0.000125 ** (og - 1) )
+      boil_time_factor = (1 - Math::E ** ( -0.04 * boil_time ) ) / 4.15
+      alpha_acid_utilization = bigness_factor * boil_time_factor
+      added_alpha_acids = (decimal_aa_rating * amount * 1000) / batch_size
+      ibus = alpha_acid_utilization * added_alpha_acids
+      return ibus
+    end
+
+    def mgl_added_alpha_acids(batch_size, alpha, amount)
+      (alpha * amount * 1000) / batch_size
+    end
   end
 end
 

data/lib/beer_recipe/hop_wrapper.rb

@@ -1,13 +1,20 @@
 class BeerRecipe::HopWrapper < BeerRecipe::Wrapper
-  attr_accessor :ibu
 
   def amount
     @record.amount * 1000
   end
 
+  def aau
+    @record.alpha * amount * 0.035274
+  end
+
+  # mg/l of added alpha acids
+  def mgl_added_alpha_acids
+    BeerRecipe::Formula.new.mgl_added_alpha_acids(@recipe.batch_size, @record.alpha, amount)
+  end
+
   def ibu
-    # IBU = (Alfasyrahalt) X (Humlemängd) X (Koktid) X (3) / (Bryggvolym)
-    ( @record.alpha * amount * boil_time * 3 ) / @recipe.batch_size
+    @ibu ||= BeerRecipe::Formula.new.tinseth(@recipe.batch_size, @record.time, @recipe.og, @record.alpha, amount)
   end
 
   def dryhop?

data/lib/beer_recipe/misc_wrapper.rb

@@ -1,26 +1,45 @@
 class BeerRecipe::MiscWrapper < BeerRecipe::Wrapper
+  DAY = 1440
+
+  def weight?
+    amount_is_weight
+  end
+
+  def days?
+    time > DAY
+  end
+
+  def large_amount?
+    amount >= 1
+  end
+
   def unit
-    if amount_is_weight
-      'grams'
+    # maybe use display_amount directly instead
+    if weight?
+      large_amount? ? 'kilograms' : 'grams'
     else
-      'ml'
+      large_amount? ? 'items' : 'ml'
     end
   end
 
   def formatted_amount
-    "#{'%.0f' % (1000 * amount)}"
+    if large_amount?
+      "#{'%.0f' % amount}"
+    else
+      "#{'%.0f' % (1000 * amount)}"
+    end
   end
 
   def formatted_time
-    t = if time > 1440
-      "#{'%.0f' % (time / 1440)}"
+    t = if days?
+      "#{'%.0f' % (time / DAY)}"
     else
       "#{'%.0f' % time}"
     end
   end
 
   def time_unit
-    if time > 1440
+    if days?
       'days'
     else
       'minutes'

data/lib/beer_recipe/recipe_wrapper.rb

@@ -49,7 +49,7 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   def ibu
     return @ibu if @ibu
     @ibu = 0
-    hops.each do |hop|
+    hops.select { |h| h.use == 'Boil' }.each do |hop|
       @ibu += hop.ibu
     end
     @ibu

data/lib/beer_recipe/text_formatter.rb

@@ -8,7 +8,7 @@ class BeerRecipe::TextFormatter < BeerRecipe::RecipeFormatter
     puts "OG: #{@recipe.og}"
     puts "FG: #{@recipe.fg}"
     puts "ABV: #{'%.2f' % @recipe.abv}%"
-    puts "IBU: #{@recipe.ibu}"
+    puts "IBU: #{'%.0f' % @recipe.ibu}"
   end
 
   def format_mash(mash)
@@ -38,6 +38,14 @@ class BeerRecipe::TextFormatter < BeerRecipe::RecipeFormatter
     puts "#{h.formatted_amount}\t#{h.name} (#{h.form})\t#{h.use}\t#{h.formatted_time}\t#{h.formatted_ibu}"
   end
 
+  def before_miscs
+    puts "\nMiscellaneous:"
+  end
+
+  def format_misc(m)
+    puts "#{m.name}\t#{m.formatted_amount} #{m.unit}\t#{m.formatted_time} #{m.time_unit}"
+  end
+
   def before_yeasts
     puts "\nYeasts:"
   end

data/lib/beer_recipe/version.rb

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

data/locales/en.yml

@@ -88,6 +88,7 @@ Fining: Fining
 Herb: Herb
 Spice: Spice
 Flavor: Flavor
+Water Agent: Water Agent
 Other: Other
 Secondary: Secondary
 Yeast Nutrient: Yeast Nutrient
@@ -95,3 +96,6 @@ Ginger Root: Ginger Root
 Fermentation: Fermentation
 Coffee: Coffee
 Seeds of Paradise: Seeds of Paradise
+items: items
+Primary: Primary
+Bottling: Bottling

data/locales/se.yml

@@ -87,6 +87,7 @@ Fining: Klarning
 Herb: Ört
 Spice: Krydda
 Flavor: Smak
+Water Agent: Vattenjustering
 Other: Övrigt
 Secondary: Sekundär
 Yeast Nutrient: Jästnäring
@@ -94,3 +95,6 @@ Ginger Root: Ingefära
 Fermentation: Jäsning
 Coffee: Kaffe
 Seeds of Paradise: Paradisfrön
+items: stycken
+Primary: Primär
+Bottling: Buteljering

data/template/exalted_beer.html.erb

@@ -223,36 +223,6 @@
         </table>
       </section>
 
-      <% if miscs.count > 0 %>
-      <section class="recipe_miscs">
-        <h2><%= I18n.t(:miscs) %></h2>
-        <table>
-          <thead>
-            <tr>
-              <th><%= I18n.t(:misc_name) %></th>
-              <th><%= I18n.t(:misc_amount) %></th>
-              <th><%= I18n.t(:misc_type) %></th>
-              <th><%= I18n.t(:misc_use) %></th>
-              <th><%= I18n.t(:misc_time) %></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% miscs.each do |m| %>
-            <meta itemprop="recipeIngredient"
-              content="<%= m.formatted_amount %> <%= I18n.t(m.unit, default: m.unit) %> <%= m.name %>">
-            <tr>
-              <td class="misc_name"><%= I18n.t(m.name, default: m.name) %></td>
-              <td class="misc_amount format_number"><%= m.formatted_amount %> <%= I18n.t(m.unit, default: m.unit) %></td>
-              <td class="misc_type"><%= I18n.t(m.type, default: m.type) %></td>
-              <td class="misc_use"><%= I18n.t(m.use, default: m.use) %></td>
-              <td class="misc_time"><%= m.formatted_time %> <%= I18n.t(m.time_unit, default: m.time_unit) %></td>
-            </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </section>
-    <% end %>
-
       <section class="recipe_hops">
         <h2><%= I18n.t(:hops) %></h2>
         <table>
@@ -287,6 +257,36 @@
         </table>
       </section>
 
+      <% if miscs.count > 0 %>
+      <section class="recipe_miscs">
+        <h2><%= I18n.t(:miscs) %></h2>
+        <table>
+          <thead>
+            <tr>
+              <th><%= I18n.t(:misc_name) %></th>
+              <th><%= I18n.t(:misc_amount) %></th>
+              <th><%= I18n.t(:misc_type) %></th>
+              <th><%= I18n.t(:misc_use) %></th>
+              <th><%= I18n.t(:misc_time) %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% miscs.each do |m| %>
+            <meta itemprop="recipeIngredient"
+              content="<%= m.formatted_amount %> <%= I18n.t(m.unit, default: m.unit) %> <%= m.name %>">
+            <tr>
+              <td class="misc_name"><%= I18n.t(m.name, default: m.name) %></td>
+              <td class="misc_amount format_number"><%= m.formatted_amount %> <%= I18n.t(m.unit, default: m.unit) %></td>
+              <td class="misc_type"><%= I18n.t(m.type, default: m.type) %></td>
+              <td class="misc_use"><%= I18n.t(m.use, default: m.use) %></td>
+              <td class="misc_time"><%= m.formatted_time %> <%= I18n.t(m.time_unit, default: m.time_unit) %></td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </section>
+      <% end %>
+
       <section class="yeasts">
         <h2><%= I18n.t(:yeasts) %></h2>
         <table>

metadata

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