beerdb 0.8.2 → 0.9.0

data/README.md

@@ -119,6 +119,12 @@ Just install the gem:
     $ gem install beerdb
 
 
+## Free Open Public Domain Datasets
+
+- [`beer.db`](https://github.com/openbeer) - free open public domain beer n brewery data for use in any (programming) language
+
+
+
 ## License
 
 The `beerdb` scripts are dedicated to the public domain.
@@ -126,5 +132,6 @@ Use it as you please with no restrictions whatsoever.
 
 ## Questions? Comments?
 
-Send them along to the [Open Beer & Brewery Database Forum/Mailing List](http://groups.google.com/group/beerdb). Thanks!
+Send them along to the [Open Beer & Brewery Database Forum/Mailing List](http://groups.google.com/group/beerdb).
+Thanks!
 

data/Rakefile

@@ -1,6 +1,7 @@
 require 'hoe'
 require './lib/beerdb/version.rb'
 
+
 Hoe.spec 'beerdb' do
   
   self.version = BeerDb::VERSION
@@ -21,8 +22,7 @@ Hoe.spec 'beerdb' do
     ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
 
-    ['worlddb', '~> 1.7'],  # NB: worlddb already includes
-                               #         - commander
+    ['worlddb', '~> 1.8'],     # NB: worlddb already includes
                                #         - logutils
                                #         - textutils
                                
@@ -38,70 +38,3 @@ Hoe.spec 'beerdb' do
 
 end
 
-
-
-##############################
-## for testing 
-##
-## NB: use rake -I ../world.db.ruby/lib -I ./lib beerdb:build
-
-namespace :beerdb do
-  
-  BUILD_DIR = "./build"
-  
-  BEER_DB_PATH = "#{BUILD_DIR}/beer.db"
-
-  DB_CONFIG = {
-    :adapter   =>  'sqlite3',
-    :database  =>  BEER_DB_PATH
-  }
-
-  directory BUILD_DIR
-
-  task :clean do
-    rm BEER_DB_PATH if File.exists?( BEER_DB_PATH )
-  end
-
-  task :env => BUILD_DIR do
-    require 'worlddb'   ### NB: for local testing use rake -I ./lib dev:test e.g. do NOT forget to add -I ./lib
-    require 'beerdb'
-    require 'logutils/db'
-
-    LogUtils::Logger.root.level = :debug
-
-    pp DB_CONFIG
-    ActiveRecord::Base.establish_connection( DB_CONFIG )
-  end
-
-  task :create => :env do
-    LogDb.create
-    WorldDb.create
-    BeerDb.create
-  end
-
-  task :importworld => :env do
-    WorldDb.read_setup( 'setups/sport.db.admin', '../world.db', skip_tags: true )  # populate world tables
-    WorldDb.tables
-  end
-
-  task :importbeer => :env do
-    BeerDb.read_setup( 'setups/at', '../beer.db' )
-    BeerDb.tables
-  end
-
-  task :deletebeer => :env do
-    BeerDb.delete!
-  end
-
-
-  desc 'beerdb - build from scratch'
-  task :build => [:clean, :create, :importworld, :importbeer] do
-    puts 'Done.'
-  end
-
-  desc 'beerdb - update'
-  task :update => [:deletebeer, :importbeer] do
-    puts 'Done.'
-  end
-
-end  # namespace :beerdb

data/lib/beerdb/models/beer.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Beer < ActiveRecord::Base
 
@@ -10,15 +10,15 @@ class Beer < ActiveRecord::Base
   #   self.create_or_update_from_values
   extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, is_taglist? etc.
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Models::Region',  :foreign_key => 'region_id'
-  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
-  belongs_to :brand,   :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brand_id'
-  belongs_to :brewery, :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brewery_id'
+  belongs_to :brand,   :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brand_id'
+  belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
 
-  has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'
-  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Models::Tag'
+  has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
+  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
@@ -191,4 +191,4 @@ class Beer < ActiveRecord::Base
 
 end # class Beer
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/bookmark.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Bookmark < ActiveRecord::Base
 
@@ -10,22 +10,22 @@ class Bookmark < ActiveRecord::Base
 
   ### fix - how to do it with has_many macro? use finder_sql?
   def drinks
-    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    ## todo: check/assert bookmarkable_type == BeerDB::Model::Beer
     Drink.where( user_id: user_id, beer_id: bookmarkable_id )
   end
 
   def notes
-    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    ## todo: check/assert bookmarkable_type == BeerDB::Model::Beer
     Note.where( user_id: user_id, beer_id: bookmarkable_id )
   end
 
 
   ## todo: check: how to handle polymorphic best for getting beer for bookmarkable?
   def beer
-    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    ## todo: check/assert bookmarkable_type == BeerDB::Model::Beer
     Beer.find( bookmarkable_id )
   end
 
 end # class Bookmark
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/brand.rb

@@ -1,19 +1,19 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Brand < ActiveRecord::Base
 
   # NB: use extend - is_<type>? become class methods e.g. self.is_<type>?
   extend TextUtils::ValueHelper  # e.g. self.find_key_n_title, self.is_year?, self.is_region?, is_address?, is_taglist? etc.
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Models::Region',  :foreign_key => 'region_id'
-  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
-  belongs_to :brewery, :class_name => 'BeerDb::Models::Brewery',  :foreign_key => 'brewery_id'
+  belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
 
-  has_many   :beers,   :class_name => 'BeerDb::Models::Beer',     :foreign_key => 'brand_id'
+  has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brand_id'
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
@@ -57,4 +57,4 @@ class Brand < ActiveRecord::Base
 
 end # class Brand
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/brewery.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Brewery < ActiveRecord::Base
 
@@ -13,15 +13,15 @@ class Brewery < ActiveRecord::Base
 
   self.table_name = 'breweries'
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'WorldDb::Models::Region',  :foreign_key => 'region_id'
-  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'WorldDb::Model::Region',  :foreign_key => 'region_id'
+  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
-  has_many   :beers,   :class_name => 'BeerDb::Models::Beer',     :foreign_key => 'brewery_id'
-  has_many   :brands,  :class_name => 'BeerDb::Models::Brand',    :foreign_key => 'brand_id'
+  has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brewery_id'
+  has_many   :brands,  :class_name => 'BeerDb::Model::Brand',    :foreign_key => 'brand_id'
 
-  has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'
-  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Models::Tag'
+  has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
+  has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
@@ -230,4 +230,4 @@ class Brewery < ActiveRecord::Base
 end # class Brewery
 
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/city.rb

@@ -1,9 +1,11 @@
-module WorldDb::Models
+module WorldDb::Model
 
 class City
-    has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'city_id'
-    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'city_id'
-    has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'city_id'
+    has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'city_id'
+    has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'city_id'
+    has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'city_id'
 end # class Country
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+
+

data/lib/beerdb/models/country.rb

@@ -1,10 +1,9 @@
-
-module WorldDb::Models
+module WorldDb::Model
 
 class Country
-    has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'country_id'
-    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'country_id'
-    has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'country_id'
+  has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'country_id'
+  has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'country_id'
+  has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'country_id'
 end # class Country
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/beerdb/models/drink.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Drink < ActiveRecord::Base
 
-  belongs_to :beer, class_name: 'BeerDb::Models::Beer'
-  belongs_to :user, class_name: 'BeerDb::Models::User'
+  belongs_to :beer, class_name: 'BeerDb::Model::Beer'
+  belongs_to :user, class_name: 'BeerDb::Model::User'
 
   before_save :on_before_save
 
@@ -19,4 +19,4 @@ class Drink < ActiveRecord::Base
 
 end # class Drink
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/forward.rb

@@ -1,19 +1,20 @@
 ### forward references
 ##   require first to resolve circular references
 
-module BeerDb::Models
+
+module BeerDb::Model
 
   ## todo: why? why not use include WorldDb::Models here???
 
-  Continent = WorldDb::Models::Continent
-  Country   = WorldDb::Models::Country
-  Region    = WorldDb::Models::Region
-  City      = WorldDb::Models::City
+  Continent = WorldDb::Model::Continent
+  Country   = WorldDb::Model::Country
+  Region    = WorldDb::Model::Region
+  City      = WorldDb::Model::City
 
-  Tag       = WorldDb::Models::Tag
-  Tagging   = WorldDb::Models::Tagging
+  Tag       = WorldDb::Model::Tag
+  Tagging   = WorldDb::Model::Tagging
 
-  Prop      = WorldDb::Models::Prop
+  Prop      = WorldDb::Model::Prop
 
   class Beer < ActiveRecord::Base ; end
   class Brand < ActiveRecord::Base ; end
@@ -27,10 +28,11 @@ module BeerDb::Models
 end
 
 
-module WorldDb::Models
+module WorldDb::Model
 
-  Beer    = BeerDb::Models::Beer
-  Brand   = BeerDb::Models::Brand
-  Brewery = BeerDb::Models::Brewery
+  Beer    = BeerDb::Model::Beer
+  Brand   = BeerDb::Model::Brand
+  Brewery = BeerDb::Model::Brewery
 
 end
+

data/lib/beerdb/models/note.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class Note < ActiveRecord::Base
 
-  belongs_to :beer, class_name: 'BeerDb::Models::Beer'
-  belongs_to :user, class_name: 'BeerDb::Models::User'
+  belongs_to :beer, class_name: 'BeerDb::Model::Beer'
+  belongs_to :user, class_name: 'BeerDb::Model::User'
 
 end # class Note
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/models/region.rb

@@ -1,10 +1,10 @@
-
-module WorldDb::Models
+module WorldDb::Model
 
 class Region
-    has_many :beers,     :class_name => 'BeerDb::Models::Beer',    :foreign_key => 'region_id'
-    has_many :brands,    :class_name => 'BeerDb::Models::Brand',   :foreign_key => 'region_id'
-    has_many :breweries, :class_name => 'BeerDb::Models::Brewery', :foreign_key => 'region_id'
+    has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'region_id'
+    has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'region_id'
+    has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'region_id'
 end # class Region
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/beerdb/models/tag.rb

@@ -1,9 +1,8 @@
-
-module WorldDb::Models
+module WorldDb::Model
 
 class Tag
-  has_many :beers,     :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Models::Beer',    :class_name => 'BeerDb::Models::Beer'
-  has_many :breweries, :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Models::Brewery', :class_name => 'BeerDb::Models::Brewery'
+  has_many :beers,     :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Model::Beer',    :class_name => 'BeerDb::Model::Beer'
+  has_many :breweries, :through => :taggings, :source => :taggable, :source_type => 'BeerDb::Model::Brewery', :class_name => 'BeerDb::Model::Brewery'
 end # class Country
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/beerdb/models/user.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
 class User < ActiveRecord::Base
 
@@ -23,4 +23,5 @@ class User < ActiveRecord::Base
 
 end # class User
 
-end # module BeerDb::Models
+end # module BeerDb::Model
+

data/lib/beerdb/reader.rb

@@ -6,19 +6,19 @@ module BeerDb
 module Matcher
 
   def match_beers_for_country( name, &blk )
-    match_xxx_for_country( name, 'beers', blk )
+    match_xxx_for_country( name, 'beers', &blk )
   end
 
   def match_beers_for_country_n_region( name, &blk )
-    match_xxx_for_country_n_region( name, 'beers', blk )
+    match_xxx_for_country_n_region( name, 'beers', &blk )
   end
 
   def match_breweries_for_country( name, &blk )
-    match_xxx_for_country( name, 'breweries', blk )
+    match_xxx_for_country( name, 'breweries', &blk )
   end
 
   def match_breweries_for_country_n_region( name, &blk )
-    match_xxx_for_country_n_region( name, 'breweries', blk )
+    match_xxx_for_country_n_region( name, 'breweries', &blk )
   end
 
 end # module Matcher
@@ -30,7 +30,7 @@ class Reader
 
   include BeerDb::Models
 
-  include WorldDb::Matcher
+  include WorldDb::Matcher   ## fix: move to BeerDb::Matcher module ??? - cleaner?? why? why not?
   include BeerDb::Matcher # lets us use match_teams_for_country etc.
 
   attr_reader :include_path
@@ -151,12 +151,17 @@ class Reader
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    # NB: region lookup requires country id (region key only unique for country)
-    region  = Region.find_by_key_and_country_id!( region_key, country.id )
-    logger.debug "Region #{region.key} >#{region.title}<"
-
     more_attribs[ :country_id ] = country.id
-    more_attribs[ :region_id  ] = region.id
+
+    # note: region lookup requires country id (region key only unique for country)
+    region  = Region.find_by_key_and_country_id( region_key, country.id )
+    if region.nil?
+      # note: allow unknown region keys; issue warning n skip region
+      logger.warn "Region w/ key >#{region_key}< not found; skip adding region"
+    else
+      logger.debug "Region #{region.key} >#{region.title}<"
+      more_attribs[ :region_id  ] = region.id
+    end
 
     more_attribs[ :txt ] = name  # store source ref
 

data/lib/beerdb/serializers/beer.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
   class BeerSerializer
 
@@ -42,4 +42,4 @@ module BeerDb::Models
 
   end # class BeerSerializer
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/serializers/brewery.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module BeerDb::Models
+module BeerDb::Model
 
   class BrewerySerializer
 
@@ -43,4 +43,4 @@ module BeerDb::Models
 
   end # class BrewerySerializer
 
-end # module BeerDb::Models
+end # module BeerDb::Model

data/lib/beerdb/version.rb

@@ -1,4 +1,6 @@
 
 module BeerDb
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end
+
+

data/lib/beerdb.rb

@@ -38,6 +38,12 @@ require 'beerdb/models/drink'     # db model extensions - move to its own addon
 require 'beerdb/models/bookmark'  # db model extensions - move to its own addon gem?
 require 'beerdb/models/note'      # db model extensions - move to its own addon gem?
 
+## add backwards compatible namespace (delete later!)
+module BeerDb
+  Models = Model
+end
+
+
 require 'beerdb/serializers/beer'
 require 'beerdb/serializers/brewery'
 
@@ -71,7 +77,7 @@ module BeerDb
     CreateDbExtrasDrinks.new.up
     CreateDbExtrasNotes.new.up
 
-    BeerDb::Models::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
+    BeerDb::Model::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
   end
 
 
@@ -79,7 +85,7 @@ module BeerDb
   module CodeReaderContext
     #  make models available w/o namespace
     #  e.g. lets you use Beer instead of BeerDb::Models::Beer
-    include BeerDb::Models
+    include BeerDb::Models    # check does it work w/ alias e.g. Models == Model
     ## <evaluated code here>
   end
 

data/test/helper.rb

@@ -24,14 +24,14 @@ require 'active_record'
 require 'beerdb'
 require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
 
-Country = WorldDb::Models::Country
-Region  = WorldDb::Models::Region
+Country = WorldDb::Model::Country
+Region  = WorldDb::Model::Region
 
 ## todo: get all models aliases (e.g. from console script)
 
-Beer    = BeerDb::Models::Beer
-Brand   = BeerDb::Models::Brand
-Brewery = BeerDb::Models::Brewery
+Beer    = BeerDb::Model::Beer
+Brand   = BeerDb::Model::Brand
+Brewery = BeerDb::Model::Brewery
 
 
 def setup_in_memory_db

data/test/test_fixture_matchers.rb

@@ -7,7 +7,8 @@ require 'helper'
 
 class TestFixtureMatchers < MiniTest::Unit::TestCase
 
-  include BeerDb::FixtureMatcher
+  include WorldDb::Matcher
+  include BeerDb::Matcher
 
 
   def test_country
@@ -16,7 +17,9 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
       'europe/at/beers',
       'europe/at-austria/beers',
       'at-austria/beers',
-      'at-austria!/beers'
+      'at-austria!/beers',
+      '1--at-austria--central/beers',
+      'europe/1--at-austria--central/beers'
     ]
 
     beers_at.each do |name|
@@ -30,7 +33,9 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
       'europe/at/breweries',
       'europe/at-austria/breweries',
       'at-austria/breweries',
-      'at-austria!/breweries'
+      'at-austria!/breweries',
+      '1--at-austria--central/breweries',
+      'europe/1--at-austria--central/breweries'
     ]
 
     breweries_at.each do |name|
@@ -47,7 +52,9 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
     beers_at = [
       'europe/at-austria/w-wien/beers',
       'at-austria/w-wien/beers',
-      'at-austria!/w-wien/beers'
+      'at-austria!/w-wien/beers',
+      '1--at-austria--central/1--w-wien--eastern/beers',
+      'europe/1--at-austria--central/1--w-wien--eastern/beers'
     ]
 
     beers_at.each do |name|
@@ -61,7 +68,9 @@ class TestFixtureMatchers < MiniTest::Unit::TestCase
     breweries_at = [
       'europe/at-austria/w-wien/breweries',
       'at-austria/w-wien/breweries',
-      'at-austria!/w-wien/breweries'
+      'at-austria!/w-wien/breweries',
+      '1--at-austria--central/1--w-wien--eastern/breweries',
+      'europe/1--at-austria--central/1--w-wien--eastern/breweries'
     ]
 
     breweries_at.each do |name|

data/test/test_values.rb

@@ -8,6 +8,7 @@
 
 require 'helper'
 
+
 class TestValues < MiniTest::Unit::TestCase
 
   def setup
@@ -33,14 +34,14 @@ class TestValues < MiniTest::Unit::TestCase
     beer = Beer.create_or_update_from_values( values, more_attribs )
 
     beer2 = Beer.find_by_key!( key )
-    assert( beer.id == beer2.id )
-
-    assert( beer.title         == values[0] )
-    assert( beer.country_id    == AT.id )
-    assert( beer.country.title == AT.title )
-    assert( beer.abv           == 5.2 )
-    assert( beer.og            == 11.8 )
-    assert( beer.srm           == nil )
+    assert_equal beer.id,  beer2.id
+
+    assert_equal beer.title,         values[0]
+    assert_equal beer.country_id,    AT.id 
+    assert_equal beer.country.title, AT.title
+    assert_equal beer.abv,           5.2
+    assert_equal beer.og,            11.8
+    assert_equal beer.srm,           nil
   end
 
   def test_load_brewery_values
@@ -67,24 +68,24 @@ class TestValues < MiniTest::Unit::TestCase
     by = Brewery.create_or_update_from_values( values, more_attribs )
 
     by2 = Brewery.find_by_key!( key )
-    assert( by.id == by2.id )
+    assert_equal by.id, by2.id
 
-    assert( by.title         == values[1] )
-    assert( by.country_id    == AT.id )
-    assert( by.country.title == AT.title )
-    assert( by.since         == 1838 )
-    assert( by.web           == 'www.ottakringer.at' )
-    assert( by.address       == '1160 Wien // Ottakringer Platz 1' )
-    assert( by.grade         == 4 )
+    assert_equal by.title,         values[1]
+    assert_equal by.country_id,    AT.id
+    assert_equal by.country.title, AT.title
+    assert_equal by.since,         1838
+    assert_equal by.web,           'www.ottakringer.at'
+    assert_equal by.address,       '1160 Wien // Ottakringer Platz 1'
+    assert_equal by.grade,         4
 
     # check auto-created brand
 
     br = Brand.find_by_key!( 'ottakringer')
 
-    assert( br.title         == 'Ottakringer' )
-    assert( br.brewery_id    == by.id )
-    assert( br.brewery.title == by.title )
-    assert( br.country_id    == by.country_id )
+    assert_equal br.title,         'Ottakringer'
+    assert_equal br.brewery_id,    by.id
+    assert_equal br.brewery.title, by.title
+    assert_equal br.country_id,    by.country_id
   end
 
 
@@ -111,10 +112,10 @@ class TestValues < MiniTest::Unit::TestCase
     by = Brewery.create_or_update_from_values( values, more_attribs )
 
     by2 = Brewery.find_by_key!( key )
-    assert( by.id == by2.id )
+    assert_equal by.id, by2.id
 
-    assert( by.title         == 'Ottakringer Brauerei' )
-    assert( by.grade         == 2 )
+    assert_equal by.title, 'Ottakringer Brauerei'
+    assert_equal by.grade, 2
   end
 
   def test_load_brewery_values_w_grade_in_synonyms
@@ -143,11 +144,11 @@ class TestValues < MiniTest::Unit::TestCase
     by = Brewery.create_or_update_from_values( values, more_attribs )
 
     by2 = Brewery.find_by_key!( key )
-    assert( by.id == by2.id )
+    assert_equal by.id, by2.id
 
-    assert( by.title         == 'Ottakringer Brauerei' )
-    assert( by.synonyms      == 'Otta' )
-    assert( by.grade         == 2 )
+    assert_equal by.title,    'Ottakringer Brauerei'
+    assert_equal by.synonyms, 'Otta'
+    assert_equal by.grade,     2
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &19996224 !ruby/object:Gem::Requirement
+  requirement: &21954864 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *19996224
+  version_requirements: *21954864
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &19995804 !ruby/object:Gem::Requirement
+  requirement: &21954264 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *19995804
+  version_requirements: *21954264
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &19995360 !ruby/object:Gem::Requirement
+  requirement: &21953868 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *19995360
+  version_requirements: *21953868
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19995060 !ruby/object:Gem::Requirement
+  requirement: &21953472 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +54,18 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *19995060
+  version_requirements: *21953472
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19994712 !ruby/object:Gem::Requirement
+  requirement: &21953076 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *19994712
+  version_requirements: *21953076
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: beerdb
-rubygems_version: 1.7.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: beerdb - beer.db command line tool