beerdb 0.6.0 → 0.6.1

data/lib/beerdb/models/beer.rb

@@ -134,7 +134,7 @@ class Beer < ActiveRecord::Base
         value_tag_keys += tag_keys
       else
         # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}<"
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
       end
     end # each value
 

data/lib/beerdb/models/brewery.rb

@@ -36,6 +36,7 @@ class Brewery < ActiveRecord::Base
     logger = LogKernel::Logger.root
 
     value_tag_keys    = []
+    value_brands      = ''
 
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
 
@@ -84,13 +85,18 @@ class Brewery < ActiveRecord::Base
         end
       elsif value =~ /^[0-9]{4}$/   # founded/established year e.g. 1776
         new_attributes[ :since ] = value.to_i
-      elsif value =~ /^(?:([0-9][0-9_]*[0-9]|[0-9])\s?hl)$/  # e.g. 20_0000 hl or 50hl etc.
-        new_attributes[ :prod ] << $1.gsub(/_/, '').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 value =~ /^www\.|\.com$/   # 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 =~ /\/{2}/  # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
         new_attributes[ :address ] = 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)) && value =~ /^[a-z0-9\|_ ]+$/   # tags must be last entry
 
         logger.debug "   found tags: >>#{value}<<"
@@ -107,7 +113,7 @@ class Brewery < ActiveRecord::Base
         value_tag_keys += tag_keys
       else
         # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}<"
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
       end
     end # each value
 
@@ -125,6 +131,14 @@ class Brewery < ActiveRecord::Base
 
     rec.update_attributes!( new_attributes )
 
+    ###################
+    # auto-add brands if presents
+
+    if value_brands.present?
+      logger.debug " auto-adding brands >#{value_brands}<"
+      # fix: to be done!
+    end
+
     ##################
     ## add taggings
 

data/lib/beerdb/reader.rb

@@ -115,8 +115,8 @@ class Reader
     reader.each do |key, value|
       brewery = Brewery.find_by_key!( key )
       
-      if value =~ /(?:([0-9][0-9_]*[0-9]|[0-9])\s*hl)/  # e.g. 20_0000 hl or 50hl etc.
-        prod =  $1.gsub(/_/, '').to_i
+      if value =~ /(?:([0-9][0-9_ ]+[0-9]|[0-9]{1,2})\s*hl)/  # e.g. 20_0000 hl or 50hl etc.
+        prod =  $1.gsub(/[ _]/, '').to_i
         logger.debug "  adding #{key} => >#{prod}<"
         brewery.prod = prod
         brewery.save!

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73799560 !ruby/object:Gem::Requirement
+  requirement: &81839750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *73799560
+  version_requirements: *81839750
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &73799340 !ruby/object:Gem::Requirement
+  requirement: &81839530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *73799340
+  version_requirements: *81839530
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &73799120 !ruby/object:Gem::Requirement
+  requirement: &81839310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *73799120
+  version_requirements: *81839310
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73798900 !ruby/object:Gem::Requirement
+  requirement: &81839090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73798900
+  version_requirements: *81839090
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73798680 !ruby/object:Gem::Requirement
+  requirement: &81838870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73798680
+  version_requirements: *81838870
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: