beerdb 0.6.15 → 0.7.0

data/Manifest.txt

@@ -18,6 +18,8 @@ lib/beerdb/models/region.rb
 lib/beerdb/models/tag.rb
 lib/beerdb/reader.rb
 lib/beerdb/schema.rb
+lib/beerdb/serializers/beer.rb
+lib/beerdb/serializers/brewery.rb
 lib/beerdb/server.rb
 lib/beerdb/server/public/style.css
 lib/beerdb/server/views/_debug.erb
@@ -27,3 +29,5 @@ lib/beerdb/server/views/index.erb
 lib/beerdb/server/views/layout.erb
 lib/beerdb/stats.rb
 lib/beerdb/version.rb
+test/helper.rb
+test/test_values.rb

data/Rakefile

@@ -21,7 +21,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.6'],  # NB: worlddb already includes
+    ['worlddb', '~> 1.7'],  # NB: worlddb already includes
                                #         - commander
                                #         - logutils
                                #         - textutils

data/lib/beerdb/models/beer.rb

@@ -4,9 +4,11 @@ module BeerDb::Models
 
 class Beer < ActiveRecord::Base
 
+  extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
+
   # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
   #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. is_year?, is_region?, is_address?, is_taglist? etc.
+  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'
@@ -47,117 +49,100 @@ class Beer < ActiveRecord::Base
     puts "*** depreceated fn api - use og="
     self.og = value
   end
+  
+  def as_json_v2( opts={} )
+    # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
+    BeerSerializer.new( self ).as_json
+  end
 
 
-  def self.create_or_update_from_values( new_attributes, values )
-    
-    ## fix: add/configure logger for ActiveRecord!!!
+  def self.create_or_update_from_values( values, more_attribs={} )
+
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+      
+    # check for optional values
+    Beer.create_or_update_from_attribs( attribs, more_values )
+  end
+
+
+  def self.create_or_update_from_attribs( attribs, values )
+
+    # fix: add/configure logger for ActiveRecord!!!
     logger = LogKernel::Logger.root
     
     value_tag_keys    = []
      
-    ## check for grades (e.g. ***/**/*) in titles (will add new_attributes[:grade] to hash)
+    ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
     ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
-    new_attributes[ :grade ] ||= 4
+    attribs[ :grade ] ||= 4
            
-    ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-      
-    if new_attributes[:tags].present?
-      more_tag_keys = new_attributes[:tags].split('|')
-      new_attributes.delete(:tags)
-
-      ## unify; replace _ w/ space; remove leading n trailing whitespace
-      more_tag_keys = more_tag_keys.map do |key|
-        key = key.gsub( '_', ' ' )
-        key = key.strip
-        key
-      end
-
-      value_tag_keys += more_tag_keys
-    end
-
+    ### check for "default" tags - that is, if present attribs[:tags] remove from hash
+    value_tag_keys += find_tags_in_attribs!( attribs )
 
     ## check for optional values
     values.each_with_index do |value,index|
-      if value =~ /^country:/   ## country:
-        value_country_key = value[8..-1]  ## cut off country: prefix
-        value_country = Country.find_by_key!( value_country_key )
-        new_attributes[ :country_id ] = value_country.id
-      elsif value =~ /^region:/   ## region:
-        value_region_key = value[7..-1]  ## cut off region: prefix
-        value_region = Region.find_by_key_and_country_id!( value_region_key, new_attributes[:country_id] )
-        new_attributes[ :region_id ] = value_region.id
-      elsif is_region?( value )  ## assume region code e.g. TX or N
-        value_region = Region.find_by_key_and_country_id!( value.downcase, new_attributes[:country_id] )
-        new_attributes[ :region_id ] = value_region.id
-      elsif value =~ /^city:/   ## city:
-        value_city_key = value[5..-1]  ## cut off city: prefix
-        value_city = City.find_by_key( value_city_key )
-        if value_city.present?
-          new_attributes[ :city_id ] = value_city.id
-        else
-          ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
-          logger.warn "city with key #{value_city_key} missing"
-        end
-      elsif value =~ /^by:/   ## by:  -brewed by/brewery
-        value_brewery_key = value[3..-1]  ## cut off by: prefix
-        value_brewery = Brewery.find_by_key!( value_brewery_key )
-        new_attributes[ :brewery_id ] = value_brewery.id
-
-        # for easy queries cache city and region ids
+      if match_country(value) do |country|
+           attribs[ :country_id ] = country.id
+         end
+      elsif match_region_for_country(value, attribs[:country_id]) do |region|
+              attribs[ :region_id ] = region.id
+            end
+      elsif match_city(value) do |city|
+              if city.present?
+                attribs[ :city_id ] = city.id
+              else
+                ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
+                logger.warn "city with key #{value[5..-1]} missing for beer #{attribs[:key]}"
+              end
+            end
+      elsif match_brewery(value) do |brewery|
+              attribs[ :brewery_id ] = brewery.id
+
+              # for easy queries cache city and region ids
           
