beerdb-models 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81cbea581c2fdb972632982aa387c16ad9c8120c
-  data.tar.gz: 8865a095da2b63a7e11447452226d29af752d8d3
+  metadata.gz: fb9be2add651cb418cd11f1fcded05d8bfb4b571
+  data.tar.gz: 6f3ea6a6df8dbe92638db7993448693d766edaaf
 SHA512:
-  metadata.gz: 541a57ed981411438c18a0e40f9d276c84e9922d3dbe084aec5c4b807ec425e72b502cd5d15598278200fd1e514b8d1574b08094a440a7dad67f69dbf3a650f1
-  data.tar.gz: e9cc5b27bb0e342ca75e70b052743b5fe23b9b5fff12c77081028476d59fd5d7433f25d6b07273375aae9dc414863ecaa5eebdefdce5501e4bee0f25417ce479
+  metadata.gz: fc605a8fdbd6a1b32000da48925e37cdac5efaf60b55fe74e4fc83e3908c5c0efb6e7752003d590e24464c84c82c250e08ce47bf2604631235896b6bcd05d090
+  data.tar.gz: 0c87ea1a5a0610f0198b7612319821ea547ab611dc7b5da5f72d97f7477d1841bd63816a12d30b1c8486b4f62e9eeb3db8ee62e4c6a0a8bdd6485b818ae71768

data/Manifest.txt

@@ -15,11 +15,16 @@ lib/beerdb/models/world/region.rb
 lib/beerdb/reader.rb
 lib/beerdb/reader_file.rb
 lib/beerdb/reader_zip.rb
+lib/beerdb/readers/beer.rb
+lib/beerdb/readers/brewery.rb
+lib/beerdb/readers/quick.rb
 lib/beerdb/schema.rb
 lib/beerdb/serializers/beer.rb
 lib/beerdb/serializers/brewery.rb
 lib/beerdb/stats.rb
 lib/beerdb/version.rb
+test/data/great-beers-europe.txt
 test/helper.rb
 test/test_fixture_matchers.rb
+test/test_reader_quick.rb
 test/test_values.rb

data/README.md

@@ -8,8 +8,13 @@
 * forum :: [groups.google.com/group/beerdb](https://groups.google.com/group/beerdb)
 
 
+
 ## Usage Models
 
+Class Model Diagram
+
+![](beerdb-models.png)
+
 Brewery Model
 
 ```

data/lib/beerdb/models.rb

@@ -17,10 +17,14 @@ require 'beerdb/models/beer'
 require 'beerdb/models/brand'
 require 'beerdb/models/brewery'
 
-
 require 'beerdb/serializers/beer'
 require 'beerdb/serializers/brewery'
 
+require 'beerdb/readers/beer'
+require 'beerdb/readers/brewery'
+require 'beerdb/readers/quick'
+
+
 require 'beerdb/schema'
 require 'beerdb/reader'
 require 'beerdb/reader_file'

data/lib/beerdb/reader.rb

@@ -112,50 +112,6 @@ class ReaderBase
   end
 
 
-  def load_beers_worker( name, more_attribs={} )
-
-    reader = create_beers_reader( name, more_attribs )  ### "virtual" method - required by concrete class
-
-    ### todo: cleanup - check if [] works for build_title...
-    #     better cleaner way ???
-    if more_attribs[:region_id].present?
-      known_breweries_source = Brewery.where( region_id:  more_attribs[:region_id] )
-    elsif more_attribs[:country_id].present?
-      known_breweries_source = Brewery.where( country_id: more_attribs[:country_id] )
-    else
-      logger.warn "no region or country specified; use empty brewery ary for header mapper"
-      known_breweries_source = []
-    end
-
-    known_breweries  = TextUtils.build_title_table_for( known_breweries_source )
-
-
-    reader.each_line do |new_attributes, values|
-
-      ## note: check for header attrib; if present remove
-      ### todo: cleanup code later
-      ## fix: add to new_attributes hash instead of values ary
-      ##   - fix: match_brewery()   move region,city code out of values loop for reuse at the end
-      if new_attributes[:header].present?
-        brewery_line = new_attributes[:header].dup   # note: make sure we make a copy; will use in-place string ops
-        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
-
-        logger.debug "  trying to find brewery in line >#{brewery_line}<"
-        ## todo: check what map_titles_for! returns (nothing ???)
-        TextUtils.map_titles_for!( 'brewery', brewery_line, known_breweries )
-        brewery_key = TextUtils.find_key_for!( 'brewery', brewery_line )
-        logger.debug "  brewery_key = >#{brewery_key}<"
-        unless brewery_key.nil?
-          ## bingo! add brewery_id upfront, that is, as first value in ary
-          values = values.unshift "by:#{brewery_key}"
-        end
-      end
-
-      Beer.create_or_update_from_attribs( new_attributes, values )
-    end # each_line
-  end
-
-
   def load_breweries_for_country_n_region( country_key, region_key, name, more_attribs={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
@@ -188,32 +144,5 @@ class ReaderBase
     load_breweries_worker( name, more_attribs )
   end
 
-  def load_breweries_worker( name, more_attribs={} )
-    
-    if name =~ /\(m\)/     # check for (m) mid-size/medium marker -todo- use $?? must be last?
-       more_attribs[ :prod_m ] = true
-    elsif name =~ /\(l\)/  # check for (l) large marker - todo - use $?? must be last?
-       more_attribs[ :prod_l ] = true
-    else
-      ## no marker; do nothing
-    end
-
-    reader = create_breweries_reader( name, more_attribs ) ### "virtual" method - required by concrete class
-
-    reader.each_line do |new_attributes, values|
-      
-      #######
-      # fix: move to (inside)
-      #    Brewery.create_or_update_from_attribs ||||
-      ## note: group header not used for now; do NOT forget to remove from hash!
-      if new_attributes[:header].present?
-        logger.warn "removing unused group header #{new_attributes[:header]}"
-        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
-      end
-      
-      Brewery.create_or_update_from_attribs( new_attributes, values )
-    end # each_line
-  end
-
 end # class ReaderBase
 end # module BeerDb

data/lib/beerdb/reader_file.rb

@@ -25,8 +25,7 @@ class Reader < ReaderBase
 
     logger.info "parsing data (beers) '#{name}' (#{path})..."
 
-    ValuesReader.from_file( path, more_attribs )
-    ## ValuesReaderV2.new( name, @include_path, more_attribs )
+    BeerReader.from_file( path, more_attribs )
   end
 
   def create_breweries_reader( name, more_attribs={} )
@@ -36,8 +35,15 @@ class Reader < ReaderBase
 
     logger.info "parsing data (breweries) '#{name}' (#{path})..."
 
-    ValuesReader.from_file( path, more_attribs )
-    ## ValuesReaderV2.new( name, @include_path, more_attribs )
+    if name =~ /\(m\)/     # check for (m) mid-size/medium marker -todo- use $?? must be last?
+       more_attribs[ :prod_m ] = true
+    elsif name =~ /\(l\)/  # check for (l) large marker - todo - use $?? must be last?
+       more_attribs[ :prod_l ] = true
+    else
+      ## no marker; do nothing
+    end
+
+    BreweryReader.from_file( path, more_attribs )
   end
 
 private

data/lib/beerdb/reader_zip.rb

@@ -68,15 +68,24 @@ class ZipReader < ReaderBase
 
     logger.debug "parsing data (beers) in zip '#{name}' (#{path})..."
 
-    ValuesReader.from_zip( @zip_file, path, more_attribs )
+    BeerReader.from_zip( @zip_file, path, more_attribs )
   end
 
+
   def create_breweries_reader( name, more_attribs={} )
     path = name_to_zip_entry_path( name )
 
     logger.debug "parsing data (breweries) in zip '#{name}' (#{path})..."
 
-    ValuesReader.from_zip( @zip_file, path, more_attribs )
+    if name =~ /\(m\)/     # check for (m) mid-size/medium marker -todo- use $?? must be last?
+       more_attribs[ :prod_m ] = true
+    elsif name =~ /\(l\)/  # check for (l) large marker - todo - use $?? must be last?
+       more_attribs[ :prod_l ] = true
+    else
+      ## no marker; do nothing
+    end
+
+    BreweryReader.from_zip( @zip_file, path, more_attribs )
   end
 
 private

data/lib/beerdb/readers/beer.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+
+module BeerDb
+
+class BeerReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## get text content from zip
+    entry = zip_file.find_entry( entry_path )
+
+    text = entry.get_input_stream().read()
+    text = text.force_encoding( Encoding::UTF_8 )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    BeerReader.new( text, more_attribs )
+  end  
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+
+  def read()
+
+    reader = ValuesReader.from_string( @text, @more_attribs )
+
+    ### todo: cleanup - check if [] works for build_title...
+    #     better cleaner way ???
+    if @more_attribs[:region_id].present?
+      known_breweries_source = Brewery.where( region_id:  @more_attribs[:region_id] )
+    elsif @more_attribs[:country_id].present?
+      known_breweries_source = Brewery.where( country_id: @more_attribs[:country_id] )
+    else
+      logger.warn "no region or country specified; use empty brewery ary for header mapper"
+      known_breweries_source = []
+    end
+
+    known_breweries  = TextUtils.build_title_table_for( known_breweries_source )
+
+
+    reader.each_line do |new_attributes, values|
+
+      ## note: check for header attrib; if present remove
+      ### todo: cleanup code later
+      ## fix: add to new_attributes hash instead of values ary
+      ##   - fix: match_brewery()   move region,city code out of values loop for reuse at the end
+      if new_attributes[:header].present?
+        brewery_line = new_attributes[:header].dup   # note: make sure we make a copy; will use in-place string ops
+        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+
+        logger.debug "  trying to find brewery in line >#{brewery_line}<"
+        ## todo: check what map_titles_for! returns (nothing ???)
+        TextUtils.map_titles_for!( 'brewery', brewery_line, known_breweries )
+        brewery_key = TextUtils.find_key_for!( 'brewery', brewery_line )
+        logger.debug "  brewery_key = >#{brewery_key}<"
+        unless brewery_key.nil?
+          ## bingo! add brewery_id upfront, that is, as first value in ary
+          values = values.unshift "by:#{brewery_key}"
+        end
+      end
+
+      Beer.create_or_update_from_attribs( new_attributes, values )
+    end # each_line
+  end
+
+
+end # class BeerReader
+end # module BeerDb

data/lib/beerdb/readers/brewery.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+
+module BeerDb
+
+class BreweryReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## get text content from zip
+    entry = zip_file.find_entry( entry_path )
+
+    text = entry.get_input_stream().read()
+    text = text.force_encoding( Encoding::UTF_8 )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    BreweryReader.new( text, more_attribs )
+  end  
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+
+
+
+  def read()
+
+=begin
+    if name =~ /\(m\)/     # check for (m) mid-size/medium marker -todo- use $?? must be last?
+       more_attribs[ :prod_m ] = true
+    elsif name =~ /\(l\)/  # check for (l) large marker - todo - use $?? must be last?
+       more_attribs[ :prod_l ] = true
+    else
+      ## no marker; do nothing
+    end
+=end
+
+    reader = ValuesReader.from_string( @text, @more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      
+      #######
+      # fix: move to (inside)
+      #    Brewery.create_or_update_from_attribs ||||
+      ## note: group header not used for now; do NOT forget to remove from hash!
+      if new_attributes[:header].present?
+        logger.warn "removing unused group header #{new_attributes[:header]}"
+        new_attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+      end
+      
+      Brewery.create_or_update_from_attribs( new_attributes, values )
+    end # each_line
+  end
+
+end # class BreweryReader
+end # module BeerDb

data/lib/beerdb/readers/quick.rb

@@ -0,0 +1,127 @@
+# encoding: utf-8
+
+#####################################
+#  quick (all-in-one-file) reader
+#
+#  reads breweries n beers "mixed-up" in a single-file
+
+
+module BeerDb
+
+class QuickReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## get text content from zip
+    entry = zip_file.find_entry( entry_path )
+
+    text = entry.get_input_stream().read()
+    text = text.force_encoding( Encoding::UTF_8 )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    QuickReader.new( text, more_attribs )
+  end  
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+
+  def read()
+
+    ########
+    # note:
+    #   assume meta.format == multiline  => brewery
+    #                      == line       => beer
+
+    last_brewery = nil
+
+    reader = ValuesReader.from_string( @text, @more_attribs )
+
+    reader.each_line_with_meta do |attributes|
+
+      ## note: group header not used for now; do NOT forget to remove from hash!
+      if attributes[:header].present?
+        logger.warn "removing unused group header #{attributes[:header]}"
+        attributes.delete(:header)   ## note: do NOT forget to remove from hash!
+      end
+
+      if attributes[:meta][:format] == :multiline
+        ### assume new brewery
+        puts
+        puts "new brewery w/ attributes: #{attributes.inspect}"
+      else
+        ### assume new beer
+        puts
+        puts "new beer w/ attributes: #{attributes.inspect}"
+      end
+
+      meta   = attributes[:meta]
+      values = attributes[:values]
+
+      attributes.delete(:meta)
+      attributes.delete(:values)
+
+      if meta[:format] == :multiline
+        ## assume new brewery
+        ### check values for worldtree entry w/ › e.g. Hainaut › Belgium
+
+        worldtree = values.find {|val| val.index('›') }
+        if worldtree
+          puts "  worldtree: #{worldtree}"
+          worldtree_ary = worldtree.split( /\s*›\s*/ )   ## note: remove leading n trailing spaces
+          pp worldtree_ary
+          ## assume last entry is country
+          country_name = worldtree_ary[-1]
+          puts "     country: #{country_name}"
+
+          country = Country.find_by_name( country_name )
+          if country.nil?
+            puts "  auto-add country #{country_name}"
+            ## hack: fix use worldlite to get proper key,code,area,pop etc.
+            country = Country.create!( key:  country_name[0..2].downcase,
+                                       name: country_name,
+                                       code: country_name[0..2].upcase,
+                                       area: 0,
+                                       pop:  0 )
+          end
+
+          attributes[:country_id] = country.id
+
+          last_brewery = Brewery.create_or_update_from_attribs( attributes, values )
+        else
+          puts "  worldtree missing (no country etc.) !!!!!"
+          exit
+        end
+      else
+        ## assume new beer
+        attributes[:brewery_id] = last_brewery.id
+        attributes[:country_id] = last_brewery.country_id
+
+        Beer.create_or_update_from_attribs( attributes, values )
+      end
+
+    end # each_line
+  end
+
+
+end # class QuickReader
+end # module BeerDb
+

data/lib/beerdb/schema.rb

@@ -8,8 +8,8 @@ class CreateDb < ActiveRecord::Migration
 def up
 
 create_table :beers do |t|
-  t.string  :key,   :null => false   # import/export key
-  t.string  :title, :null => false
+  t.string  :key,      null: false   # import/export key
+  t.string  :title,    null: false
   t.string  :synonyms  # comma separated list of synonyms
 
   t.string  :web    # optional url link (e.g. )
@@ -18,17 +18,17 @@ create_table :beers do |t|
   # t.boolean  :bottle,  :null => false, :default => false # Flaschenbier
   # t.boolean  :draft,   :null => false, :default => false # Fassbier
   ## todo: check seasonal is it proper english?
-  t.boolean  :seasonal, :null => false, :default => false # all year or just eg. Festbier/Oktoberfest Special
-  t.boolean  :limited, :null => false, :default => false   # one year or season only
+  t.boolean  :seasonal, null: false, default: false # all year or just eg. Festbier/Oktoberfest Special
+  t.boolean  :limited,  null: false, default: false   # one year or season only
   ## todo: add microbrew/brewpub flag?
   #### t.boolean  :brewpub, :null => false, :default => false
-  
+
   ## add t.boolean :lite  flag ??
-  t.decimal    :kcal    # kcal/100ml e.g. 45.0 kcal/100ml
+  t.decimal    :kcal,  precision: 10, scale: 2     # kcal/100ml e.g. 45.0 kcal/100ml
 
   ## check: why decimal and not float? 
-  t.decimal    :abv    # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
-  t.decimal    :og     # malt extract (original gravity) in plato
+  t.decimal    :abv,   precision: 10, scale: 2     # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
+  t.decimal    :og,    precision: 10, scale: 2     # malt extract (original gravity) in plato
   t.integer    :srm    # color in srm
   t.integer    :ibu    # bitterness in ibu
 
@@ -66,13 +66,13 @@ create_table :beers do |t|
   # - C-grade /3nd class/ tier3/ / speciality, minor ?
 
   # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
-  t.integer :grade, :null => false, :default => 4
+  t.integer :grade,  null: false, default: 4
 
   t.string  :txt            # source ref
-  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
 
 
-  t.references :country,  :null => false
+  t.references :country,  null: false
   t.references :region   # optional
   t.references :city     # optional
 
@@ -81,33 +81,33 @@ end
 
 
 create_table :brands do |t|   # beer families (sharing same name e.g. brand)
-  t.string  :key,   :null => false   # import/export key
-  t.string  :title, :null => false
+  t.string  :key,     null: false   # import/export key
+  t.string  :title,   null: false
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :web   # optional web page (e.g. www.ottakringer.at)
   t.string  :wiki  # optional wiki(pedia page)
   t.integer :since
 
   ## scope of brand (global/intern'l/national/regional/local) ??
-  t.boolean :global,     :null => false, :default => false 
-  t.boolean :internl,    :null => false, :default => false
-  t.boolean :national,   :null => false, :default => false
-  t.boolean :regional,   :null => false, :default => false
-  t.boolean :local,      :null => false, :default => false
+  t.boolean :global,     null: false, default: false 
+  t.boolean :internl,    null: false, default: false
+  t.boolean :national,   null: false, default: false
+  t.boolean :regional,   null: false, default: false
+  t.boolean :local,      null: false, default: false
 
   # t.integer :brand_grade   # 1/2/3/4/5  (global/intern'l/national/regional/local)
 
   # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
-  t.integer :grade, :null => false, :default => 4
+  t.integer :grade, null: false, default: 4
   #   -- todo: add plus 1 for brewery w/ *** ??
 
   t.string  :txt            # source ref
-  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+  t.boolean :txt_auto,  null: false, default: false     # inline? got auto-added?
 
 
   t.references :brewery   # optional (for now)
 
-  t.references :country,   :null => false
+  t.references :country,  null: false
   t.references :region   # optional
   t.references :city     # optional
 
@@ -115,8 +115,8 @@ create_table :brands do |t|   # beer families (sharing same name e.g. brand)
 end
 
 create_table :breweries do |t|
-  t.string  :key,   :null => false   # import/export key
-  t.string  :title, :null => false
+  t.string  :key,    null: false   # import/export key
+  t.string  :title,  null: false
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :address
   t.integer :since
@@ -129,10 +129,10 @@ create_table :breweries do |t|
 
 ## todo: add optional parent brewery (owned_by)  ???
 
-  t.boolean  :brewpub, :null => false, :default => false
-  t.boolean  :prod_m,  :null => false, :default => false   # prod medium  (mid-size/regional brewery)
+  t.boolean  :brewpub, null: false, default: false
+  t.boolean  :prod_m,  null: false, default: false   # prod medium  (mid-size/regional brewery)
                        #   e.g. > 15_000 barrels (us)
-  t.boolean  :prod_l,  :null => false, :default => false   # prod large
+  t.boolean  :prod_l,  null: false, default: false   # prod large
                        #   e.g. > 500_000 hl (at), > 6_000_000 barrels (us)
 
   t.integer :prod  # (estimated) annual production/capacity in hl (1hl=100l) e.g. megabrewery 2_000_000, microbrewery 1_000 hl; brewbup 500 hl etc.
@@ -153,11 +153,11 @@ create_table :breweries do |t|
 
 
   # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
-  t.integer :grade, :null => false, :default => 4
+  t.integer :grade,  null: false, default: 4
 
 
   t.string  :txt            # source ref
-  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+  t.boolean :txt_auto, null: false, default: false     # inline? got auto-added?
 
   t.string  :web        # optional web page (e.g. www.ottakringer.at)
   t.string  :wikipedia  # optional wiki(pedia page)
@@ -176,7 +176,7 @@ create_table :breweries do |t|
   # todo: add t.references :parent  # for parent brewery
   # (or better use has many parents w/ percentage of ownership; might not be 100%)
 
-  t.references :country,   :null => false
+  t.references :country,   null: false
   t.references :region   # optional
   t.references :city     # optional
   

data/lib/beerdb/version.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 module BeerDb
-  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
-  MINOR = 10
+  MAJOR = 1 ## todo: namespace inside version or something - why? why not??
+  MINOR = 0
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/data/great-beers-europe.txt

@@ -0,0 +1,155 @@
+###############################
+# Great Beers from Europe
+
+
+[Aass Bryggeri]
+  Ole Steens Gate 10 // 3007 Drammen
+  Buskerud › Østlandet › Norway
+  www.aass.no
+
+# Norways's oldest brewery, 1834
+#  Bryggeri -- is norwegian for brewery
+#  Østlandet -- is norwegian for eastern norway (region)
+
+Aass Bock,  6.5%, dunkler_bock
+Aass Juleøl, 6.2%, dunkler_bock
+
+
+[Abbaye des Rocs]   ## Brasserie des Rocs (formerly known as Brasserie de l'Abbaye des Rocs
+  Chaussée Brunehault 37 // 7387 Montignies-sur-Roc
+  Hainaut › Wallonie › Belgium
+  www.abbaye-des-rocs.com
+
+Blanche des Honnelles, 6%, belgian_witbier
+Abbaye des Rocs Brune, 9%, dunkles_starkbier 
+
+
+[Achelse Kluis]
+  De Kluis 1 // De Sint-Benedictusabdij // 3930 Hamont-Achel
+  Limburg › Vlaanderen › Belgium
+  www.achelsekluis.org
+
+# De Sint-Benedictusabdij -- in dutch is Saint-Benedictus Abbey
+
+Achel 8 Bruin, 8%, trappist
+Achel Extra Bruin, 9.5%,  trappist
+
+
+[Airbräu]
+  Terminalstraße Mitte 18 // München Airport Center // 85356 München
+  Oberbayern › Bayern › Germany
+  www.airbraeu.de
+
+Fliegerquell (Helles), 5.2%, lager|unfiltriert
+Kumulus (Weißbier),    5.4%, weissbier
+
+
+[Aktienbrauerei]   ## Aktienbrauerei Kaufbeuren (ABK)
+  Hohe Buchleuthe 3 // 87600 Kaufbeuren
+  Schwaben › Bayern › Germany
+  www.aktienbrauerei.de
+
+Kellerbier Naturtrüb, 5.1%, kellerbier
+Fendt Dieselrossöl,   5.9%, maerzen
+
+
+[A. Le Coq]
+  Laulupeo Pst 15 // 50050 Tartu
+  Tartu › Estonia
+  www.alecoq.ee
+
+A. Le Coq Porter,      6.5%, porter
+A. Le Coq Double Bock,   7%, bock
+
+
+[Alhambra]
+  Avenida de Murcia 1 // 18012 Granada
+  www.cervezasalhambra.es
+  Andalucía › Spain
+
+Alhambra Premium Lager, 4.6%, lager
+Mezquita,               7.2%, weizenbier
+
+
+[Allersheim]
+  Allersheim 6 // 37603 Holzminden
+  Niedersachsen › Germany
+  www.brauerei-allersheim.de
+
+Allersheimer Landbier, 5%, pilsner
+##  Allersheimer Blue Moon, 1.9%, colabiermix  ## Cola-Bier-Mix
+
+
+[Almond 22]    ##  Birra Almond '22
+  Contrada Remartello 47/H // 65014 Loreto Aprutino
+  www.birraalmond.com
+  Pescara › Abruzzo › Italy
+
+## old address (until 2014?): Via Colle di Mezzo 25 // 65010 Spoltore
+
+Torbata,  8.7%, barleywine
+Farrotta, 5.7%, dinkelbier
+
+
+[Alpirsbach]   ## Alpirsbacher Klosterbräu
+  Marktplatz 1 // 72275 Alpirsbach
+  Baden-Württemberg › Germany
+  www.alpirsbacher.de
+
+Alpirsbacher Klosterbräu Kleiner Mönch,  5.2%, lager
+Alpirsbacher Klosterbräu Schwarzes Pils, 4.9%, pilsner    ## note: no longer available
+
+
+[Altöttinger]   ## Altöttinger Hell-Bräu
+  Herrenmühlstraße 15 // 84503 Altötting
+  Oberbayern › Bayern › Germany
+  www.hellbraeu.de
+
+Altöttinger Bayrisch Dunkel, 5.2%, dunkel
+Altöttinger Fein-Herb, 5%, lager
+
+
+[Amber]    ## Browar Amber
+  Bielkówko // ul. Gregorkiewicza 1 // 83-050 Kolbudy
+  Gdańsk › Pomorskie [Pomeranian] › Poland
+  www.browar-amber.pl
+
+Koźlak, 6.5%, dunkler_bock
+Żywe,   6.2%, pilsner
+
+
+[Andechs]  ## Klosterbrauerei Andechs
+  Bergstr. 2 // 82346 Andechs
+  Oberbayern › Bayern › Germany
+  www.andechs.de
+
+Andechser Bergbock Hell, 7%, bock
+Andechser Doppelbock Dunkel, 7%, dunkler_bock
+
+
+[Anker]  ## Brouwerij Het Anker
+  Guido Gezellelaan 49 // 2800 Mechelen
+  Antwerpen › Vlaanderen › Belgium
+  www.hetanker.be
+
+Gouden Carolus Classic,    8.5%, strong_dark_ale
+Gouden Carolus Christmas, 10.5%, strong_dark_ale
+
+
+[Ankerbrauerei Nördlingen]   ## Ankerbräu
+  Ankergasse 4 // 86720 Nördlingen
+  www.ankerbrauerei.de
+  Schwaben › Bayern › Germany
+
+Ankerbräu Lager Hell, 5%, lager
+Nördlinger Premium Pils, 4.7%, pilsner
+
+
+[Apatinska Pivara]
+  Trg oslobodjenja 5 // 25260 Apatin
+  www.jelenpivo.com
+  West Bačka › Vojvodina › Serbia
+
+Jelen Pivo, 5%, lager
+Apatinsko Pivo, 5%, lager
+

data/test/test_reader_quick.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_reader_quick.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+
+class TestReaderQuick < MiniTest::Test
+
+  def setup
+    #  delete all beers, brands, breweries in in-memory only db
+    BeerDb.delete!
+  end
+
+  def test_reader
+
+    reader = BeerDb::QuickReader.from_file( "#{BeerDb.root}/test/data/great-beers-europe.txt")
+    reader.read()
+
+    assert true
+  end
+
+end # class TestReaderQuick

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerdb-models
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -79,13 +79,18 @@ files:
 - lib/beerdb/reader.rb
 - lib/beerdb/reader_file.rb
 - lib/beerdb/reader_zip.rb
+- lib/beerdb/readers/beer.rb
+- lib/beerdb/readers/brewery.rb
+- lib/beerdb/readers/quick.rb
 - lib/beerdb/schema.rb
 - lib/beerdb/serializers/beer.rb
 - lib/beerdb/serializers/brewery.rb
 - lib/beerdb/stats.rb
 - lib/beerdb/version.rb
+- test/data/great-beers-europe.txt
 - test/helper.rb
 - test/test_fixture_matchers.rb
+- test/test_reader_quick.rb
 - test/test_values.rb
 homepage: https://github.com/beerkit/beer.db.models
 licenses:
@@ -115,4 +120,5 @@ specification_version: 4
 summary: beerdb-models - beer.db schema 'n' models for easy (re)use
 test_files:
 - test/test_values.rb
+- test/test_reader_quick.rb
 - test/test_fixture_matchers.rb