nrb-beerxml 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03033c9e27c70f80d8743be2e283b166fb64e7a4
-  data.tar.gz: 1449230fbd782ba350b23b2e8dda9a36dabaec9a
+  metadata.gz: 66306fa0b088483f971caf5455cc2abdef308a17
+  data.tar.gz: 7d2fff22101ba6f8f0b65aae0d026bda25a940d1
 SHA512:
-  metadata.gz: d2ab79db6af27da53a608e8d35923cd51930eff78e51dbd21de6294025e10794e28c58695342220d0b649c6f6514626879610d7c59d52319abd3f66a654a6d8e
-  data.tar.gz: f81eae1407baafc9fbabec27561439076e57b6fd07e2ff1bbdf8351654bdef50c0a5ee9dae2f9ba34f8c307100279747db26b98f81ce22ed0a9375959dcd370a
+  metadata.gz: e69f093577b35328ff267a6af2b535392a0c7f46fe21758f9121c0965b2a2611ca84d47026659a84ab991937df9c01c37f4299f7b55a969d6cce5641cd00fd8b
+  data.tar.gz: f24c6182bb438aa5937e93acf0d65f467f2c11ca573f0c3d44bfbad0096553a51e135cf9a77d84dbe72d256039e7c2c889e4393c9ed90ec7c8cd2cfc33948470

data/README.md

@@ -21,18 +21,19 @@ Or install it yourself as:
 
 ## Parse
 
-Parse a BeerXML file
-
 ```ruby
 require `nrb/beerxml`
+
 parser = NRB::BeerXML::Parser.new
+=> #<NRB::BeerXML::Parser:0x007fbe4fb58d70 @builder=#<NRB::BeerXML::Builder:0x007fbe4fb58a00>, @reader=Nokogiri::XML>
+
 parser.parse file_path
 => #<NRB::BeerXML::Equipment:0x007fbe501e4298 @name="Brew Pot", ...>
 ```
 
 `parse` can handle a `String` pathname or an `IO` containing the BeerXML.
 
-### Builder
+#### Builder
 
 The parser uses a builder class to construct `NRB::BeerXML::Record` objects.  If you would rather get back some other class of object (for example a `ActiveRecord` model) just give it your own builder class at initialization.
 
@@ -42,7 +43,7 @@ parser = NRB::BeerXML::Parser.new buider: MyBuilder
 
 Your builder should implement a `build(type)` method which returns a new object of the requested type.  `type` will be an underscored string.
 
-### Reader
+#### Reader
 
 NRB::BeerXML uses Nokogiri by default.  If you want to use another reader, simply pass the class name to the Parser's initializer.
 
@@ -70,4 +71,4 @@ defined?(BeerXML) || BeerXML = NRB::BeerXML
 
 ## Contributors
 
