beer_recipe 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59854fd37ab30f4018a7971da8615e820886e166
-  data.tar.gz: a023d8a675a187fcc9acd681e680f0c0e6b11485
+  metadata.gz: b8e2bb78a9f64806b377bd0e0222c07028f82777
+  data.tar.gz: 378bcc1bf96f2f0f4ceeca9c89120fef04a24cc0
 SHA512:
-  metadata.gz: d7c4041ab2c42bb4d54a99efca92d62496ce8a5f55741772f49b87e25c77fa2348c775445b1002f1ce7cba751960f85fee4a36a767e5a9e86944552e5e7c2e16
-  data.tar.gz: 19112e1ac28a6043fdbb0198d672f6df39161b3504dc9ffd9f0c6f4eb7b58cfce04c64dc257c245e6e4013f7f5f1a7cd7acb0a788e784f6e5ff9557b588fd0e4
+  metadata.gz: 346bea94b4361255d09db38fc337af63e0d80423a2f843a7438f12996824a41e3e6468acd560446171dec311234473973fec6cbb8f5d3262a936c593be67af87
+  data.tar.gz: 8d7c6e320d56f637e38e1b02c6c0ac32280be731c22b2d9a3b78c86f32c7e3038e198474ddd31adc46d9704e70eda885a30d71bea53f38affe63f343ec9752d7

data/bin/beer_recipe

@@ -9,7 +9,7 @@ doc = <<DOCOPT
 Beer Recipe
 
 Usage:
-  #{__FILE__} [--file <beer.xml>] [--format=<format>] [--template=<path>]
+  #{__FILE__} [--file <beer.xml>] [--format=<format>] [--template=<path>] [--language=<file>]
   #{__FILE__} -h | --help
   #{__FILE__} --version
 
@@ -19,6 +19,7 @@ Options:
   --format=<format>  Output format: text|html [default: html].
   --template=<path>  Path to ERB html template file to use instead of default.
   --file=<beerxml>   Path to beerxml file to read (default STDIN).
+  --language=<file>  Path to language file (defaults to locales/en.yml)
 
 DOCOPT
 

data/lib/beer_recipe.rb

@@ -1,6 +1,7 @@
 require 'nrb/beerxml'
 require 'erb'
 require 'pathname'
+require 'i18n'
 
 module BeerRecipe
 end
@@ -8,6 +9,7 @@ end
 require 'beer_recipe/version'
 require 'beer_recipe/errors'
 require 'beer_recipe/reader'
+require 'beer_recipe/formula'
 require 'beer_recipe/wrapper'
 require 'beer_recipe/mash_wrapper'
 require 'beer_recipe/mash_step_wrapper'

data/lib/beer_recipe/errors.rb

@@ -1,4 +1,6 @@
 module BeerRecipe
   class BeerRecipeError < StandardError; end
+  class ParseError < BeerRecipeError; end
+  class FormatError < BeerRecipeError; end
   class NotImplentedError < BeerRecipeError; end
 end

data/lib/beer_recipe/fermentable_wrapper.rb

@@ -1,11 +1,10 @@
 class BeerRecipe::FermentableWrapper < BeerRecipe::Wrapper
   def formatted_amount
-    "#{'%.2f' % amount} kg"
+    "#{'%.2f' % amount}"
   end
 
-    #@type="Grain", @yield=82.5, @color=5.91,
   def formatted_color
-    "#{'%.0f' % color} EBC"
+    "#{'%.0f' % color_ebc}"
   end
 
   def color_ebc
@@ -13,16 +12,35 @@ class BeerRecipe::FermentableWrapper < BeerRecipe::Wrapper
   end
 
   def color_srm
-    color / 1.97
+    @color_srm ||= BeerRecipe::Formula.new.ebc_to_srm(color_ebc)
   end
 
-  def color_class
-    "srm#{'%.0f' % color_srm}"
+  def srm_in_batch
+    BeerRecipe::Formula.new.mcu_to_srm(mcu)
   end
 
   def mcu
-    # MCU = (weight kg * lovibond * 2.205) / (volume * 0.264)
-    (amount * color_srm * 2.205) / (@recipe.batch_size * 0.264)
+    @mcu ||= BeerRecipe::Formula.new.mcu(amount, color_srm, @recipe.batch_size)
   end
+
+  def color_class
+    c = color_srm.to_i
+    if c > 40
+      'srm-max'
+    elsif c < 1
+      'srm-min'
+    else
+      "srm#{c}"
+    end
+  end
+
+  def color_hex
+    "#%02x%02x%02x" % BeerRecipe::Formula.new.srm_to_rgb(color_srm)
+  end
+
+  def amount_percent
+    amount / @recipe.total_grains * 100
+  end
+
 end
 

data/lib/beer_recipe/formula.rb

@@ -0,0 +1,53 @@
+module BeerRecipe
+  class Formula
+    def ebc_to_srm(ebc)
+      ebc / 1.97
+    end
+
+    def srm_to_ebc(srm)
+      srm * 1.97
+    end
+
+    def mcu_to_srm(mcu)
+      # SRM color = 1.4922 * (MCU ** 0.6859)
+      srm = 1.4922 * (mcu ** 0.6859)
+      if srm > 8
+        srm
+      else
+        mcu
+      end
+    end
+
+    def srm_to_rgb(srm)
+      r = [255, [0, 255 * (0.975 ** srm)].max].min
+      g = [255, [0, 245 * (0.88  ** srm)].max].min
+      b = [255, [0, 220 * (0.7   ** srm)].max].min
+      [r, g, b]
+    end
+
+    def mcu(amount, srm, volume)
+      # MCU = (weight kg * lovibond * 2.205) / (volume * 0.264)
+      (amount * srm * 2.205) / (volume * 0.264)
+    end
+
+    def sg_to_abv(og, fg)
+      if og > 0 && fg > 0
+        ( (76.08 * (og - fg) / (1.775 - og) ) * (fg / 0.794) )
+      else
+        0
+      end
+    end
+
+    def calories(serving_size, abv, og, fg)
+      r = real_extract(og, fg)
+      ( 6.9 * ( 0.79 * ( abv / fg ) ) + 4 * ( r - 0.1 ) ) * fg * ( serving_size / 100 )
+    end
+
+    def real_extract(og, fg)
+      p = (-205.35 * (og ** 2)) + (668.72 * og) - 463.37
+      q = (-205.35 * (fg ** 2)) + (668.72 * fg) - 463.37
+      (0.1808 * p) + (0.8192 * q)
+    end
+  end
+end
+

data/lib/beer_recipe/hop_wrapper.rb

@@ -10,8 +10,12 @@ class BeerRecipe::HopWrapper < BeerRecipe::Wrapper
     ( @record.alpha * amount * boil_time * 3 ) / @recipe.batch_size
   end
 
+  def dryhop?
+    @record.use == 'Dry Hop'
+  end
+
   def boil_time
-    if @record.use == 'Dry Hop'
+    if dryhop?
       0
     else
       @record.time / 60
@@ -19,19 +23,32 @@ class BeerRecipe::HopWrapper < BeerRecipe::Wrapper
   end
 
   def formatted_time
-    if @record.use == 'Dry Hop'
-      "#{'%.0f' % (@record.time / 1440)} days"
+    if dryhop?
+      "#{'%.0f' % (@record.time / 1440)}"
     else
-      "#{'%.0f' % @record.time} min"
+      "#{'%.0f' % @record.time}"
+    end
+  end
+
+  def time_unit
+    if dryhop?
+      'days'
+    else
+      'min'
     end
   end
 
   def formatted_amount
-   "#{'%.0f' % amount} gr"
+   "#{'%.0f' % amount}"
   end
 
   def formatted_ibu
-   "#{'%.2f' % ibu} IBU"
+   "#{'%.1f' % ibu}"
+  end
+
+  def amount_percent
+    amount / @recipe.total_hops * 100
   end
+
 end
 

data/lib/beer_recipe/mash_step_wrapper.rb

@@ -1,10 +1,18 @@
 class BeerRecipe::Mash_stepWrapper < BeerRecipe::Wrapper
   def formatted_step_temp
