brewser 0.1.0 → 0.2.0

data/lib/brewser/model/mash_schedule.rb

@@ -7,6 +7,30 @@ module Brewser
     property :grain_temp, Temperature
     property :sparge_temp, Temperature
     
-    has n, :mash_steps    
+    has n, :mash_steps
+    
+    def self.json_create(o)
+      return nil if o.blank?
+      a = self.new
+      a.name = o['name']
+      a.description = o['description']
+      a.grain_temp = o['grain_temperature'].u unless o['grain_temperature'].blank?
+      a.sparge_temp = o['sparge_temperature'].u unless o['sparge_temperature'].blank?
+      o['mash_steps'].each do |step|
+        a.mash_steps.push step
+      end unless o['mash_steps'].nil?
+
+      return a
+    end
+    
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::MashSchedule",
+          'name' => name, 'description' => description, 
+          'grain_temperature' => grain_temp.to_s, 'sparge_temperature' => sparge_temp.to_s,
+          'mash_steps' => mash_steps.to_a
+      }
+    end 
+       
   end
 end

data/lib/brewser/model/mash_steps.rb

@@ -13,12 +13,45 @@ module Brewser
     
     property :step_volume, Volume
     property :ramp_time, Time
+    property :water_to_grain_ratio, Float
     
     property :infusion_volume, Volume
     property :infusion_temperature, Temperature
     
     property :rest_temperature, Temperature, :required => true
     property :rest_time, Time, :required => true
+    
+    def self.json_create(o)
+      return nil if o.blank?
+      a = self.new
+      a.name = o['name']
+      a.index = o['index']
+      a.description = o['description']
+      a.type = o['type']
+      a.purpose = o['purpose']
+      a.step_volume = o['step_volume'].u unless o['step_volume'].blank?
+      a.ramp_time = o['ramp_time'].u unless o['ramp_time'].blank?
+      a.water_to_grain_ratio = o['water_to_grain_ratio']
+      a.infusion_volume = o['infusion_volume'].u unless o['infusion_volume'].blank?
+      a.infusion_temperature = o['infusion_temperature'].u unless o['infusion_temperature'].blank?
+      a.rest_temperature = o['rest_temperature'].u unless o['rest_temperature'].blank?
+      a.rest_time = o['rest_time'].u unless o['rest_time'].blank?
+
+      return a
+    end
+    
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::MashStep",
+        'name' => name, 'index' => index, 'description' => description, 
+        'type' => type, 'purpose' => purpose,
+        'step_volume' => step_volume.to_s, 'ramp_time' => ramp_time.to_s,
+        'infusion_volume' => infusion_volume.to_s, 'infusion_temperature' => infusion_temperature.to_s,
+        'rest_temperature' => rest_temperature.to_s, 'rest_time' => rest_time.to_s,
+        'water_to_grain_ratio' => water_to_grain_ratio 
+      }
+    end
+    
   end
   
 end

data/lib/brewser/model/recipe.rb

@@ -45,6 +45,69 @@ module Brewser
   
     validates_presence_of :mash_schedule, :if => proc { |t| t.method != 'Extract' }
     
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::Recipe",
+        'name' => name, 
+        'description' => description, 
+        'type' => type,
+        'method' => method,
+        'brewer' => brewer,
+        'style' => style,
+        'recipe_volume' => recipe_volume.to_s, 
+        'boil_volume' => boil_volume.to_s,
+        'boil_time' => boil_time.to_s, 
+        'recipe_efficiency' => recipe_efficiency, 
+        'hops' => hops.to_a, 'fermentables' => fermentables.to_a, 
+        'additives' => additives.to_a, 'yeasts' => yeasts.to_a,
+        'mash_schedule' => mash_schedule, 'fermentation_schedule' => fermentation_schedule, 
+        'water_profile' => water_profile,
+        'estimated_og' => estimated_og, 'estimated_fg' => estimated_fg, 
+        'estimated_color' => estimated_color, 'estimated_ibu' => estimated_ibu, 
+        'estimated_abv' => estimated_abv, 'carbonation_level' => carbonation_level, 
+        'source' => source, 'url' => url
+      }
+    end
+    
+    def self.json_create(o)
+      a = self.new
+      a.name = o['name']
+      a.description = o['description']
+      a.brewer = o['brewer']
+      a.method = o['method']
+      a.type = o['type']
+      a.style = o['style']
+      a.mash_schedule = o['mash_schedule']
+      a.fermentation_schedule = o['fermentation_schedule']
+      a.water_profile = o['water_profile']
+      o['fermentables'].each do |fermentable|
+        a.fermentables.push fermentable
+      end unless o['fermentables'].nil?
+      o['hops'].each do |hop|
+        a.hops.push hop
+      end unless o['hops'].nil?
+      o['additives'].each do |additive|
+        a.additives.push additive
+      end unless o['additives'].nil?
+      o['yeasts'].each do |yeast|
+        a.yeasts.push yeast
+      end unless o['yeasts'].nil?
+      a.recipe_volume = o['recipe_volume'].u unless o['recipe_volume'].blank?
+      a.boil_volume = o['boil_volume'].u unless o['boil_volume'].blank?
+      a.boil_time = o['boil_time'].u unless o['boil_time'].blank?
+      a.recipe_efficiency = o['recipe_efficiency']
+      a.estimated_og = o['estimated_og']
+      a.estimated_fg = o['estimated_fg']
+      a.estimated_color = o['estimated_color']
+      a.estimated_ibu = o['estimated_ibu']
+      a.estimated_abv = o['estimated_abv']
+      a.carbonation_level = o['carbonation_level']
+      a.source = o['source']
+      a.url = o['url']
+
+      return a
+    end
+      
   end
 
 end

