nrb-beerxml 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51eaa64ba2a4d1531949f7abe439972c3ff87c8f
-  data.tar.gz: 23547b7ccacd9d9be222d0ed684f5e7b859f909e
+  metadata.gz: 03033c9e27c70f80d8743be2e283b166fb64e7a4
+  data.tar.gz: 1449230fbd782ba350b23b2e8dda9a36dabaec9a
 SHA512:
-  metadata.gz: bd13bebb6e1b92cb16fca920416240a5e984bd0474eb677032ef7af992b4d3d61b5716ff5edd8988bf2866779aaa74834f217e13b520459397084aedf5044cee
-  data.tar.gz: d5aff037afe785f105608212fb794dac08da3d6703b24982aec25a7d441744b1afacb0f1378a38e23249b95effd8c8deeb74de3f874d1126ab6f1588639e2575
+  metadata.gz: d2ab79db6af27da53a608e8d35923cd51930eff78e51dbd21de6294025e10794e28c58695342220d0b649c6f6514626879610d7c59d52319abd3f66a654a6d8e
+  data.tar.gz: f81eae1407baafc9fbabec27561439076e57b6fd07e2ff1bbdf8351654bdef50c0a5ee9dae2f9ba34f8c307100279747db26b98f81ce22ed0a9375959dcd370a

data/README.md

@@ -1,10 +1,9 @@
-# NRB::Beerxml
+# NRB::Beerxml – A [BeerXML](http://www.beerxml.com/) parser
 
 [![Code Climate](https://codeclimate.com/github/NewRepublicBrewing/beerxml/badges/gpa.svg)](https://codeclimate.com/github/NewRepublicBrewing/beerxml)
 
-A BeerXML parser
 
-## Installation
+## Install
 
 Add this line to your application's Gemfile:
 
@@ -20,14 +19,55 @@ Or install it yourself as:
 
     % gem install nrb-beerxml
 
-## Usage
+## Parse
 
+Parse a BeerXML file
 
+```ruby
+require `nrb/beerxml`
+parser = NRB::BeerXML::Parser.new
+parser.parse file_path
+=> #<NRB::BeerXML::Equipment:0x007fbe501e4298 @name="Brew Pot", ...>
+```
+
+`parse` can handle a `String` pathname or an `IO` containing the BeerXML.
+
+### 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.
+
+```ruby
+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
+
+NRB::BeerXML uses Nokogiri by default.  If you want to use another reader, simply pass the class name to the Parser's initializer.
 
-## Contributing
+```ruby
+parser = NRB::BeerXML::Parser.new reader: SomeXMLReader
+```
+
+The reader should implement a `parse(stream)` method which returns a document.  The document object should implement `#children`, `#name`, `#root`, `#text` &amp; `#text?`
 
-1. Fork it ( https://github.com/NewRepublicBrewing/nrb-beerxml/fork )
+## Bonus
+
+If `BeerXML` is not in your namespace before `require 'nrb/beerxml'` you can leave off the `NRB` prefix when referencing classes.
+
+```ruby
+defined?(BeerXML) || BeerXML = NRB::BeerXML
+```
+
+## Contribute
+
+1. [Fork me](https://github.com/NewRepublicBrewing/nrb-beerxml/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some beers'`)
 4. Push to the branch (`git push origin my-new-beer`)
 5. Create a Pull Request
+
+## Contributors
+
+@brundage at the [New Republic Brewing Company](https://github.com/NewRepublicBrewing)

data/lib/nrb/beerxml.rb

@@ -0,0 +1,24 @@
+module NRB
+  module BeerXML
+
+    autoload :Builder,          'nrb/beerxml/builder'
+    autoload :Equipment,        'nrb/beerxml/equipment'
+    autoload :Fermentable,      'nrb/beerxml/fermentable'
+    autoload :Hop,              'nrb/beerxml/hop'
+    autoload :Inflector,        'nrb/beerxml/inflector'
+    autoload :Mash,             'nrb/beerxml/mash'
+    autoload :MashStep,         'nrb/beerxml/mash_step'
+    autoload :Misc,             'nrb/beerxml/misc'
+    autoload :Parser,           'nrb/beerxml/parser'
+    autoload :Recipe,           'nrb/beerxml/recipe'
+    autoload :Record,           'nrb/beerxml/record'
+    autoload :RecordSet,        'nrb/beerxml/record_set'
+    autoload :RecordValidators, 'nrb/beerxml/record_validators'
+    autoload :Style,            'nrb/beerxml/style'
+    autoload :Water,            'nrb/beerxml/water'
+    autoload :Yeast,            'nrb/beerxml/yeast'
+
+  end
+end
+
+defined?(BeerXML) || BeerXML = NRB::BeerXML

data/lib/{beerxml → nrb/beerxml}/builder.rb

@@ -21,7 +21,6 @@ module NRB; module BeerXML
 
   private
 
-
     def record_set?(type)
       self.class.record_sets.include? type
     end

data/lib/nrb/beerxml/equipment.rb

@@ -0,0 +1,36 @@
+require 'nrb/beerxml/record_validators/boolean_validator'
+require 'nrb/beerxml/record_validators/percentage_validator'
+module NRB; module BeerXML
+  class Equipment < Record
+
+    attr_accessor :batch_size           # volume required
+    attr_accessor :boil_size            # volume required
+    attr_accessor :boil_time            # time
+    attr_accessor :calc_boil_volume     # boolean
+    attr_accessor :evap_rate            # percent
+    attr_accessor :hop_utilization      # percent
+    attr_accessor :lauter_tun_deadspace # volume
+    attr_accessor :notes                # string
+    attr_accessor :top_up_kettle        # volume
+    attr_accessor :top_up_water         # volume
+    attr_accessor :trub_chiller_loss    # volume
+    attr_accessor :tun_specific_heat    # float
+    attr_accessor :tun_volume           # volume
+    attr_accessor :tun_weight           # weight
+
+    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 :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 }
+
+  end
+end; end

data/lib/nrb/beerxml/fermentable.rb

@@ -0,0 +1,31 @@
+require 'nrb/beerxml/record_validators/boolean_validator'  # hack so "validates percentage:" magic works
+require 'nrb/beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
+
+module NRB; module BeerXML
+  class Fermentable < Record
+
+    attr_accessor :add_after_boil   # boolean
+    attr_accessor :amount           # weight required
+    attr_accessor :coarse_fine_diff # percent
+    attr_accessor :color            # float required
+    attr_accessor :diastatic_power  # float
+    attr_accessor :ibu_gal_per_lb   # float
+    attr_accessor :max_in_batch     # percent
+    attr_accessor :moisture         # percent
+    attr_accessor :notes            # text
+    attr_accessor :origin           # text
+    attr_accessor :recommend_mash   # boolean
+    attr_accessor :supplier         # text
+    attr_accessor :type             # list required
+    attr_accessor :yield            # percent required
+
+    validates :add_after_boil, boolean: 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 }
+
+  end
+end; end

data/lib/nrb/beerxml/hop.rb

@@ -0,0 +1,36 @@
+require 'nrb/beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
+module NRB; module BeerXML
+  class Hop < Record
+
+    attr_accessor :alpha          # percentage required
+    attr_accessor :amount         # weight     required
+    attr_accessor :beta           # percentage
+    attr_accessor :caryophyllene  # percentage
+    attr_accessor :cohumulone     # percentage
+    attr_accessor :form           # list
+    attr_accessor :hsi            # percentage
+    attr_accessor :myrcene        # percentage
+    attr_accessor :notes          # text
+    attr_accessor :origin         # text
+    attr_accessor :substitutes    # text
+    attr_accessor :time           # time       required
+    attr_accessor :type           # list
+    attr_accessor :use            # list       required
+
+    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 :time, presence: true,
+                     numericality: { greater_than_or_equal_to: 0 }
+    validates :type, inclusion: { in: %w(Aroma Bittering Both) }
+
+    validates :use, presence: true,
+                    inclusion: { in: [ "Aroma", "Boil", "Dry Hop", "First Wort", "Mash" ] }
+
+  end
+end; end

data/lib/nrb/beerxml/mash.rb

@@ -0,0 +1,33 @@
+require 'nrb/beerxml/record_validators/boolean_validator'
+module NRB; module BeerXML
+  class Mash < Record
+
+    attr_accessor :equip_adjust      # boolean
+    attr_accessor :grain_temp        # temperature required
+    attr_accessor :mash_steps        # record set required
+    attr_accessor :notes             # string
+    attr_accessor :ph                # float
+    attr_accessor :sparge_temp       # temperature
+    attr_accessor :tun_specific_heat # float
+    attr_accessor :tun_temp          # temperature
+    attr_accessor :tun_weight        # weight
+
+    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 }
+
+
+    after_initialize :initialize_mash_steps
+
+  private
+
+    def initialize_mash_steps
+      self.mash_steps ||= RecordSet.new(record_type: :mash_step)
+    end
+
+  end
+end; end

data/lib/nrb/beerxml/mash_step.rb

@@ -0,0 +1,24 @@
+module NRB; module BeerXML
+  class MashStep < Record
+
+    attr_accessor :end_temp      # temperature
+    attr_accessor :infuse_amount # volume conditionally required
+    attr_accessor :ramp_time     # time
+    attr_accessor :step_temp     # temperature required
+    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 :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) },
+                     presence: true
+
+    def infuse_amount_required?
+      type == "Infusion"
+    end
+
+  end
+end; end