-    "#{'%.0f' % step_temp}°C"
+    "#{'%.0f' % step_temp}"
+  end
+
+  def formatted_ramp_time
+    "#{'%.0f' % ramp_time}"
   end
 
   def formatted_step_time
-    "#{'%.0f' % step_time} min"
+    "#{'%.0f' % step_time}"
+  end
+
+  def formatted_infuse_amount
+    "#{'%.2f' % infuse_amount}"
   end
 end
 

data/lib/beer_recipe/mash_wrapper.rb

@@ -10,5 +10,9 @@ class BeerRecipe::MashWrapper < BeerRecipe::Wrapper
       BeerRecipe::Wrapper.wrap(step, @recipe)
     end
   end
+
+  def total_mash_time
+    steps.map { |s| s.step_time }.reduce :+
+  end
 end
 

data/lib/beer_recipe/reader.rb

@@ -5,6 +5,11 @@ class BeerRecipe::Reader
     @options = options
     @options[:recipe_wrapper] ||= BeerRecipe::RecipeWrapper
     @options[:formatter] ||= BeerRecipe::HtmlFormatter
+    setup_translation
+  end
+
+  def setup_translation
+    I18n.backend.store_translations(:en, YAML.load(File.read(@options[:language])))
   end
 
   def self.parse_options(options)
@@ -16,19 +21,25 @@ class BeerRecipe::Reader
     end
     opts[:template] = options['--template'] if options['--template']
     opts[:file] = options['--file'] if options['--file']
+    opts[:language] = options['--language'] || 'locales/en.yml'
     opts
   end
 
   def read
     @parser ||= NRB::BeerXML::Parser.new
-    @beerxml = parser.parse @options.fetch(:file, STDIN)
+    @beerxml = @parser.parse @options.fetch(:file, STDIN)
     self
   end
 
   def parse
+    raise BeerRecipe::ParseError if @beerxml.nil?
     @beerxml.records.each do |record|
       recipe = @options[:recipe_wrapper].new(record)
-      @options[:formatter].new(@options).format(recipe).output
+      begin
+        @options[:formatter].new(@options).format(recipe).output
+      rescue NoMethodError => e
+        raise BeerRecipe::FormatError.new e
+      end
     end
   end
 end

data/lib/beer_recipe/recipe_wrapper.rb

@@ -16,7 +16,7 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
 
   def method_missing(method, *args, &block)
     if SETS.include?(method)
-      @sets[method] ||= BeerRecipe::Wrapper.set(recipe, method)
+      @sets[method] ||= BeerRecipe::Wrapper.set(self, recipe.send(method))
     else
       @record.send(method, *args, &block)
     end
@@ -30,19 +30,20 @@ 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 style_code
     "#{recipe.style.category_number} #{recipe.style.style_letter}"
   end
 
   def abv
-    return @abv if @abv
-    og = recipe.og
-    fg = recipe.fg
-    @abv = if og > 0 && fg > 0
-      ( (76.08 * (og - fg) / (1.775 - og) ) * (fg / 0.794) )
-    else
-      0
-    end
+    @abv ||= BeerRecipe::Formula.new.sg_to_abv(recipe.og, recipe.fg)
   end
 
   def ibu
@@ -71,43 +72,77 @@ class BeerRecipe::RecipeWrapper < BeerRecipe::Wrapper
   end
 
   def color_srm
-    # SRM color = 1.4922 * (MCU ** 0.6859)
-    mcu = color_mcu
-    srm = 1.4922 * (mcu ** 0.6859)
-    if srm > 8
-      srm
-    else
-      mcu
-    end
+    @color_srm ||= BeerRecipe::Formula.new.mcu_to_srm(color_mcu)
   end
 
   def color_ebc
-    color_srm * 1.97
+    @color_eb ||= BeerRecipe::Formula.new.srm_to_ebc(color_srm)
   end
 
   def color_class
-    "srm#{'%.0f' % color}"
+    c = color_srm.to_i
+    if c > 40
+      'srm-max'
+    elsif c < 1
+      'srm-min'
+    else
+      "srm#{c}"
+    end
+  end
+
+  def color_hex
+    "#%02x%02x%02x" % BeerRecipe::Formula.new.srm_to_rgb(color_srm)
   end
 
   def formatted_color