data/lib/brewser/model/style.rb

@@ -25,5 +25,27 @@ module Brewser
     property :profile, String, :length => 65535
     property :ingredients, String, :length => 65535
     property :examples, String, :length => 65535
+    
+    def self.json_create(o)
+      a = self.new
+      a.name = o['name']
+      a.category = o['category']
+      a.category_number = o['category_number']
+      a.style_letter = o['style_letter']
+      a.type = o['type']
+      a.style_guide = o['style_guide']
+
+      return a
+    end
+    
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::Style",
+          'name' => name, 'category' => category, 
+          'category_number' => category_number, 'style_letter' => style_letter,
+          'type' => type, 'style_guide' => style_guide
+      }
+    end
+    
   end
 end

data/lib/brewser/model/units.rb

@@ -25,7 +25,7 @@ module Brewser::Model::Units
     def load(value)
       return if value.nil?
       if !value.u.unitless?
-        raise(ArgumentError, "#{value.inspect} is not a #{kind_of}") unless value.u.kind == kind_of
+        raise(ArgumentError, "#{value.inspect} is not a #{kind_of}") unless kind_of.nil? or value.u.kind == kind_of
         value.u
       else
         "#{value} #{base_unit}".u
@@ -65,9 +65,14 @@ module Brewser::Model::Units
 
   class WeightOrVolume < Units
     
+    def kind_of
+      nil
+    end
+    
     def valid_kind?(value)
       value.kind == :mass || value.kind == :volume
     end
+    
     def base_unit
     end
   end

data/lib/brewser/model/water_profile.rb

@@ -3,7 +3,8 @@ module Brewser
     belongs_to :recipe
     
     property :name, String, :required => true
-
+    property :description, String, :length => 65535
+    
     property :calcium, Float, :required => true
     property :magnesium, Float, :required => true
     property :sodium, Float, :required => true
@@ -12,5 +13,33 @@ module Brewser
     property :bicarbonate, Float
     property :alkalinity, Float
     property :ph, Float
+    
+    def self.json_create(o)
+      a = self.new
+      a.name = o['name']
+      a.description = o['description']
+      a.calcium = o['calcium']
+      a.sodium = o['sodium']
+      a.magnesium = o['magnesium']
+      a.chloride = o['chloride']
+      a.sulfates = o['sulfates']
+      a.bicarbonate = o['bicarbonate']
+      a.alkalinity = o['alkalinity']
+      a.ph = o['ph']
+      
+      return a
+    end
+    
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::WaterProfile",
+        'name' => name, 'description' => description,
+        'calcium' => calcium, 'magnesium' => magnesium,
+        'sodium' => sodium, 'chloride' => chloride,
+        'sulfates' => sulfates, 'bicarbonate' => bicarbonate,
+        'alkalinity' => alkalinity, 'ph' => ph
+      }
+    end
+
   end
 end

data/lib/brewser/model/yeast.rb

@@ -25,5 +25,42 @@ module Brewser
     # These are applicable only in Batches
     property :times_cultured, Integer
 