-@brundage at the [New Republic Brewing Company](https://github.com/NewRepublicBrewing)
+[@brundage](https://github.com/brundage) at the [New Republic Brewing Company](https://github.com/NewRepublicBrewing)

data/lib/nrb/beerxml/equipment.rb

@@ -20,17 +20,17 @@ module NRB; module BeerXML
 
     validates :batch_size, numericality: { greater_than_or_equal_to: 0 }, presence: true
     validates :boil_size, numericality: { greater_than_or_equal_to: 0 }, presence: true
-    validates :boil_time, numericality: { greater_than_or_equal_to: 0 }
-    validates :calc_boil_volume, boolean: true
+    validates :boil_time, numericality: { allow_nil:true, greater_than_or_equal_to: 0 }
+    validates :calc_boil_volume, boolean: { allow_nil: true }
     validates :evap_rate, percentage: true
-    validates :hop_utilization, percentage: { give_110: true }
-    validates :lauter_tun_deadspace, numericality: { greater_than_or_equal_to: 0 }
-    validates :top_up_kettle, numericality: { greater_than_or_equal_to: 0 }
-    validates :top_up_water, numericality: { greater_than_or_equal_to: 0 }
-    validates :trub_chiller_loss, numericality: { greater_than_or_equal_to: 0 }
-    validates :tun_specific_heat, numericality: { greater_than_or_equal_to: 0 }
-    validates :tun_volume, numericality: { greater_than_or_equal_to: 0 }
-    validates :tun_weight, numericality: { greater_than_or_equal_to: 0 }
+    validates :hop_utilization, percentage: { allow_nil: true, give_110: true }
+    validates :lauter_tun_deadspace, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :top_up_kettle, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :top_up_water, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :trub_chiller_loss, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :tun_specific_heat, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :tun_volume, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :tun_weight, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
 
   end
 end; end

data/lib/nrb/beerxml/fermentable.rb

@@ -19,13 +19,13 @@ module NRB; module BeerXML
     attr_accessor :type             # list required
     attr_accessor :yield            # percent required
 
-    validates :add_after_boil, boolean: true
+    validates :add_after_boil, boolean: { allow_nil: true }
     validates :amount, presence: true
     validates :color, presence: true
     validates :type, inclusion: { in: [ "Adjunct", "Dry Extract", "Extract", "Grain", "Sugar" ] }, presence: true
     validates :yield, presence: true
 
-    validates :diastatic_power, numericality: { greater_than_or_equal_to: 0 }
+    validates :diastatic_power, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
 
   end
 end; end

data/lib/nrb/beerxml/hop.rb

@@ -19,15 +19,15 @@ module NRB; module BeerXML
 
     validates :alpha, presence: true, percentage: true
     validates :amount, presence: true, numericality: { greater_than_or_equal_to: 0 }
-    validates :beta, percentage: true
-    validates :caryophyllene, percentage: true
-    validates :cohumulone, percentage: true
-    validates :form, inclusion: { in: %w(Leaf Pellet Plug) }
-    validates :hsi, percentage: true
-    validates :myrcene, percentage: true
+    validates :beta, percentage: { allow_nil: true }
+    validates :caryophyllene, percentage: { allow_nil: true }
+    validates :cohumulone, percentage: { allow_nil: true }
+    validates :form, inclusion: { allow_nil: true, in: %w(Leaf Pellet Plug) }
+    validates :hsi, percentage: { allow_nil: true }
+    validates :myrcene, percentage: { allow_nil: true }
     validates :time, presence: true,
                      numericality: { greater_than_or_equal_to: 0 }
-    validates :type, inclusion: { in: %w(Aroma Bittering Both) }
+    validates :type, inclusion: { allow_nil: true, in: %w(Aroma Bittering Both) }
 
     validates :use, presence: true,
                     inclusion: { in: [ "Aroma", "Boil", "Dry Hop", "First Wort", "Mash" ] }

data/lib/nrb/beerxml/mash.rb

@@ -14,11 +14,11 @@ module NRB; module BeerXML
 
     validates :grain_temp, numericality: true, presence: true
     validates :mash_steps, presence: true
-    validates :ph, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 14 }
-    validates :sparge_temp, numericality: true
-    validates :tun_specific_heat, numericality: { greater_than_or_equal_to: 0 }
-    validates :tun_temp, numericality: true
-    validates :tun_weight, numericality: { greater_than_or_equal_to: 0 }
+    validates :ph, numericality: { allow_nil: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 14 }
+    validates :sparge_temp, numericality: { allow_nil: true }
+    validates :tun_specific_heat, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :tun_temp, numericality: { allow_nil: true }
+    validates :tun_weight, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
 
 
     after_initialize :initialize_mash_steps

data/lib/nrb/beerxml/mash_step.rb

@@ -8,9 +8,9 @@ module NRB; module BeerXML
     attr_accessor :step_time     # time required
     attr_accessor :type          # list required
 
-    validates :end_temp, numericality: true
-    validates :infuse_amount, presence: { if: Proc.new { |step| step.infuse_amount_required? } }, numericality: true
-    validates :ramp_time, numericality: { greater_than_or_equal_to: 0 }
+    validates :end_temp, numericality: { allow_nil: true }
+    validates :infuse_amount, presence: { if: Proc.new { |step| step.infuse_amount_required? } }, numericality: { allow_nil: true }
+    validates :ramp_time, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
     validates :step_temp, numericality: true, presence: true
     validates :step_time, numericality: { greater_than_or_equal_to: 0 }, presence: true
     validates :type, inclusion: { in: %w(Decoction Infusion Temperature) },

data/lib/nrb/beerxml/parser.rb

@@ -3,6 +3,24 @@ require 'nokogiri'
 module NRB; module BeerXML
   class Parser
 
+    class InvalidRecordError < RuntimeError
+
+      attr_reader :errors, :record
+
+      def initialize(record, errors={})
+        super nil
+        @errors = errors
+        @record = record
+      end
+
+      def to_s
+        errors.keys.inject("Invalid #{record.class} record\n") do |message,key|
+          message += "#{key}=#{record.send(key)} #{errors.fetch(key)}\n"
+        end
+      end
+
+    end
+
     include Inflector
 
     attr_reader :builder, :reader
@@ -49,7 +67,12 @@ module NRB; module BeerXML
 
 
     def attribute_value(node)
-      node.children.first.text
+      value = node.children.first.text.strip
+      return value.to_i if value =~ /^-?[0-9]+$/
+      return value.to_f if value =~ /^-?[0-9.]+$/
+      return false if value == "FALSE"
+      return true if value == "TRUE"
+      value
     end
 
 
@@ -91,6 +114,8 @@ module NRB; module BeerXML
 
         assign_child_to_parent parent, obj
 
+        validate obj
+
         obj
       end
     end
@@ -110,5 +135,12 @@ module NRB; module BeerXML
       end
     end
 
+
+    def validate(obj)
+      return unless obj.respond_to?(:valid?)
+      return if obj.valid?
+      raise InvalidRecordError.new(obj, obj.errors.messages)
+    end
+
   end
 end; end

data/lib/nrb/beerxml/recipe.rb

@@ -42,34 +42,34 @@ module NRB; module BeerXML
     attr_accessor :waters              # waters record set required
     attr_accessor :yeasts              # yeasts record set required
 
-    validates :age, numericality: { greater_than_or_equal_to: 0 }
-    validates :age_temp, numericality: true
-    validates :batch_size, numericality: { greater_than_or_equal_to: 0 }, presence: true
-    validates :boil_size, numericality: { greater_than_or_equal_to: 0 }, presence: true
-    validates :boil_time, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :age, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :age_temp, numericality: { allow_nil: true }
+    validates :batch_size, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }, presence: true
+    validates :boil_size, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }, presence: true
+    validates :boil_time, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }, presence: true
     validates :brewer, presence: true