-    "#{'%.0f' % color} °L"
+    "#{'%.0f' % color_ebc} EBC"
   end
 
   def total_grains
-    total_grains = 0
+    return @total_grains if @total_grains
+    @total_grains = 0
     fermentables.each do |f|
-      total_grains += f.amount
+      @total_grains += f.amount
     end
-    total_grains
+    @total_grains
   end
 
   def total_hops
-    hop_weight = 0
+    return @hop_weight if @hop_weight
+    @hop_weight = 0
     hops.each do |hop|
-      hop_weight += hop.amount
+      @hop_weight += hop.amount
     end
-    hop_weight
+    @hop_weight
   end
 
+  def total_time
+    boil_time + mash.total_mash_time
+  end
+
+  def total_time_period
+    "PT#{'%0.f' % total_time}M"
+  end
+
+  def boil_time_period
+    "PT#{'%0.f' % boil_time}M"
+  end
+
+  def serving_size
+    1000
+  end
+
+  # Returns calories per liter
+  def calories
+    @calories ||= if has_final_values?
+      BeerRecipe::Formula.new.calories(serving_size, abv, og, fg)
+    else
+      0
+    end
+  end
+
+  def real_extract
+    @real_extract ||= BeerRecipe::Formula.new.real_extract(og, fg)
+  end
 end
 

data/lib/beer_recipe/version.rb

@@ -1,3 +1,3 @@
 module BeerRecipe
-  VERSION = '0.3.0'
+  VERSION = '0.4.3'
 end

data/lib/beer_recipe/wrapper.rb

@@ -17,7 +17,7 @@ class BeerRecipe::Wrapper
   end
 
   def self.set(recipe, set)
-    recipe.send(set).map { |record| self.wrap(record, recipe) }
+    set.map { |record| self.wrap(record, recipe) }
   end
 
   def self.wrap(record, recipe)

data/locales/en.yml

@@ -0,0 +1,79 @@
+---
+information: Information
+style: Style
+type: Type
+grains: Grains
+kilograms: kg
+hops: Hops
+grams: gr
+equipment: Equipment
+brew_date: Brew Date
+brewer: Brewer
+assisted_by: assisted by %{assistant}
+notes: Notes
+recipe_details: Recipe Details
+batch_size: Batch Size
+boil_time: Boil Time
+ibu: IBU
+og: OG
+fg: FG
+abv: ABV
+calories_per_liter: Calories / L
+color: Color
+liter_abbr: L
+degrees: '°C'
+minutes: min
+sg: SG
+percent: '%'
+percent_sign: '%'
+ebc: EBC
+fermentables: Fermentables
+recipe_details: Recipe Details
+fermentable_name: Name
+fermentable_amount: Amount
+fermentable_type: Type
+fermentable_color: Color
+Grain: Grain
+Dry Extract: Dry Extract
+Sugar: Sugar
+Adjunct: Adjunct
+hops_name: Name
+hops_amount: Amount
+hops_time: Time
+hops_use: Use
+hops_form: Form
+hops_alpha: Alpha
+hops_ibu: IBU
+Pellet: Pellet
+Leaf: Leaf
+Plug: Plug
+days: days
+min: min
+Dry Hop: Dry Hop
+Boil: Boil
+Aroma: Aroma
+yeasts: Yeasts
+yeast_name: Name
+yeast_product_id: Product ID
+yeast_lab: Lab
+yeast_form: Form
+yeast_attenuation: Attenuation
+yeast_temperature: Temperature
+Dry: Dry
+Liquid: Liquid
+mash: Mash
+mash_name: Name
+mash_type: Type
+mash_infuse_amount: Infuse Amount
+mash_step_temp: Step Temp
+mash_ramp_time: Ramp Time
+mash_step_time: Step Time
+Temperature: Temperature
+Infusion: Infusion
+Mash In: Mash In
+Protein Rest: Protein Rest
+Saccharification: Saccharification
+Low Saccharification: Low Saccharification
+High Saccharification: High Saccharification
+Mash Out: Mash Out
+generated_by: Generated by