+    def self.json_create(o)
+      a = self.new
+      a.name = o['name']
+      a.description = o['description']
+      a.type = o['type']
+      a.best_for = o['best_for']
+      a.supplier = o['supplier']
+      a.catalog = o['catalog']
+      a.min_temperature = o['min_temperature'].u unless o['min_temperature'].blank?
+      a.max_temperature = o['max_temperature'].u unless o['max_temperature'].blank?
+      a.flocculation = o['flocculation']
+      a.attenuation = o['attenuation']
+      
+      a.add_to_secondary = o['add_to_secondary']
+      a.form = o['form']
+      a.amount = o['amount'].u unless o['amount'].blank?
+      a.max_reuse = o['max_reuse']
+      a.times_cultured = o['times_cultured']
+      
+      return a
+    end
+    
+    def as_json(options={})
+      {
+        JSON.create_id => "Brewser::Yeast",
+        'name' => name, 
+        'description' => description, 
+        'type' => type,  'best_for' => best_for,
+        'supplier' => supplier, 'catalog' => catalog,
+        'min_temperature' => min_temperature.to_s, 'max_temperature' => max_temperature.to_s,
+        'flocculation' => flocculation, 'attenuation' => attenuation,
+        'add_to_secondary' => add_to_secondary?, 
+        'form' => form, 'amount' => amount.to_s,
+        'max_reuse' => max_reuse, 'times_cultured' => times_cultured
+      }
+    end
+    
   end
 end

data/lib/brewser/version.rb

@@ -1,3 +1,3 @@
 module Brewser
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/basic_spec.rb

@@ -18,7 +18,7 @@ describe "Basic spec" do
     Brewser.identify(read_file('promash/PumpkinAle.txt')).should == ProMashTxt
   end
   
-  it "should raise an error if it cannot identify content" do
+  it "should identify as ProMash rec when unknown" do
     Brewser.identify("Some unknown content").should == ProMashRec
   end
   

data/spec/beerxml_spec.rb

@@ -112,7 +112,6 @@ describe "BeerXML tests" do
       m=@recipe.mash_schedule
       m.mash_steps.count.should == 2
       s=m.mash_steps[0]
-      # @TODO Fix this
       s.index.should == 1
       s.name.should == "Mash In"
       s.type.should == "Infusion"

data/spec/brewson_spec.rb

@@ -0,0 +1,207 @@
+require "spec_helper"
+
+describe "BrewSON spec" do
+  
+  before :each do
+    @recipe = Brewser.parse(read_file('beerxmlv1/recipes.xml')).first
+  end
+  
+  it "should generate JSON" do
+    json = BrewSON.serialize(@recipe)
+    json.valid_json?.should be_true
+  end
+  
+  context "round trip" do
+    
+    before :each do
+      json = @recipe.to_json
+      @return = Brewser.parse(json)
+    end
+    
+    it "should survive the round trip" do
+      @return.class.should == Brewser::Recipe
+      @return.name.should == "Burton Ale"
+      @return.style.name.should == "English Pale Ale"
+    end
+    
+    it "should deserialize the base recipe data" do
+      @return.name.should == "Burton Ale"
+      @return.brewer.should == "Brad Smith"
+      @return.method.should == "All Grain"
+      @return.type.should == "Ale"
+      
+      @return.recipe_volume.class.should == Unit
+      @return.recipe_volume.kind.should == :volume
+      @return.recipe_volume.scalar_in('gal').should be_within(0.01).of(5)
+      
+      @return.boil_volume.class.should == Unit
+      @return.boil_volume.kind.should == :volume
+      @return.boil_volume.scalar_in('gal').should be_within(0.01).of(5.5)
+      
+      @return.boil_time.class.should == Unit
+      @return.boil_time.kind.should == :time
+      @return.boil_time.should == "60 min".u
+      
+      @return.recipe_efficiency.should == 72.0
+      
+      @return.estimated_og.should == 1.056
+      @return.estimated_fg.should == 1.015
+      @return.estimated_color.should == 7.0
+      @return.estimated_ibu.should == 32.4
+      @return.estimated_abv.should == 5.3
+    end
+    
+    it "should deserialize the hop data" do
+      @return.hops.count.should == 4
+      h=@return.hops[1]
+      h.name.should == "Northern Brewer"
+      h.origin.should == "Germany"
+      h.alpha_acids.should == 7.5
+      h.amount.should === "0.50 oz".u
+      h.added_when.should == "Boil"
+      h.time.should === "60 min".u
+      h.description.should_not be_nil
+      h.type.should == "Both"
+      h.form.should == "Pellet"
+      h.beta_acids.should == 4.0
+      h.storageability.should == 35.0
+    end
+    
+    it "should deserialize the fermentable data" do
+      @return.fermentables.count.should == 3
+      f=@return.fermentables[0]
+      f.name.should == "Pale Malt (2 Row) UK"
+      f.origin.should == "United Kingdom"
+      f.type.should == "Grain"
+      f.description.should_not be_nil
+      f.amount.should === "8 lb".u
+      f.potential.should == 1.036
+      f.color.should == 2.5
+      f.moisture.should == 4.0
+      f.diastatic_power.should == 45.0
+      f.protein.should == 10.1
+      f.late_addition.should == false
+      f.recommend_mash?.should == false
+      f.max_in_batch.should == 100.0
+      f.ibu_gal_per_lb.should == 0.0
+    end
+    
+    it "should deserialize the additive data" do
+      @return.additives.count.should == 2
+      a=@return.additives[0]
+      a.name.should == "Irish Moss"
+      a.type.should == "Fining"
+      a.description.should_not be_nil
+      a.added_when.should == "Boil"
+      a.amount.should == "0.25 tsp".u
+      a.time.should == "10 min".u
+    end
+    
+    it "should deserialize the yeast data" do
+      @return.yeasts.count.should == 1
+      y=@return.yeasts.first
+      y.name.should == "Burton Ale"
+      y.type.should == "Ale"
+      y.form.should == "Liquid"
+      y.supplier.should == "White Labs"
+      y.catalog.should == "WLP023"
+      y.description.should_not be_nil
+      y.best_for.should_not be_nil
+      y.min_temperature.should == "68 dF".u
+      y.max_temperature.should == "73 dF".u
+      y.amount.should == "35 ml".u
+      y.add_to_secondary?.should == false
+      y.flocculation.should == "Medium"
+      y.attenuation.should == 72.0
+      y.max_reuse.should == 5
+      y.times_cultured.should == 0
+    end
+    
+    it "should deserialize the mash schedule data" do
+      m=@return.mash_schedule
+      m.name.should == "Single Infusion, Full Body"
+      m.grain_temp.should == "72 dF".u
+      m.sparge_temp.should == "168 dF".u
+    end
+    
+    it "should deserialize the mash step data" do
+      m=@return.mash_schedule
+      m.mash_steps.count.should == 2
+      s=m.mash_steps[0]
+      s.index.should == 1
+      s.name.should == "Mash In"
+      s.type.should == "Infusion"
+      s.description.should_not be_nil
+      s.rest_time.should == "45 min".u
+      s.rest_temperature.should == "70 dC".u
+      s.infusion_volume.should == "11.25 qt".u
+      s.infusion_temperature.should == "170.5 dF".u
+      s.water_to_grain_ratio.should == 1.25
+    end
+    
+    it "should deserialize the fermentation step data" do
+      f=@return.fermentation_schedule
+      f.fermentation_steps.count.should == 3
+      s=f.fermentation_steps[0]
+      s.index.should == 1
+      s.name.should == "Primary"
+      s.time.should == "4 days".u
+      s.temperature.should == "68 dF".u
+    end
+
+    it "should deserialize the water profile data" do
+      w=@return.water_profile
+      w.name.should == "Burton On Trent, UK"
+      w.description.should == "Distinctive pale ales strongly hopped.  Very hard water accentuates the hops flavor.\nExample: Bass Ale"
+      w.calcium.should == 295.0
+      w.bicarbonate.should == 300.0
+      w.sulfates.should == 725.0
+      w.chloride.should == 25.0
+      w.sodium.should == 55.0
+      w.magnesium.should == 45.0
+      w.ph.should ==8.0
+    end
+
+    it "should deserialize the style data" do
+      s=@return.style
+      s.name.should == "English Pale Ale"
+      s.category.should == "Bitter & English Pale Ale"
+      s.style_letter.should == "A"
+      s.style_guide.should == "BJCP 1999"
+      s.type.should == "Ale"
+    end
+  end
+  
+  context "should deserialize json file" do
+    
+    before :each do
+      @recipe = Brewser.parse(read_file('brewson/belgian_white.json'))
+    end
+    
+    it "should deserialize the base recipe data" do
+      @recipe.name.should == "Jeffrey's Winter White"
+      @recipe.brewer.should == "Nobody"
+      @recipe.method.should == "All Grain"
+      @recipe.type.should == "Ale"
+      
+      @recipe.recipe_volume.class.should == Unit
+      @recipe.recipe_volume.kind.should == :volume
+      @recipe.recipe_volume.should == "5 gal".u
+      
+      @recipe.boil_volume.class.should == Unit
+      @recipe.boil_volume.kind.should == :volume
+      @recipe.boil_volume.should == "5 gal".u
+      
+      @recipe.boil_time.class.should == Unit
+      @recipe.boil_time.kind.should == :time
+      @recipe.boil_time.should == "60 min".u
+      
+      @recipe.recipe_efficiency.should == 75.0
+      
+      @recipe.estimated_og.should == 1.049
+      @recipe.estimated_ibu.should == 16.3
+    end
+    
+  end
+  
+end