-    validates :carbonation, numericality: { greater_than_or_equal_to: 0 }
-    validates :carbonation_temp, numericality: true
+    validates :carbonation, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :carbonation_temp, numericality: { allow_nil: true }
     validates :equipment, presence: true
-    validates :efficiency, percentage: true, presence: { if: Proc.new { |recipe| recipe.efficiency_required? } }
+    validates :efficiency, percentage: { allow_nil: true }, presence: { if: Proc.new { |recipe| recipe.efficiency_required? } }
     validates :fermentables, presence: true
-    validates :fermentation_stages, numericality: { only_integer: true }
-    validates :fg, numericality: true
-    validates :forced_carbonation, boolean: true
+    validates :fermentation_stages, numericality: { allow_nil: true, only_integer: true }
+    validates :fg, numericality: { allow_nil: true }
+    validates :forced_carbonation, boolean: { allow_nil: true }
     validates :hops, presence: true
-    validates :keg_priming_factor, numericality: true
+    validates :keg_priming_factor, numericality: { allow_nil: true }
     validates :mash, presence: true
     validates :miscs, presence: true
-    validates :og, numericality: true
-    validates :primary_age, numericality: { greater_than_or_equal_to: 0 }
-    validates :primary_temp, numericality: true
-    validates :priming_sugar_equiv, numericality: true
-    validates :secondary_age, numericality: { greater_than_or_equal_to: 0 }
-    validates :secondary_temp, numericality: true
+    validates :og, numericality: { allow_nil: true }
+    validates :primary_age, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :primary_temp, numericality: { allow_nil: true }
+    validates :priming_sugar_equiv, numericality: { allow_nil: true }
+    validates :secondary_age, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :secondary_temp, numericality: { allow_nil: true }
     validates :style, presence: true
-    validates :taste_rating, numericality: true
-    validates :tertiary_age, numericality: { greater_than_or_equal_to: 0 }
-    validates :tertiary_temp, numericality: true
+    validates :taste_rating, numericality: { allow_nil: true }
+    validates :tertiary_age, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :tertiary_temp, numericality: { allow_nil: true }
     validates :type, inclusion: { in: [ "All Grain", "Extract", "Partial Mash" ] }, presence: true
     validates :waters, presence: true
     validates :yeasts, presence: true

data/lib/nrb/beerxml/record.rb

@@ -29,7 +29,7 @@ module NRB; module BeerXML
     def equipment?;    am_a? :equipment; end
     def fermentable?;  am_a? :fermentable; end
     def hop?;          am_a? :hop; end
-    def mash_profile?; am_a? :mash_profile; end
+    def mash?;         am_a? :mash; end
     def mash_step?;    am_a? :mash_step; end
     def misc?;         am_a? :misc; end
     def recipe?;       am_a? :recipe; end

data/lib/nrb/beerxml/record_set.rb

@@ -29,6 +29,11 @@ module NRB; module BeerXML
       @records = []
     end
 
+
+    def record_count
+      @records.size
+    end
+
   private
 
     def valid_record_type?(type)

data/lib/nrb/beerxml/record_validators/boolean_validator.rb

@@ -8,7 +8,9 @@ module NRB; module BeerXML;
         end
       end
     private
-      def delimiter; [false, true]; end
+      def delimiter
+        [false, true]
+      end
     end
   end
 end; end

data/lib/nrb/beerxml/record_validators/percentage_validator.rb

@@ -6,7 +6,22 @@ module NRB; module BeerXML;
       def validate_each(record, attribute, value)
         return unless value
         unless value.is_a?(Numeric) && greater_than_min(value) && less_than_max(value)
-          record.errors[attribute] << 'must be a BeerXML percentage (a number between 0 & 100)'
+
+          message = 'must be a percentage'
+
+          if options[:allow_negative] && options[:give_110]
+
+          elsif options[:allow_negative]
+            message += ' (greater than 0)'
+
+          elsif options[:give_110]
+            message += ' (less than 100)'
+
+          else
+            message += ' (between 0 & 100)'
+          end
+
+          record.errors[attribute] << message
         end
       end
 

data/lib/nrb/beerxml/style.rb

@@ -24,10 +24,10 @@ module NRB; module BeerXML
     attr_accessor :style_letter    # string required
     attr_accessor :type            # list required
 
-    validates :abv_max, numericality: { greater_than_or_equal_to: 0 }
-    validates :abv_min, numericality: { greater_than_or_equal_to: 0 }
-    validates :carb_max, numericality: { greater_than_or_equal_to: 0 }
-    validates :carb_min, numericality: { greater_than_or_equal_to: 0 }
+    validates :abv_max, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :abv_min, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :carb_max, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
+    validates :carb_min, numericality: { allow_nil: true, greater_than_or_equal_to: 0 }
     validates :category, presence: true
     validates :category_number, presence: true
     validates :color_max, numericality: { greater_than_or_equal_to: 0 }, presence: true