-        # 1) check if brewery has city - if yes, use it for beer too
-        if value_brewery.city.present?
-          new_attributes[ :city_id ] = value_brewery.city.id
-        end
-
-        # 2) check if brewery has city w/ region if yes, use it for beer to
-        #   if not check for region for brewery
-        if value_brewery.city.present? && value_brewery.city.region.present?
-          new_attributes[ :region_id ] = value_brewery.city.region.id
-        elsif value_brewery.region.present?
-          new_attributes[ :region_id ] = value_brewery.region.id
-        end
-
-      elsif is_year?( value )  # founded/established year e.g. 1776
-        new_attributes[ :since ] = value.to_i
-      elsif is_website?( value )   # check for url/internet address e.g. www.ottakringer.at
-        # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
-        new_attributes[ :web ] = value
-      elsif value =~ /^<?\s*(\d+(?:\.\d+)?)\s*%$/  ## abv (alcohol by volumee)
-        ## nb: allow leading < e.g. <0.5%
-        value_abv_str = $1.dup   # convert to decimal? how? use float?
-        new_attributes[ :abv ] = value_abv_str
-      elsif value =~ /^(\d+(?:\.\d+)?)°$/  ## plato (stammwuerze/gravity?) e.g. 11.2°
-        ## nb: no whitespace allowed between ° and number e.g. 11.2°
-        value_og_str = $1.dup   # convert to decimal? how? use float?
-        new_attributes[ :og ] = value_og_str
-      elsif value =~ /^(\d+(?:\.\d+)?)\s*kcal(?:\/100ml)?$/  ## kcal
-         ## nb: allow 44.4 kcal/100ml or 44.4 kcal or 44.4kcal
-        value_kcal_str = $1.dup   # convert to decimal? how? use float?
-        new_attributes[ :kcal ] = value_kcal_str
+              # 1) check if brewery has city - if yes, use it for beer too
+              if brewery.city.present?
+                attribs[ :city_id ] = brewery.city.id
+              end
+
+              # 2) check if brewery has city w/ region if yes, use it for beer to
+              #   if not check for region for brewery
+              if brewery.city.present? && brewery.city.region.present?
+                attribs[ :region_id ] = brewery.city.region.id
+              elsif brewery.region.present?
+                attribs[ :region_id ] = brewery.region.id
+              end
+            end
+      elsif match_year( value ) do |num|  # founded/established year e.g. 1776
+              attribs[ :since ] = num
+            end
+      elsif match_website( value ) do |website|  # check for url/internet address e.g. www.ottakringer.at
+              attribs[ :web ] = website
+            end
+      elsif match_abv( value ) do |num|   # abv (alcohol by volume)
+              # nb: also allows leading < e.g. <0.5%
+              attribs[ :abv ] = num
+            end
+      elsif match_og( value ) do |num|  # plato (stammwuerze/gravity?) e.g. 11.2°
+              # nb: no whitespace allowed between ° and number e.g. 11.2°
+              attribs[ :og ] = num
+            end
+      elsif match_kcal( value ) do |num| # kcal
+              # nb: allow 44.4 kcal/100ml or 44.4 kcal or 44.4kcal
+              attribs[ :kcal ] = num
+            end
       elsif (values.size==(index+1)) && is_taglist?( value )  # tags must be last entry
-
         logger.debug "   found tags: >>#{value}<<"
-
-        tag_keys = value.split('|')
-  
-        ## unify; replace _ w/ space; remove leading n trailing whitespace
-        tag_keys = tag_keys.map do |key|
-          key = key.gsub( '_', ' ' )
-          key = key.strip
-          key
-        end
-          
-        value_tag_keys += tag_keys
+        value_tag_keys += find_tags( value )
       else
         # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+        logger.warn "unknown type for value >#{value}< - key #{attribs[:key]}"
       end
     end # each value
 
-    #  rec = Beer.find_by_key_and_country_id( new_attributes[ :key ], new_attributes[ :country_id] )
-    rec = Beer.find_by_key( new_attributes[ :key ] )
+    #  rec = Beer.find_by_key_and_country_id( attribs[ :key ], attribs[ :country_id] )
+    rec = Beer.find_by_key( attribs[ :key ] )
 
     if rec.present?
       logger.debug "update Beer #{rec.id}-#{rec.key}:"
@@ -166,9 +151,9 @@ class Beer < ActiveRecord::Base
       rec = Beer.new
     end
       
-    logger.debug new_attributes.to_json
+    logger.debug attribs.to_json
 
-    rec.update_attributes!( new_attributes )
+    rec.update_attributes!( attribs )
 
     ##################
     # add taggings 

data/lib/beerdb/models/brand.rb

@@ -4,6 +4,9 @@ module BeerDb::Models
 
 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'
@@ -14,6 +17,44 @@ class Brand < ActiveRecord::Base
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
+
+  def self.create_or_update_from_values( values, more_attribs = {} )
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+
+    Brand.create_or_update_from_attribs( attribs, more_values )
+  end
+
+  # convenience helper Brand.create_or_update_from_title
+  def self.create_or_update_from_title( title, more_attribs = {} )
+    values = [title]
+    Brand.create_or_update_from_values( values, more_attribs )
+  end
+
+
+  def self.create_or_update_from_attribs( attribs, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check for grades (e.g. ***/**/*) in titles (will add attribs[:grade] to hash)
+    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
+    attribs[:grade] ||= 4
+
+    rec = Brand.find_by_key( attribs[:key] )
+
+    if rec.present?
+      logger.debug "update Brand #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Brand:"
+      rec = Brand.new
+    end
+      
+    logger.debug attribs.to_json
+
+    rec.update_attributes!( attribs )
+  end
+
 end # class Brand
 
 end # module BeerDb::Models

data/lib/beerdb/models/brewery.rb

@@ -4,10 +4,12 @@ module BeerDb::Models
 
 class Brewery < ActiveRecord::Base
 
+  extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
+
   # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
   #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. is_year?, is_region?, is_address?, is_taglist? etc.
-  extend TextUtils::AddressHelper  # e.g normalize_address, find_city_for_country, etc.
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, is_address?, is_taglist? etc.
+  extend TextUtils::AddressHelper  # e.g self.normalize_addr, self.find_city_in_addr, etc.
 
   self.table_name = 'breweries'
 
@@ -40,9 +42,23 @@ class Brewery < ActiveRecord::Base
     self.since = value
   end
 
+  def as_json_v2( opts={} )
+    # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
+    BrewerySerializer.new( self ).as_json
+  end
+
 
 
-  def self.create_or_update_from_values( new_attributes, values )
+  def self.create_or_update_from_values( values, more_attribs={} )
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
+
+    # check for optional values
+    Brewery.create_or_update_from_attribs( attribs, more_values )
+  end
+
+
+  def self.create_or_update_from_attribs( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
     logger = LogKernel::Logger.root
@@ -55,78 +71,49 @@ class Brewery < ActiveRecord::Base
     new_attributes[ :grade ] ||= 4
 
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-
-    if new_attributes[:tags].present?
-      more_tag_keys = new_attributes[:tags].split('|')
-      new_attributes.delete(:tags)
-
-      ## unify; replace _ w/ space; remove leading n trailing whitespace
-      more_tag_keys = more_tag_keys.map do |key|
-        key = key.gsub( '_', ' ' )
-        key = key.strip
-        key
-      end
-
-      value_tag_keys += more_tag_keys
-    end
-
+    value_tag_keys += find_tags_in_attribs!( new_attributes )
 
     ## check for optional values
     values.each_with_index do |value,index|
-      if value =~ /^country:/   ## country:
-        value_country_key = value[8..-1]  ## cut off country: prefix
-        value_country = Country.find_by_key!( value_country_key )
-        new_attributes[ :country_id ] = value_country.id
-      elsif value =~ /^region:/   ## region:
-        value_region_key = value[7..-1]  ## cut off region: prefix
-        value_region = Region.find_by_key_and_country_id!( value_region_key, new_attributes[:country_id] )
-        new_attributes[ :region_id ] = value_region.id
-      elsif is_region?( value )  ## assume region code e.g. TX or N
-        value_region = Region.find_by_key_and_country_id!( value.downcase, new_attributes[:country_id] )
-        new_attributes[ :region_id ] = value_region.id
-      elsif value =~ /^city:/   ## city:
-        value_city_key = value[5..-1]  ## cut off city: prefix
-        value_city = City.find_by_key( value_city_key )
-        if value_city.present?
-          new_attributes[ :city_id ] = value_city.id
-        else
-          ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
-          logger.warn "city with key #{value_city_key} missing"
-        end
-
-        ## for easy queries: cache region_id (from city)
-        #  - check if city w/ region if yes, use it for brewery too
-        if value_city.present? && value_city.region.present?
-          new_attributes[ :region_id ] = value_city.region.id
-        end
-      elsif is_year?( value )  # founded/established year e.g. 1776
-        new_attributes[ :since ] = value.to_i
-      elsif value =~ /^(?:([0-9][0-9_ ]+[0-9]|[0-9]{1,2})\s*hl)$/  # e.g. 20_000 hl or 50hl etc.
-        value_prod = $1.gsub( /[ _]/, '' ).to_i
-        new_attributes[ :prod ] = value_prod
-      elsif is_website?( value )   # check for url/internet address e.g. www.ottakringer.at
-        # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
-        new_attributes[ :web ] = value
+      if match_country(value) do |country|
+           new_attributes[ :country_id ] = country.id
+         end
+      elsif match_region_for_country(value,new_attributes[:country_id]) do |region|
+              new_attributes[ :region_id ] = region.id
+            end
+      elsif match_city(value) do |city|
+              if city.present?
+                new_attributes[ :city_id ] = city.id
+              else
+                ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
+                logger.warn "city with key #{value[5..-1]} missing - for brewery #{new_attributes[:key]}"
+              end
+
+              ## for easy queries: cache region_id (from city)
+              #  - check if city w/ region if yes, use it for brewery too
+              if city.present? && city.region.present?
+                new_attributes[ :region_id ] = city.region.id
+              end
+            end
+      elsif match_year( value ) do |num|  # founded/established year e.g. 1776
+              new_attributes[ :since ] = num
+            end
+      elsif match_hl( value ) do |num|  # e.g. 20_000 hl or 50hl etc.
+              new_attributes[ :prod ] = num
+            end
+      elsif match_website( value ) do |website|  # check for url/internet address e.g. www.ottakringer.at
+              # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
+              new_attributes[ :web ] = website
+            end
       elsif is_address?( value ) # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
-        new_attributes[ :address ] = normalize_address( value )
+        new_attributes[ :address ] = normalize_addr( value )
       elsif value =~ /^brands:/   # brands:
         value_brands = value[7..-1]  ## cut off brands: prefix
         value_brands = value_brands.strip  # remove leading and trailing spaces
         # NB: brands get processed after record gets created (see below)
       elsif (values.size==(index+1)) && is_taglist?( value ) # tags must be last entry
-
         logger.debug "   found tags: >>#{value}<<"
-
-        tag_keys = value.split('|')
-  
-        ## unify; replace _ w/ space; remove leading n trailing whitespace
-        tag_keys = tag_keys.map do |key|
-          key = key.gsub( '_', ' ' )
-          key = key.strip
-          key
-        end
-          
-        value_tag_keys += tag_keys
+        value_tag_keys += find_tags( value )
       else
         # issue warning: unknown type for value
         logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
@@ -161,40 +148,20 @@ class Brewery < ActiveRecord::Base
 
         ## todo: how to handle nil/empty address lines?
 
-        ## todo: use find_city_in_adr_for_country ?? too long ?? use adr or addr
-        city_title = find_city_for_country( country_key, new_attributes[:address] )
+        city_title = find_city_in_addr( new_attributes[:address], country_key )
         
         if city_title.present?
           
-          # remove optional english translation in square brackets ([]) e.g. Wien [Vienna]
-          city_title = TextUtils.strip_translations( city_title )
-          # remove optional longer title part in {} e.g. Ottakringer {Bio} or {Alkoholfrei}
-          city_title = TextUtils.strip_tags( city_title )
-          
-          city_key = TextUtils.title_to_key( city_title )
-
-          city = City.find_by_key( city_key )
-
+          city_values = [city_title]
           city_attributes = {
-            title:      city_title,
             country_id: rec.country_id,
             region_id:  rec.region_id
-            ### fix/todo: add new autoadd flag too?
           }
+          # todo: add convenience helper create_or_update_from_title
+          city = City.create_or_update_from_values( city_values, city_attributes )
 
-          if city.present?
-            logger.debug "update City #{city.id}-#{city.key}:"
-            # todo: check - any point in updating city? for now no new attributes
-            #   update only for title - title will change?
-          else
-            logger.debug "create City:"
-            city = City.new
-            city_attributes[ :key ] = city_key   # NB: new record; include/update key
-          end
-
-          logger.debug city_attributes.to_json
-
-          city.update_attributes!( city_attributes )
+          ### fix/todo: set new autoadd flag too?
+          ##  e.g. check if updated? e.g. timestamp created <> updated otherwise assume created?
 
           ## now at last add city_id to brewery!
           rec.city_id = city.id
@@ -212,46 +179,26 @@ class Brewery < ActiveRecord::Base
     if value_brands.present?
       logger.debug " auto-adding brands >#{value_brands}<"
 
-      # remove optional english translation in square brackets ([]) e.g. Wien [Vienna]
-      value_brands = TextUtils.strip_translations( value_brands )
-
+      ## todo/fix: use strip_inline_comments (e.g #() or (()) - why?? why not??)
+      #   - allows titles as usual (use new syntax for inline comments e.g. #() or (()) for example)
+      
       # remove optional longer title part in () e.g. Las Palmas (de Gran Canaria), Palma (de Mallorca)
       value_brands = TextUtils.strip_subtitles( value_brands )
 
-      # remove optional longer title part in {} e.g. Ottakringer {Bio} or {Alkoholfrei}
-      value_brands = TextUtils.strip_tags( value_brands )
-
-      value_brand_titles = value_brands.split( ',' )
+      brand_titles = value_brands.split( ',' )
 
       # pass 1) remove leading n trailing spaces
-      value_brand_titles = value_brand_titles.map { |value| value.strip }
-
-      value_brand_titles.each do |brand_title|
-        
-        # autogenerate key from title
-        brand_key = TextUtils.title_to_key( brand_title )
-
-        brand = Brand.find_by_key( brand_key )
+      brand_titles = brand_titles.map { |value| value.strip }
 
-        brand_attributes = {
-          title:      brand_title,
-          brewery_id: rec.id,
-          country_id: rec.country_id,
-          region_id:  rec.region_id,
-          city_id:    rec.city_id
-        }
-
-        if brand.present?
-          logger.debug "update Brand #{brand.id}-#{brand.key}:"
-        else
-          logger.debug "create Brand:"
-          brand = Brand.new
-          brand_attributes[ :key ] = brand_key   # NB: new record; include/update key
-        end
-      
-        logger.debug brand_attributes.to_json
+      brand_attribs = {
+        brewery_id: rec.id,
+        country_id: rec.country_id,
+        region_id:  rec.region_id,
+        city_id:    rec.city_id
+      }
 
-        brand.update_attributes!( brand_attributes )
+      brand_titles.each do |brand_title|
+        Brand.create_or_update_from_title( brand_title, brand_attribs )
       end
     end
 

data/lib/beerdb/reader.rb

@@ -66,12 +66,9 @@ class Reader
     end
   end
 
-  def load_brewery_wikipedia( lang_key, name )
-    path = "#{include_path}/#{name}.yml"
 
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = HashReader.new( path )
+  def load_brewery_wikipedia( lang_key, name )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       brewery = Brewery.find_by_key!( key )
@@ -81,17 +78,11 @@ class Reader
       brewery.wikipedia = wikipedia
       brewery.save!
     end
-
-    Prop.create_from_fixture!( name, path )
   end
 
 
   def load_brewery_prod( name )
-    path = "#{include_path}/#{name}.yml"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = HashReader.new( path )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       brewery = Brewery.find_by_key!( key )
@@ -105,11 +96,9 @@ class Reader
         logger.warn "  unknown type for brewery prod value >#{value}<; regex pattern match failed"
       end
     end
-
-    Prop.create_from_fixture!( name, path )
   end
 
-  def load_beers_for_country_n_region( country_key, region_key, name, more_values={} )
+  def load_beers_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})<"
 