data/lib/nrb/beerxml/misc.rb

@@ -0,0 +1,22 @@
+require 'nrb/beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
+module NRB; module BeerXML
+  class Misc < Record
+
+    attr_accessor :amount           # float required
+    attr_accessor :amount_is_weight # boolean
+    attr_accessor :notes            # string
+    attr_accessor :time             # time required
+    attr_accessor :type             # list required
+    attr_accessor :use              # list required
+    attr_accessor :use_for          # string
+
+    validates :amount, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :amount_is_weight, boolean: true
+    validates :time, numericality: { greater_than_or_equal_to: 0 },
+                     presence: true
+    validates :type, inclusion: { in: ["Fining", "Flavor", "Herb", "Other", "Spice", "Water Agent"] }, presence: true
+    validates :use, inclusion: { in: %w(Boil Bottling Mash Primary Secondary) }, presence: true
+
+
+  end
+end; end

data/lib/nrb/beerxml/recipe.rb

@@ -0,0 +1,107 @@
+require 'nrb/beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
+require 'nrb/beerxml/record_validators/percentage_validator'  # hack so "validates percentag:" magic works
+module NRB; module BeerXML
+  class Recipe < Record
+
+    after_initialize :set_up_record_sets
+
+    attr_accessor :age                 # time
+    attr_accessor :age_temp            # temperature
+    attr_accessor :asst_brewer         # string
+    attr_accessor :batch_size          # volume required
+    attr_accessor :boil_size           # volume required
+    attr_accessor :boil_time           # time required
+    attr_accessor :brewer              # string required
+    attr_accessor :carbonation         # float
+    attr_accessor :carbonation_temp    # temperature
+    attr_accessor :date                # string
+    attr_accessor :efficiency          # percentage conditionally required
+    attr_reader   :equipment           # equipment record
+    attr_accessor :fermentables        # fermentables record set required
+    attr_accessor :fermentation_stages # integer
+    attr_accessor :fg                  # specific gravity
+    attr_accessor :forced_carbonation  # boolean
+    attr_accessor :hops                # hops record set required
+    attr_accessor :keg_priming_factor  # float
+    attr_accessor :mash                # mash profile record required
+    attr_accessor :miscs               # miscs record set required
+    attr_accessor :notes               # string
+    attr_accessor :og                  # specific gravity
+    attr_accessor :primary_age         # time
+    attr_accessor :primary_temp        # temperature
+    attr_accessor :priming_sugar_equiv # float
+    attr_accessor :priming_sugar_name  # string
+    attr_accessor :secondary_age       # time
+    attr_accessor :secondary_temp      # temperature
+    attr_reader   :style               # style record required
+    attr_accessor :taste_notes         # string
+    attr_accessor :taste_rating        # float
+    attr_accessor :tertiary_age        # time
+    attr_accessor :tertiary_temp       # temperature
+    attr_accessor :type                # list required
+    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 :brewer, presence: true
+    validates :carbonation, numericality: { greater_than_or_equal_to: 0 }
+    validates :carbonation_temp, numericality: true
+    validates :equipment, presence: true
+    validates :efficiency, percentage: 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 :hops, presence: true
+    validates :keg_priming_factor, numericality: 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 :style, presence: true
+    validates :taste_rating, numericality: true
+    validates :tertiary_age, numericality: { greater_than_or_equal_to: 0 }
+    validates :tertiary_temp, numericality: true
+    validates :type, inclusion: { in: [ "All Grain", "Extract", "Partial Mash" ] }, presence: true
+    validates :waters, presence: true
+    validates :yeasts, presence: true
+
+
+    def equipment=(equipment)
+      restricted_assign :equipment, equipment
+    end
+
+
+    def efficiency_required?
+      ["ALl Grain", "Partial Mash"].include?(type)
+    end
+
+
+    def set_up_record_sets
+      %i(fermentable hop misc water yeast).each do |record_type|
+        send "#{record_type}s=", RecordSet.new(record_type: record_type)
+      end
+    end
+
+
+    def style=(style)
+      restricted_assign :style, style
+    end
+
+  private
+
+    def restricted_assign(type, value)
+      raise "Can't assign a non-#{type} to #{type} (got a #{value.record_type}" unless value.nil? || value.send("#{type}?")
+      instance_variable_set "@#{type}", value
+    end
+
+  end
+end; end

data/lib/nrb/beerxml/record.rb

@@ -0,0 +1,47 @@
+require 'active_model'
+module NRB; module BeerXML
+  class Record
+    include Inflector
+    include ActiveModel::Model
+    extend ActiveModel::Callbacks
+    extend ActiveModel::Naming
+
+    define_model_callbacks :initialize, only: :after
+
+    attr_accessor :name
+    attr_accessor :version
+
+    validates :name, presence: true
+    validates :version, presence: true, numericality: { only_integer: true }
+
+
+    def initialize(*args)
+      super
+      run_callbacks :initialize
+    end
+
+
+    def record_type
+      underscore(self.class.name.split(/::/).last).to_sym
+    end
+
+
+    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_step?;    am_a? :mash_step; end
+    def misc?;         am_a? :misc; end
+    def recipe?;       am_a? :recipe; end
+    def style?;        am_a? :style; end
+    def water?;        am_a? :water; end
+    def yeast?;        am_a? :yeast; end
+
+    def persisted?; false; end
+
+  private
+
+    def am_a?(question); record_type == question; end
+
+  end
+end; end

data/lib/nrb/beerxml/record_validators.rb

@@ -0,0 +1,6 @@
+module NRB; module BeerXML
+  module RecordValidators
+    autoload :BooleanValidator, 'nrb/beerxml/record_validators/boolean_validator'
+    autoload :PercentageValidator, 'nrb/beerxml/record_validators/percentage_validator'
+  end
+end; end

data/lib/nrb/beerxml/style.rb

@@ -0,0 +1,47 @@
+require 'nrb/beerxml/record_validators/percentage_validator'
+module NRB; module BeerXML
+  class Style < Record
+
+    attr_accessor :abv_max         # float
+    attr_accessor :abv_min         # float
+    attr_accessor :carb_max        # float
+    attr_accessor :carb_min        # float
+    attr_accessor :category        # string required
+    attr_accessor :category_number # string required
+    attr_accessor :color_max       # float required
+    attr_accessor :color_min       # float required
+    attr_accessor :examples        # text
+    attr_accessor :fg_max          # float required
+    attr_accessor :fg_min          # float required
+    attr_accessor :ibu_max         # float required
+    attr_accessor :ibu_min         # float required
+    attr_accessor :ingredients     # text
+    attr_accessor :notes           # text
+    attr_accessor :og_max          # float required
+    attr_accessor :og_min          # float required
+    attr_accessor :profile         # text
+    attr_accessor :style_guide     # string required
+    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 :category, presence: true
+    validates :category_number, presence: true
+    validates :color_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :color_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :fg_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :fg_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :ibu_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :ibu_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :og_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :og_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
+    validates :style_guide, presence: true
+    validates :style_letter, presence: true
+    validates :type, inclusion: { in: %w(Ale Cider Lager Mead Mixed Wheat ) },
+                     presence: true
+
+  end
+end; end

data/lib/nrb/beerxml/version.rb

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

data/lib/nrb/beerxml/water.rb

@@ -0,0 +1,24 @@
+module NRB; module BeerXML
+  class Water < Record
+
+    attr_accessor :amount      # volume required
+    attr_accessor :bicarbonate # float required
+    attr_accessor :calcium     # float required
+    attr_accessor :chloride    # float required
+    attr_accessor :magnesium   # float required
+    attr_accessor :notes       # string
+    attr_accessor :ph          # float
+    attr_accessor :sodium      # float required
+    attr_accessor :sulfate     # float required
+
+    validates :amount, numericality: true, presence: true
+    validates :bicarbonate, numericality: true, presence: true
+    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 :sodium, numericality: true, presence: true
+    validates :sulfate, numericality: true, presence: true
+
+  end
+end; end

data/lib/nrb/beerxml/yeast.rb

@@ -0,0 +1,36 @@
+require 'nrb/beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
+require 'nrb/beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
+module NRB; module BeerXML
+  class Yeast < Record
+
+    attr_accessor :add_to_secondary # boolean
+    attr_accessor :amount           # float required
+    attr_accessor :amount_is_weight # boolean
+    attr_accessor :attenuation      # percentage
+    attr_accessor :best_for         # string
+    attr_accessor :flocculation     # list
+    attr_accessor :form             # list required
+    attr_accessor :laboratory       # string
+    attr_accessor :max_reuse        # integer
+    attr_accessor :max_temperature  # temperature
+    attr_accessor :min_temperature  # temperature
+    attr_accessor :notes            # string
+    attr_accessor :product_id       # string
+    attr_accessor :times_cultured   # integer
+    attr_accessor :type             # list required
+
+    validates :add_to_secondary, boolean: 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 :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 :type, presence: true, inclusion: { in: %w(Ale Champagne Lager Wheat Wine) }
+
+
+  end
+end; end

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

@@ -1,4 +1,4 @@
-require 'beerxml/record_validators/boolean_validator'
+require 'nrb/beerxml/record_validators/boolean_validator'
 module NRB
   module Fake
     class FakeBooleanObject

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

@@ -1,4 +1,4 @@
-require 'beerxml/record_validators/percentage_validator'
+require 'nrb/beerxml/record_validators/percentage_validator'
 module NRB
   module Fake
     class FakePercentage

data/spec/cases/beerxml/version_spec.rb

@@ -1,4 +1,4 @@
-require 'beerxml/version'
+require 'nrb/beerxml/version'
 describe NRB::BeerXML do
 
   it 'responds to version' do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'beerxml'
+require 'nrb/beerxml'
 require 'active_model'
 require 'shoulda/matchers'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrb-beerxml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dean Brundage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -117,26 +117,26 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- lib/beerxml.rb
-- lib/beerxml/builder.rb
-- lib/beerxml/equipment.rb
-- lib/beerxml/fermentable.rb
-- lib/beerxml/hop.rb
-- lib/beerxml/inflector.rb
-- lib/beerxml/mash.rb
-- lib/beerxml/mash_step.rb
-- lib/beerxml/misc.rb
-- lib/beerxml/parser.rb
-- lib/beerxml/recipe.rb
-- lib/beerxml/record.rb
-- lib/beerxml/record_set.rb
-- lib/beerxml/record_validators.rb
-- lib/beerxml/record_validators/boolean_validator.rb
-- lib/beerxml/record_validators/percentage_validator.rb
-- lib/beerxml/style.rb
-- lib/beerxml/version.rb
-- lib/beerxml/water.rb
-- lib/beerxml/yeast.rb
+- 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
 - spec/cases/beerxml/builder_spec.rb
 - spec/cases/beerxml/equipment_spec.rb
 - spec/cases/beerxml/fermentable_spec.rb

data/lib/beerxml.rb

@@ -1,24 +0,0 @@
-module NRB
-  module BeerXML
-
-    autoload :Builder,          'beerxml/builder'
-    autoload :Equipment,        'beerxml/equipment'
-    autoload :Fermentable,      'beerxml/fermentable'
-    autoload :Hop,              'beerxml/hop'
-    autoload :Inflector,        'beerxml/inflector'
-    autoload :Mash,             'beerxml/mash'
-    autoload :MashStep,         'beerxml/mash_step'
-    autoload :Misc,             'beerxml/misc'
-    autoload :Parser,           'beerxml/parser'
-    autoload :Recipe,           'beerxml/recipe'
-    autoload :Record,           'beerxml/record'
-    autoload :RecordSet,        'beerxml/record_set'
-    autoload :RecordValidators, 'beerxml/record_validators'
-    autoload :Style,            'beerxml/style'
-    autoload :Water,            'beerxml/water'
-    autoload :Yeast,            'beerxml/yeast'
-
-  end
-end
-
-defined?(BeerXML) || BeerXML = NRB::BeerXML

data/lib/beerxml/equipment.rb