data/lib/nrb/beerxml/version.rb

@@ -1,4 +1,4 @@
 module NRB; module BeerXML
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
   def self.version; VERSION; end
 end; end

data/lib/nrb/beerxml/water.rb

@@ -16,7 +16,7 @@ module NRB; module BeerXML
     validates :calcium, numericality: true, presence: true
     validates :chloride, numericality: true, presence: true
     validates :magnesium, numericality: true, presence: true
-    validates :ph, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 14 }
+    validates :ph, numericality: { allow_nil: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 14 }
     validates :sodium, numericality: true, presence: true
     validates :sulfate, numericality: true, presence: true
 

data/lib/nrb/beerxml/yeast.rb

@@ -19,16 +19,16 @@ module NRB; module BeerXML
     attr_accessor :times_cultured   # integer
     attr_accessor :type             # list required
 
-    validates :add_to_secondary, boolean: true
+    validates :add_to_secondary, boolean: { allow_nil: true }
     validates :amount, presence: { greater_than_or_equal_to: 0 }
-    validates :amount_is_weight, boolean: true
-    validates :attenuation, percentage: true
-    validates :flocculation, inclusion: { in: ["High", "Low", "Medium", "Very High" ] }
+    validates :amount_is_weight, boolean: { allow_nil: true }
+    validates :attenuation, percentage: { allow_nil: true }
+    validates :flocculation, inclusion: { allow_nil: true, in: ["High", "Low", "Medium", "Very High" ] }
     validates :form, presence: true, inclusion: { in: %w( Culture Dry Liquid Slant ) }
-    validates :max_reuse, numericality: { greater_than_or_equal_to: 0, only_integer: true }
-    validates :max_temperature, numericality: true
-    validates :min_temperature, numericality: true
-    validates :times_cultured, numericality: { greater_than_or_equal_to: 0, only_integer: true }
+    validates :max_reuse, numericality: { allow_nil: true, greater_than_or_equal_to: 0, only_integer: true }
+    validates :max_temperature, numericality: { allow_nil: true }
+    validates :min_temperature, numericality: { allow_nil: true }
+    validates :times_cultured, numericality: { allow_nil: true, greater_than_or_equal_to: 0, only_integer: true }
     validates :type, presence: true, inclusion: { in: %w(Ale Champagne Lager Wheat Wine) }
 
 

data/nrb-beerxml.gemspec

@@ -0,0 +1,80 @@
+# coding: utf-8
+lib = File.expand_path(File.join('..','lib'), __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'nrb/beerxml/version'
+
+Gem::Specification.new do |s|
+  s.name          = 'nrb-beerxml'
+  s.version       = NRB::BeerXML.version
+  s.authors       = ['Dean Brundage']
+  s.email         = ['dean@newrepublicbrewing.com']
+  s.summary       = 'BeerXML parser'
+  s.description   = 'Parses BeerXML files into ruby objects'
+  s.homepage      = ""
+  s.license       = "GPL-3"
+  s.required_ruby_version = '>=2'
+
+  s.require_paths = ['lib']
+
+  s.add_dependency 'activemodel'
+  s.add_dependency 'nokogiri'
+
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "shoulda"
+
+  s.files = [
+              'README.md',
+              'LICENSE',
+              'lib/nrb/beerxml.rb',
+              'lib/nrb/beerxml/builder.rb',
+              'lib/nrb/beerxml/equipment.rb',
+              'lib/nrb/beerxml/fermentable.rb',
+              'lib/nrb/beerxml/hop.rb',
+              'lib/nrb/beerxml/inflector.rb',
+              'lib/nrb/beerxml/mash.rb',
+              'lib/nrb/beerxml/mash_step.rb',
+              'lib/nrb/beerxml/misc.rb',
+              'lib/nrb/beerxml/parser.rb',
+              'lib/nrb/beerxml/recipe.rb',
+              'lib/nrb/beerxml/record.rb',
+              'lib/nrb/beerxml/record_set.rb',
+              'lib/nrb/beerxml/record_validators.rb',
+              'lib/nrb/beerxml/record_validators/boolean_validator.rb',
+              'lib/nrb/beerxml/record_validators/percentage_validator.rb',
+              'lib/nrb/beerxml/style.rb',
+              'lib/nrb/beerxml/version.rb',
+              'lib/nrb/beerxml/water.rb',
+              'lib/nrb/beerxml/yeast.rb',
+              'nrb-beerxml.gemspec'
+            ]
+
+  s.test_files = [
+                   'spec/cases/beerxml/builder_spec.rb',
+                   'spec/cases/beerxml/equipment_spec.rb',
+                   'spec/cases/beerxml/fermentable_spec.rb',
+                   'spec/cases/beerxml/hop_spec.rb',
+                   'spec/cases/beerxml/mash_spec.rb',
+                   'spec/cases/beerxml/mash_step_spec.rb',
+                   'spec/cases/beerxml/misc_spec.rb',
+                   'spec/cases/beerxml/parser_spec.rb',
+                   'spec/cases/beerxml/recipe_spec.rb',
+                   'spec/cases/beerxml/record_set_spec.rb',
+                   'spec/cases/beerxml/record_spec.rb',
+                   'spec/cases/beerxml/record_validators/boolean_validator_spec.rb',
+                   'spec/cases/beerxml/record_validators/percentage_validator_spec.rb',
+                   'spec/cases/beerxml/style_spec.rb',
+                   'spec/cases/beerxml/version_spec.rb',
+                   'spec/cases/beerxml/water_spec.rb',
+                   'spec/cases/beerxml/yeast_spec.rb',
+                   'spec/cases/beerxml_spec.rb',
+                   'spec/fixtures/equipment.xml',
+                   'spec/fixtures/recipes.xml',
+                   'spec/shared/active_model_lint.rb',
+                   'spec/shared/record_typing.rb',
+                   'spec/spec_helper.rb'
+                 ]
+
+end

data/spec/cases/beerxml/equipment_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 describe NRB::BeerXML::Equipment do
 
   it_behaves_like :ActiveModel
@@ -8,27 +9,14 @@ describe NRB::BeerXML::Equipment do
 
   it { should validate_numericality_of(:batch_size).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:boil_size).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:boil_time).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:lauter_tun_deadspace).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:top_up_kettle).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:top_up_water).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:trub_chiller_loss).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:tun_specific_heat).is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:boil_time).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:lauter_tun_deadspace).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:top_up_kettle).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:top_up_water).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:trub_chiller_loss).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:tun_specific_heat).is_greater_than_or_equal_to(0).allow_nil }
   it { should validate_numericality_of(:tun_volume).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:tun_weight).is_greater_than_or_equal_to(0) }