@@ -117,41 +106,35 @@ class Reader
     region  = Region.find_by_key_and_country_id!( region_key, country.id )
     logger.debug "Region #{region.key} >#{region.title}<"
 
-    more_values[ :country_id ] = country.id
-    more_values[ :region_id  ] = region.id
+    more_attribs[ :country_id ] = country.id
+    more_attribs[ :region_id  ] = region.id
     
-    more_values[ :txt ] = name  # store source ref
+    more_attribs[ :txt ] = name  # store source ref
 
-    load_beers_worker( name, more_values )
+    load_beers_worker( name, more_attribs )
   end
 
-  def load_beers_for_country( country_key, name, more_values={} )
+  def load_beers_for_country( country_key, name, more_attribs={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    more_values[ :country_id ] = country.id
+    more_attribs[ :country_id ] = country.id
 
-    more_values[ :txt ] = name  # store source ref
+    more_attribs[ :txt ] = name  # store source ref
 
-    load_beers_worker( name, more_values )
+    load_beers_worker( name, more_attribs )
   end
 
-  def load_beers_worker( name, more_values={} )
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
+  def load_beers_worker( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|
-      Beer.create_or_update_from_values( new_attributes, values )
+      Beer.create_or_update_from_attribs( new_attributes, values )
     end # each_line
-
-    Prop.create_from_fixture!( name, path )
   end
 
 
-  def load_breweries_for_country_n_region( country_key, region_key, name, more_values={} )
+  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})<"
 
@@ -159,37 +142,31 @@ class Reader
     region  = Region.find_by_key_and_country_id!( region_key, country.id )
     logger.debug "Region #{region.key} >#{region.title}<"
 
-    more_values[ :country_id ] = country.id
-    more_values[ :region_id  ] = region.id
+    more_attribs[ :country_id ] = country.id
+    more_attribs[ :region_id  ] = region.id
 
-    more_values[ :txt ] = name  # store source ref
+    more_attribs[ :txt ] = name  # store source ref
 
-    load_breweries_worker( name, more_values )
+    load_breweries_worker( name, more_attribs )
   end
 
-  def load_breweries_for_country( country_key, name, more_values={} )
+  def load_breweries_for_country( country_key, name, more_attribs={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    more_values[ :country_id ] = country.id
+    more_attribs[ :country_id ] = country.id
 
-    more_values[ :txt ] = name  # store source ref
+    more_attribs[ :txt ] = name  # store source ref
 
-    load_breweries_worker( name, more_values )
+    load_breweries_worker( name, more_attribs )
   end
 
-  def load_breweries_worker( name, more_values={} )
-    path = "#{include_path}/#{name}.txt"
+  def load_breweries_worker( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
-    
     reader.each_line do |new_attributes, values|
-      Brewery.create_or_update_from_values( new_attributes, values )
+      Brewery.create_or_update_from_attribs( new_attributes, values )
     end # each_line
-
-    Prop.create_from_fixture!( name, path )
   end
 
 end # class Reader

data/lib/beerdb/serializers/beer.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+  class BeerSerializer
+
+    def initialize( beer )
+      @beer = beer
+    end
+    
+    attr_reader :beer
+    
+    def as_json
+      brewery = {}
+      if beer.brewery.present?
+        brewery = { key: beer.brewery.key,
+                    title: beer.brewery.title }
+      end
+
+      tags = []
+      if beer.tags.present?
+        beer.tags.each { |tag| tags << tag.key }
+      end
+
+      country = {
+        key:   beer.country.key,
+        title: beer.country.title
+      }
+
+      data = { key:      beer.key,
+               title:    beer.title,
+               synonyms: beer.synonyms,
+               abv:      beer.abv,
+               srm:      beer.srm,
+               og:       beer.og,
+               tags:     tags,
+               brewery: brewery,
+               country: country }
+      
+      data.to_json
+    end
+
+  end # class BeerSerializer
+
+end # module BeerDb::Models

data/lib/beerdb/serializers/brewery.rb

@@ -0,0 +1,46 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+  class BrewerySerializer
+
+    def initialize( brewery )
+      @brewery = brewery
+    end
+    
+    attr_reader :brewery
+    
+    def as_json
+
+      beers = []
+      brewery.beers.each do |b|
+        beers << { key: b.key, title: b.title }
+      end
+
+      tags = []
+      if brewery.tags.present?
+        brewery.tags.each { |tag| tags << tag.key }
+      end
+
+      country = {
+        key:   brewery.country.key,
+        title: brewery.country.title
+      }
+
+      data = { key:      brewery.key,
+               title:    brewery.title,
+               synonyms: brewery.synonyms,
+               since:    brewery.since,
+               address:  brewery.address,
+               web:      brewery.web,
+               prod:     brewery.prod,  # (estimated) annual production in hl e.g. 2_000 hl
+               tags:     tags,
+               beers:    beers,
+               country:  country }
+
+      data.to_json
+    end
+
+  end # class BrewerySerializer
+
+end # module BeerDb::Models

data/lib/beerdb/server.rb

@@ -72,34 +72,13 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random beer
+      # NB: use .first (otherwise will get ActiveRelation not Model)
       beer = Beer.rnd.first
     else
       beer = Beer.find_by_key!( key )
     end
 
-    brewery = {}
-    if beer.brewery.present?
-      brewery = { key: beer.brewery.key,
-                  title: beer.brewery.title }
-    end
-
-    tags = []
-    if beer.tags.present?
-      beer.tags.each { |tag| tags << tag.key }
-    end
-
-    country = {
-      key:   beer.country.key,
-      title: beer.country.title
-    }
-
-    data = { key: beer.key, title: beer.title, synonyms: beer.synonyms,
-                     abv: beer.abv, srm: beer.srm, og: beer.og,
-                     tags: tags,
-                     brewery: brewery,
-                     country: country }
-
-    json_or_jsonp( data )
+    json_or_jsonp( beer.as_json_v2 )
   end
 
 
@@ -107,55 +86,29 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random brewery
+      # NB: use .first (otherwise will get ActiveRelation not Model)
       brewery = Brewery.rnd.first
     else
       brewery = Brewery.find_by_key!( key )
     end
 
-
-    beers = []
-    brewery.beers.each do |b|
-      beers << { key: b.key, title: b.title }
-    end
-
-    tags = []
-    if brewery.tags.present?
-      brewery.tags.each { |tag| tags << tag.key }
-    end
-
-    country = {
-      key:   brewery.country.key,
-      title: brewery.country.title
-    }
-
-    data = {  key: brewery.key,
-              title: brewery.title,
-              synonyms: brewery.synonyms,
-              since: brewery.since,
-              address: brewery.address,
-              web: brewery.web,
-              prod: brewery.prod,  # (estimated) annual production in hl e.g. 2_000 hl
-              tags: tags,
-              beers: beers,
-              country: country }
-
-    json_or_jsonp( data )
+    json_or_jsonp( brewery.as_json_v2 )
   end
 
 
 ### helper for json or jsonp response (depending on callback para)
 
 private
-def json_or_jsonp( data )
+def json_or_jsonp( json )
   callback = params.delete('callback')
   response = ''
 
   if callback
     content_type :js
-    response = "#{callback}(#{data.to_json})"
+    response = "#{callback}(#{json})"
   else
     content_type :json
-    response = data.to_json
+    response = json
   end
   
   response

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.15'
+  VERSION = '0.7.0'
 end

data/test/helper.rb

@@ -0,0 +1,79 @@
+
+## $:.unshift(File.dirname(__FILE__))
+
+## minitest setup
+
+# require 'minitest/unit'
+require 'minitest/autorun'
+
+# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
+
+
+# ruby stdlibs
+
+require 'json'
+require 'uri'
+require 'pp'
+
+# ruby gems
+
+require 'active_record'
+
+# our own code
+
+require 'beerdb'
+require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+
+Country = WorldDb::Models::Country
+Region  = WorldDb::Models::Region
+
+## todo: get all models aliases (e.g. from console script)
+
+Beer    = BeerDb::Models::Beer
+Brand   = BeerDb::Models::Brand
+Brewery = BeerDb::Models::Brewery
+
+
+def setup_in_memory_db
+  # Database Setup & Config
+
+  db_config = {
+    adapter:  'sqlite3',
+    database: ':memory:'
+  }
+
+  pp db_config
+
+  ActiveRecord::Base.logger = Logger.new( STDOUT )
+  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+  ## NB: every connect will create a new empty in memory db
+  ActiveRecord::Base.establish_connection( db_config )
+
+
+  ## build schema
+
+  LogDb.create
+  WorldDb.create
+  BeerDb.create
+end
+
+def fillup_in_memory_db
+  ## add some counties
+
+  at = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
+  Region.create!( key: 'w', title: 'Wien', country_id: at.id )
+  
+  de = Country.create!( key: 'de', title: 'Germany', code: 'DEU', pop: 0, area: 0 )
+  Region.create!( key: 'by', title: 'Bayern', country_id: de.id )
+  
+end
+
+setup_in_memory_db()
+fillup_in_memory_db()
+
+AT   =  Country.find_by_key!( 'at' )
+W    =  Region.find_by_key!( 'w' )
+
+DE   =  Country.find_by_key!( 'de' )
+BY   =  Region.find_by_key!( 'by' )

data/test/test_values.rb

@@ -16,26 +16,26 @@ class TestValues < MiniTest::Unit::TestCase
   end
 
   def test_load_beer_values
-    
-    new_attributes = {
-      key: 'ottakringerpur',
-      title: 'Ottakringer (Gold Fassl) Pur {Bio}',
-      synonyms: '',
-      country_id: AT.id
-    }
+
+    key = 'ottakringerpur'
 
     values = [
+      'Ottakringer (Gold Fassl) Pur {Bio}',
       '5.2 %',
       '11.8°',
       'bio'
     ]
-    
-    beer = Beer.create_or_update_from_values( new_attributes, values )
-    
-    beer2 = Beer.find_by_key!( new_attributes[:key] )
+
+    more_attribs = {
+      country_id: AT.id
+    }
+
+    beer = Beer.create_or_update_from_values( values, more_attribs )
+
+    beer2 = Beer.find_by_key!( key )
     assert( beer.id == beer2.id )
 
-    assert( beer.title         == new_attributes[:title] )
+    assert( beer.title         == values[0] )
     assert( beer.country_id    == AT.id )
     assert( beer.country.title == AT.title )
     assert( beer.abv           == 5.2 )
@@ -48,26 +48,28 @@ class TestValues < MiniTest::Unit::TestCase
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
     #   brands: Ottakringer
 
-    new_attributes = {
-      key: 'ottakringer',
-      title: 'Ottakringer Brauerei',
-      synonyms: '',
-      country_id: AT.id
-    }
+    key = 'ottakringer'
 
     values = [
+      key,
+      'Ottakringer Brauerei',
       '1838',
       'www.ottakringer.at',
       '1160 Wien // Ottakringer Platz 1',
       'brands: Ottakringer'
     ]
+
+    more_attribs = {
+      country_id: AT.id
+    }
+
     
-    by = Brewery.create_or_update_from_values( new_attributes, values )
+    by = Brewery.create_or_update_from_values( values, more_attribs )
 
-    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    by2 = Brewery.find_by_key!( key )
     assert( by.id == by2.id )
 
-    assert( by.title         == new_attributes[:title] )
+    assert( by.title         == values[1] )
     assert( by.country_id    == AT.id )
     assert( by.country.title == AT.title )
     assert( by.since         == 1838 )
@@ -91,23 +93,24 @@ class TestValues < MiniTest::Unit::TestCase
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
     #   brands: Ottakringer
 
-    new_attributes = {
-      key: 'ottakringer',
-      title: 'Ottakringer Brauerei **',
-      synonyms: '',
-      country_id: AT.id
-    }
+    key = 'ottakringer'
 
     values = [
+      key,
+      'Ottakringer Brauerei **',
       '1838',
       'www.ottakringer.at',
       '1160 Wien // Ottakringer Platz 1',
       'brands: Ottakringer'
     ]
-    
-    by = Brewery.create_or_update_from_values( new_attributes, values )
 
-    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    more_attribs = {
+      country_id: AT.id
+    }
+
+    by = Brewery.create_or_update_from_values( values, more_attribs )
+
+    by2 = Brewery.find_by_key!( key )
     assert( by.id == by2.id )
 
     assert( by.title         == 'Ottakringer Brauerei' )
@@ -122,23 +125,24 @@ class TestValues < MiniTest::Unit::TestCase
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
     #   brands: Ottakringer
 
-    new_attributes = {
-      key: 'ottakringer',
-      title: 'Ottakringer Brauerei',
-      synonyms: 'Otta **',
-      country_id: AT.id
-    }
+    key = 'ottakringer'
 
     values = [
+      key,
+      'Ottakringer Brauerei|Otta **',  # NB: title will auto-gen grade n synonyms
       '1838',
       'www.ottakringer.at',
       '1160 Wien // Ottakringer Platz 1',
       'brands: Ottakringer'
     ]
-    
-    by = Brewery.create_or_update_from_values( new_attributes, values )
 
-    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    more_attribs = {
+      country_id: AT.id
+    }
+
+    by = Brewery.create_or_update_from_values( values, more_attribs )
+
+    by2 = Brewery.find_by_key!( key )
     assert( by.id == by2.id )
 
     assert( by.title         == 'Ottakringer Brauerei' )
@@ -152,27 +156,28 @@ class TestValues < MiniTest::Unit::TestCase
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
     #   brands: Ottakringer
 
-    new_attributes = {
-      key: 'ottakringer',
-      title: 'Ottakringer Brauerei',
-      synonyms: '',
-      country_id: AT.id,
-      region_id: W.id
-    }
+    key = 'ottakringer'
 
     values = [
+      key,
+      'Ottakringer Brauerei',
       '1838',
       'www.ottakringer.at',
       '1160 Wien // Ottakringer Platz 1',
       'brands: Ottakringer'
     ]
-    
-    by = Brewery.create_or_update_from_values( new_attributes, values )
 
-    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    more_attribs = {
+      country_id: AT.id,
+      region_id: W.id
+    }
+
+    by = Brewery.create_or_update_from_values( values, more_attribs )
+
+    by2 = Brewery.find_by_key!( key )
     assert( by.id == by2.id )
 
-    assert( by.title         == new_attributes[:title] )
+    assert( by.title         == values[1] )
     assert( by.country_id    == AT.id )
     assert( by.country.title == AT.title )
     assert( by.since         == 1838 )
@@ -197,27 +202,28 @@ class TestValues < MiniTest::Unit::TestCase
 
     # hofbraeu, Hofbräu München, 1589, www.hofbraeu-muenchen.de, 81829 München // Hofbräuallee 1 
 
-    new_attributes = {
-      key: 'hofbraeu',
-      title: 'Hofbräu München',
-      synonyms: '',
-      country_id: DE.id,
-      region_id: BY.id
-    }
+    key = 'hofbraeu'
 
     values = [
+      key, 
+      'Hofbräu München',
       '1589',
       'www.hofbraeu-muenchen.de',
       '81829 München // Hofbräuallee 1',
       'brands: Hofbräu'
     ]
-    
-    by = Brewery.create_or_update_from_values( new_attributes, values )
 
-    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    more_attribs = {
+      country_id: DE.id,
+      region_id:  BY.id
+    }
+
+    by = Brewery.create_or_update_from_values( values, more_attribs )
+
+    by2 = Brewery.find_by_key!( key )
     assert( by.id == by2.id )
 
-    assert( by.title         == new_attributes[:title] )
+    assert( by.title         == values[1] )
     assert( by.country_id    == DE.id )
     assert( by.country.title == DE.title )
     assert( by.since         == 1589 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &87568670 !ruby/object:Gem::Requirement
+  requirement: &81804710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *87568670
+  version_requirements: *81804710
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &87568420 !ruby/object:Gem::Requirement
+  requirement: &81804490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *87568420
+  version_requirements: *81804490
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &87568190 !ruby/object:Gem::Requirement
+  requirement: &81804270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *87568190
+  version_requirements: *81804270
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &87567960 !ruby/object:Gem::Requirement
+  requirement: &81804050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *87567960
+  version_requirements: *81804050
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &87567740 !ruby/object:Gem::Requirement
+  requirement: &81803830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *87567740
+  version_requirements: *81803830
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -94,6 +94,8 @@ files:
 - lib/beerdb/models/tag.rb
 - lib/beerdb/reader.rb
 - lib/beerdb/schema.rb
+- lib/beerdb/serializers/beer.rb
+- lib/beerdb/serializers/brewery.rb
 - lib/beerdb/server.rb
 - lib/beerdb/server/public/style.css
 - lib/beerdb/server/views/_debug.erb
@@ -103,6 +105,7 @@ files:
 - lib/beerdb/server/views/layout.erb
 - lib/beerdb/stats.rb
 - lib/beerdb/version.rb
+- test/helper.rb
 - test/test_values.rb
 - .gemtest
 homepage: https://github.com/geraldb/beer.db.ruby