@@ -1,38 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'
-require 'beerxml/record_validators/percentage_validator'
-module NRB
-  module BeerXML
-    class Equipment < Record
-
-      attr_accessor :batch_size           # volume required
-      attr_accessor :boil_size            # volume required
-      attr_accessor :boil_time            # time
-      attr_accessor :calc_boil_volume     # boolean
-      attr_accessor :evap_rate            # percent
-      attr_accessor :hop_utilization      # percent
-      attr_accessor :lauter_tun_deadspace # volume
-      attr_accessor :notes                # string
-      attr_accessor :top_up_kettle        # volume
-      attr_accessor :top_up_water         # volume
-      attr_accessor :trub_chiller_loss    # volume
-      attr_accessor :tun_specific_heat    # float
-      attr_accessor :tun_volume           # volume
-      attr_accessor :tun_weight           # weight
-
-      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 :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 }
-
-    end
-  end
-end

data/lib/beerxml/fermentable.rb

@@ -1,33 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'  # hack so "validates percentage:" magic works
-require 'beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
-
-module NRB
-  module BeerXML
-    class Fermentable < Record
-
-      attr_accessor :add_after_boil   # boolean
-      attr_accessor :amount           # weight required
-      attr_accessor :coarse_fine_diff # percent
-      attr_accessor :color            # float required
-      attr_accessor :diastatic_power  # float
-      attr_accessor :ibu_gal_per_lb   # float
-      attr_accessor :max_in_batch     # percent
-      attr_accessor :moisture         # percent
-      attr_accessor :notes            # text
-      attr_accessor :origin           # text
-      attr_accessor :recommend_mash   # boolean
-      attr_accessor :supplier         # text
-      attr_accessor :type             # list required
-      attr_accessor :yield            # percent required
-
-      validates :add_after_boil, boolean: 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 }
-
-    end
-  end
-end

data/lib/beerxml/hop.rb

@@ -1,38 +0,0 @@
-require 'beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
-module NRB
-  module BeerXML
-    class Hop < Record
-
-      attr_accessor :alpha          # percentage required
-      attr_accessor :amount         # weight     required
-      attr_accessor :beta           # percentage
-      attr_accessor :caryophyllene  # percentage
-      attr_accessor :cohumulone     # percentage
-      attr_accessor :form           # list
-      attr_accessor :hsi            # percentage
-      attr_accessor :myrcene        # percentage
-      attr_accessor :notes          # text
-      attr_accessor :origin         # text
-      attr_accessor :substitutes    # text
-      attr_accessor :time           # time       required
-      attr_accessor :type           # list
-      attr_accessor :use            # list       required
-
-      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 :time, presence: true,
-                       numericality: { greater_than_or_equal_to: 0 }
-      validates :type, inclusion: { in: %w(Aroma Bittering Both) }
-
-      validates :use, presence: true,
-                      inclusion: { in: [ "Aroma", "Boil", "Dry Hop", "First Wort", "Mash" ] }
-
-    end
-  end
-end

data/lib/beerxml/mash.rb

@@ -1,35 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'
-module NRB
-  module BeerXML
-    class Mash < Record
-
-      attr_accessor :equip_adjust      # boolean
-      attr_accessor :grain_temp        # temperature required
-      attr_accessor :mash_steps        # record set required
-      attr_accessor :notes             # string
-      attr_accessor :ph                # float
-      attr_accessor :sparge_temp       # temperature
-      attr_accessor :tun_specific_heat # float
-      attr_accessor :tun_temp          # temperature
-      attr_accessor :tun_weight        # weight
-
-      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 }
-
-
-      after_initialize :initialize_mash_steps
-
-    private
-
-      def initialize_mash_steps
-        self.mash_steps ||= RecordSet.new(record_type: :mash_step)
-      end
-
-    end
-  end
-end

data/lib/beerxml/mash_step.rb

@@ -1,26 +0,0 @@
-module NRB
-  module BeerXML
-    class MashStep < Record
-
-      attr_accessor :end_temp      # temperature
-      attr_accessor :infuse_amount # volume conditionally required
-      attr_accessor :ramp_time     # time
-      attr_accessor :step_temp     # temperature required
-      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 :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) },
-                       presence: true
-
-      def infuse_amount_required?
-        type == "Infusion"
-      end
-
-    end
-  end
-end

data/lib/beerxml/misc.rb

@@ -1,24 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
-module NRB
-  module BeerXML
-    class Misc < Record
-
-      attr_accessor :amount           # float required
-      attr_accessor :amount_is_weight # boolean
-      attr_accessor :notes            # string
-      attr_accessor :time             # time required
-      attr_accessor :type             # list required
-      attr_accessor :use              # list required
-      attr_accessor :use_for          # string
-
-      validates :amount, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :amount_is_weight, boolean: true
-      validates :time, numericality: { greater_than_or_equal_to: 0 },
-                       presence: true
-      validates :type, inclusion: { in: ["Fining", "Flavor", "Herb", "Other", "Spice", "Water Agent"] }, presence: true
-      validates :use, inclusion: { in: %w(Boil Bottling Mash Primary Secondary) }, presence: true
-
-
-    end
-  end
-end

data/lib/beerxml/recipe.rb

@@ -1,109 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
-require 'beerxml/record_validators/percentage_validator'  # hack so "validates percentag:" magic works
-module NRB
-  module BeerXML
-    class Recipe < Record
-
-      after_initialize :set_up_record_sets
-
-      attr_accessor :age                 # time
-      attr_accessor :age_temp            # temperature
-      attr_accessor :asst_brewer         # string
-      attr_accessor :batch_size          # volume required
-      attr_accessor :boil_size           # volume required
-      attr_accessor :boil_time           # time required
-      attr_accessor :brewer              # string required
-      attr_accessor :carbonation         # float
-      attr_accessor :carbonation_temp    # temperature
-      attr_accessor :date                # string
-      attr_accessor :efficiency          # percentage conditionally required
-      attr_reader   :equipment           # equipment record
-      attr_accessor :fermentables        # fermentables record set required
-      attr_accessor :fermentation_stages # integer
-      attr_accessor :fg                  # specific gravity
-      attr_accessor :forced_carbonation  # boolean
-      attr_accessor :hops                # hops record set required
-      attr_accessor :keg_priming_factor  # float
-      attr_accessor :mash                # mash profile record required
-      attr_accessor :miscs               # miscs record set required
-      attr_accessor :notes               # string
-      attr_accessor :og                  # specific gravity
-      attr_accessor :primary_age         # time
-      attr_accessor :primary_temp        # temperature
-      attr_accessor :priming_sugar_equiv # float
-      attr_accessor :priming_sugar_name  # string
-      attr_accessor :secondary_age       # time
-      attr_accessor :secondary_temp      # temperature
-      attr_reader   :style               # style record required
-      attr_accessor :taste_notes         # string
-      attr_accessor :taste_rating        # float
-      attr_accessor :tertiary_age        # time
-      attr_accessor :tertiary_temp       # temperature
-      attr_accessor :type                # list required
-      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 :brewer, presence: true
-      validates :carbonation, numericality: { greater_than_or_equal_to: 0 }
-      validates :carbonation_temp, numericality: true
-      validates :equipment, presence: true
-      validates :efficiency, percentage: 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 :hops, presence: true
-      validates :keg_priming_factor, numericality: 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 :style, presence: true
-      validates :taste_rating, numericality: true
-      validates :tertiary_age, numericality: { greater_than_or_equal_to: 0 }
-      validates :tertiary_temp, numericality: true
-      validates :type, inclusion: { in: [ "All Grain", "Extract", "Partial Mash" ] }, presence: true
-      validates :waters, presence: true
-      validates :yeasts, presence: true
-
-
-      def equipment=(equipment)
-        restricted_assign :equipment, equipment
-      end
-
-
-      def efficiency_required?
-        ["ALl Grain", "Partial Mash"].include?(type)
-      end
-
-
-      def set_up_record_sets
-        %i(fermentable hop misc water yeast).each do |record_type|
-          send "#{record_type}s=", RecordSet.new(record_type: record_type)
-        end
-      end
-
-
-      def style=(style)
-        restricted_assign :style, style
-      end
-
-    private
-
-      def restricted_assign(type, value)
-        raise "Can't assign a non-#{type} to #{type} (got a #{value.record_type}" unless value.nil? || value.send("#{type}?")
-        instance_variable_set "@#{type}", value
-      end
-
-    end
-  end
-end

data/lib/beerxml/record.rb

@@ -1,49 +0,0 @@
-require 'active_model'
-module NRB
-  module BeerXML
-    class Record
-      include Inflector
-      include ActiveModel::Model
-      extend ActiveModel::Callbacks
-      extend ActiveModel::Naming
-
-      define_model_callbacks :initialize, only: :after
-
-      attr_accessor :name
-      attr_accessor :version
-
-      validates :name, presence: true
-      validates :version, presence: true, numericality: { only_integer: true }
-
-
-      def initialize(*args)
-        super
-        run_callbacks :initialize
-      end
-
-
-      def record_type
-        underscore(self.class.name.split(/::/).last).to_sym
-      end
-
-
-      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_step?;    am_a? :mash_step; end
-      def misc?;         am_a? :misc; end
-      def recipe?;       am_a? :recipe; end
-      def style?;        am_a? :style; end
-      def water?;        am_a? :water; end
-      def yeast?;        am_a? :yeast; end
-
-      def persisted?; false; end
-
-    private
-
-      def am_a?(question); record_type == question; end
-
-    end
-  end
-end

data/lib/beerxml/record_validators.rb

@@ -1,8 +0,0 @@
-module NRB
-  module BeerXML
-    module RecordValidators
-      autoload :BooleanValidator, 'beerxml/record_validators/boolean_validator'
-      autoload :PercentageValidator, 'beerxml/record_validators/percentage_validator'
-    end
-  end
-end

data/lib/beerxml/style.rb

@@ -1,49 +0,0 @@
-require 'beerxml/record_validators/percentage_validator'
-module NRB
-  module BeerXML
-    class Style < Record
-
-      attr_accessor :abv_max         # float
-      attr_accessor :abv_min         # float
-      attr_accessor :carb_max        # float
-      attr_accessor :carb_min        # float
-      attr_accessor :category        # string required
-      attr_accessor :category_number # string required
-      attr_accessor :color_max       # float required
-      attr_accessor :color_min       # float required
-      attr_accessor :examples        # text
-      attr_accessor :fg_max          # float required
-      attr_accessor :fg_min          # float required
-      attr_accessor :ibu_max         # float required
-      attr_accessor :ibu_min         # float required
-      attr_accessor :ingredients     # text
-      attr_accessor :notes           # text
-      attr_accessor :og_max          # float required
-      attr_accessor :og_min          # float required
-      attr_accessor :profile         # text
-      attr_accessor :style_guide     # string required
-      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 :category, presence: true
-      validates :category_number, presence: true
-      validates :color_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :color_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :fg_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :fg_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :ibu_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :ibu_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :og_max, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :og_min, numericality: { greater_than_or_equal_to: 0 }, presence: true
-      validates :style_guide, presence: true
-      validates :style_letter, presence: true
-      validates :type, inclusion: { in: %w(Ale Cider Lager Mead Mixed Wheat ) },
-                       presence: true
-
-    end
-  end
-end

data/lib/beerxml/version.rb

@@ -1,6 +0,0 @@
-module NRB
-  module BeerXML
-    VERSION = "0.0.3"
-    def self.version; VERSION; end
-  end
-end

data/lib/beerxml/water.rb

@@ -1,26 +0,0 @@
-module NRB
-  module BeerXML
-    class Water < Record
-
-      attr_accessor :amount      # volume required
-      attr_accessor :bicarbonate # float required
-      attr_accessor :calcium     # float required
-      attr_accessor :chloride    # float required
-      attr_accessor :magnesium   # float required
-      attr_accessor :notes       # string
-      attr_accessor :ph          # float
-      attr_accessor :sodium      # float required
-      attr_accessor :sulfate     # float required
-
-      validates :amount, numericality: true, presence: true
-      validates :bicarbonate, numericality: true, presence: true
-      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 :sodium, numericality: true, presence: true
-      validates :sulfate, numericality: true, presence: true
-
-    end
-  end
-end

data/lib/beerxml/yeast.rb

@@ -1,38 +0,0 @@
-require 'beerxml/record_validators/boolean_validator'  # hack so "validates boolean:" magic works
-require 'beerxml/record_validators/percentage_validator'  # hack so "validates percentage:" magic works
-module NRB
-  module BeerXML
-    class Yeast < Record
-
-      attr_accessor :add_to_secondary # boolean
-      attr_accessor :amount           # float required
-      attr_accessor :amount_is_weight # boolean
-      attr_accessor :attenuation      # percentage
-      attr_accessor :best_for         # string
-      attr_accessor :flocculation     # list
-      attr_accessor :form             # list required
-      attr_accessor :laboratory       # string
-      attr_accessor :max_reuse        # integer
-      attr_accessor :max_temperature  # temperature
-      attr_accessor :min_temperature  # temperature
-      attr_accessor :notes            # string
-      attr_accessor :product_id       # string
-      attr_accessor :times_cultured   # integer
-      attr_accessor :type             # list required
-
-      validates :add_to_secondary, boolean: 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 :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 :type, presence: true, inclusion: { in: %w(Ale Champagne Lager Wheat Wine) }
-
-
-    end
-  end
-end