-
-
-  shared_examples_for :record_typing do
-    let(:all_types) { %i( equipment fermentable hop mash_profile mash_step misc recipe style water yeast ) }
-    it 'correctly answers to its own type' do
-      expect subject.send("#{type}?")
-    end
-    it 'correctly answers to other types' do
-      (all_types - [type]).each do |question|
-        expect ! subject.send("#{question}?")
-      end
-    end
-  end
+  it { should validate_numericality_of(:tun_weight).is_greater_than_or_equal_to(0).allow_nil }
 
 
   it_behaves_like :record_typing do

data/spec/cases/beerxml/fermentable_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Fermentable do
 
@@ -11,7 +12,11 @@ describe NRB::BeerXML::Fermentable do
 
   it { should validate_inclusion_of(:type).in_array( [ "Adjunct", "Dry Extract", "Extract", "Grain", "Sugar" ] ) }
 
-  it { should validate_numericality_of(:diastatic_power).is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:diastatic_power).is_greater_than_or_equal_to(0).allow_nil }
 
 
+  it_behaves_like :record_typing do
+    let(:type) { :recipe }
+  end
+
 end

data/spec/cases/beerxml/hop_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Hop do
 
@@ -9,13 +10,17 @@ describe NRB::BeerXML::Hop do
   it { should validate_presence_of :time }
   it { should validate_presence_of :use }
 
-  it { should validate_inclusion_of(:form).in_array( ["Leaf", "Pellet", "Plug"] ) }
+  it { should validate_inclusion_of(:form).in_array( ["Leaf", "Pellet", "Plug"] ).allow_nil }
 
   it { should validate_numericality_of(:amount).is_greater_than_or_equal_to(0) }
-  it { should validate_inclusion_of(:type).in_array(%w(Aroma Bittering Both) ) }
+  it { should validate_inclusion_of(:type).in_array(%w(Aroma Bittering Both) ).allow_nil }
   it { should validate_inclusion_of(:use).in_array( [ "Aroma", "Boil", "Dry Hop", "First Wort", "Mash" ] ) }
 
   it { should validate_numericality_of(:time).is_greater_than_or_equal_to(0) }
 
+  it_behaves_like :record_typing do
+    let(:type) { :hop }
+  end
+
 
 end

data/spec/cases/beerxml/mash_spec.rb

@@ -1,4 +1,6 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
+
 describe NRB::BeerXML::Mash do
 
   it_behaves_like :ActiveModel
@@ -7,11 +9,11 @@ describe NRB::BeerXML::Mash do
   it { should validate_presence_of :mash_steps }
 
   it { should validate_numericality_of :grain_temp }
-  it { should validate_numericality_of(:ph).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(14) }
-  it { should validate_numericality_of :sparge_temp }
-  it { should validate_numericality_of(:tun_specific_heat).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of :tun_temp }
-  it { should validate_numericality_of(:tun_weight).is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:ph).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(14).allow_nil }
+  it { should validate_numericality_of(:sparge_temp).allow_nil }
+  it { should validate_numericality_of(:tun_specific_heat).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:tun_temp).allow_nil }
+  it { should validate_numericality_of(:tun_weight).is_greater_than_or_equal_to(0).allow_nil }
 
 
   it 'should start with empty mash steps' do
@@ -22,4 +24,9 @@ describe NRB::BeerXML::Mash do
     expect( subject.mash_steps.record_type ).to eq :mash_step
   end
 
+  it_behaves_like :record_typing do
+    let(:type) { :mash }
+  end
+
+
 end

data/spec/cases/beerxml/mash_step_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::MashStep do
 
@@ -13,9 +14,9 @@ describe NRB::BeerXML::MashStep do
 
   it { should validate_inclusion_of(:type).in_array(%w(Decoction Infusion Temperature)) }
 
-  it { should validate_numericality_of(:end_temp) }
-  it { should validate_numericality_of(:infuse_amount) }
-  it { should validate_numericality_of(:ramp_time).is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:end_temp).allow_nil }
+  it { should validate_numericality_of(:infuse_amount).allow_nil }
+  it { should validate_numericality_of(:ramp_time).is_greater_than_or_equal_to(0).allow_nil }
   it { should validate_numericality_of(:step_temp) }
   it { should validate_numericality_of(:step_time).is_greater_than_or_equal_to(0) }
 
@@ -36,4 +37,9 @@ describe NRB::BeerXML::MashStep do
     it { should_not validate_presence_of :infuse_amount }
   end
 
+
+  it_behaves_like :record_typing do
+    let(:type) { :mash_step }
+  end
+
 end

data/spec/cases/beerxml/misc_spec.rb

@@ -1,3 +1,5 @@
+require 'shared/record_typing'
+
 describe NRB::BeerXML::Misc do
 
   it { should validate_presence_of :amount }
@@ -11,4 +13,9 @@ describe NRB::BeerXML::Misc do
   it { should validate_inclusion_of(:type).in_array(["Fining", "Flavor", "Herb", "Other", "Spice", "Water Agent"]) }
   it { should validate_inclusion_of(:use).in_array(%w(Boil Bottling Mash Primary Secondary)) }
 
+  it_behaves_like :record_typing do
+    let(:type) { :misc }
+  end
+
+
 end

data/spec/cases/beerxml/parser_spec.rb

@@ -1,5 +1,7 @@
 describe NRB::BeerXML::Parser do
 
+  # Need a few more cases since this is pretty much the heart of the gem
+
   context 'Parsing' do
 
     let(:base_dir) { File.expand_path File.join('..','..','..'), __FILE__ }

data/spec/cases/beerxml/recipe_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Recipe do
 
@@ -42,22 +43,22 @@ describe NRB::BeerXML::Recipe do
 
   it { should validate_inclusion_of(:type).in_array([ "All Grain", "Extract", "Partial Mash" ]) }
 
-  it { should validate_numericality_of(:age).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:age_temp) }
+  it { should validate_numericality_of(:age).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:age_temp).allow_nil}
   it { should validate_numericality_of(:batch_size).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:boil_size).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:boil_time).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:carbonation).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:carbonation_temp) }
-  it { should validate_numericality_of(:fermentation_stages).only_integer }
-  it { should validate_numericality_of(:fg) }
-  it { should validate_numericality_of(:og) }
-  it { should validate_numericality_of(:primary_age).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:primary_temp) }
-  it { should validate_numericality_of(:secondary_age).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:secondary_temp) }
-  it { should validate_numericality_of(:tertiary_age).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:tertiary_temp) }
+  it { should validate_numericality_of(:carbonation).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:carbonation_temp).allow_nil }
+  it { should validate_numericality_of(:fermentation_stages).only_integer.allow_nil }
+  it { should validate_numericality_of(:fg).allow_nil }
+  it { should validate_numericality_of(:og).allow_nil }
+  it { should validate_numericality_of(:primary_age).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:primary_temp).allow_nil }
+  it { should validate_numericality_of(:secondary_age).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:secondary_temp).allow_nil }
+  it { should validate_numericality_of(:tertiary_age).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:tertiary_temp).allow_nil }
 
 
   %i(fermentable hop misc water yeast).each do |record_type|
@@ -95,4 +96,8 @@ describe NRB::BeerXML::Recipe do
     it_behaves_like :restricted_assignment
   end
 
+  it_behaves_like :record_typing do
+    let(:type) { :recipe }
+  end
+
 end

data/spec/cases/beerxml/record_validators/percentage_validator_spec.rb

@@ -29,7 +29,7 @@ describe NRB::BeerXML::RecordValidators::PercentageValidator do
 
     it 'tells you why the record is invalid' do
       record.valid?
-      expect(record.errors[:percentage]).to include('must be a BeerXML percentage (a number between 0 & 100)')
+      expect(record.errors[:percentage]).to include(message)
     end
 
   end
@@ -63,6 +63,7 @@ describe NRB::BeerXML::RecordValidators::PercentageValidator do
 
   context 'a vanilla percentage validator' do
     let(:okay) { 88 }
+    let(:message) { 'must be a percentage (between 0 & 100)' }
     let(:record) { NRB::Fake::VanillaFakePercentage.new percentage: percentage }
     let(:too_big) { 101 }
     let(:too_small) { -1 }
@@ -76,6 +77,7 @@ describe NRB::BeerXML::RecordValidators::PercentageValidator do
 
   context 'with no maximum' do
     let(:okay) { 1000 }
+    let(:message) { 'must be a percentage (less than 100)' }
     let(:record) { NRB::Fake::NoMaxFakePercentage.new percentage: percentage }
     let(:too_small) { -1 }
 
@@ -87,6 +89,7 @@ describe NRB::BeerXML::RecordValidators::PercentageValidator do
 
   context 'with no minimum' do
     let(:okay) { -10 }
+    let(:message) { 'must be a percentage (greater than 0)' }
     let(:record) { NRB::Fake::NoMinFakePercentage.new percentage: percentage }
     let(:too_big) { 101 }
 

data/spec/cases/beerxml/style_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Style do
 
@@ -20,10 +21,10 @@ describe NRB::BeerXML::Style do
 
   it { should validate_inclusion_of(:type).in_array(%w(Ale Cider Lager Mead Mixed Wheat) ) }
 
-  it { should validate_numericality_of(:abv_max).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:abv_min).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:carb_max).is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:carb_min).is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:abv_max).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:abv_min).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:carb_max).is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:carb_min).is_greater_than_or_equal_to(0).allow_nil }
   it { should validate_numericality_of(:color_max).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:color_min).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:fg_max).is_greater_than_or_equal_to(0) }
@@ -33,4 +34,8 @@ describe NRB::BeerXML::Style do
   it { should validate_numericality_of(:og_max).is_greater_than_or_equal_to(0) }
   it { should validate_numericality_of(:og_min).is_greater_than_or_equal_to(0) }
 
+  it_behaves_like :record_typing do
+    let(:type) { :style }
+  end
+
 end

data/spec/cases/beerxml/water_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Water do
 
@@ -17,9 +18,13 @@ describe NRB::BeerXML::Water do
   it { should validate_numericality_of :calcium }
   it { should validate_numericality_of :chloride }
   it { should validate_numericality_of :magnesium }
-  it { should validate_numericality_of(:ph).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(14) }
+  it { should validate_numericality_of(:ph).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(14).allow_nil }
 
   it { should validate_numericality_of :sodium }
   it { should validate_numericality_of :sulfate }
 
+  it_behaves_like :record_typing do
+    let(:type) { :water }
+  end
+
 end

data/spec/cases/beerxml/yeast_spec.rb

@@ -1,4 +1,5 @@
 require 'shared/active_model_lint'
+require 'shared/record_typing'
 
 describe NRB::BeerXML::Yeast do
 
@@ -8,13 +9,17 @@ describe NRB::BeerXML::Yeast do
   it { should validate_presence_of :form }
   it { should validate_presence_of :type }
 
-  it { should validate_inclusion_of(:flocculation).in_array(["High","Low","Medium","Very High"]) }
+  it { should validate_inclusion_of(:flocculation).in_array(["High","Low","Medium","Very High"]).allow_nil }
   it { should validate_inclusion_of(:form).in_array(%w(Culture Dry Liquid Slant )) }
   it { should validate_inclusion_of(:type).in_array(%w(Ale Champagne Lager Wheat Wine)) }
 
-  it { should validate_numericality_of(:max_reuse).only_integer.is_greater_than_or_equal_to(0) }
-  it { should validate_numericality_of(:max_temperature) }
-  it { should validate_numericality_of(:min_temperature) }
-  it { should validate_numericality_of(:times_cultured).only_integer.is_greater_than_or_equal_to(0) }
+  it { should validate_numericality_of(:max_reuse).only_integer.is_greater_than_or_equal_to(0).allow_nil }
+  it { should validate_numericality_of(:max_temperature).allow_nil }
+  it { should validate_numericality_of(:min_temperature).allow_nil }
+  it { should validate_numericality_of(:times_cultured).only_integer.is_greater_than_or_equal_to(0).allow_nil }
+
+  it_behaves_like :record_typing do
+    let(:type) { :yeast }
+  end
 
 end

data/spec/fixtures/recipes.xml

@@ -157,9 +157,9 @@ Also called &quot;Crystal&quot; malt.</NOTES>
  <SUPPLIER></SUPPLIER>
  <NOTES>Imparts a rich sweet flavor. Used in Scottish ales, holiday ales and some old ales.</NOTES>
  <COARSE_FINE_DIFF>-</COARSE_FINE_DIFF>
- <MOISTURE>-</MOISTURE>
- <DIASTATIC_POWER>-</DIASTATIC_POWER>
- <PROTEIN>-</PROTEIN>
+ <MOISTURE></MOISTURE>
+ <DIASTATIC_POWER></DIASTATIC_POWER>
+ <PROTEIN></PROTEIN>
  <MAX_IN_BATCH>10.0</MAX_IN_BATCH>
  <RECOMMEND_MASH>FALSE</RECOMMEND_MASH>
  <IBU_GAL_PER_LB>0.000</IBU_GAL_PER_LB>
@@ -265,7 +265,7 @@ Example: Bass Ale</NOTES>
  <COLOR_MIN>6.00000000</COLOR_MIN>
  <COLOR_MAX>12.00000000</COLOR_MAX>
  <CARB_MIN>1.5</CARB_MIN>
- <CARB_MAX>2.4></CARB_MAX>
+ <CARB_MAX>2.4</CARB_MAX>
  <ABV_MAX>5.5</ABV_MAX>
  <ABV_MIN>4.5</ABV_MIN>
  <NOTES>Famous style from Burton-on-Trent.  Stronger body than ordinary bitter, but slightly less bitter.  A balanced, easy drinking beer that is malty and strong but not overbearing. </NOTES>
@@ -602,7 +602,7 @@ Gives &quot;dryness&quot; to a stout or porter -- much more so than regular Roas
  <COLOR_MIN>35.00000000</COLOR_MIN>
  <COLOR_MAX>200.00000000</COLOR_MAX>
  <CARB_MIN>1.6</CARB_MIN>
- <CARB_MAX>2.1></CARB_MAX>
+ <CARB_MAX>2.1</CARB_MAX>
  <ABV_MAX>5.5</ABV_MAX>
  <ABV_MIN>3.0</ABV_MIN>
  <NOTES>Famous Irish Stout (AKA Guiness). Dry roasted almost coffee like flavor.  Irish versions have low starting gravity.  Often mixed with soured, pasturized beer to give a slight acidity as well.</NOTES>
@@ -955,6 +955,21 @@ Use for: Bock, Porter, Marzen, Oktoberfest beers</NOTES>
 </YEASTS>
 
  <WATERS>
+<WATER>
+ <NAME>Burton On Trent, UK</NAME>
+ <VERSION>1</VERSION>
+ <AMOUNT>18.927168</AMOUNT>
+ <CALCIUM>295.0</CALCIUM>
+ <BICARBONATE>300.0</BICARBONATE>
+ <SULFATE>725.0</SULFATE>
+ <CHLORIDE>25.0</CHLORIDE>
+ <SODIUM>55.0</SODIUM>
+ <MAGNESIUM>45.0</MAGNESIUM>
+ <PH>8.0</PH>
+ <NOTES>Distinctive pale ales strongly hopped.  Very hard water accentuates the hops flavor.
+Example: Bass Ale</NOTES>
+ <DISPLAY_AMOUNT>5.00 gal</DISPLAY_AMOUNT>
+</WATER>
 </WATERS>
 
  <STYLE>
@@ -974,7 +989,7 @@ Use for: Bock, Porter, Marzen, Oktoberfest beers</NOTES>
  <COLOR_MIN>30.00000000</COLOR_MIN>
  <COLOR_MAX>60.00000000</COLOR_MAX>
  <CARB_MIN>1.8</CARB_MIN>
- <CARB_MAX>2.5></CARB_MAX>
+ <CARB_MAX>2.5</CARB_MAX>
  <ABV_MAX>6.0</ABV_MAX>
  <ABV_MIN>4.8</ABV_MIN>
  <NOTES>Stronger, darker version of porter with a slight dryness.  Flavor derived from chocolate and black malts, but lacks the strong roasted flavor of a dry stout.</NOTES>
@@ -1256,6 +1271,21 @@ Examples: Belgian White beer, Wit</NOTES>
 </YEASTS>
 
  <WATERS>
+<WATER>
+ <NAME>Burton On Trent, UK</NAME>
+ <VERSION>1</VERSION>
+ <AMOUNT>18.927168</AMOUNT>
+ <CALCIUM>295.0</CALCIUM>
+ <BICARBONATE>300.0</BICARBONATE>
+ <SULFATE>725.0</SULFATE>
+ <CHLORIDE>25.0</CHLORIDE>
+ <SODIUM>55.0</SODIUM>
+ <MAGNESIUM>45.0</MAGNESIUM>
+ <PH>8.0</PH>
+ <NOTES>Distinctive pale ales strongly hopped.  Very hard water accentuates the hops flavor.
+Example: Bass Ale</NOTES>
+ <DISPLAY_AMOUNT>5.00 gal</DISPLAY_AMOUNT>
+</WATER>
 </WATERS>
 
  <STYLE>
@@ -1275,7 +1305,7 @@ Examples: Belgian White beer, Wit</NOTES>
  <COLOR_MIN>2.00000000</COLOR_MIN>
  <COLOR_MAX>4.00000000</COLOR_MAX>
  <CARB_MIN>2.1</CARB_MIN>
- <CARB_MAX>2.7></CARB_MAX>
+ <CARB_MAX>2.7</CARB_MAX>
  <ABV_MAX>5.5</ABV_MAX>
  <ABV_MIN>4.1</ABV_MIN>
  <NOTES>Distinctive Wit or &quot;White&quot; beer spiced with bitter Curacao orange peel and coriander. A distinctive yeast strain provides orange aroma/flavor.</NOTES>

data/spec/shared/record_typing.rb

@@ -3,7 +3,7 @@ require 'active_model/lint'
 
 shared_examples_for :record_typing do
 
-  let(:all_types) { %i( equipment fermentable hop mash_profile mash_step misc recipe style water yeast ) }
+  let(:all_types) { %i( equipment fermentable hop mash mash_step misc recipe style water yeast ) }
 
   it 'correctly answers to its own type' do
     expect subject.send("#{type}?")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nrb-beerxml
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Dean Brundage
@@ -137,6 +137,7 @@ files:
 - lib/nrb/beerxml/version.rb
 - lib/nrb/beerxml/water.rb
 - lib/nrb/beerxml/yeast.rb
+- nrb-beerxml.gemspec
 - spec/cases/beerxml/builder_spec.rb
 - spec/cases/beerxml/equipment_spec.rb
 - spec/cases/beerxml/fermentable_spec.rb