beerdb 0.6.14 → 0.6.15

data/lib/beerdb/models/beer.rb

@@ -55,7 +55,11 @@ class Beer < ActiveRecord::Base
     logger = LogKernel::Logger.root
     
     value_tag_keys    = []
-      
+     
+    ## check for grades (e.g. ***/**/*) in titles (will add new_attributes[:grade] to hash)
+    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
+    new_attributes[ :grade ] ||= 4
+           
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
       
     if new_attributes[:tags].present?

data/lib/beerdb/models/brewery.rb

@@ -7,6 +7,7 @@ class Brewery < ActiveRecord::Base
   # 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.
 
   self.table_name = 'breweries'
 
@@ -41,82 +42,6 @@ class Brewery < ActiveRecord::Base
 
 
 
-  ## todo/fix:
-  #    move to textutils - use AddressHelper ??
-  #  todo: add _in_adr or _in_addr to name
-
-  def self.find_city_for_country( country_key, address )
-
-    return nil if address.blank?    # do NOT process nil or empty address lines; sorry
-
-    lines = address.split( '//' )
-
-    if country_key == 'at' || country_key == 'de'
-      # first line strip numbers (assuming zip code) and whitespace
-      line1 = lines[0]
-      line1 = line1.gsub( /\b[0-9]+\b/, '' )   # use word boundries (why? why not?)
-      line1 = line1.strip
-      
-      return nil if line1.blank?   # nothing left sorry; better return nil
-      
-      line1   # assume its the city
-    else
-      nil   # unsupported country/address schema for now; sorry
-    end
-  end
-
-
-  def self.find_grade( text )  # NB: returns ary [grade,text] / two values
-    grade = 4  # defaults to grade 4  e.g  *** => 1, ** => 2, * => 3, -/- => 4
-
-    text = text.sub( /\s+(\*{1,3})\s*$/ ) do |_|  # NB: stars must end field/value
-      if $1 == '***'
-        grade = 1
-      elsif $1 == '**'
-        grade = 2
-      elsif $1 == '*'
-        grade = 3
-      else
-        # unknown grade; not possible, is'it?
-      end
-      ''  # remove * from title if found
-    end
-
-    [grade,text]
-  end
-
-  ## todo/fix: move to helper for reuse in textutils!!! (use for beer model too)
-
-  def self.find_grade_in_titles!( new_attributes )
-
-    # NB: will add a new attributes grade to hash e.g. new_attributes[:grade] = grade
-
-    if new_attributes[:title].present?
-      grade, title = find_grade( new_attributes[:title] )
-      
-      if grade == 1 || grade == 2 || grade == 3  # grade found/present; use stripped title
-        new_attributes[:title] = title
-        new_attributes[:grade] = grade
-        return grade
-      end
-    end  
-      
-    if new_attributes[:synonyms].present?
-      grade, synonyms = find_grade( new_attributes[:synonyms] )
-      
-      if grade == 1 || grade == 2 || grade == 3  # grade found/present; use stripped title
-        new_attributes[:synonyms] = synonyms
-        new_attributes[:grade] = grade
-        return grade
-      end
-    end  
-      
-    grade = 4  # defaults to grade 4  e.g  *** => 1, ** => 2, * => 3, -/- => 4
-    new_attributes[:grade] = grade
-    grade
-  end
-
-
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
@@ -126,7 +51,8 @@ class Brewery < ActiveRecord::Base
     value_brands      = ''
 
     ## check for grades (e.g. ***/**/*) in titles (will add new_attributes[:grade] to hash)
-    find_grade_in_titles!( new_attributes )
+    ## if grade missing; set default to 4; lets us update overwrite 1,2,3 values on update
+    new_attributes[ :grade ] ||= 4
 
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
 
@@ -182,7 +108,7 @@ class Brewery < ActiveRecord::Base
         # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
         new_attributes[ :web ] = value
       elsif is_address?( value ) # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
-        new_attributes[ :address ] = TextUtils.normalize_address( value )
+        new_attributes[ :address ] = normalize_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
@@ -266,7 +192,7 @@ class Brewery < ActiveRecord::Base
             city_attributes[ :key ] = city_key   # NB: new record; include/update key
           end
 
-          logger.info city_attributes.to_json
+          logger.debug city_attributes.to_json
 
           city.update_attributes!( city_attributes )
 

data/lib/beerdb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &86079670 !ruby/object:Gem::Requirement
+  requirement: &87568670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *86079670
+  version_requirements: *87568670
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &86079430 !ruby/object:Gem::Requirement
+  requirement: &87568420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *86079430
+  version_requirements: *87568420
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &86079180 !ruby/object:Gem::Requirement
+  requirement: &87568190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *86079180
+  version_requirements: *87568190
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &86078950 !ruby/object:Gem::Requirement
+  requirement: &87567960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *86078950
+  version_requirements: *87567960
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &86078720 !ruby/object:Gem::Requirement
+  requirement: &87567740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *86078720
+  version_requirements: *87567740
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: